eof: Remove support for EOF Creation Transaction

gumb0 · gumb0 · commit 16ed652c691b · 2025-04-09T19:03:01.000+02:00
diff --git a/lib/evmone/eof.hpp b/lib/evmone/eof.hpp
@@ -203,7 +203,7 @@ enum class EOFValidationError
 
 enum class ContainerKind : uint8_t
 {
-    /// Container that uses RETURNCODE. Can be used by EOFCREATE/TXCREATE/Creation transaction.
+    /// Container that uses RETURNCODE. Can be used by EOFCREATE/TXCREATE.
     initcode,
     /// Container that uses STOP/RETURN. Can be returned by RETURNCODE.
     runtime,
diff --git a/test/state/errors.hpp b/test/state/errors.hpp
@@ -28,6 +28,7 @@ enum ErrorCode : int
     EMPTY_BLOB_HASHES_LIST,
     INVALID_BLOB_HASH_VERSION,
     BLOB_GAS_LIMIT_EXCEEDED,
+    EOF_CREATION_TRANSACTION,
     CREATE_SET_CODE_TX,
     EMPTY_AUTHORIZATION_LIST,
     INIT_CODE_EMPTY,
@@ -81,6 +82,8 @@ inline const std::error_category& evmone_category() noexcept
                 return "invalid blob hash version";
             case BLOB_GAS_LIMIT_EXCEEDED:
                 return "blob gas limit exceeded";
+            case EOF_CREATION_TRANSACTION:
+                return "EOF initcode in creation transaction";
             case CREATE_SET_CODE_TX:
                 return "set code transaction must not be a create transaction";
             case EMPTY_AUTHORIZATION_LIST:
diff --git a/test/state/host.cpp b/test/state/host.cpp
@@ -277,42 +277,9 @@ std::optional<evmc_message> Host::prepare_message(evmc_message msg) noexcept
             }
             else
             {
-                assert(msg.kind == EVMC_EOFCREATE);
-                const bytes_view input = {msg.input_data, msg.input_size};
-
-                // Indicator of an EOF creation tx - EVMC_EOFCREATE at depth 0.
-                if (msg.depth == 0)
-                {
-                    // Assert this is a legacy EOF creation tx.
-                    assert(is_eof_container(input));
-                    const auto header_or_error = validate_header(m_rev, input);
-
-                    const auto* header = std::get_if<EOF1Header>(&header_or_error);
-                    if (header == nullptr)
-                        return {};  // Light early exception.
-
-                    if (!header->has_full_data(msg.input_size))
-                        return {};  // Light early exception.
-
-                    const auto container_size =
-                        static_cast<size_t>(header->data_offset) + header->data_size;
-                    // Follows from the header->can_init condition above.
-                    assert(container_size <= msg.input_size);
-
-                    msg.code = msg.input_data;
-                    msg.code_size = container_size;
-                    msg.input_data = msg.input_data + container_size;
-                    msg.input_size = msg.input_size - container_size;
-
-                    if (validate_eof(m_rev, ContainerKind::initcode, {msg.code, msg.code_size}) !=
-                        EOFValidationError::success)
-                        return {};  // Light early exception.
-
-                    msg.recipient = compute_create_address(msg.sender, creation_sender_nonce);
-                }
                 // EOFCREATE or TXCREATE
-                else
-                    msg.recipient = compute_eofcreate_address(msg.sender, msg.create2_salt);
+                assert(msg.kind == EVMC_EOFCREATE);
+                msg.recipient = compute_eofcreate_address(msg.sender, msg.create2_salt);
             }
 
             // By EIP-2929, the access to new created address is never reverted.
@@ -395,7 +362,7 @@ evmc::Result Host::create(const evmc_message& msg) noexcept
         {
             if (m_rev >= EVMC_OSAKA)
             {
-                // Only EOFCREATE/TXCREATE/EOF-creation-tx is allowed to deploy code starting with
+                // Only EOFCREATE/TXCREATE is allowed to deploy code starting with
                 // EF. It must be valid EOF, which was validated before execution.
                 if (msg.kind != EVMC_EOFCREATE)
                     return evmc::Result{EVMC_CONTRACT_VALIDATION_FAILURE};
diff --git a/test/state/state.cpp b/test/state/state.cpp
@@ -75,7 +75,7 @@ TransactionCost compute_tx_intrinsic_cost(evmc_revision rev, const Transaction&
     static constexpr auto INITCODE_WORD_COST = 2;
     static constexpr auto TOTAL_COST_FLOOR_PER_TOKEN = 10;
 
-    const auto is_create = !tx.to.has_value();  // Covers also EOF creation transactions.
+    const auto is_create = !tx.to.has_value();
 
     const auto create_cost = (is_create && rev >= EVMC_HOMESTEAD) ? TX_CREATE_COST : 0;
 
@@ -186,17 +186,12 @@ int64_t process_authorization_list(
     return delegation_refund;
 }
 
-evmc_message build_message(
-    const Transaction& tx, int64_t execution_gas_limit, evmc_revision rev) noexcept
+evmc_message build_message(const Transaction& tx, int64_t execution_gas_limit) noexcept
 {
     const auto recipient = tx.to.has_value() ? *tx.to : evmc::address{};
 
-    const auto is_legacy_eof_create =
-        rev >= EVMC_OSAKA && !tx.to.has_value() && is_eof_container(tx.data);
-
-    return {.kind = is_legacy_eof_create ? EVMC_EOFCREATE :
-                    tx.to.has_value()    ? EVMC_CALL : // NOLINT(readability-avoid-nested-conditional-operator)
-                                           EVMC_CREATE,
+    return {
+        .kind = tx.to.has_value() ? EVMC_CALL : EVMC_CREATE,
         .flags = 0,
         .depth = 0,
         .gas = execution_gas_limit,
@@ -208,7 +203,8 @@ evmc_message build_message(
         .create2_salt = {},
         .code_address = recipient,
         .code = nullptr,
-        .code_size = 0};
+        .code_size = 0,
+    };
 }
 }  // namespace
 
@@ -531,6 +527,9 @@ std::variant<TransactionProperties, std::error_code> validate_transaction(
     if (rev >= EVMC_SHANGHAI && !tx.to.has_value() && tx.data.size() > MAX_INITCODE_SIZE)
         return make_error_code(INIT_CODE_SIZE_LIMIT_EXCEEDED);
 
+    if (rev >= EVMC_OSAKA && !tx.to.has_value() && is_eof_container(tx.data))
+        return make_error_code(EOF_CREATION_TRANSACTION);
+
     // Compute and check if sender has enough balance for the theoretical maximum transaction cost.
     // Note this is different from tx_max_cost computed with effective gas price later.
     // The computation cannot overflow if done with 512-bit precision.
@@ -634,7 +633,7 @@ TransactionReceipt transition(const StateView& state_view, const BlockInfo& bloc
     if (rev >= EVMC_SHANGHAI)
         host.access_account(block.coinbase);
 
-    auto message = build_message(tx, tx_props.execution_gas_limit, rev);
+    auto message = build_message(tx, tx_props.execution_gas_limit);
     if (tx.to.has_value())
     {
         if (const auto delegate = get_delegate_address(host, *tx.to))
diff --git a/test/statetest/statetest_export.cpp b/test/statetest/statetest_export.cpp
@@ -49,6 +49,8 @@ namespace evmone::test
         return "TR_BLOBVERSION_INVALID";
     case BLOB_GAS_LIMIT_EXCEEDED:
         return "TR_BLOBLIST_OVERSIZE";
+    case EOF_CREATION_TRANSACTION:
+        return "TR_EOFCreationTransaction";
     case UNKNOWN_ERROR:
         return "Unknown error";
     default:
diff --git a/test/unittests/eof_example_test.cpp b/test/unittests/eof_example_test.cpp
@@ -119,46 +119,6 @@ TEST_F(state_transition, eof_examples_callf)
     expect.post[*tx.to].exists = true;
 }
 
-TEST_F(state_transition, eof_examples_creation_tx)
-{
-    // # Example 4
-    //
-    // A creation transaction used to create a new EOF contract.
-
-    rev = EVMC_OSAKA;
-
-    const auto initcontainer = bytecode(
-        //////////////////
-        // Initcontainer
-        //                        Code section: PUSH0 [aux data size], PUSH0 [aux data offset] and
-        //                                      RETURNCODE first subcontainer
-        //                                                                   |
-        //               Header: 1 code section 4 bytes long                 |
-        //               |                                                   |
-        //    version    |                                     Header terminator
-        //    |          |___________                          |             |________
-        "EF00 01 01 0004 02 0001 0004 03 0001 00000014 FF 0000 00 00 80 0002 5F5F EE00"
-        //       |‾‾‾‾‾‾              |‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ |‾‾‾‾‾‾    |‾‾‾‾‾‾‾‾‾
-        //       |                    |                Header: data section 0 bytes long
-        //       |                    |                           |
-        //       Header: types section 4 bytes long               Types section: first code section
-        //                            |                           0 inputs, non-returning,
-        //                            |                           max stack height 2
-        //       Header: 1 subcontainer 20 bytes long
-        //
-        //////////////////
-        // Deployed container (contract doing nothing, see Example 1)
-        "EF00 01 01 0004 02 0001 0001 FF 0000 00 00 80 0000 00");
-
-    // Put the initcontainer in the `data` field of the transaction, appending some calldata.
-    tx.data = initcontainer + "ABCDEF";
-    // Empty `to` field.
-    tx.to = std::nullopt;
-
-    // Address of the newly created contract is calculated using the deployer's address and nonce.
-    expect.post[0x3442a1dec1e72f337007125aa67221498cdd759d_address].exists = true;
-}
-
 TEST_F(state_transition, eof_examples_eofcreate)
 {
     // # Example 5
diff --git a/test/unittests/state_transition_eof_create_test.cpp b/test/unittests/state_transition_eof_create_test.cpp
diff --git a/test/unittests/state_tx_test.cpp b/test/unittests/state_tx_test.cpp

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ enum class EOFValidationError`
`203`	`203`
`204`	`204`	`enum class ContainerKind : uint8_t`
`205`	`205`	`{`
`206`		`- /// Container that uses RETURNCODE. Can be used by EOFCREATE/TXCREATE/Creation transaction.`
	`206`	`+ /// Container that uses RETURNCODE. Can be used by EOFCREATE/TXCREATE.`
`207`	`207`	`initcode,`
`208`	`208`	`/// Container that uses STOP/RETURN. Can be returned by RETURNCODE.`
`209`	`209`	`runtime,`