EOFCREATE and RETURNCONTRACT implementation (#553)

circle.yml

@@ -451,7 +451,7 @@ jobs:
             ~/tests/EIPTests/BlockchainTests/
       - download_execution_tests:
           repo: ipsilon/tests
-          rev: eof-calls-20240321
+          rev: eof-eofcreate-20240416
           legacy: false
       - run:
           name: "State tests (EOF)"

lib/evmone/CMakeLists.txt

@@ -45,7 +45,7 @@ if(CABLE_COMPILER_GNULIKE)
     target_compile_options(
         evmone PRIVATE
         -fno-exceptions
-        $<$<CXX_COMPILER_ID:GNU>:-Wstack-usage=2800>
+        $<$<CXX_COMPILER_ID:GNU>:-Wstack-usage=2900>
     )
     if(NOT SANITIZE MATCHES undefined)
         # RTTI can be disabled except for UBSan which checks vptr integrity.

lib/evmone/advanced_instructions.cpp

@@ -62,6 +62,22 @@ inline TermResult impl(AdvancedExecutionState& state) noexcept
     return CoreFn(state.stack.top_item, state.gas_left, state);
 }
 
+template <Opcode Op,
+    Result CoreFn(StackTop, int64_t, ExecutionState&, code_iterator&) noexcept = core::impl<Op>>
+inline Result impl(AdvancedExecutionState& state, code_iterator pos) noexcept
+{
+    // Stack height adjustment may be omitted.
+    return CoreFn(state.stack.top_item, state.gas_left, state, pos);
+}
+
+template <Opcode Op,
+    TermResult CoreFn(StackTop, int64_t, ExecutionState&, code_iterator) noexcept = core::impl<Op>>
+inline TermResult impl(AdvancedExecutionState& state, code_iterator pos) noexcept
+{
+    // Stack height adjustment may be omitted.
+    return CoreFn(state.stack.top_item, state.gas_left, state, pos);
+}
+
 template <Opcode Op,
     code_iterator CoreFn(StackTop, ExecutionState&, code_iterator) noexcept = core::impl<Op>>
 inline code_iterator impl(AdvancedExecutionState& state, code_iterator pos) noexcept
@@ -87,6 +103,14 @@ inline code_iterator impl(AdvancedExecutionState& state, code_iterator pos) noex
 template <code_iterator InstrFn(AdvancedExecutionState&, code_iterator)>
 const Instruction* op(const Instruction* /*instr*/, AdvancedExecutionState& state) noexcept;
 
+/// Wraps the generic instruction implementation to advanced instruction function signature.
+template <Result InstrFn(AdvancedExecutionState&, code_iterator) noexcept>
+const Instruction* op(const Instruction* instr, AdvancedExecutionState& state) noexcept;
+
+/// Wraps the generic instruction implementation to advanced instruction function signature.
+template <TermResult InstrFn(AdvancedExecutionState&, code_iterator) noexcept>
+const Instruction* op(const Instruction* instr, AdvancedExecutionState& state) noexcept;
+
 namespace
 {
 using advanced::op;
@@ -286,6 +310,8 @@ constexpr std::array<instruction_exec_fn, 256> instruction_implementations = [](
     table[OP_DUPN] = op_undefined;
     table[OP_SWAPN] = op_undefined;
     table[OP_EXCHANGE] = op_undefined;
+    table[OP_EOFCREATE] = op_undefined;
+    table[OP_RETURNCONTRACT] = op_undefined;
 
     return table;
 }();

lib/evmone/baseline.cpp

@@ -209,7 +209,30 @@ struct Position
     state.status = result.status;
     return nullptr;
 }
-/// @}
+
+[[release_inline]] inline code_iterator invoke(
+    Result (*instr_fn)(StackTop, int64_t, ExecutionState&, code_iterator&) noexcept, Position pos,
+    int64_t& gas, ExecutionState& state) noexcept
+{
+    const auto result = instr_fn(pos.stack_top, gas, state, pos.code_it);
+    gas = result.gas_left;
+    if (result.status != EVMC_SUCCESS)
+    {
+        state.status = result.status;
+        return nullptr;
+    }
+    return pos.code_it;
+}
+
+[[release_inline]] inline code_iterator invoke(
+    TermResult (*instr_fn)(StackTop, int64_t, ExecutionState&, code_iterator) noexcept,
+    Position pos, int64_t& gas, ExecutionState& state) noexcept
+{
+    const auto result = instr_fn(pos.stack_top, gas, state, pos.code_it);
+    gas = result.gas_left;
+    state.status = result.status;
+    return nullptr;
+}
 
 /// A helper to invoke the instruction implementation of the given opcode Op.
 template <Opcode Op>
@@ -358,8 +381,13 @@ evmc_result execute(
     const auto gas_refund = (state.status == EVMC_SUCCESS) ? state.gas_refund : 0;
 
     assert(state.output_size != 0 || state.output_offset == 0);
-    const auto result = evmc::make_result(state.status, gas_left, gas_refund,
-        state.output_size != 0 ? &state.memory[state.output_offset] : nullptr, state.output_size);
+    const auto result =
+        (state.deploy_container.has_value() ?
+                evmc::make_result(state.status, gas_left, gas_refund,
+                    state.deploy_container->data(), state.deploy_container->size()) :
+                evmc::make_result(state.status, gas_left, gas_refund,
+                    state.output_size != 0 ? &state.memory[state.output_offset] : nullptr,
+                    state.output_size));
 
     if (INTX_UNLIKELY(tracer != nullptr))
         tracer->notify_execution_end(result);

lib/evmone/baseline_instruction_table.cpp

@@ -41,6 +41,8 @@ constexpr auto legacy_cost_tables = []() noexcept {
     tables[EVMC_PRAGUE][OP_EXTCALL] = instr::undefined;
     tables[EVMC_PRAGUE][OP_EXTSTATICCALL] = instr::undefined;
     tables[EVMC_PRAGUE][OP_EXTDELEGATECALL] = instr::undefined;
+    tables[EVMC_PRAGUE][OP_EOFCREATE] = instr::undefined;
+    tables[EVMC_PRAGUE][OP_RETURNCONTRACT] = instr::undefined;
     return tables;
 }();