Skip to content

Commit 345b9b9

Browse files
anvacaruanvacaru
committed
Merge remote-tracking branch 'origin/master' into fork-testing-experimental
2 parents 592ae79 + f7b1e51 commit 345b9b9

File tree

57 files changed

+731
-435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+731
-435
lines changed

‎deps/k_release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.208
1+
7.1.212

‎deps/kevm_release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.787
1+
1.0.792

‎flake.lock

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description = "Kontrol";
33

44
inputs = {
5-
kevm.url = "github:runtimeverification/evm-semantics/v1.0.787";
5+
kevm.url = "github:runtimeverification/evm-semantics/v1.0.792";
66
nixpkgs.follows = "kevm/nixpkgs";
77
k-framework.follows = "kevm/k-framework";
88
flake-utils.follows = "kevm/flake-utils";

‎poetry.lock

Lines changed: 445 additions & 152 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ authors = [
1212

1313
[tool.poetry.dependencies]
1414
python = "^3.10"
15-
kevm-pyk = { path = "/home/anvacaru/dev/evm-semantics/fork-testing-experimental", develop = true, subdirectory = "kevm-pyk" }
15+
kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.792", subdirectory = "kevm-pyk" }
1616
eth-utils = "*"
1717
pycryptodome = "^3.20.0"
1818
pyevmasm = "^0.2.3"

‎src/tests/integration/test-data/lemmas.k

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module SUM-TO-N-INVARIANT
2020
NORMAL
2121
</mode>
2222
<schedule>
23-
SHANGHAI
23+
CANCUN
2424
</schedule>
2525
<ethereum>
2626
<evm>

‎src/tests/integration/test-data/pausability-lemmas.k

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ module PAUSABILITY-LEMMAS [symbolic]
124124
rule [test-copy-memory-to-memory-summary]:
125125
<k> #execute ... </k>
126126
<useGas> false </useGas>
127-
<schedule> SHANGHAI </schedule>
127+
<schedule> CANCUN </schedule>
128128
<jumpDests> JUMPDESTS </jumpDests>
129129
// The program and program counter are symbolic, focusing on the part we will be executing (CP)
130130
<program> PROGRAM </program>

‎src/tests/integration/test-data/show/AccountParamsTest.testDealConcrete().trace.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ module SUMMARY-TEST%ACCOUNTPARAMSTEST.TESTDEALCONCRETE():0
3939
NORMAL
4040
</mode>
4141
<schedule>
42-
SHANGHAI
42+
CANCUN
4343
</schedule>
4444
<useGas>
4545
false

‎src/tests/integration/test-data/show/AddConst.applyOp(uint256).cse.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ module SUMMARY-SRC%CSE%ADDCONST.APPLYOP(UINT256):0
8888
NORMAL
8989
</mode>
9090
<schedule>
91-
SHANGHAI
91+
CANCUN
9292
</schedule>
9393
<useGas>
9494
false
@@ -267,7 +267,7 @@ module SUMMARY-SRC%CSE%ADDCONST.APPLYOP(UINT256):0
267267
NORMAL
268268
</mode>
269269
<schedule>
270-
SHANGHAI
270+
CANCUN
271271
</schedule>
272272
<useGas>
273273
false

0 commit comments

Comments
 (0)