Implement Pectra Eip-7623

silkworm/core/protocol/intrinsic_gas.cpp

@@ -30,6 +30,26 @@ intx::uint128 intrinsic_gas(const UnsignedTransaction& txn, const evmc_revision
         gas += fee::kGTxCreate;
     }
 
+    const uint64_t data_len{txn.data.length()};
+    if (data_len > 0) {
+        const intx::uint128 non_zero_bytes{std::ranges::count_if(txn.data, [](uint8_t c) { return c != 0; })};
+        const intx::uint128 non_zero_gas{rev >= EVMC_ISTANBUL ? fee::kGTxDataNonZeroIstanbul : fee::kGTxDataNonZeroFrontier};
+        gas += non_zero_bytes * non_zero_gas;
+        const intx::uint128 zero_bytes{data_len - non_zero_bytes};
+        gas += zero_bytes * fee::kGTxDataZero;
+
+        // EIP-3860: Limit and meter initcode
+        if (contract_creation && rev >= EVMC_SHANGHAI) {
+            gas += num_words(data_len) * fee::kInitCodeWordCost;
+        }
+
+        if (rev >= EVMC_PRAGUE) {
+            // EIP-7623: Increase calldata cost
+            const intx::uint128 floor_cost = fee::kGTransaction + (zero_bytes + non_zero_bytes * 4) * fee::kTotalCostFloorPerToken;
+            gas = std::max(gas, floor_cost);
+        }
+    }
+
     // EIP-2930: Optional access lists
     gas += intx::uint128{txn.access_list.size()} * fee::kAccessListAddressCost;
     intx::uint128 total_num_of_storage_keys{0};
@@ -38,22 +58,6 @@ intx::uint128 intrinsic_gas(const UnsignedTransaction& txn, const evmc_revision
     }
     gas += total_num_of_storage_keys * fee::kAccessListStorageKeyCost;
 
-    const uint64_t data_len{txn.data.length()};
-    if (data_len == 0) {
-        return gas;
-    }
-
-    const intx::uint128 non_zero_bytes{std::ranges::count_if(txn.data, [](uint8_t c) { return c != 0; })};
-    const intx::uint128 non_zero_gas{rev >= EVMC_ISTANBUL ? fee::kGTxDataNonZeroIstanbul : fee::kGTxDataNonZeroFrontier};
-    gas += non_zero_bytes * non_zero_gas;
-    const intx::uint128 zero_bytes{data_len - non_zero_bytes};
-    gas += zero_bytes * fee::kGTxDataZero;
-
-    // EIP-3860: Limit and meter initcode
-    if (contract_creation && rev >= EVMC_SHANGHAI) {
-        gas += num_words(data_len) * fee::kInitCodeWordCost;
-    }
-
     return gas;
 }
 

silkworm/core/protocol/intrinsic_gas_test.cpp

@@ -64,6 +64,25 @@ namespace protocol {
         CHECK(g0 == fee::kGTransaction + 2 * fee::kAccessListAddressCost + 2 * fee::kAccessListStorageKeyCost);
     }
 
+    TEST_CASE("EIP-7623 intrinsic gas") {
+        // EIP-7623 rules should take precedence
+
+        const Bytes calldata = Bytes(22 * 1024, 1);
+        UnsignedTransaction txn{
+            .type = TransactionType::kDynamicFee,
+            .chain_id = kSepoliaConfig.chain_id,
+            .nonce = 7,
+            .max_priority_fee_per_gas = 30000000000,
+            .max_fee_per_gas = 30000000000,
+            .gas_limit = 25748100,
+            .value = 2 * kEther,
+            .data = calldata};
+
+        intx::uint128 g0{intrinsic_gas(txn, EVMC_PRAGUE)};
+        // Calldata contains only 'ones' and the cost per EIP-7623 is higher
+        CHECK(g0 == fee::kGTransaction + 4 * calldata.size() * fee::kTotalCostFloorPerToken);
+    }
+
 }  // namespace protocol
 
 }  // namespace silkworm

silkworm/core/protocol/param.hpp

@@ -40,6 +40,8 @@ namespace fee {
 
     inline constexpr uint64_t kInitCodeWordCost{2};  // EIP-3860
 
+    inline constexpr uint64_t kTotalCostFloorPerToken{10};  // EIP-7623: Increase calldata cost
+
 }  // namespace fee
 
 inline constexpr uint64_t kMinGasLimit{5000};