Merge branch 'main' into stZeroKnowledge

kkrt-labs · Oct 2, 2023 · a149cef · a149cef
2 parents 4e975d7 + e88308a
commit a149cef
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/blockchain-tests-skip.yml b/blockchain-tests-skip.yml
@@ -674,6 +674,8 @@ filename:
     - sstore_XtoYtoX.json # ef-tests #410
     - sstore_XtoYtoY.json # ef-tests #410
     - sstore_XtoYtoZ.json # ef-tests #410
+  stZeroCallsTest:
+    - ZeroValue_CALL.json # ef-tests #436
   stSolidityTest:
     - TestContractSuicide.json # ef-test #132
     - TestCryptographicFunctions.json # ef-test #133
@@ -806,6 +808,12 @@ 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
+  stWalletTest:
+    - walletConfirm.json # ef-test #429
+    - walletExecuteOverDailyLimitMultiOwner.json # ef-test #430
+    - walletExecuteOverDailyLimitOnlyOneOwner.json # ef-test #430
+    - walletExecuteOverDailyLimitOnlyOneOwnerNew.json # ef-test #430
+    - walletExecuteUnderDailyLimit.json # ef-test #430
   stStaticCall:
     - StaticcallToPrecompileFromContractInitialization.json # ef-tests #421
     - static_CallContractToCreateContractAndCallItOOG.json # ef-tests #421

diff --git a/crates/ef-testing/tests/tests.rs b/crates/ef-testing/tests/tests.rs
@@ -123,12 +123,15 @@ mod blockchain_tests {
     // blockchain_tests!(st_static_flag_enabled, stStaticFlagEnabled); // 13 failing tests
     // blockchain_tests!(st_system_operations_test, stSystemOperationsTest); // 28 failing tests
     // 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_transaction_test, stTransactionTest); // ef-test #447 -
     // blockchain_tests!(st_transition_test, stTransitionTest); // 3 failing tests
-    // blockchain_tests!(st_wallet_test, stWalletTest); // 5 failing tests
+    blockchain_tests!(st_wallet_test, stWalletTest);
     blockchain_tests!(st_zero_calls_revert, stZeroCallsRevert);
     // blockchain_tests!(st_zero_calls_test, stZeroCallsTest); // 1 failing test
     blockchain_tests!(st_zero_knowledge, stZeroKnowledge);
     blockchain_tests!(st_zero_knowledge2, stZeroKnowledge2);
+    blockchain_tests!(st_zero_calls_test, stZeroCallsTest);
+    // blockchain_tests!(st_zero_knowledge, stZeroKnowledge); // 60 failing
+    // blockchain_tests!(st_zero_knowledge2, stZeroKnowledge2); // 59 failing
     blockchain_tests!(vm_tests, VmTests);
 }