Use Cancun as default schedule (#2697)

* Set Cancun as the default schedule * Update unit test expected output
runtimeverification · Jan 29, 2025 · bfd9e29 · bfd9e29
1 parent 3ba781a
commit bfd9e29
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -145,7 +145,7 @@ test-prove-smoke: $(prove_smoke_tests:=.prove)
 TEST_CONCRETE_BACKEND := llvm
 
 KEVM_MODE     := NORMAL
-KEVM_SCHEDULE := SHANGHAI
+KEVM_SCHEDULE := CANCUN
 KEVM_CHAINID  := 1
 
 KRUN_OPTS     ?=

diff --git a/README.md b/README.md
@@ -231,7 +231,7 @@ poetry -C kevm-pyk run kdist build evm-semantics.llvm --arg enable-llvm-debug=tr
 To debug a conformance test, add the `--debugger` flag to the command:
 
 ```sh
-poetry -C kevm-pyk run kevm-pyk run tests/ethereum-tests/BlockchainTests/GeneralStateTests/stExample/add11.json --target llvm --mode NORMAL --schedule SHANGHAI --chainid 1 --debugger
+poetry -C kevm-pyk run kevm-pyk run tests/ethereum-tests/BlockchainTests/GeneralStateTests/stExample/add11.json --target llvm --mode NORMAL --schedule CANCUN --chainid 1 --debugger
 ```
 
 ### Keeping in mind while developing

diff --git a/kevm-pyk/src/kevm_pyk/cli.py b/kevm-pyk/src/kevm_pyk/cli.py
@@ -454,7 +454,7 @@ class EVMChainOptions(Options):
     @staticmethod
     def default() -> dict[str, Any]:
         return {
-            'schedule': 'SHANGHAI',
+            'schedule': 'CANCUN',
             'chainid': 1,
             'mode': 'NORMAL',
             'usegas': True,

diff --git a/kevm-pyk/src/tests/integration/test_run.py b/kevm-pyk/src/tests/integration/test_run.py
@@ -31,7 +31,7 @@ def test_run(gst_file: Path, update_expected_output: bool) -> None:
         gst_data = json.load(f)
 
     # When
-    pattern = interpret(gst_data, 'SHANGHAI', 'NORMAL', 1, True, check=False)
+    pattern = interpret(gst_data, 'CANCUN', 'NORMAL', 1, True, check=False)
     actual = kore_print(pattern, definition_dir=kdist.get('evm-semantics.llvm'), output=PrintOutput.PRETTY)
 
     # Then

diff --git a/kevm-pyk/src/tests/unit/test_gst_to_kore.py b/kevm-pyk/src/tests/unit/test_gst_to_kore.py
@@ -40,7 +40,7 @@ def test_gst_to_kore(gst_path: str, expected_path: str, update_expected_output:
     expected = KoreParser(expected_file.read_text()).pattern()
 
     # When
-    actual = gst_to_kore(gst_data, 'SHANGHAI', 'NORMAL', 1, True)
+    actual = gst_to_kore(gst_data, 'CANCUN', 'NORMAL', 1, True)
 
     # Then
     if update_expected_output:

diff --git a/tests/interactive/CallRecursiveContract_d0g0v0.json.parse-expected b/tests/interactive/CallRecursiveContract_d0g0v0.json.parse-expected
diff --git a/tests/interactive/log3.gst-to-kore.expected b/tests/interactive/log3.gst-to-kore.expected
diff --git a/tests/interactive/log3_MaxTopic_d0g0v0.json.parse-expected b/tests/interactive/log3_MaxTopic_d0g0v0.json.parse-expected