diff --git a/README.md b/README.md index e24c2d1947..1180195a14 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ docker run --entrypoint evmone-bench ethereum/evmone /src/test/benchmarks evmone supports EOFv1. Since EOF validation is done once during deploy-time, evmone does not revalidate during execution of bytecode. To force EOF revalidation, you can use the `validate_eof` option, example: ``` -evmc run --vm libevmone.so,validate_eof --rev 13 "EF00" +evmc run --vm libevmone.so,validate_eof --rev 14 "EF00" ``` ## References diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt index dc1ebc2b15..7d1dcc603c 100644 --- a/test/integration/CMakeLists.txt +++ b/test/integration/CMakeLists.txt @@ -29,22 +29,22 @@ DUP1,4 {\"pc\":6,\"op\":3,\"gas\":\"0xf4234\",\"gasCost\":\"0x3\",\"memSize\":0,\"stack\":\\[\"0x0\",\"0x4\"\\],\"depth\":1,\"refund\":0,\"opName\":\"SUB\"} ") - add_test(NAME ${PREFIX}/validate_eof COMMAND evmc::tool --vm $,validate_eof run --rev 13 EF0001) + add_test(NAME ${PREFIX}/validate_eof COMMAND evmc::tool --vm $,validate_eof run --rev 14 EF0001) set_tests_properties( ${PREFIX}/validate_eof PROPERTIES PASS_REGULAR_EXPRESSION "contract validation failure") - add_test(NAME ${PREFIX}/validate_eof_success COMMAND evmc::tool --vm $,validate_eof run --rev 13 EF00010100040200010001040000000080000000) + add_test(NAME ${PREFIX}/validate_eof_success COMMAND evmc::tool --vm $,validate_eof run --rev 14 EF00010100040200010001040000000080000000) set_tests_properties( ${PREFIX}/validate_eof_success PROPERTIES PASS_REGULAR_EXPRESSION "Result: success") - add_test(NAME ${PREFIX}/validate_eof_create COMMAND evmc::tool --vm $,validate_eof run --rev 13 --create EF00010100040200010001040000000080000000) + add_test(NAME ${PREFIX}/validate_eof_create COMMAND evmc::tool --vm $,validate_eof run --rev 14 --create EF00010100040200010001040000000080000000) set_tests_properties( ${PREFIX}/validate_eof_create PROPERTIES PASS_REGULAR_EXPRESSION "contract validation failure") - add_test(NAME ${PREFIX}/validate_eof_create_success COMMAND evmc::tool --vm $,validate_eof run --rev 13 --create EF00010100040200010004030001001404000000008000025F5FEE00EF00010100040200010001040000000080000000) + add_test(NAME ${PREFIX}/validate_eof_create_success COMMAND evmc::tool --vm $,validate_eof run --rev 14 --create EF00010100040200010004030001001404000000008000025F5FEE00EF00010100040200010001040000000080000000) set_tests_properties( ${PREFIX}/validate_eof_create_success PROPERTIES PASS_REGULAR_EXPRESSION "Result: success") diff --git a/test/integration/statetest/eof/invalid_eof_in_state.json b/test/integration/statetest/eof/invalid_eof_in_state.json index 05a3e6dcbb..5a08b32501 100644 --- a/test/integration/statetest/eof/invalid_eof_in_state.json +++ b/test/integration/statetest/eof/invalid_eof_in_state.json @@ -11,7 +11,7 @@ "currentTimestamp": "0x03e8" }, "post": { - "Prague": [ + "Osaka": [ { "hash": "0xe8010ce590f401c9d61fef8ab05bea9bcec24281b795e5868809bc4e515aa530", "indexes": { diff --git a/test/unittests/eof_validation_test.cpp b/test/unittests/eof_validation_test.cpp index d4363fed93..faf15c4ceb 100644 --- a/test/unittests/eof_validation_test.cpp +++ b/test/unittests/eof_validation_test.cpp @@ -309,7 +309,7 @@ TEST_F(eof_validation, EOF1_undefined_opcodes) opcode == OP_DATALOADN || opcode == OP_JUMPF || opcode == OP_EOFCREATE || opcode == OP_RETURNCONTRACT) continue; - // These opcodes are deprecated since Prague. + // These opcodes are deprecated since Osaka. // gas_cost table current implementation does not allow to undef instructions. if (opcode == OP_JUMP || opcode == OP_JUMPI || opcode == OP_PC || opcode == OP_CALLCODE || opcode == OP_SELFDESTRUCT || opcode == OP_CALL || opcode == OP_STATICCALL ||