diff --git a/deps/k_release b/deps/k_release index f3b5af39e..0c1fa2fc4 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.1.1 +6.1.10 diff --git a/deps/kevm_release b/deps/kevm_release index 5e952e4f0..99d98ea69 100644 --- a/deps/kevm_release +++ b/deps/kevm_release @@ -1 +1 @@ -1.0.347 +1.0.357 diff --git a/flake.lock b/flake.lock index fb8bd2ff8..8491f9e9f 100644 --- a/flake.lock +++ b/flake.lock @@ -72,17 +72,17 @@ ] }, "locked": { - "lastModified": 1699449951, - "narHash": "sha256-XQ4xHUGvG77JTWPepKzeGnKyTMHm3T7YlzaCyRuRu0w=", + "lastModified": 1699536445, + "narHash": "sha256-ghF12CD5ho23qFf9hIOH+0mVJ49s4RvSLEEfFsay9FU=", "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "15a9fc41edcf6b22730f37e77a3e29acb2ae3601", + "rev": "175f10b16ad50dd2bb50fcfe68cbcacd79760317", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "15a9fc41edcf6b22730f37e77a3e29acb2ae3601", + "rev": "175f10b16ad50dd2bb50fcfe68cbcacd79760317", "type": "github" } }, @@ -154,22 +154,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -288,11 +272,9 @@ "k-framework": { "inputs": { "booster-backend": "booster-backend", - "flake-compat": "flake-compat", "flake-utils": "flake-utils", "haskell-backend": "haskell-backend", "llvm-backend": "llvm-backend", - "mavenix": "mavenix", "nixpkgs": [ "kevm", "k-framework", @@ -302,16 +284,16 @@ "rv-utils": "rv-utils" }, "locked": { - "lastModified": 1699459419, - "narHash": "sha256-HMGdPX8jWdN/hSW8TMogVS+gcLEOzy5Iw5Inb+cpqQA=", + "lastModified": 1699909407, + "narHash": "sha256-MVqxGM65EY8KfOHwXnA3UDMB8MqQ5GOKpw95F9SafCg=", "owner": "runtimeverification", "repo": "k", - "rev": "1d8b5cad4dba8e660ff20121be28251c10349af4", + "rev": "7faf239a91615c7d15b1cb7650401cbe15ed9a7c", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v6.1.1", + "ref": "v6.1.10", "repo": "k", "type": "github" } @@ -355,16 +337,16 @@ ] }, "locked": { - "lastModified": 1699521787, - "narHash": "sha256-tqUrZNT73ZU3mFP6snSr4K8/YtJ+INyMFn0DeD6UKmY=", + "lastModified": 1700042547, + "narHash": "sha256-EewvdErmcSJFpUBg+tCXSvOzVeEtYPg3YZwGp7ItGis=", "owner": "runtimeverification", "repo": "evm-semantics", - "rev": "2e56a6371066a87a684ec4bd0ef4f0387cbcb865", + "rev": "449fbfa9dfd13e7f13e105822ea5bca10b63d450", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v1.0.347", + "ref": "v1.0.357", "repo": "evm-semantics", "type": "github" } @@ -390,11 +372,7 @@ "inputs": { "fmt-src": "fmt-src", "immer-src": "immer-src", - "mavenix": [ - "kevm", - "k-framework", - "mavenix" - ], + "mavenix": "mavenix", "nixpkgs": [ "kevm", "k-framework", @@ -410,11 +388,11 @@ ] }, "locked": { - "lastModified": 1699324123, - "narHash": "sha256-1BPe87ABW1FSe/sBdN3vy2y4gWQM9GsPysBuMlElRnM=", + "lastModified": 1699905783, + "narHash": "sha256-flKLsCM7pjyioY14TTza9LqXhYGW2AQt2EfeYiXm8Vg=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "cb8fe609ba0a9894b207c14da9e88bf311978d4c", + "rev": "29bb01e45da52e13549f4f9a38dac91aacb6d0bd", "type": "github" }, "original": { @@ -425,30 +403,20 @@ }, "mavenix": { "inputs": { - "nixpkgs": [ - "kevm", - "k-framework", - "haskell-backend", - "nixpkgs" - ], - "utils": [ - "kevm", - "k-framework", - "flake-utils" - ] + "nixpkgs": "nixpkgs_2", + "utils": "utils" }, "locked": { - "lastModified": 1656435814, - "narHash": "sha256-Gx4QoWB9eI437/66iqTr6AUjxGgN6WslqrQ57s+sL6A=", - "owner": "goodlyrottenapple", + "lastModified": 1643802645, + "narHash": "sha256-BynM25iwp/l3FyrcHqiNJdDxvN6IxSM3/zkFR6PD3B0=", + "owner": "nix-community", "repo": "mavenix", - "rev": "0cbd57b2494d52909b27f57d03580acc66bf0298", + "rev": "ce9ddfd7f361190e8e8dcfaf6b8282eebbb3c7cb", "type": "github" }, "original": { - "owner": "goodlyrottenapple", + "owner": "nix-community", "repo": "mavenix", - "rev": "0cbd57b2494d52909b27f57d03580acc66bf0298", "type": "github" } }, @@ -491,6 +459,20 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1621552131, + "narHash": "sha256-AD/AEXv+QOYAg0PIqMYv2nbGOGTIwfOGKtz3rE+y+Tc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d42cd445dde587e9a993cd9434cb43da07c4c5de", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1698675399, "narHash": "sha256-nj+LNEeVXGP31vxoL3x7HW7+oEiyoLVDqwMg30yFBMA=", @@ -557,20 +539,20 @@ "poetry2nix", "flake-utils" ], - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1699473822, - "narHash": "sha256-CzdPTlqBew6Xth/eUvEpEXAvyEZr0IWxfamVkK0ADRU=", + "lastModified": 1699947831, + "narHash": "sha256-5lJTvaTTB2/eY9au/ubhI6QRfZ3ELv4oN5W1DugdUyk=", "owner": "runtimeverification", "repo": "pyk", - "rev": "edc297774f4ce99d44788aee7a0f6cee044aaf73", + "rev": "ea1e4ebac62b67ab1f3cedd821faa8610d6db935", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.494", + "ref": "v0.1.500", "repo": "pyk", "type": "github" } @@ -764,6 +746,21 @@ "type": "github" } }, + "utils": { + "locked": { + "lastModified": 1620759905, + "narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b543720b25df6ffdfcf9227afafc5b8c1fabfae8", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "xbyak": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 0122cad12..770a4d3e3 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Kontrol"; inputs = { - kevm.url = "github:runtimeverification/evm-semantics/v1.0.347"; + kevm.url = "github:runtimeverification/evm-semantics/v1.0.357"; nixpkgs.follows = "kevm/nixpkgs"; nixpkgs-pyk.follows = "kevm/nixpkgs-pyk"; k-framework.follows = "kevm/k-framework"; diff --git a/package/version b/package/version index a2d633db7..fbde3d5ae 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.61 +0.1.62 diff --git a/poetry.lock b/poetry.lock index 7a5e7859e..50228b199 100644 --- a/poetry.lock +++ b/poetry.lock @@ -430,7 +430,7 @@ requirements-deprecated-finder = ["pip-api", "pipreqs"] [[package]] name = "kevm-pyk" -version = "1.0.347" +version = "1.0.357" description = "" optional = false python-versions = "^3.10" @@ -439,15 +439,15 @@ develop = false [package.dependencies] pathos = "*" -pyk = {git = "https://github.com/runtimeverification/pyk.git", tag = "v0.1.494"} +pyk = {git = "https://github.com/runtimeverification/pyk.git", tag = "v0.1.500"} tomlkit = "^0.11.6" xdg-base-dirs = "^6.0.0" [package.source] type = "git" url = "https://github.com/runtimeverification/evm-semantics.git" -reference = "v1.0.347" -resolved_reference = "2e56a6371066a87a684ec4bd0ef4f0387cbcb865" +reference = "v1.0.357" +resolved_reference = "449fbfa9dfd13e7f13e105822ea5bca10b63d450" subdirectory = "kevm-pyk" [[package]] @@ -567,38 +567,38 @@ dill = ">=0.3.7" [[package]] name = "mypy" -version = "1.6.1" +version = "1.7.0" description = "Optional static typing for Python" optional = false python-versions = ">=3.8" files = [ - {file = "mypy-1.6.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e5012e5cc2ac628177eaac0e83d622b2dd499e28253d4107a08ecc59ede3fc2c"}, - {file = "mypy-1.6.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d8fbb68711905f8912e5af474ca8b78d077447d8f3918997fecbf26943ff3cbb"}, - {file = "mypy-1.6.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21a1ad938fee7d2d96ca666c77b7c494c3c5bd88dff792220e1afbebb2925b5e"}, - {file = "mypy-1.6.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b96ae2c1279d1065413965c607712006205a9ac541895004a1e0d4f281f2ff9f"}, - {file = "mypy-1.6.1-cp310-cp310-win_amd64.whl", hash = "sha256:40b1844d2e8b232ed92e50a4bd11c48d2daa351f9deee6c194b83bf03e418b0c"}, - {file = "mypy-1.6.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:81af8adaa5e3099469e7623436881eff6b3b06db5ef75e6f5b6d4871263547e5"}, - {file = "mypy-1.6.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:8c223fa57cb154c7eab5156856c231c3f5eace1e0bed9b32a24696b7ba3c3245"}, - {file = "mypy-1.6.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8032e00ce71c3ceb93eeba63963b864bf635a18f6c0c12da6c13c450eedb183"}, - {file = "mypy-1.6.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:4c46b51de523817a0045b150ed11b56f9fff55f12b9edd0f3ed35b15a2809de0"}, - {file = "mypy-1.6.1-cp311-cp311-win_amd64.whl", hash = "sha256:19f905bcfd9e167159b3d63ecd8cb5e696151c3e59a1742e79bc3bcb540c42c7"}, - {file = "mypy-1.6.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:82e469518d3e9a321912955cc702d418773a2fd1e91c651280a1bda10622f02f"}, - {file = "mypy-1.6.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d4473c22cc296425bbbce7e9429588e76e05bc7342da359d6520b6427bf76660"}, - {file = "mypy-1.6.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:59a0d7d24dfb26729e0a068639a6ce3500e31d6655df8557156c51c1cb874ce7"}, - {file = "mypy-1.6.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:cfd13d47b29ed3bbaafaff7d8b21e90d827631afda134836962011acb5904b71"}, - {file = "mypy-1.6.1-cp312-cp312-win_amd64.whl", hash = "sha256:eb4f18589d196a4cbe5290b435d135dee96567e07c2b2d43b5c4621b6501531a"}, - {file = "mypy-1.6.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:41697773aa0bf53ff917aa077e2cde7aa50254f28750f9b88884acea38a16169"}, - {file = "mypy-1.6.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7274b0c57737bd3476d2229c6389b2ec9eefeb090bbaf77777e9d6b1b5a9d143"}, - {file = "mypy-1.6.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bbaf4662e498c8c2e352da5f5bca5ab29d378895fa2d980630656178bd607c46"}, - {file = "mypy-1.6.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:bb8ccb4724f7d8601938571bf3f24da0da791fe2db7be3d9e79849cb64e0ae85"}, - {file = "mypy-1.6.1-cp38-cp38-win_amd64.whl", hash = "sha256:68351911e85145f582b5aa6cd9ad666c8958bcae897a1bfda8f4940472463c45"}, - {file = "mypy-1.6.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:49ae115da099dcc0922a7a895c1eec82c1518109ea5c162ed50e3b3594c71208"}, - {file = "mypy-1.6.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8b27958f8c76bed8edaa63da0739d76e4e9ad4ed325c814f9b3851425582a3cd"}, - {file = "mypy-1.6.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:925cd6a3b7b55dfba252b7c4561892311c5358c6b5a601847015a1ad4eb7d332"}, - {file = "mypy-1.6.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8f57e6b6927a49550da3d122f0cb983d400f843a8a82e65b3b380d3d7259468f"}, - {file = "mypy-1.6.1-cp39-cp39-win_amd64.whl", hash = "sha256:a43ef1c8ddfdb9575691720b6352761f3f53d85f1b57d7745701041053deff30"}, - {file = "mypy-1.6.1-py3-none-any.whl", hash = "sha256:4cbe68ef919c28ea561165206a2dcb68591c50f3bcf777932323bc208d949cf1"}, - {file = "mypy-1.6.1.tar.gz", hash = "sha256:4d01c00d09a0be62a4ca3f933e315455bde83f37f892ba4b08ce92f3cf44bcc1"}, + {file = "mypy-1.7.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5da84d7bf257fd8f66b4f759a904fd2c5a765f70d8b52dde62b521972a0a2357"}, + {file = "mypy-1.7.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a3637c03f4025f6405737570d6cbfa4f1400eb3c649317634d273687a09ffc2f"}, + {file = "mypy-1.7.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b633f188fc5ae1b6edca39dae566974d7ef4e9aaaae00bc36efe1f855e5173ac"}, + {file = "mypy-1.7.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d6ed9a3997b90c6f891138e3f83fb8f475c74db4ccaa942a1c7bf99e83a989a1"}, + {file = "mypy-1.7.0-cp310-cp310-win_amd64.whl", hash = "sha256:1fe46e96ae319df21359c8db77e1aecac8e5949da4773c0274c0ef3d8d1268a9"}, + {file = "mypy-1.7.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:df67fbeb666ee8828f675fee724cc2cbd2e4828cc3df56703e02fe6a421b7401"}, + {file = "mypy-1.7.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a79cdc12a02eb526d808a32a934c6fe6df07b05f3573d210e41808020aed8b5d"}, + {file = "mypy-1.7.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f65f385a6f43211effe8c682e8ec3f55d79391f70a201575def73d08db68ead1"}, + {file = "mypy-1.7.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0e81ffd120ee24959b449b647c4b2fbfcf8acf3465e082b8d58fd6c4c2b27e46"}, + {file = "mypy-1.7.0-cp311-cp311-win_amd64.whl", hash = "sha256:f29386804c3577c83d76520abf18cfcd7d68264c7e431c5907d250ab502658ee"}, + {file = "mypy-1.7.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:87c076c174e2c7ef8ab416c4e252d94c08cd4980a10967754f91571070bf5fbe"}, + {file = "mypy-1.7.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6cb8d5f6d0fcd9e708bb190b224089e45902cacef6f6915481806b0c77f7786d"}, + {file = "mypy-1.7.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d93e76c2256aa50d9c82a88e2f569232e9862c9982095f6d54e13509f01222fc"}, + {file = "mypy-1.7.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:cddee95dea7990e2215576fae95f6b78a8c12f4c089d7e4367564704e99118d3"}, + {file = "mypy-1.7.0-cp312-cp312-win_amd64.whl", hash = "sha256:d01921dbd691c4061a3e2ecdbfbfad029410c5c2b1ee88946bf45c62c6c91210"}, + {file = "mypy-1.7.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:185cff9b9a7fec1f9f7d8352dff8a4c713b2e3eea9c6c4b5ff7f0edf46b91e41"}, + {file = "mypy-1.7.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7a7b1e399c47b18feb6f8ad4a3eef3813e28c1e871ea7d4ea5d444b2ac03c418"}, + {file = "mypy-1.7.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fc9fe455ad58a20ec68599139ed1113b21f977b536a91b42bef3ffed5cce7391"}, + {file = "mypy-1.7.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d0fa29919d2e720c8dbaf07d5578f93d7b313c3e9954c8ec05b6d83da592e5d9"}, + {file = "mypy-1.7.0-cp38-cp38-win_amd64.whl", hash = "sha256:2b53655a295c1ed1af9e96b462a736bf083adba7b314ae775563e3fb4e6795f5"}, + {file = "mypy-1.7.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c1b06b4b109e342f7dccc9efda965fc3970a604db70f8560ddfdee7ef19afb05"}, + {file = "mypy-1.7.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bf7a2f0a6907f231d5e41adba1a82d7d88cf1f61a70335889412dec99feeb0f8"}, + {file = "mypy-1.7.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:551d4a0cdcbd1d2cccdcc7cb516bb4ae888794929f5b040bb51aae1846062901"}, + {file = "mypy-1.7.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:55d28d7963bef00c330cb6461db80b0b72afe2f3c4e2963c99517cf06454e665"}, + {file = "mypy-1.7.0-cp39-cp39-win_amd64.whl", hash = "sha256:870bd1ffc8a5862e593185a4c169804f2744112b4a7c55b93eb50f48e7a77010"}, + {file = "mypy-1.7.0-py3-none-any.whl", hash = "sha256:96650d9a4c651bc2a4991cf46f100973f656d69edc7faf91844e87fe627f7e96"}, + {file = "mypy-1.7.0.tar.gz", hash = "sha256:1e280b5697202efa698372d2f39e9a6713a0395a756b1c6bd48995f8d72690dc"}, ] [package.dependencies] @@ -609,6 +609,7 @@ typing-extensions = ">=4.1.0" [package.extras] dmypy = ["psutil (>=4.0)"] install-types = ["pip"] +mypyc = ["setuptools (>=50)"] reports = ["lxml"] [[package]] @@ -677,13 +678,13 @@ flake8 = ">=5.0.0" [[package]] name = "platformdirs" -version = "3.11.0" +version = "4.0.0" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." optional = false python-versions = ">=3.7" files = [ - {file = "platformdirs-3.11.0-py3-none-any.whl", hash = "sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e"}, - {file = "platformdirs-3.11.0.tar.gz", hash = "sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3"}, + {file = "platformdirs-4.0.0-py3-none-any.whl", hash = "sha256:118c954d7e949b35437270383a3f2531e99dd93cf7ce4dc8340d3356d30f173b"}, + {file = "platformdirs-4.0.0.tar.gz", hash = "sha256:cb633b2bcf10c51af60beb0ab06d2f1d69064b43abf4c185ca6b28865f3f9731"}, ] [package.extras] @@ -808,7 +809,7 @@ plugins = ["importlib-metadata"] [[package]] name = "pyk" -version = "0.1.494" +version = "0.1.500" description = "" optional = false python-versions = "^3.10" @@ -828,8 +829,8 @@ tomli = "^2.0.1" [package.source] type = "git" url = "https://github.com/runtimeverification/pyk.git" -reference = "v0.1.494" -resolved_reference = "edc297774f4ce99d44788aee7a0f6cee044aaf73" +reference = "v0.1.500" +resolved_reference = "ea1e4ebac62b67ab1f3cedd821faa8610d6db935" [[package]] name = "pyperclip" @@ -911,13 +912,13 @@ dev = ["pre-commit", "pytest-asyncio", "tox"] [[package]] name = "pytest-xdist" -version = "3.3.1" +version = "3.4.0" description = "pytest xdist plugin for distributed testing, most importantly across multiple CPUs" optional = false python-versions = ">=3.7" files = [ - {file = "pytest-xdist-3.3.1.tar.gz", hash = "sha256:d5ee0520eb1b7bcca50a60a518ab7a7707992812c578198f8b44fdfac78e8c93"}, - {file = "pytest_xdist-3.3.1-py3-none-any.whl", hash = "sha256:ff9daa7793569e6a68544850fd3927cd257cc03a7ef76c95e86915355e82b5f2"}, + {file = "pytest-xdist-3.4.0.tar.gz", hash = "sha256:3a94a931dd9e268e0b871a877d09fe2efb6175c2c23d60d56a6001359002b832"}, + {file = "pytest_xdist-3.4.0-py3-none-any.whl", hash = "sha256:e513118bf787677a427e025606f55e95937565e06dfaac8d87f55301e57ae607"}, ] [package.dependencies] @@ -1041,13 +1042,13 @@ test = ["coverage", "pytest", "pytest-cov"] [[package]] name = "wcwidth" -version = "0.2.9" +version = "0.2.10" description = "Measures the displayed width of unicode strings in a terminal" optional = false python-versions = "*" files = [ - {file = "wcwidth-0.2.9-py2.py3-none-any.whl", hash = "sha256:9a929bd8380f6cd9571a968a9c8f4353ca58d7cd812a4822bba831f8d685b223"}, - {file = "wcwidth-0.2.9.tar.gz", hash = "sha256:a675d1a4a2d24ef67096a04b85b02deeecd8e226f57b5e3a72dbb9ed99d27da8"}, + {file = "wcwidth-0.2.10-py2.py3-none-any.whl", hash = "sha256:aec5179002dd0f0d40c456026e74a729661c9d468e1ed64405e3a6c2176ca36f"}, + {file = "wcwidth-0.2.10.tar.gz", hash = "sha256:390c7454101092a6a5e43baad8f83de615463af459201709556b6e4b1c861f97"}, ] [[package]] @@ -1079,4 +1080,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "d517b19ada459b47510ec4af44d5c1030f637ecb61deeaaa6dd96fda1ccbac10" +content-hash = "56a76f0b6a9c3c85cd23e4b46fe3d677eacd4fa8119f7c4f96052883002e887a" diff --git a/pyproject.toml b/pyproject.toml index 6f3fa6e27..5c3e8e9ea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kontrol" -version = "0.1.61" +version = "0.1.62" description = "Foundry integration for KEVM" authors = [ "Runtime Verification, Inc. ", @@ -12,7 +12,7 @@ authors = [ [tool.poetry.dependencies] python = "^3.10" -kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.347", subdirectory = "kevm-pyk" } +kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.357", subdirectory = "kevm-pyk" } [tool.poetry.group.dev.dependencies] autoflake = "*" diff --git a/src/kontrol/__init__.py b/src/kontrol/__init__.py index 66278d984..d61fd5594 100644 --- a/src/kontrol/__init__.py +++ b/src/kontrol/__init__.py @@ -5,4 +5,4 @@ if TYPE_CHECKING: from typing import Final -VERSION: Final = '0.1.61' +VERSION: Final = '0.1.62' diff --git a/src/kontrol/__main__.py b/src/kontrol/__main__.py index 11c2397d0..2a3223fa7 100644 --- a/src/kontrol/__main__.py +++ b/src/kontrol/__main__.py @@ -572,13 +572,6 @@ def _parse_test_version_tuple(value: str) -> tuple[str, int | None]: type=int, help='Enables bounded model checking. Specifies the maximum depth to unroll all loops to.', ) - prove_args.add_argument( - '--use-booster', - dest='use_booster', - default=False, - action='store_true', - help='Use the booster RPC server instead of kore-rpc.', - ) prove_args.add_argument( '--run-constructor', dest='run_constructor', diff --git a/src/kontrol/cli.py b/src/kontrol/cli.py index 3be8b9785..4ddf3dae0 100644 --- a/src/kontrol/cli.py +++ b/src/kontrol/cli.py @@ -64,3 +64,29 @@ def kompile_target_args(self) -> ArgumentParser: help='[haskell-booster|maude]', ) return args + + @cached_property + def rpc_args(self) -> ArgumentParser: + args = ArgumentParser(add_help=False) + args.add_argument( + '--trace-rewrites', + dest='trace_rewrites', + default=False, + action='store_true', + help='Log traces of all simplification and rewrite rule applications.', + ) + args.add_argument( + '--kore-rpc-command', + dest='kore_rpc_command', + type=str, + default=None, + help='Custom command to start RPC server', + ) + args.add_argument( + '--use-booster', + dest='use_booster', + default=False, + action='store_true', + help='Use the booster RPC server instead of kore-rpc.', + ) + return args