Enable running new Istanbul tests, add list of failing tests (#599)

* evm, state-loader: add Istanbul schedule * Makefile: use Istanbul tests and LegacyTests * tests/{failing,slow}.{llvm,ocaml}: add failing/slow Istanbul tests A test is `slow` if it either takes longer that 120s or passes in 120s but takes >10G RAM. A test is `failing` if it exits with code non-0 in less than 120s.
runtimeverification · Dec 4, 2019 · 58cab80 · 58cab80
1 parent 4d66123
commit 58cab80
Show file tree

Hide file tree

Showing 7 changed files with 2,866 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -467,7 +467,8 @@ test-all-vm: $(all_vm_tests:=.run)
 test-rest-vm: $(rest_vm_tests:=.run)
 test-vm: $(passing_vm_tests:=.run)
 
-all_bchain_tests     = $(wildcard tests/ethereum-tests/LegacyTests/Constantinople/BlockchainTests/GeneralStateTests/*/*.json)
+all_bchain_tests     = $(wildcard tests/ethereum-tests/BlockchainTests/GeneralStateTests/*/*.json)                            \
+                       $(wildcard tests/ethereum-tests/LegacyTests/Constantinople/BlockchainTests/GeneralStateTests/*/*.json)
 quick_bchain_tests   = $(filter-out $(slow_conformance_tests), $(all_bchain_tests))
 passing_bchain_tests = $(filter-out $(failing_conformance_tests), $(quick_bchain_tests))
 rest_bchain_tests    = $(filter-out $(passing_bchain_tests), $(all_bchain_tests))

diff --git a/evm.md b/evm.md
@@ -1690,6 +1690,7 @@ Precompiled Contracts
     rule #precompiledAccounts(BYZANTIUM)         => #precompiledAccounts(SPURIOUS_DRAGON) SetItem(5) SetItem(6) SetItem(7) SetItem(8)
     rule #precompiledAccounts(CONSTANTINOPLE)    => #precompiledAccounts(BYZANTIUM)
     rule #precompiledAccounts(PETERSBURG)        => #precompiledAccounts(CONSTANTINOPLE)
+    rule #precompiledAccounts(ISTANBUL)          => #precompiledAccounts(PETERSBURG)
 ```
 
 -   `ECREC` performs ECDSA public key recovery.
@@ -2431,6 +2432,16 @@ A `ScheduleConst` is a constant determined by the fee schedule.
       requires notBool ( SCHEDFLAG ==K Ghasdirtysstore )
 ```
 
+### Istanbul Schedule
+
+```k
+    syntax Schedule ::= "ISTANBUL" [klabel(ISTANBUL_EVM), symbol]
+ // -------------------------------------------------------------
+    rule SCHEDCONST < ISTANBUL > => SCHEDCONST < PETERSBURG >
+
+    rule SCHEDFLAG << ISTANBUL >> => SCHEDFLAG << PETERSBURG >>
+```
+
 EVM Program Representations
 ===========================
 

diff --git a/state-loader.md b/state-loader.md
@@ -171,6 +171,7 @@ The `"network"` key allows setting the fee schedule inside the test.
     rule #asScheduleString("Byzantium")         => BYZANTIUM
     rule #asScheduleString("Constantinople")    => CONSTANTINOPLE
     rule #asScheduleString("ConstantinopleFix") => PETERSBURG
+    rule #asScheduleString("Istanbul")          => ISTANBUL
 ```
 
 The `"rlp"` key loads the block information.

diff --git a/tests/failing.llvm b/tests/failing.llvm
diff --git a/tests/failing.ocaml b/tests/failing.ocaml
diff --git a/tests/slow.llvm b/tests/slow.llvm
@@ -1,3 +1,9 @@
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopy.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/Return50000_2.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/Return50000.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stStaticCall/static_Call50000.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stStaticCall/static_Call50000_rip160.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stTimeConsuming/static_Call50000_sha256.json
 tests/ethereum-tests/LegacyTests/Constantinople/BlockchainTests/GeneralStateTests/stAttackTest/ContractCreationSpam_d0g0v0.json
 tests/ethereum-tests/LegacyTests/Constantinople/BlockchainTests/GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize_d0g0v0.json
 tests/ethereum-tests/LegacyTests/Constantinople/BlockchainTests/GeneralStateTests/stCodeSizeLimit/codesizeValid_d0g0v0.json

diff --git a/tests/slow.ocaml b/tests/slow.ocaml
@@ -1,3 +1,15 @@
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/Call50000.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/Callcode50000.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopy.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/Return50000_2.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/Return50000.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stStaticCall/static_Call50000_ecrec.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stStaticCall/static_Call50000_identity2.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stStaticCall/static_Call50000_identity.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stStaticCall/static_Call50000.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stStaticCall/static_Call50000_rip160.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stStaticCall/static_Return50000_2.json
+tests/ethereum-tests/BlockchainTests/GeneralStateTests/stTimeConsuming/static_Call50000_sha256.json
 tests/ethereum-tests/LegacyTests/Constantinople/BlockchainTests/GeneralStateTests/stCreateTest/CREATE_ContractRETURNBigOffset_d0g0v0.json
 tests/ethereum-tests/LegacyTests/Constantinople/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/Call50000bytesContract50_1_d0g0v0.json
 tests/ethereum-tests/LegacyTests/Constantinople/BlockchainTests/GeneralStateTests/stQuadraticComplexityTest/Call50000bytesContract50_1_d0g1v0.json