Fix gas prices tests

eosnetworkfoundation · Nov 14, 2024 · 4f8a9b4 · 4f8a9b4
1 parent eddafd3
commit 4f8a9b4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/silkworm b/silkworm
diff --git a/src/config_wrapper.cpp b/src/config_wrapper.cpp
@@ -291,7 +291,7 @@ void config_wrapper::update_consensus_parameters(eosio::asset ram_price_mb, uint
                              account_bytes * gas_per_byte, /* gas_newaccount */
                              contract_fixed_bytes * gas_per_byte, /*gas_txcreate*/
                              gas_per_byte,/*gas_codedeposit*/
-                             gas_sset_min + storage_slot_bytes * gas_per_byte /*gas_sset*/
+                             (get_evm_version() < 3 ? gas_sset_min : 0) + storage_slot_bytes * gas_per_byte /*gas_sset*/
     );
 
     if(get_evm_version() >= 1) {
@@ -315,7 +315,7 @@ void config_wrapper::update_consensus_parameters2(std::optional<uint64_t> gas_tx
             if (gas_txcreate.has_value()) v.gas_parameter.gas_txcreate = *gas_txcreate;
             if (gas_codedeposit.has_value()) v.gas_parameter.gas_codedeposit = *gas_codedeposit;
             if (gas_sset.has_value()) {
-                eosio::check(*gas_sset >= gas_sset_min, "gas_sset too small");
+                eosio::check(get_evm_version() >= 3 || *gas_sset >= gas_sset_min, "gas_sset too small");
                 v.gas_parameter.gas_sset = *gas_sset;
             }
         }, p);

diff --git a/tests/gas_prices_tests.cpp b/tests/gas_prices_tests.cpp
@@ -55,20 +55,21 @@ struct gas_prices_evm_tester : basic_evm_tester
       return std::string(pl, '0') + s;
    }
 
-   auto validate_final_fee(const auto& res, uint64_t storage_gas, const silkworm::gas_prices_t& gas_prices) {
+   auto validate_final_fee(const auto& res, uint64_t cpu_gas, uint64_t storage_gas, const silkworm::gas_prices_t& gas_prices) {
 
-      auto [cost, inclusion_price, effective_gas_price, total_gas_used, scaled_gp] = res;
+      auto [cost, inclusion_price, effective_gas_price, total_gas_billed, scaled_gp] = res;
+      intx::uint256 total_gas_used = cpu_gas+storage_gas;
 
       intx::uint256 gas_refund = 0;
       if( gas_prices.storage_price >= gas_prices.overhead_price ) {
-         gas_refund = intx::uint256(total_gas_used - storage_gas);
+         gas_refund = cpu_gas;
          gas_refund *= intx::uint256(gas_prices.storage_price-gas_prices.overhead_price);
          gas_refund /= intx::uint256(effective_gas_price);
       }
 
-      auto cpu_gas = total_gas_used - storage_gas + gas_refund;
-      auto calculated_final_fee = (intx::uint256(cpu_gas + storage_gas)-gas_refund)*effective_gas_price;
-      BOOST_REQUIRE(cost == calculated_final_fee);
+      total_gas_used -= gas_refund;
+      BOOST_REQUIRE(total_gas_used == total_gas_billed);
+      BOOST_REQUIRE(cost == total_gas_used*effective_gas_price);
    }
 
 };
@@ -169,7 +170,8 @@ BOOST_FIXTURE_TEST_CASE(gas_param_scale, gas_prices_evm_tester) try {
       auto [res, contract_address] = deploy_contract_ex(evm1, evmc::from_hex(contract_bytecode).value());
       auto contract_account = find_account_by_address(contract_address).value();
       auto code_len = get_code_len(contract_account.code_id.value());
-      validate_final_fee(res, code_len*std::get<4>(res).G_codedeposit + std::get<4>(res).G_txcreate, gas_prices);
+      // total_cpu_gas_consumed: 30945
+      validate_final_fee(res, 30945, code_len*std::get<4>(res).G_codedeposit + std::get<4>(res).G_txcreate, gas_prices);
 
       // *****************************************************
       // TEST G_sset
@@ -181,7 +183,8 @@ BOOST_FIXTURE_TEST_CASE(gas_param_scale, gas_prices_evm_tester) try {
          return send_tx(eoa, txn, gas_prices, gas_params);
       };
       res = set_value(evm1, intx::uint256{77});
-      validate_final_fee(res, std::get<4>(res).G_sset - (2800 + 100), gas_prices); //sset - reset
+      // total_cpu_gas_consumed: 26646
+      validate_final_fee(res, 26646, std::get<4>(res).G_sset, gas_prices); //sset - reset
 
       // *****************************************************
       // TEST G_txnewaccount
@@ -192,7 +195,8 @@ BOOST_FIXTURE_TEST_CASE(gas_param_scale, gas_prices_evm_tester) try {
          return send_tx(eoa, txn, gas_prices, gas_params);
       };
       res = send_to_new_address(evm1, intx::uint256{1});
-      validate_final_fee(res, std::get<4>(res).G_txnewaccount, gas_prices);
+      // total_cpu_gas_consumed: 21000
+      validate_final_fee(res, 21000, std::get<4>(res).G_txnewaccount, gas_prices);
 
       // *****************************************************
       // TEST G_newaccount
@@ -211,7 +215,8 @@ BOOST_FIXTURE_TEST_CASE(gas_param_scale, gas_prices_evm_tester) try {
       };
 
       res = transfer_random_wei(evm1);
-      validate_final_fee(res, std::get<4>(res).G_newaccount, gas_prices);
+      // total_cpu_gas_consumed: 31250
+      validate_final_fee(res, 31250, std::get<4>(res).G_newaccount, gas_prices);
    };
 
    silkworm::gas_prices_t gas_prices1{
+1 −1		CMakeLists.txt
+1 −1		silkworm/core/execution/evm.cpp
+5 −4		silkworm/silkrpc/core/evm_trace.cpp
+14 −14		silkworm/silkrpc/core/evm_trace_test.cpp
+1 −1		third_party/evmone