use base_fee_per_gas

eosnetworkfoundation · Apr 16, 2024 · ccc5242 · ccc5242
1 parent 14342cc
commit ccc5242
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/include/evm_runtime/types.hpp b/include/evm_runtime/types.hpp
@@ -90,8 +90,9 @@ namespace evm_runtime {
    struct evmtx_v0 {
       uint64_t  eos_evm_version;
       bytes     rlptx;
-
-      EOSLIB_SERIALIZE(evmtx_v0, (eos_evm_version)(rlptx));
+      uint64_t  base_fee_per_gas;
+
+      EOSLIB_SERIALIZE(evmtx_v0, (eos_evm_version)(rlptx)(base_fee_per_gas));
    };
 
    using evmtx_type = std::variant<evmtx_v0>;

diff --git a/silkworm b/silkworm
diff --git a/src/actions.cpp b/src/actions.cpp
@@ -329,8 +329,14 @@ void evm_contract::exec(const exec_input& input, const std::optional<exec_callba
     eosevm::block_mapping bm(_config->get_genesis_time().sec_since_epoch());
 
     Block block;
+
+    auto evm_version = _config->get_evm_version();
+    std::optional<uint64_t> base_fee_per_gas;
+    if (evm_version >= 1) {
+        base_fee_per_gas = _config->get_gas_price();
+    }
     eosevm::prepare_block_header(block.header, bm, get_self().value,
-        bm.timestamp_to_evm_block_num(eosio::current_time_point().time_since_epoch().count()), _config->get_evm_version());
+        bm.timestamp_to_evm_block_num(eosio::current_time_point().time_since_epoch().count()), evm_version, base_fee_per_gas);
 
     evm_runtime::state state{get_self(), get_self(), true};
     IntraBlockState ibstate{state};
@@ -448,8 +454,14 @@ void evm_contract::process_tx(const runtime_config& rc, eosio::name miner, const
     eosevm::block_mapping bm(_config->get_genesis_time().sec_since_epoch());
 
     Block block;
+
+    std::optional<uint64_t> base_fee_per_gas;
+    if (current_version >= 1) {
+        base_fee_per_gas = _config->get_gas_price();
+    }
+
     eosevm::prepare_block_header(block.header, bm, get_self().value,
-        bm.timestamp_to_evm_block_num(eosio::current_time_point().time_since_epoch().count()), current_version);
+        bm.timestamp_to_evm_block_num(eosio::current_time_point().time_since_epoch().count()), current_version, base_fee_per_gas);
 
     silkworm::protocol::TrustRuleSet engine{*found_chain_config->second};
 
@@ -490,7 +502,7 @@ void evm_contract::process_tx(const runtime_config& rc, eosio::name miner, const
     }
 
     if (current_version >= 1) {
-        auto event = evmtx_type{evmtx_v0{current_version, txn.get_rlptx()}};
+        auto event = evmtx_type{evmtx_v0{current_version, txn.get_rlptx(), *base_fee_per_gas}};
         action(std::vector<permission_level>{}, get_self(), "evmtx"_n, event)
             .send();
     }

diff --git a/tests/basic_evm_tester.hpp b/tests/basic_evm_tester.hpp
@@ -52,6 +52,7 @@ namespace evm_test {
 struct evmtx_v0 {
    uint64_t  eos_evm_version;
    bytes     rlptx;
+   uint64_t  base_fee_per_gas;
 };
 
 using evmtx_type = std::variant<evmtx_v0>;
@@ -195,7 +196,7 @@ FC_REFLECT(evm_test::message_receiver, (account)(handler)(min_fee)(flags));
 FC_REFLECT(evm_test::bridge_message_v0, (receiver)(sender)(timestamp)(value)(data));
 FC_REFLECT(evm_test::gcstore, (id)(storage_id));
 FC_REFLECT(evm_test::account_code, (id)(ref_count)(code)(code_hash));
-FC_REFLECT(evm_test::evmtx_v0, (eos_evm_version)(rlptx));
+FC_REFLECT(evm_test::evmtx_v0, (eos_evm_version)(rlptx)(base_fee_per_gas));
 
 namespace evm_test {
 class evm_eoa