diff --git a/external/silkworm b/external/silkworm index c524bbd..6325c33 160000 --- a/external/silkworm +++ b/external/silkworm @@ -1 +1 @@ -Subproject commit c524bbde67c99812bbf8ba46e27eeec638b7815e +Subproject commit 6325c33324f4f15d3519d1f71d0f0eed4f52eb1e diff --git a/src/block_conversion_plugin.cpp b/src/block_conversion_plugin.cpp index f9f146f..e7dd014 100644 --- 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 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().get_tx(), *curr.consensus_parameter_index, consensus_param); + silkworm::db::update_consensus_parameters(appbase::app().get_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 index 0c1aa61..bd63b4a 100755 --- 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)