Merge branch 'main' into stZeroKnowledge

kkrt-labs · Oct 3, 2023 · 4d94149 · 4d94149
2 parents 3a5786c + 608e66f
commit 4d94149
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest-16-cores
-    timeout-minutes: 30
+    timeout-minutes: 120
     steps:
       - uses: actions/checkout@v3
       - name: Setup rust env

diff --git a/blockchain-tests-skip.yml b/blockchain-tests-skip.yml
@@ -808,6 +808,35 @@ filename:
     - ecadd_1-3_0-0_25000_80.json # ef-test #462
     - ecmul_0-0_340282366920938463463374607431768211456_28000_128.json # ef-test #462
     - ecmul_0-3_0_21000_80.json # ef-test #462
+  stSystemOperationsTest:
+    - ABAcalls0.json # ef-test #450
+    - ABAcalls1.json # ef-test #450
+    - ABAcalls2.json # ef-test #450
+    - ABAcalls3.json # ef-test #450
+    - ABAcallsSuicide0.json # ef-test #450
+    - Call10.json # ef-test #450
+    - callerAccountBalance.json # ef-test #450
+    - CallRecursiveBomb0.json # ef-test #450
+    - CallRecursiveBomb0_OOG_atMaxCallDepth.json # ef-test #450
+    - CallRecursiveBomb1.json # ef-test #450
+    - CallRecursiveBomb2.json # ef-test #450
+    - CallRecursiveBomb3.json # ef-test #450
+    - CallRecursiveBombLog.json # ef-test #450
+    - CallRecursiveBombLog2.json # ef-test #450
+    - CallToNameRegistratorAddressTooBigRight.json # ef-test #450
+    - PostToReturn1.json # ef-test #450
+    - CreateHashCollision.json # ef-test #451
+    - createNameRegistratorValueTooHigh.json # ef-test #451
+    - createNameRegistratorZeroMem.json # ef-test #451
+    - createNameRegistratorZeroMem2.json # ef-test #451
+    - createNameRegistratorZeroMemExpansion.json # ef-test #451
+    - createWithInvalidOpcode.json # ef-test #451
+    - testRandomTest.json # ef-test #451
+    - doubleSelfdestructTest.json # ef-test #452
+    - extcodecopy.json # ef-test #452
+    - multiSelfdestruct.json # ef-test #452
+    - suicideCallerAddresTooBigRight.json # ef-test #452
+    - suicideNotExistingAccount.json # ef-test #452
   stStaticFlagEnabled:
     - CallcodeToPrecompileFromCalledContract.json # ef-test #443
     - CallcodeToPrecompileFromContractInitialization.json # ef-test #443

diff --git a/crates/ef-testing/tests/tests.rs b/crates/ef-testing/tests/tests.rs
@@ -88,10 +88,10 @@ mod blockchain_tests {
     blockchain_tests!(st_create2, stCreate2);
     blockchain_tests!(st_create_test, stCreateTest);
     blockchain_tests!(st_delegatecall_test_homestead, stDelegatecallTestHomestead);
-    blockchain_tests!(st_eip150_specific, stEIP150Specific);
     blockchain_tests!(st_eip150single_code_gas_prices, stEIP150singleCodeGasPrices);
-    // blockchain_tests!(st_eip1559, stEIP1559); // ef-tests #455 - failing due to missing field gasPrice, cannot measure number of failing tests
+    blockchain_tests!(st_eip150_specific, stEIP150Specific);
     blockchain_tests!(st_eip158_specific, stEIP158Specific);
+    // blockchain_tests!(st_eip1559, stEIP1559); // ef-tests #455 - failing due to missing field gasPrice, cannot measure number of failing tests
     // blockchain_tests!(st_eip2930, stEIP2930); // ef-tests #455 - failing due to missing field gasPrice, cannot measure number of failing tests
     blockchain_tests!(st_eip3607, stEIP3607);
     // blockchain_tests!(st_example, stExample); // ef-tests #455 - failing due to missing field gasPrice, cannot measure number of failing tests
@@ -112,26 +112,19 @@ mod blockchain_tests {
     blockchain_tests!(st_refund_test, stRefundTest);
     blockchain_tests!(st_return_data_test, stReturnDataTest);
     blockchain_tests!(st_revert_test, stRevertTest);
-    blockchain_tests!(st_sload_test, stSLoadTest);
-    blockchain_tests!(st_sstore_test, stSStoreTest);
     blockchain_tests!(st_self_balance, stSelfBalance);
     blockchain_tests!(st_shift, stShift);
+    blockchain_tests!(st_sload_test, stSLoadTest);
     blockchain_tests!(st_solidity_test, stSolidityTest);
-    // blockchain_tests!(st_special_test, stSpecialTest); // 3 failing tests
-    // blockchain_tests!(st_stack_tests, stStackTests); // 7 failing tests
-    // blockchain_tests!(st_static_call, stStaticCall); // 207 failing tests
-    blockchain_tests!(st_static_flag_enabled, stStaticFlagEnabled);
     blockchain_tests!(st_special_test, stSpecialTest);
+    blockchain_tests!(st_sstore_test, stSStoreTest);
     blockchain_tests!(st_stack_tests, stStackTests);
     blockchain_tests!(st_static_call, stStaticCall);
-    // blockchain_tests!(st_static_flag_enabled, stStaticFlagEnabled); // 13 failing tests
-    // blockchain_tests!(st_system_operations_test, stSystemOperationsTest); // 28 failing tests
+    blockchain_tests!(st_static_flag_enabled, stStaticFlagEnabled);
+    blockchain_tests!(st_system_operations_test, stSystemOperationsTest);
     // blockchain_tests!(st_time_consuming, stTimeConsuming); // 14 failing tests
     // blockchain_tests!(st_transaction_test, stTransactionTest); // failing due to: invalid length 62, expected a (both 0x-prefixed or not) hex string or byte array containing betwee
     blockchain_tests!(st_transition_test, stTransitionTest);
-    // blockchain_tests!(st_wallet_test, stWalletTest); // 5 failing tests
-    // blockchain_tests!(st_transaction_test, stTransactionTest); // ef-test #447 -
-    // blockchain_tests!(st_transition_test, stTransitionTest); // 3 failing tests
     blockchain_tests!(st_wallet_test, stWalletTest);
     blockchain_tests!(st_zero_calls_revert, stZeroCallsRevert);
     blockchain_tests!(st_zero_knowledge, stZeroKnowledge);