Blockchain converter code adjusted to hive::protocol::transaction::id…

… change
openhive-network · Nov 9, 2023 · 8233eeb · 8233eeb
1 parent a787b10
commit 8233eeb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/programs/blockchain_converter/converter.cpp b/programs/blockchain_converter/converter.cpp
@@ -415,7 +415,8 @@ namespace hive { namespace converter {
           calculate_transaction_expiration( head_block_time.sec_since_epoch(), _signed_block.timestamp.sec_since_epoch(), trx.expiration.sec_since_epoch(), block_offset, trx_time_offset )
         };
       }
-      while(!tapos_scope_tx_ids.insert( trx.id() ).second);
+      /// use same id computation scheme as the one used inside convert_signed_transaction.
+      while(!tapos_scope_tx_ids.insert( trx.id(hp::pack_type::legacy) ).second);
     };
 
     std::set<size_t> already_signed_transaction_pos;

diff --git a/programs/blockchain_converter/plugins/block_log_conversion/block_log_conversion_plugin.cpp b/programs/blockchain_converter/plugins/block_log_conversion/block_log_conversion_plugin.cpp
@@ -121,7 +121,7 @@ namespace detail {
           {
             converter.touch(_full_block->get_block_id());
 
-            ilog("Comparing signatures in trx ${trx_id} in block ${block_num}:", ("trx_id", tx.id())("block_num", _full_block->get_block_num()));
+            ilog("Comparing signatures in trx ${trx_id} in block ${block_num}:", ("trx_id", tx.id(hp::pack_type::legacy))("block_num", _full_block->get_block_num()));
 
             const auto& sig = *tx.signatures.begin();
             ilog("Previous signature: ${sig}", ("sig", sig));