# # # patch "lua_hooks.cc" # from [a5a2929db1af952708bdb1d04db73351df9d8ffc] # to [4198c65539f0a21073fb101c67593c9ea38fcbd1] # # patch "netsync.cc" # from [2cb4ed19f15eaf172872da4d7daf3ad490e1aca9] # to [502912033460ac4b1defa43c06f00aefcf6d1260] # # patch "refiner.cc" # from [52fe54a2aae857ec18ab790a4637b6aa825895ac] # to [edac9ab124500705179f7aa38dd8e632364b88cc] # ============================================================ --- lua_hooks.cc a5a2929db1af952708bdb1d04db73351df9d8ffc +++ lua_hooks.cc 4198c65539f0a21073fb101c67593c9ea38fcbd1 @@ -951,7 +951,7 @@ lua_hooks::hook_note_netsync_revision_re Lua ll(st); ll .func("note_netsync_revision_received") - .push_str(new_id.inner()()) + .push_str(encode_hexenc(new_id.inner()())) .push_str(rdat.inner()()); ll.push_table(); @@ -1001,7 +1001,7 @@ lua_hooks::hook_note_netsync_cert_receiv Lua ll(st); ll .func("note_netsync_cert_received") - .push_str(rid.inner()()) + .push_str(encode_hexenc(rid.inner()())) .push_str(kid()) .push_str(name()) .push_str(value()) ============================================================ --- netsync.cc 2cb4ed19f15eaf172872da4d7daf3ad490e1aca9 +++ netsync.cc 502912033460ac4b1defa43c06f00aefcf6d1260 @@ -3113,7 +3113,7 @@ insert_with_parents(revision_id rev, { revs.insert(rid); ++revisions_ticker; - ref.note_local_item(rev.inner()); + ref.note_local_item(rid.inner()); vector parents; rev_enumerator.get_revision_parents(rid, parents); for (vector::const_iterator i = parents.begin(); ============================================================ --- refiner.cc 52fe54a2aae857ec18ab790a4637b6aa825895ac +++ refiner.cc edac9ab124500705179f7aa38dd8e632364b88cc @@ -175,8 +175,8 @@ refiner::note_item_in_peer(merkle_node c // Write a debug message /* { - hexenc hslotval; - their_node.get_hex_slot(slot, hslotval); + id slotval; + their_node.get_raw_slot(slot, slotval); hexenc hpref; their_node.get_hex_prefix(hpref); @@ -185,7 +185,8 @@ refiner::note_item_in_peer(merkle_node c netcmd_item_type_to_string(their_node.type, typestr); L(FL("%s's peer has %s '%s' at slot %d (in node '%s', level %d)") - % voicestr() % typestr % hslotval % slot % hpref % their_node.level); + % voicestr() % typestr % encode_hexenc(slotval()) + % slot % hpref % their_node.level); } */ }