Merge pull request #226 from eosnetworkfoundation/elmato/merge-block-…

…extra-data-to-main [1.0 -> main] Use updated silkworm with the new block-extra-data storage
eosnetworkfoundation · May 30, 2024 · 3d78379 · 3d78379
2 parents d3dd534 + dd1af24
commit 3d78379
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/external/silkworm b/external/silkworm
diff --git a/src/block_conversion_plugin.cpp b/src/block_conversion_plugin.cpp
@@ -129,7 +129,10 @@ class block_conversion_plugin_impl : std::enable_shared_from_this<block_conversi
          new_block.header.parent_hash = last_evm_block.header.hash();
          new_block.header.transactions_root = silkworm::kEmptyRoot;
          // Note: can be null
-         new_block.consensus_parameter_index = last_evm_block.consensus_parameter_index;
+         auto cpi = last_evm_block.get_consensus_parameter_index();
+         if(cpi.has_value()) {
+            new_block.set_consensus_parameter_index(cpi);
+         }
          return new_block;
       }
 
@@ -293,9 +296,9 @@ class block_conversion_plugin_impl : std::enable_shared_from_this<block_conversi
                         .gas_sset = std::visit([](auto&& arg) -> auto& { return arg.gas_parameter.gas_sset; }, new_config),
                      }
                   };
-                  curr.consensus_parameter_index = consensus_param.hash();
+                  curr.set_consensus_parameter_index(consensus_param.hash());
 
-                  silkworm::db::update_consensus_parameters(appbase::app().get_plugin<blockchain_plugin>().get_tx(), *curr.consensus_parameter_index, consensus_param);
+                  silkworm::db::update_consensus_parameters(appbase::app().get_plugin<blockchain_plugin>().get_tx(), *curr.get_consensus_parameter_index(), consensus_param);
                }
 
                for_each_action(*new_block, [this, &curr, &block_version](const auto& act){

diff --git a/tests/nodeos_eos_evm_server.py b/tests/nodeos_eos_evm_server.py
@@ -232,7 +232,7 @@
     cmd="set account permission eosio.evm active --add-code -p eosio.evm@active"
     prodNode.processCleosCmd(cmd, cmd, silentErrors=True, returnType=ReturnType.raw)
 
-    trans = prodNode.pushMessage(evmAcc.name, "init", '{"chainid":15555, "fee_params": {"gas_price": "150000000000", "miner_cut": 10000, "ingress_bridge_fee": null}}', '-p eosio.evm')
+    trans = prodNode.pushMessage(evmAcc.name, "init", '{"chainid":15555, "fee_params": {"gas_price": "150000000000", "miner_cut": 10000, "ingress_bridge_fee": "0.0001 EOS"}}', '-p eosio.evm')
 
     prodNode.waitForTransBlockIfNeeded(trans[1], True)