From 3cc6077926083a23f812ab7404f503dd09851b90 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Tue, 29 Oct 2024 14:26:18 -0600 Subject: [PATCH 1/3] Update dependency: deps/k_release (#2650) * deps/k_release: Set Version 7.1.165 * kevm-pyk/: sync poetry files pyk version 7.1.165 * flake.{nix,lock}: update Nix derivations * deps/k_release: Set Version 7.1.166 * kevm-pyk/: sync poetry files pyk version 7.1.166 * flake.{nix,lock}: update Nix derivations * kevm-pyk/: sync poetry files pyk version 7.1.166 * tests/failing-symbolic.haskell-booster-dev: update failing list * kevm-pyk/: sync poetry files pyk version 7.1.166 --------- Co-authored-by: devops Co-authored-by: Everett Hildenbrandt --- deps/k_release | 2 +- flake.lock | 24 ++-- flake.nix | 2 +- kevm-pyk/poetry.lock | 143 +++++++++++---------- kevm-pyk/pyproject.toml | 2 +- tests/failing-symbolic.haskell-booster-dev | 16 +-- 6 files changed, 94 insertions(+), 95 deletions(-) diff --git a/deps/k_release b/deps/k_release index abf92f03d7..3f313895f7 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -7.1.163 +7.1.166 diff --git a/flake.lock b/flake.lock index 90cd02ddc9..c506220531 100644 --- a/flake.lock +++ b/flake.lock @@ -243,16 +243,16 @@ "z3": "z3_2" }, "locked": { - "lastModified": 1729168859, - "narHash": "sha256-S9Vx0p6kDorS9NwnZb+QOTGpMKXwGlchCiiow881nTs=", + "lastModified": 1729679874, + "narHash": "sha256-+HNfnDTdH08YEHgTYIB0CF1YWrJMbiH9vyQUKnOyhsA=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "712543ed61f5ca4365b84d0f7ef6d71a35349662", + "rev": "d933d5ccb4cee63b83b8a990a03d3f4267139e41", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.90", + "ref": "v0.1.92", "repo": "haskell-backend", "type": "github" } @@ -352,16 +352,16 @@ ] }, "locked": { - "lastModified": 1729209879, - "narHash": "sha256-6kDVw8CTZWJf8iHeWGO95/PZYJiQ85UtmqsN43oZ/JI=", + "lastModified": 1729715336, + "narHash": "sha256-e4515vXk5qzIITnYvcUK3kbC37S8S0PMbqv56ld5OAU=", "owner": "runtimeverification", "repo": "k", - "rev": "bf646f946cebf36aa77f2eec4dd695cc1d99823e", + "rev": "5d1ccd5a2585cbec970c68f8530ddbf2b27fe574", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v7.1.163", + "ref": "v7.1.166", "repo": "k", "type": "github" } @@ -432,16 +432,16 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1729095682, - "narHash": "sha256-+mUxQhIwzIfBFIfnCjlbp06uWDYVbxq78FEQAgAB40E=", + "lastModified": 1729195362, + "narHash": "sha256-/Fw5o0F3AJ+zk9nEOEsxLnSrWiKrDOe5RN6ChilbVfY=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "84a419e02b1e378df4f012d8975c0e4f16f71783", + "rev": "37b1dd959d47f7b072751b8a3aaef3837de49a79", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.100", + "ref": "v0.1.101", "repo": "llvm-backend", "type": "github" } diff --git a/flake.nix b/flake.nix index d3cfc4c996..6195974555 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "A flake for the KEVM Semantics"; inputs = { - k-framework.url = "github:runtimeverification/k/v7.1.163"; + k-framework.url = "github:runtimeverification/k/v7.1.166"; nixpkgs.follows = "k-framework/nixpkgs"; flake-utils.follows = "k-framework/flake-utils"; rv-utils.follows = "k-framework/rv-utils"; diff --git a/kevm-pyk/poetry.lock b/kevm-pyk/poetry.lock index 78183af8e4..026eb0a328 100644 --- a/kevm-pyk/poetry.lock +++ b/kevm-pyk/poetry.lock @@ -107,25 +107,25 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""} [[package]] name = "cmd2" -version = "2.4.3" +version = "2.5.0" description = "cmd2 - quickly build feature-rich and user-friendly interactive command line applications in Python" optional = false -python-versions = ">=3.6" +python-versions = ">=3.8" files = [ - {file = "cmd2-2.4.3-py3-none-any.whl", hash = "sha256:f1988ff2fff0ed812a2d25218a081b0fa0108d45b48ba2a9272bb98091b654e6"}, - {file = "cmd2-2.4.3.tar.gz", hash = "sha256:71873c11f72bd19e2b1db578214716f0d4f7c8fa250093c601265a9a717dee52"}, + {file = "cmd2-2.5.0-py3-none-any.whl", hash = "sha256:77aa9873259080a86f765bf466e0d9c9e145faacd129b56325940997cc36ca0c"}, + {file = "cmd2-2.5.0.tar.gz", hash = "sha256:36292d144e5fd62549b50e94e5f36514557fb92e615155ac28763ea4bc13b954"}, ] [package.dependencies] -attrs = ">=16.3.0" -pyperclip = ">=1.6" +pyperclip = "*" pyreadline3 = {version = "*", markers = "sys_platform == \"win32\""} -wcwidth = ">=0.1.7" +wcwidth = "*" [package.extras] -dev = ["codecov", "doc8", "flake8", "invoke", "mypy", "nox", "pytest (>=4.6)", "pytest-cov", "pytest-mock", "sphinx", "sphinx-autobuild", "sphinx-rtd-theme", "twine (>=1.11)"] -test = ["codecov", "coverage", "gnureadline", "pytest (>=4.6)", "pytest-cov", "pytest-mock"] -validate = ["flake8", "mypy", "types-pkg-resources"] +dev = ["codecov", "doc8", "invoke", "mypy", "nox", "pytest (>=4.6)", "pytest-cov", "pytest-mock", "ruff", "sphinx", "sphinx-autobuild", "sphinx-rtd-theme", "twine"] +docs = ["setuptools", "setuptools-scm", "sphinx", "sphinx-autobuild", "sphinx-rtd-theme"] +test = ["codecov", "coverage", "gnureadline", "pytest", "pytest-cov", "pytest-mock"] +validate = ["mypy", "ruff", "types-setuptools"] [[package]] name = "colorama" @@ -327,13 +327,13 @@ dev = ["coverage", "hypothesis", "hypothesmith (>=0.2)", "pre-commit", "pytest", [[package]] name = "flake8-comprehensions" -version = "3.15.0" +version = "3.16.0" description = "A flake8 plugin to help you write better list/set/dict comprehensions." optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "flake8_comprehensions-3.15.0-py3-none-any.whl", hash = "sha256:b7e027bbb52be2ceb779ee12484cdeef52b0ad3c1fcb8846292bdb86d3034681"}, - {file = "flake8_comprehensions-3.15.0.tar.gz", hash = "sha256:923c22603e0310376a6b55b03efebdc09753c69f2d977755cba8bb73458a5d4d"}, + {file = "flake8_comprehensions-3.16.0-py3-none-any.whl", hash = "sha256:7c1eadc9d22e765f39857798febe7766b4d9c519793c6c149e3e13bf99693f70"}, + {file = "flake8_comprehensions-3.16.0.tar.gz", hash = "sha256:9cbf789905a8f03f9d350fb82b17b264d9a16c7ce3542b2a7b871ef568cafabe"}, ] [package.dependencies] @@ -400,13 +400,13 @@ pyreadline3 = {version = "*", markers = "sys_platform == \"win32\" and python_ve [[package]] name = "hypothesis" -version = "6.115.3" +version = "6.115.5" description = "A library for property-based testing" optional = false python-versions = ">=3.9" files = [ - {file = "hypothesis-6.115.3-py3-none-any.whl", hash = "sha256:d2770b0db08ad666fe6ff36027910039ab681084d13bcf9c057449c2e27099c4"}, - {file = "hypothesis-6.115.3.tar.gz", hash = "sha256:d4efc8c7371bd4ec906d2777f1f18fee5539e47b3d7c7cdc93d1026ad35d9b33"}, + {file = "hypothesis-6.115.5-py3-none-any.whl", hash = "sha256:b7733459ae9a93020fac3b91b41473c9b85e975139a152a70d88f3a5caa3fa3f"}, + {file = "hypothesis-6.115.5.tar.gz", hash = "sha256:4768c5fb426b305462ed31032d6e216a31daaefb1dc3134fdf2795b7961d7cb3"}, ] [package.dependencies] @@ -495,13 +495,13 @@ colors = ["colorama (>=0.4.6)"] [[package]] name = "kframework" -version = "7.1.163" +version = "7.1.166" description = "" optional = false python-versions = "<4.0,>=3.10" files = [ - {file = "kframework-7.1.163-py3-none-any.whl", hash = "sha256:811990c7bb1421928b2d823f38c652ae13c6e2618acd7de887d31c1da335011b"}, - {file = "kframework-7.1.163.tar.gz", hash = "sha256:5ddf3d3041505eae2aaafeca75371d56cef4add54ad441e32aa5e49de9114d12"}, + {file = "kframework-7.1.166-py3-none-any.whl", hash = "sha256:a040ac35a29c06fe7abec2d305dbc4b632a037a6a4047992605326a5078c8565"}, + {file = "kframework-7.1.166.tar.gz", hash = "sha256:cf57661f081e1a4309dd639e6bbf71ad38df080111b6e5f793f65e8c5848e69f"}, ] [package.dependencies] @@ -634,43 +634,43 @@ dill = ">=0.3.9" [[package]] name = "mypy" -version = "1.12.1" +version = "1.13.0" description = "Optional static typing for Python" optional = false python-versions = ">=3.8" files = [ - {file = "mypy-1.12.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3d7d4371829184e22fda4015278fbfdef0327a4b955a483012bd2d423a788801"}, - {file = "mypy-1.12.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f59f1dfbf497d473201356966e353ef09d4daec48caeacc0254db8ef633a28a5"}, - {file = "mypy-1.12.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b947097fae68004b8328c55161ac9db7d3566abfef72d9d41b47a021c2fba6b1"}, - {file = "mypy-1.12.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:96af62050971c5241afb4701c15189ea9507db89ad07794a4ee7b4e092dc0627"}, - {file = "mypy-1.12.1-cp310-cp310-win_amd64.whl", hash = "sha256:d90da248f4c2dba6c44ddcfea94bb361e491962f05f41990ff24dbd09969ce20"}, - {file = "mypy-1.12.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1230048fec1380faf240be6385e709c8570604d2d27ec6ca7e573e3bc09c3735"}, - {file = "mypy-1.12.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:02dcfe270c6ea13338210908f8cadc8d31af0f04cee8ca996438fe6a97b4ec66"}, - {file = "mypy-1.12.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a5a437c9102a6a252d9e3a63edc191a3aed5f2fcb786d614722ee3f4472e33f6"}, - {file = "mypy-1.12.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:186e0c8346efc027ee1f9acf5ca734425fc4f7dc2b60144f0fbe27cc19dc7931"}, - {file = "mypy-1.12.1-cp311-cp311-win_amd64.whl", hash = "sha256:673ba1140a478b50e6d265c03391702fa11a5c5aff3f54d69a62a48da32cb811"}, - {file = "mypy-1.12.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:9fb83a7be97c498176fb7486cafbb81decccaef1ac339d837c377b0ce3743a7f"}, - {file = "mypy-1.12.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:389e307e333879c571029d5b93932cf838b811d3f5395ed1ad05086b52148fb0"}, - {file = "mypy-1.12.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:94b2048a95a21f7a9ebc9fbd075a4fcd310410d078aa0228dbbad7f71335e042"}, - {file = "mypy-1.12.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4ee5932370ccf7ebf83f79d1c157a5929d7ea36313027b0d70a488493dc1b179"}, - {file = "mypy-1.12.1-cp312-cp312-win_amd64.whl", hash = "sha256:19bf51f87a295e7ab2894f1d8167622b063492d754e69c3c2fed6563268cb42a"}, - {file = "mypy-1.12.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:d34167d43613ffb1d6c6cdc0cc043bb106cac0aa5d6a4171f77ab92a3c758bcc"}, - {file = "mypy-1.12.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:427878aa54f2e2c5d8db31fa9010c599ed9f994b3b49e64ae9cd9990c40bd635"}, - {file = "mypy-1.12.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5fcde63ea2c9f69d6be859a1e6dd35955e87fa81de95bc240143cf00de1f7f81"}, - {file = "mypy-1.12.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:d54d840f6c052929f4a3d2aab2066af0f45a020b085fe0e40d4583db52aab4e4"}, - {file = "mypy-1.12.1-cp313-cp313-win_amd64.whl", hash = "sha256:20db6eb1ca3d1de8ece00033b12f793f1ea9da767334b7e8c626a4872090cf02"}, - {file = "mypy-1.12.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b16fe09f9c741d85a2e3b14a5257a27a4f4886c171d562bc5a5e90d8591906b8"}, - {file = "mypy-1.12.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0dcc1e843d58f444fce19da4cce5bd35c282d4bde232acdeca8279523087088a"}, - {file = "mypy-1.12.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e10ba7de5c616e44ad21005fa13450cd0de7caaa303a626147d45307492e4f2d"}, - {file = "mypy-1.12.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:0e6fe449223fa59fbee351db32283838a8fee8059e0028e9e6494a03802b4004"}, - {file = "mypy-1.12.1-cp38-cp38-win_amd64.whl", hash = "sha256:dc6e2a2195a290a7fd5bac3e60b586d77fc88e986eba7feced8b778c373f9afe"}, - {file = "mypy-1.12.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:de5b2a8988b4e1269a98beaf0e7cc71b510d050dce80c343b53b4955fff45f19"}, - {file = "mypy-1.12.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:843826966f1d65925e8b50d2b483065c51fc16dc5d72647e0236aae51dc8d77e"}, - {file = "mypy-1.12.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9fe20f89da41a95e14c34b1ddb09c80262edcc295ad891f22cc4b60013e8f78d"}, - {file = "mypy-1.12.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8135ffec02121a75f75dc97c81af7c14aa4ae0dda277132cfcd6abcd21551bfd"}, - {file = "mypy-1.12.1-cp39-cp39-win_amd64.whl", hash = "sha256:a7b76fa83260824300cc4834a3ab93180db19876bce59af921467fd03e692810"}, - {file = "mypy-1.12.1-py3-none-any.whl", hash = "sha256:ce561a09e3bb9863ab77edf29ae3a50e65685ad74bba1431278185b7e5d5486e"}, - {file = "mypy-1.12.1.tar.gz", hash = "sha256:f5b3936f7a6d0e8280c9bdef94c7ce4847f5cdfc258fbb2c29a8c1711e8bb96d"}, + {file = "mypy-1.13.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6607e0f1dd1fb7f0aca14d936d13fd19eba5e17e1cd2a14f808fa5f8f6d8f60a"}, + {file = "mypy-1.13.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8a21be69bd26fa81b1f80a61ee7ab05b076c674d9b18fb56239d72e21d9f4c80"}, + {file = "mypy-1.13.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7b2353a44d2179846a096e25691d54d59904559f4232519d420d64da6828a3a7"}, + {file = "mypy-1.13.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0730d1c6a2739d4511dc4253f8274cdd140c55c32dfb0a4cf8b7a43f40abfa6f"}, + {file = "mypy-1.13.0-cp310-cp310-win_amd64.whl", hash = "sha256:c5fc54dbb712ff5e5a0fca797e6e0aa25726c7e72c6a5850cfd2adbc1eb0a372"}, + {file = "mypy-1.13.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:581665e6f3a8a9078f28d5502f4c334c0c8d802ef55ea0e7276a6e409bc0d82d"}, + {file = "mypy-1.13.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3ddb5b9bf82e05cc9a627e84707b528e5c7caaa1c55c69e175abb15a761cec2d"}, + {file = "mypy-1.13.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:20c7ee0bc0d5a9595c46f38beb04201f2620065a93755704e141fcac9f59db2b"}, + {file = "mypy-1.13.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3790ded76f0b34bc9c8ba4def8f919dd6a46db0f5a6610fb994fe8efdd447f73"}, + {file = "mypy-1.13.0-cp311-cp311-win_amd64.whl", hash = "sha256:51f869f4b6b538229c1d1bcc1dd7d119817206e2bc54e8e374b3dfa202defcca"}, + {file = "mypy-1.13.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5c7051a3461ae84dfb5dd15eff5094640c61c5f22257c8b766794e6dd85e72d5"}, + {file = "mypy-1.13.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:39bb21c69a5d6342f4ce526e4584bc5c197fd20a60d14a8624d8743fffb9472e"}, + {file = "mypy-1.13.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:164f28cb9d6367439031f4c81e84d3ccaa1e19232d9d05d37cb0bd880d3f93c2"}, + {file = "mypy-1.13.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a4c1bfcdbce96ff5d96fc9b08e3831acb30dc44ab02671eca5953eadad07d6d0"}, + {file = "mypy-1.13.0-cp312-cp312-win_amd64.whl", hash = "sha256:a0affb3a79a256b4183ba09811e3577c5163ed06685e4d4b46429a271ba174d2"}, + {file = "mypy-1.13.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:a7b44178c9760ce1a43f544e595d35ed61ac2c3de306599fa59b38a6048e1aa7"}, + {file = "mypy-1.13.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:5d5092efb8516d08440e36626f0153b5006d4088c1d663d88bf79625af3d1d62"}, + {file = "mypy-1.13.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:de2904956dac40ced10931ac967ae63c5089bd498542194b436eb097a9f77bc8"}, + {file = "mypy-1.13.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:7bfd8836970d33c2105562650656b6846149374dc8ed77d98424b40b09340ba7"}, + {file = "mypy-1.13.0-cp313-cp313-win_amd64.whl", hash = "sha256:9f73dba9ec77acb86457a8fc04b5239822df0c14a082564737833d2963677dbc"}, + {file = "mypy-1.13.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:100fac22ce82925f676a734af0db922ecfea991e1d7ec0ceb1e115ebe501301a"}, + {file = "mypy-1.13.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7bcb0bb7f42a978bb323a7c88f1081d1b5dee77ca86f4100735a6f541299d8fb"}, + {file = "mypy-1.13.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bde31fc887c213e223bbfc34328070996061b0833b0a4cfec53745ed61f3519b"}, + {file = "mypy-1.13.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:07de989f89786f62b937851295ed62e51774722e5444a27cecca993fc3f9cd74"}, + {file = "mypy-1.13.0-cp38-cp38-win_amd64.whl", hash = "sha256:4bde84334fbe19bad704b3f5b78c4abd35ff1026f8ba72b29de70dda0916beb6"}, + {file = "mypy-1.13.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0246bcb1b5de7f08f2826451abd947bf656945209b140d16ed317f65a17dc7dc"}, + {file = "mypy-1.13.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7f5b7deae912cf8b77e990b9280f170381fdfbddf61b4ef80927edd813163732"}, + {file = "mypy-1.13.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7029881ec6ffb8bc233a4fa364736789582c738217b133f1b55967115288a2bc"}, + {file = "mypy-1.13.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3e38b980e5681f28f033f3be86b099a247b13c491f14bb8b1e1e134d23bb599d"}, + {file = "mypy-1.13.0-cp39-cp39-win_amd64.whl", hash = "sha256:a6789be98a2017c912ae6ccb77ea553bbaf13d27605d2ca20a76dfbced631b24"}, + {file = "mypy-1.13.0-py3-none-any.whl", hash = "sha256:9c250883f9fd81d212e0952c92dbfcc96fc237f4b7c92f56ac81fd48460b3e5a"}, + {file = "mypy-1.13.0.tar.gz", hash = "sha256:0291a61b6fbf3e6673e3405cfcc0e7650bebc7939659fdca2702958038bd835e"}, ] [package.dependencies] @@ -680,6 +680,7 @@ typing-extensions = ">=4.6.0" [package.extras] dmypy = ["psutil (>=4.0)"] +faster-cache = ["orjson"] install-types = ["pip"] mypyc = ["setuptools (>=50)"] reports = ["lxml"] @@ -1011,27 +1012,27 @@ testing = ["filelock"] [[package]] name = "pyupgrade" -version = "3.18.0" +version = "3.19.0" description = "A tool to automatically upgrade syntax for newer versions." optional = false python-versions = ">=3.9" files = [ - {file = "pyupgrade-3.18.0-py2.py3-none-any.whl", hash = "sha256:74dbca15f715342393d20e31575d846643fdeb32c6fe8d9598c41645bab3f762"}, - {file = "pyupgrade-3.18.0.tar.gz", hash = "sha256:894cf4c64c17c020f86adaab55a82449a7add29b1ea4a1b9e659ed48c922d3ae"}, + {file = "pyupgrade-3.19.0-py2.py3-none-any.whl", hash = "sha256:1364fcae4436a6a236a85960587390ec8a939ad0f65f429346f70a5f201c1489"}, + {file = "pyupgrade-3.19.0.tar.gz", hash = "sha256:7ed4b7d972ed2788c43994f4a24f949d5bf044342992f3b48e1bed0092ddaa01"}, ] [package.dependencies] -tokenize-rt = ">=5.2.0" +tokenize-rt = ">=6.1.0" [[package]] name = "rich" -version = "13.9.2" +version = "13.9.3" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" optional = false python-versions = ">=3.8.0" files = [ - {file = "rich-13.9.2-py3-none-any.whl", hash = "sha256:8c82a3d3f8dcfe9e734771313e606b39d8247bb6b826e196f4914b333b743cf1"}, - {file = "rich-13.9.2.tar.gz", hash = "sha256:51a2c62057461aaf7152b4d611168f93a9fc73068f8ded2790f29fe2b5366d0c"}, + {file = "rich-13.9.3-py3-none-any.whl", hash = "sha256:9836f5096eb2172c9e77df411c1b009bace4193d6a481d534fea75ebba758283"}, + {file = "rich-13.9.3.tar.gz", hash = "sha256:bc1e01b899537598cf02579d2b9f4a415104d3fc439313a7a2c165d76557a08e"}, ] [package.dependencies] @@ -1044,23 +1045,23 @@ jupyter = ["ipywidgets (>=7.5.1,<9)"] [[package]] name = "setuptools" -version = "75.2.0" +version = "75.3.0" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false python-versions = ">=3.8" files = [ - {file = "setuptools-75.2.0-py3-none-any.whl", hash = "sha256:a7fcb66f68b4d9e8e66b42f9876150a3371558f98fa32222ffaa5bced76406f8"}, - {file = "setuptools-75.2.0.tar.gz", hash = "sha256:753bb6ebf1f465a1912e19ed1d41f403a79173a9acf66a42e7e6aec45c3c16ec"}, + {file = "setuptools-75.3.0-py3-none-any.whl", hash = "sha256:f2504966861356aa38616760c0f66568e535562374995367b4e69c7143cf6bcd"}, + {file = "setuptools-75.3.0.tar.gz", hash = "sha256:fba5dd4d766e97be1b1681d98712680ae8f2f26d7881245f2ce9e40714f1a686"}, ] [package.extras] check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)", "ruff (>=0.5.2)"] -core = ["importlib-metadata (>=6)", "importlib-resources (>=5.10.2)", "jaraco.collections", "jaraco.functools", "jaraco.text (>=3.7)", "more-itertools", "more-itertools (>=8.8)", "packaging", "packaging (>=24)", "platformdirs (>=2.6.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"] +core = ["importlib-metadata (>=6)", "importlib-resources (>=5.10.2)", "jaraco.collections", "jaraco.functools", "jaraco.text (>=3.7)", "more-itertools", "more-itertools (>=8.8)", "packaging", "packaging (>=24)", "platformdirs (>=4.2.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"] cover = ["pytest-cov"] doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"] enabler = ["pytest-enabler (>=2.2)"] -test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"] -type = ["importlib-metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.11.*)", "pytest-mypy"] +test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test (>=5.5)", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"] +type = ["importlib-metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.12.*)", "pytest-mypy"] [[package]] name = "sortedcontainers" @@ -1095,13 +1096,13 @@ dev = ["aiohttp (>=3.8.1)", "click (>=8.1.2)", "msgpack (>=1.0.3)"] [[package]] name = "tokenize-rt" -version = "6.0.0" +version = "6.1.0" description = "A wrapper around the stdlib `tokenize` which roundtrips." optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "tokenize_rt-6.0.0-py2.py3-none-any.whl", hash = "sha256:d4ff7ded2873512938b4f8cbb98c9b07118f01d30ac585a30d7a88353ca36d22"}, - {file = "tokenize_rt-6.0.0.tar.gz", hash = "sha256:b9711bdfc51210211137499b5e355d3de5ec88a85d2025c520cbb921b5194367"}, + {file = "tokenize_rt-6.1.0-py2.py3-none-any.whl", hash = "sha256:d706141cdec4aa5f358945abe36b911b8cbdc844545da99e811250c0cee9b6fc"}, + {file = "tokenize_rt-6.1.0.tar.gz", hash = "sha256:e8ee836616c0877ab7c7b54776d2fefcc3bde714449a206762425ae114b53c86"}, ] [[package]] @@ -1195,4 +1196,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "c1ee12c1c59bbde777325841ffc337a34b7c0aac95e09d9763677067282e335a" +content-hash = "79cc8d8426f8a27e5ac100b9059f119576ef421cc7558355600202a97d0567f9" diff --git a/kevm-pyk/pyproject.toml b/kevm-pyk/pyproject.toml index 5ef7ec0f92..a463e56059 100644 --- a/kevm-pyk/pyproject.toml +++ b/kevm-pyk/pyproject.toml @@ -13,7 +13,7 @@ authors = [ [tool.poetry.dependencies] python = "^3.10" pathos = "*" -kframework = "7.1.163" +kframework = "7.1.166" tomlkit = "^0.11.6" [tool.poetry.group.dev.dependencies] diff --git a/tests/failing-symbolic.haskell-booster-dev b/tests/failing-symbolic.haskell-booster-dev index a3ab6a12db..55e17154a8 100644 --- a/tests/failing-symbolic.haskell-booster-dev +++ b/tests/failing-symbolic.haskell-booster-dev @@ -14,7 +14,6 @@ tests/specs/benchmarks/encodepacked-keccak01-spec.k tests/specs/benchmarks/functional-spec.k tests/specs/benchmarks/keccak00-spec.k tests/specs/benchmarks/overflow00-nooverflow-spec.k -tests/specs/benchmarks/overflow00-overflow-spec.k tests/specs/benchmarks/requires01-a0gt0-spec.k tests/specs/benchmarks/requires01-a0le0-spec.k tests/specs/benchmarks/staticarray00-spec.k @@ -92,6 +91,7 @@ tests/specs/kontrol/test-storetest-testaccesses-0-spec.k tests/specs/kontrol/test-storetest-teststoreload-0-spec.k tests/specs/mcd/cat-exhaustiveness-spec.k tests/specs/mcd/cat-file-addr-pass-rough-spec.k +tests/specs/mcd/dai-adduu-fail-rough-spec.k tests/specs/mcd/dstoken-approve-fail-rough-spec.k tests/specs/mcd/dsvalue-peek-pass-rough-spec.k tests/specs/mcd/dsvalue-read-pass-spec.k @@ -100,39 +100,37 @@ tests/specs/mcd/end-cash-pass-rough-spec.k tests/specs/mcd/end-pack-pass-rough-spec.k tests/specs/mcd/end-subuu-pass-spec.k tests/specs/mcd/flapper-yank-pass-rough-spec.k +tests/specs/mcd/flipper-addu48u48-fail-rough-spec.k tests/specs/mcd/flipper-bids-pass-rough-spec.k tests/specs/mcd/flipper-tau-pass-spec.k tests/specs/mcd/flipper-ttl-pass-spec.k tests/specs/mcd/flopper-cage-pass-spec.k tests/specs/mcd/flopper-dent-guy-diff-tic-not-0-pass-rough-spec.k tests/specs/mcd/flopper-dent-guy-same-pass-rough-spec.k -tests/specs/mcd/flopper-file-pass-rough-spec.k tests/specs/mcd/flopper-kick-pass-rough-spec.k tests/specs/mcd/flopper-tick-pass-rough-spec.k tests/specs/mcd/functional-spec.k tests/specs/mcd/pot-join-pass-rough-spec.k -tests/specs/mcd/vow-fess-fail-rough-spec.k -tests/specs/mcd/vow-flog-fail-rough-spec.k tests/specs/mcd-structured/cat-exhaustiveness-spec.k tests/specs/mcd-structured/cat-file-addr-pass-rough-spec.k +tests/specs/mcd-structured/dai-adduu-fail-rough-spec.k tests/specs/mcd-structured/dstoken-approve-fail-rough-spec.k tests/specs/mcd-structured/dsvalue-peek-pass-rough-spec.k -tests/specs/mcd-structured/dsvalue-read-pass-spec.k tests/specs/mcd-structured/dsvalue-read-pass-summarize-spec.k tests/specs/mcd-structured/end-cash-pass-rough-spec.k tests/specs/mcd-structured/end-pack-pass-rough-spec.k tests/specs/mcd-structured/end-subuu-pass-spec.k tests/specs/mcd-structured/flapper-yank-pass-rough-spec.k +tests/specs/mcd-structured/flipper-addu48u48-fail-rough-spec.k tests/specs/mcd-structured/flipper-bids-pass-rough-spec.k -tests/specs/mcd-structured/flipper-tau-pass-spec.k -tests/specs/mcd-structured/flipper-ttl-pass-spec.k tests/specs/mcd-structured/flopper-cage-pass-spec.k tests/specs/mcd-structured/flopper-dent-guy-diff-tic-not-0-pass-rough-spec.k tests/specs/mcd-structured/flopper-dent-guy-same-pass-rough-spec.k -tests/specs/mcd-structured/flopper-file-pass-rough-spec.k tests/specs/mcd-structured/flopper-kick-pass-rough-spec.k tests/specs/mcd-structured/flopper-tick-pass-rough-spec.k tests/specs/mcd-structured/functional-spec.k tests/specs/mcd-structured/pot-join-pass-rough-spec.k tests/specs/mcd-structured/vow-fess-fail-rough-spec.k -tests/specs/mcd-structured/vow-flog-fail-rough-spec.k \ No newline at end of file +tests/specs/mcd-structured/vow-flog-fail-rough-spec.k +tests/specs/mcd/vow-fess-fail-rough-spec.k +tests/specs/mcd/vow-flog-fail-rough-spec.k From 1a7a2a6449cd0e68a697c8b57415c4eb09d7da40 Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Thu, 31 Oct 2024 02:43:08 -0600 Subject: [PATCH 2/3] Update dependency: deps/k_release (#2652) * deps/k_release: Set Version 7.1.169 * kevm-pyk/: sync poetry files pyk version 7.1.169 * flake.{nix,lock}: update Nix derivations --------- Co-authored-by: devops --- deps/k_release | 2 +- flake.lock | 24 ++++++++++++------------ flake.nix | 2 +- kevm-pyk/poetry.lock | 24 ++++++++++++------------ kevm-pyk/pyproject.toml | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/deps/k_release b/deps/k_release index 3f313895f7..baf7c35f3a 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -7.1.166 +7.1.169 diff --git a/flake.lock b/flake.lock index c506220531..b313d63448 100644 --- a/flake.lock +++ b/flake.lock @@ -243,16 +243,16 @@ "z3": "z3_2" }, "locked": { - "lastModified": 1729679874, - "narHash": "sha256-+HNfnDTdH08YEHgTYIB0CF1YWrJMbiH9vyQUKnOyhsA=", + "lastModified": 1730331357, + "narHash": "sha256-94XaYki+qhuQHR6K5YkajbL6Vby0EjggReTP9unzPk4=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "d933d5ccb4cee63b83b8a990a03d3f4267139e41", + "rev": "81fe80ccdfadb21c0a0c8488632afe8365cd884a", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.92", + "ref": "v0.1.95", "repo": "haskell-backend", "type": "github" } @@ -352,16 +352,16 @@ ] }, "locked": { - "lastModified": 1729715336, - "narHash": "sha256-e4515vXk5qzIITnYvcUK3kbC37S8S0PMbqv56ld5OAU=", + "lastModified": 1730344128, + "narHash": "sha256-tADlTseeQ2+/chkZ+1BKnBDhLuKptDzb3+yK2K4z1pg=", "owner": "runtimeverification", "repo": "k", - "rev": "5d1ccd5a2585cbec970c68f8530ddbf2b27fe574", + "rev": "ac5555f78ee2958c3f846dde5936357eafad891b", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v7.1.166", + "ref": "v7.1.169", "repo": "k", "type": "github" } @@ -432,16 +432,16 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1729195362, - "narHash": "sha256-/Fw5o0F3AJ+zk9nEOEsxLnSrWiKrDOe5RN6ChilbVfY=", + "lastModified": 1730229432, + "narHash": "sha256-2Y4U7TCmSf9NAZCBmvXiHLOXrHxpiRgIpw5ERYDdNSM=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "37b1dd959d47f7b072751b8a3aaef3837de49a79", + "rev": "d5eab4b0f0e610bc60843ebb482f79c043b92702", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.101", + "ref": "v0.1.103", "repo": "llvm-backend", "type": "github" } diff --git a/flake.nix b/flake.nix index 6195974555..439fa72891 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "A flake for the KEVM Semantics"; inputs = { - k-framework.url = "github:runtimeverification/k/v7.1.166"; + k-framework.url = "github:runtimeverification/k/v7.1.169"; nixpkgs.follows = "k-framework/nixpkgs"; flake-utils.follows = "k-framework/flake-utils"; rv-utils.follows = "k-framework/rv-utils"; diff --git a/kevm-pyk/poetry.lock b/kevm-pyk/poetry.lock index 026eb0a328..da59bb29cf 100644 --- a/kevm-pyk/poetry.lock +++ b/kevm-pyk/poetry.lock @@ -400,13 +400,13 @@ pyreadline3 = {version = "*", markers = "sys_platform == \"win32\" and python_ve [[package]] name = "hypothesis" -version = "6.115.5" +version = "6.115.6" description = "A library for property-based testing" optional = false python-versions = ">=3.9" files = [ - {file = "hypothesis-6.115.5-py3-none-any.whl", hash = "sha256:b7733459ae9a93020fac3b91b41473c9b85e975139a152a70d88f3a5caa3fa3f"}, - {file = "hypothesis-6.115.5.tar.gz", hash = "sha256:4768c5fb426b305462ed31032d6e216a31daaefb1dc3134fdf2795b7961d7cb3"}, + {file = "hypothesis-6.115.6-py3-none-any.whl", hash = "sha256:d7b7173934753b9624680b38a85749de4fce367c44acb36c08b62765cc0a7a19"}, + {file = "hypothesis-6.115.6.tar.gz", hash = "sha256:d4db48eef183591085676783967e943bb89fef4d596f78c3e4116c61fcc63a6b"}, ] [package.dependencies] @@ -495,13 +495,13 @@ colors = ["colorama (>=0.4.6)"] [[package]] name = "kframework" -version = "7.1.166" +version = "7.1.169" description = "" optional = false python-versions = "<4.0,>=3.10" files = [ - {file = "kframework-7.1.166-py3-none-any.whl", hash = "sha256:a040ac35a29c06fe7abec2d305dbc4b632a037a6a4047992605326a5078c8565"}, - {file = "kframework-7.1.166.tar.gz", hash = "sha256:cf57661f081e1a4309dd639e6bbf71ad38df080111b6e5f793f65e8c5848e69f"}, + {file = "kframework-7.1.169-py3-none-any.whl", hash = "sha256:af0419d93285834568f2727bb66af4188736faf625a3bdfc331d9294ade1ea95"}, + {file = "kframework-7.1.169.tar.gz", hash = "sha256:e8e432466fc0a99fff230d4db826a0f2296899ff4dbd4f1226ab07fded3ce884"}, ] [package.dependencies] @@ -943,17 +943,17 @@ testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "no [[package]] name = "pytest-cov" -version = "5.0.0" +version = "6.0.0" description = "Pytest plugin for measuring coverage." optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "pytest-cov-5.0.0.tar.gz", hash = "sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857"}, - {file = "pytest_cov-5.0.0-py3-none-any.whl", hash = "sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652"}, + {file = "pytest-cov-6.0.0.tar.gz", hash = "sha256:fde0b595ca248bb8e2d76f020b465f3b107c9632e6a1d1705f17834c89dcadc0"}, + {file = "pytest_cov-6.0.0-py3-none-any.whl", hash = "sha256:eee6f1b9e61008bd34975a4d5bab25801eb31898b032dd55addc93e96fcaaa35"}, ] [package.dependencies] -coverage = {version = ">=5.2.1", extras = ["toml"]} +coverage = {version = ">=7.5", extras = ["toml"]} pytest = ">=4.6" [package.extras] @@ -1196,4 +1196,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "79cc8d8426f8a27e5ac100b9059f119576ef421cc7558355600202a97d0567f9" +content-hash = "4b85ffb505cd654b4bab0173d61d9e8e3bc07849881fc29ab065997c8874d861" diff --git a/kevm-pyk/pyproject.toml b/kevm-pyk/pyproject.toml index a463e56059..b6a95bd885 100644 --- a/kevm-pyk/pyproject.toml +++ b/kevm-pyk/pyproject.toml @@ -13,7 +13,7 @@ authors = [ [tool.poetry.dependencies] python = "^3.10" pathos = "*" -kframework = "7.1.166" +kframework = "7.1.169" tomlkit = "^0.11.6" [tool.poetry.group.dev.dependencies] From ccee56b16e837c381d821d15fd8899105f1ca1f1 Mon Sep 17 00:00:00 2001 From: Everett Hildenbrandt Date: Thu, 7 Nov 2024 09:06:22 +0700 Subject: [PATCH 3/3] kevm-pyk/{evm,*.py}: add option --break-on-jump (#2653) --- kevm-pyk/src/kevm_pyk/__main__.py | 1 + kevm-pyk/src/kevm_pyk/cli.py | 9 +++++++++ kevm-pyk/src/kevm_pyk/kevm.py | 3 +++ kevm-pyk/src/kevm_pyk/kproj/evm-semantics/evm.md | 3 ++- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/kevm-pyk/src/kevm_pyk/__main__.py b/kevm-pyk/src/kevm_pyk/__main__.py index 02eb3da773..23f1453486 100644 --- a/kevm-pyk/src/kevm_pyk/__main__.py +++ b/kevm-pyk/src/kevm_pyk/__main__.py @@ -352,6 +352,7 @@ def create_kcfg_explore() -> KCFGExplore: max_iterations=options.max_iterations, cut_point_rules=KEVMSemantics.cut_point_rules( options.break_on_jumpi, + options.break_on_jump, options.break_on_calls, options.break_on_storage, options.break_on_basic_blocks, diff --git a/kevm-pyk/src/kevm_pyk/cli.py b/kevm-pyk/src/kevm_pyk/cli.py index ee4f4617e1..43e3f90daa 100644 --- a/kevm-pyk/src/kevm_pyk/cli.py +++ b/kevm-pyk/src/kevm_pyk/cli.py @@ -334,6 +334,7 @@ def get_argument_type() -> dict[str, Callable]: class ExploreOptions(Options): break_every_step: bool break_on_jumpi: bool + break_on_jump: bool break_on_calls: bool break_on_storage: bool break_on_basic_blocks: bool @@ -350,6 +351,7 @@ class ExploreOptions(Options): def default() -> dict[str, Any]: return { 'break_every_step': False, + 'break_on_jump': False, 'break_on_jumpi': False, 'break_on_calls': False, 'break_on_storage': False, @@ -1040,6 +1042,13 @@ def explore_args(self) -> ArgumentParser: dest='break_on_jumpi', default=None, action='store_true', + help='Store a node for every EVM jumpi opcode.', + ) + args.add_argument( + '--break-on-jump', + dest='break_on_jump', + default=None, + action='store_true', help='Store a node for every EVM jump opcode.', ) args.add_argument( diff --git a/kevm-pyk/src/kevm_pyk/kevm.py b/kevm-pyk/src/kevm_pyk/kevm.py index bf74746c3f..82f8c788d3 100644 --- a/kevm-pyk/src/kevm_pyk/kevm.py +++ b/kevm-pyk/src/kevm_pyk/kevm.py @@ -164,6 +164,7 @@ def custom_step(self, cterm: CTerm) -> KCFGExtendResult | None: @staticmethod def cut_point_rules( break_on_jumpi: bool, + break_on_jump: bool, break_on_calls: bool, break_on_storage: bool, break_on_basic_blocks: bool, @@ -172,6 +173,8 @@ def cut_point_rules( cut_point_rules = [] if break_on_jumpi: cut_point_rules.extend(['EVM.jumpi.true', 'EVM.jumpi.false']) + if break_on_jump: + cut_point_rules.extend(['EVM.jump']) if break_on_basic_blocks: cut_point_rules.append('EVM.end-basic-block') if break_on_calls or break_on_basic_blocks: diff --git a/kevm-pyk/src/kevm_pyk/kproj/evm-semantics/evm.md b/kevm-pyk/src/kevm_pyk/kproj/evm-semantics/evm.md index 56f673a5cc..5708f1ae4b 100644 --- a/kevm-pyk/src/kevm_pyk/kproj/evm-semantics/evm.md +++ b/kevm-pyk/src/kevm_pyk/kproj/evm-semantics/evm.md @@ -1076,7 +1076,8 @@ The `JUMP*` family of operations affect the current program counter. syntax UnStackOp ::= "JUMP" // --------------------------- - rule JUMP DEST => #endBasicBlock ... + rule [jump]: + JUMP DEST => #endBasicBlock ... _ => DEST DESTS requires DEST