state: Rename Transaction::Type::{eip2930→access_list}

Author: chfast

test/state/state.cpp

@@ -67,7 +67,7 @@ std::variant<int64_t, std::error_code> validate_transaction(const Account& sende
             return make_error_code(TIP_GT_FEE_CAP);  // Priority gas price is too high.
         [[fallthrough]];
 
-    case Transaction::Type::eip2930:
+    case Transaction::Type::access_list:
         if (rev < EVMC_BERLIN)
             return make_error_code(TX_TYPE_NOT_SUPPORTED);
         [[fallthrough]];
@@ -226,7 +226,7 @@ std::variant<TransactionReceipt, std::error_code> transition(
         return rlp::encode_tuple(tx.nonce, tx.max_gas_price, static_cast<uint64_t>(tx.gas_limit),
             tx.to.has_value() ? tx.to.value() : bytes_view(), tx.value, tx.data, tx.v, tx.r, tx.s);
     }
-    else if (tx.type == Transaction::Type::eip2930)
+    else if (tx.type == Transaction::Type::access_list)
     {
         if (tx.v > 1)
             throw std::invalid_argument("`v` value for eip2930 transaction must be 0 or 1");

test/state/state.hpp

@@ -104,7 +104,7 @@ struct Transaction
 
         /// The typed transaction with optional account/storage access list.
         /// Introduced by EIP-2930 https://eips.ethereum.org/EIPS/eip-2930.
-        eip2930 = 1,
+        access_list = 1,
 
         /// The typed transaction with priority gas price.
         /// Introduced by EIP-1559 https://eips.ethereum.org/EIPS/eip-1559.

test/statetest/statetest_loader.cpp

@@ -288,7 +288,7 @@ state::Transaction from_json<state::Transaction>(const json::json& j)
     {
         o.access_list = from_json<state::AccessList>(*ac_it);
         if (o.type == state::Transaction::Type::legacy)  // Upgrade tx type if tx has access list
-            o.type = state::Transaction::Type::eip2930;
+            o.type = state::Transaction::Type::access_list;
     }
 
     if (const auto type_it = j.find("type"); type_it != j.end())
@@ -317,7 +317,7 @@ static void from_json(const json::json& j, TestMultiTransaction& o)
         for (const auto& j_access_list : *ac_it)
             o.access_lists.emplace_back(from_json<state::AccessList>(j_access_list));
         if (o.type == state::Transaction::Type::legacy)  // Upgrade tx type if tx has access lists
-            o.type = state::Transaction::Type::eip2930;
+            o.type = state::Transaction::Type::access_list;
     }
 
     for (const auto& j_gas_limit : j.at("gasLimit"))

test/unittests/state_rlp_test.cpp

@@ -383,7 +383,7 @@ TEST(state_rlp, tx_to_rlp_eip1559_invalid_v_value)
 TEST(state_rlp, tx_to_rlp_eip2930_invalid_v_value)
 {
     state::Transaction tx{};
-    tx.type = evmone::state::Transaction::Type::eip2930;
+    tx.type = evmone::state::Transaction::Type::access_list;
     tx.data = ""_hex;
     tx.gas_limit = 1;
     tx.max_gas_price = 1;
@@ -431,7 +431,7 @@ TEST(state_rlp, tx_to_rlp_eip2930_with_non_empty_access_list)
     // https://etherscan.io/tx/0xf076e75aa935552e20e5d9fd4d1dda4ff33399ff3d6ac22843ae646f82c385d4
 
     state::Transaction tx{};
-    tx.type = evmone::state::Transaction::Type::eip2930;
+    tx.type = evmone::state::Transaction::Type::access_list;
     tx.data =
         "0x095ea7b3000000000000000000000000f17d23136b4fead139f54fb766c8795faae09660ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"_hex;
     tx.gas_limit = 51253;

test/unittests/statetest_loader_tx_test.cpp

@@ -163,7 +163,7 @@ TEST(statetest_loader, tx_type_1)
     })";
 
     const auto tx = test::from_json<state::Transaction>(json::json::parse(input));
-    EXPECT_EQ(tx.type, state::Transaction::Type::eip2930);
+    EXPECT_EQ(tx.type, state::Transaction::Type::access_list);
     EXPECT_TRUE(tx.data.empty());
     EXPECT_EQ(tx.gas_limit, 0);
     EXPECT_EQ(tx.value, 0);