diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile index aa2d3db0e..fb8265e23 100644 --- a/.github/workflows/Dockerfile +++ b/.github/workflows/Dockerfile @@ -29,7 +29,6 @@ RUN apt-get update \ debhelper \ libboost-test-dev \ libcrypto++-dev \ - libprocps-dev \ libsecp256k1-dev \ libssl-dev \ libyaml-dev \ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 18748d72f..cd6b5210a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ The first step is to develop and test your changes locally. ##### 1. Build Kontrol from source ``` -kup install k.openssl.procps.secp256k1 --version v$(cat deps/k_release) +kup install k.openssl.secp256k1 --version v$(cat deps/k_release) poetry install poetry run kdist clean CXX=clang++-14 poetry run kdist --verbose build -j2 evm-semantics.haskell kontrol.foundry diff --git a/Dockerfile b/Dockerfile index c25372796..531d8653d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,6 @@ RUN apt-get -y update \ cmake \ curl \ graphviz \ - libprocps-dev \ libsecp256k1-dev \ libssl-dev \ libtool \ diff --git a/README.md b/README.md index 9953ed3ca..1e42ba748 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ You need to install the [K Framework] on your system, see the instructions there The fastest way is via the [kup package manager], with which you can do to get the correct version of K: ```sh -kup install k.openssl.procps.secp256k1 --version v$(cat deps/k_release) +kup install k.openssl.secp256k1 --version v$(cat deps/k_release) ``` #### Poetry dependencies diff --git a/deps/k_release b/deps/k_release index 81c95b2f6..1dd611da1 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -7.1.108 +7.1.111 diff --git a/deps/kevm_release b/deps/kevm_release index 7610219b1..e5f81e322 100644 --- a/deps/kevm_release +++ b/deps/kevm_release @@ -1 +1 @@ -1.0.686 +1.0.690 diff --git a/flake.lock b/flake.lock index 3c0f3d015..6707b05ec 100644 --- a/flake.lock +++ b/flake.lock @@ -27,26 +27,39 @@ "k-framework", "flake-utils" ], + "k-framework": "k-framework", "libff": "libff", "nixpkgs": [ "kevm", "k-framework", "nixpkgs" ], + "poetry2nix": [ + "kevm", + "blockchain-k-plugin", + "k-framework", + "poetry2nix" + ], + "rv-utils": [ + "kevm", + "blockchain-k-plugin", + "k-framework", + "rv-utils" + ], "xbyak": "xbyak" }, "locked": { - "lastModified": 1711321833, - "narHash": "sha256-p0HqLxjrYYYHx2BMODp0N/O2KQf0TAGenMFYmToLPrE=", + "lastModified": 1723480020, + "narHash": "sha256-OoJMpEw1zz37lo8CjD4rs2oN3OSUQqcKlTUIQdJSeLA=", "owner": "runtimeverification", "repo": "blockchain-k-plugin", - "rev": "5aa6993fab90675d971b8b98b3430d11f1ec2a2b", + "rev": "64bb64b6c908c15b3dfe67ace70936b7d3913672", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "blockchain-k-plugin", - "rev": "5aa6993fab90675d971b8b98b3430d11f1ec2a2b", + "rev": "64bb64b6c908c15b3dfe67ace70936b7d3913672", "type": "github" } }, @@ -100,6 +113,22 @@ "type": "github" } }, + "flake-compat_2": { + "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_2" @@ -120,7 +149,25 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_7" }, "locked": { "lastModified": 1694529238, @@ -153,6 +200,23 @@ "type": "github" } }, + "fmt-src_2": { + "flake": false, + "locked": { + "lastModified": 1661615830, + "narHash": "sha256-rP6ymyRc7LnKxUXwPpzhHOQvpJkpnRFOt2ctvUNlYI0=", + "owner": "fmtlib", + "repo": "fmt", + "rev": "a33701196adfad74917046096bf5a2aa0ab0bb50", + "type": "github" + }, + "original": { + "owner": "fmtlib", + "ref": "9.1.0", + "repo": "fmt", + "type": "github" + } + }, "foundry": { "inputs": { "flake-utils": [ @@ -181,12 +245,14 @@ "inputs": { "nixpkgs": [ "kevm", + "blockchain-k-plugin", "k-framework", "llvm-backend", "nixpkgs" ], "rv-utils": [ "kevm", + "blockchain-k-plugin", "k-framework", "llvm-backend", "rv-utils" @@ -194,6 +260,38 @@ "stacklock2nix": "stacklock2nix", "z3": "z3" }, + "locked": { + "lastModified": 1722860063, + "narHash": "sha256-5K3BIIbwkMpN4idvAHRrw0JzHRL6Au4ui+7NqkX+c3w=", + "owner": "runtimeverification", + "repo": "haskell-backend", + "rev": "7047b0964349727e54425c2c81478caf3dad757c", + "type": "github" + }, + "original": { + "owner": "runtimeverification", + "ref": "v0.1.58", + "repo": "haskell-backend", + "type": "github" + } + }, + "haskell-backend_2": { + "inputs": { + "nixpkgs": [ + "kevm", + "k-framework", + "llvm-backend", + "nixpkgs" + ], + "rv-utils": [ + "kevm", + "k-framework", + "llvm-backend", + "rv-utils" + ], + "stacklock2nix": "stacklock2nix_2", + "z3": "z3_2" + }, "locked": { "lastModified": 1723630441, "narHash": "sha256-BbJwGKi2kwbSIegUZTuZvzOoA9g/NRn7mwsgOhKpFvg=", @@ -226,10 +324,28 @@ "type": "github" } }, + "immer-src_2": { + "flake": false, + "locked": { + "lastModified": 1708038459, + "narHash": "sha256-aV/mQFuPzioy1PxROc85ypeP7/d0nn+xcBPzy9taw2s=", + "owner": "runtimeverification", + "repo": "immer", + "rev": "4b0914f0b2acb33befe0ba4cd3a7954f2687e9bb", + "type": "github" + }, + "original": { + "owner": "runtimeverification", + "repo": "immer", + "rev": "4b0914f0b2acb33befe0ba4cd3a7954f2687e9bb", + "type": "github" + } + }, "k-framework": { "inputs": { "flake-utils": [ "kevm", + "blockchain-k-plugin", "k-framework", "llvm-backend", "utils" @@ -238,6 +354,7 @@ "llvm-backend": "llvm-backend", "nixpkgs": [ "kevm", + "blockchain-k-plugin", "k-framework", "llvm-backend", "nixpkgs" @@ -245,22 +362,62 @@ "poetry2nix": "poetry2nix", "rv-utils": [ "kevm", + "blockchain-k-plugin", "k-framework", "llvm-backend", "rv-utils" ] }, "locked": { - "lastModified": 1723662167, - "narHash": "sha256-0v0d0NRVnCGpC0j9v4ysE4X/cPiTiaH5PvC3PsngIno=", + "lastModified": 1723222636, + "narHash": "sha256-V4rRuc7QN7rbtFS6d76kM0AZJJJp8vsXqXYz5nQebIk=", "owner": "runtimeverification", "repo": "k", - "rev": "af833cab5788c1320f1e106f542447bb05e8a7b1", + "rev": "0643095937a08f26e94d58cd8c2651ab1b0b4a07", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v7.1.108", + "ref": "v7.1.103", + "repo": "k", + "type": "github" + } + }, + "k-framework_2": { + "inputs": { + "flake-utils": [ + "kevm", + "k-framework", + "llvm-backend", + "utils" + ], + "haskell-backend": "haskell-backend_2", + "llvm-backend": "llvm-backend_2", + "nixpkgs": [ + "kevm", + "k-framework", + "llvm-backend", + "nixpkgs" + ], + "poetry2nix": "poetry2nix_2", + "rv-utils": [ + "kevm", + "k-framework", + "llvm-backend", + "rv-utils" + ] + }, + "locked": { + "lastModified": 1723826727, + "narHash": "sha256-Z5P9Ki+Qw4dcg9c5XvYSKPgLuWIDlOyrJTok+xaFA+U=", + "owner": "runtimeverification", + "repo": "k", + "rev": "3692aa781186422363be7a49f6a157714caf84d7", + "type": "github" + }, + "original": { + "owner": "runtimeverification", + "ref": "v7.1.111", "repo": "k", "type": "github" } @@ -278,7 +435,7 @@ "k-framework", "haskell-backend" ], - "k-framework": "k-framework", + "k-framework": "k-framework_2", "nixpkgs": [ "kevm", "k-framework", @@ -302,16 +459,16 @@ ] }, "locked": { - "lastModified": 1723683578, - "narHash": "sha256-dUrr3pGn9ooJFFHV4Wiz2VituNFuPt8KdLlE5mlXtiM=", + "lastModified": 1723905234, + "narHash": "sha256-0DVvVz1WPN2ZaQUHLuR9OhPMMCuab77zrh8ZFf3p970=", "owner": "runtimeverification", "repo": "evm-semantics", - "rev": "e7f80cad7ddf22b729afe8102d6359e5962daecb", + "rev": "c52ef6982feb2c7bf40dad3e9e3d0859acb72f3c", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v1.0.686", + "ref": "v1.0.690", "repo": "evm-semantics", "type": "github" } @@ -340,6 +497,7 @@ "immer-src": "immer-src", "nixpkgs": [ "kevm", + "blockchain-k-plugin", "k-framework", "llvm-backend", "rv-utils", @@ -365,10 +523,43 @@ "type": "github" } }, + "llvm-backend_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "fmt-src": "fmt-src_2", + "immer-src": "immer-src_2", + "nixpkgs": [ + "kevm", + "k-framework", + "llvm-backend", + "rv-utils", + "nixpkgs" + ], + "pybind11-src": "pybind11-src_2", + "rapidjson-src": "rapidjson-src_2", + "rv-utils": "rv-utils_2", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1723094785, + "narHash": "sha256-JPe1rZkx4/q7wyEGIOitt3slEHpue5gSnT9x9tbnNMs=", + "owner": "runtimeverification", + "repo": "llvm-backend", + "rev": "e7266f7e0082b5a90ccf47ceed47ba1811bdc636", + "type": "github" + }, + "original": { + "owner": "runtimeverification", + "ref": "v0.1.77", + "repo": "llvm-backend", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ "kevm", + "blockchain-k-plugin", "k-framework", "poetry2nix", "nixpkgs" @@ -389,6 +580,29 @@ } }, "nix-github-actions_2": { + "inputs": { + "nixpkgs": [ + "kevm", + "k-framework", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1693660503, + "narHash": "sha256-B/g2V4v6gjirFmy+I5mwB2bCYc0l3j5scVfwgl6WOl8=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "bd5bdbb52350e145c526108f4ef192eb8e554fa0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nix-github-actions_3": { "inputs": { "nixpkgs": [ "kevm", @@ -443,12 +657,29 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1716457947, + "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", + "type": "github" + } + }, "poetry2nix": { "inputs": { "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "kevm", + "blockchain-k-plugin", "k-framework", "llvm-backend", "nixpkgs" @@ -477,10 +708,11 @@ "nix-github-actions": "nix-github-actions_2", "nixpkgs": [ "kevm", - "pyk", + "k-framework", + "llvm-backend", "nixpkgs" ], - "systems": "systems_5", + "systems": "systems_6", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -498,6 +730,33 @@ "type": "github" } }, + "poetry2nix_3": { + "inputs": { + "flake-utils": "flake-utils_3", + "nix-github-actions": "nix-github-actions_3", + "nixpkgs": [ + "kevm", + "pyk", + "nixpkgs" + ], + "systems": "systems_8", + "treefmt-nix": "treefmt-nix_3" + }, + "locked": { + "lastModified": 1698640399, + "narHash": "sha256-mXzyx79/iFLZ0UDuSkqgFfejYRcSJfsCnJ9WlMusaI0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "626111646fe236cb1ddc8191a48c75e072a82b7c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "626111646fe236cb1ddc8191a48c75e072a82b7c", + "type": "github" + } + }, "pybind11-src": { "flake": false, "locked": { @@ -515,6 +774,23 @@ "type": "github" } }, + "pybind11-src_2": { + "flake": false, + "locked": { + "lastModified": 1657936673, + "narHash": "sha256-/X8DZPFsNrKGbhjZ1GFOj17/NU6p4R+saCW3pLKVNeA=", + "owner": "pybind", + "repo": "pybind11", + "rev": "0ba639d6177659c5dc2955ac06ad7b5b0d22e05c", + "type": "github" + }, + "original": { + "owner": "pybind", + "repo": "pybind11", + "rev": "0ba639d6177659c5dc2955ac06ad7b5b0d22e05c", + "type": "github" + } + }, "pyk": { "inputs": { "flake-utils": [ @@ -529,22 +805,22 @@ "rv-utils", "nixpkgs" ], - "poetry2nix": "poetry2nix_2", - "rv-utils": "rv-utils_2" + "poetry2nix": "poetry2nix_3", + "rv-utils": "rv-utils_3" }, "locked": { "dir": "pyk", - "lastModified": 1723662167, - "narHash": "sha256-0v0d0NRVnCGpC0j9v4ysE4X/cPiTiaH5PvC3PsngIno=", + "lastModified": 1723826727, + "narHash": "sha256-Z5P9Ki+Qw4dcg9c5XvYSKPgLuWIDlOyrJTok+xaFA+U=", "owner": "runtimeverification", "repo": "k", - "rev": "af833cab5788c1320f1e106f542447bb05e8a7b1", + "rev": "3692aa781186422363be7a49f6a157714caf84d7", "type": "github" }, "original": { "dir": "pyk", "owner": "runtimeverification", - "ref": "v7.1.108", + "ref": "v7.1.111", "repo": "k", "type": "github" } @@ -566,6 +842,23 @@ "type": "github" } }, + "rapidjson-src_2": { + "flake": false, + "locked": { + "lastModified": 1472111945, + "narHash": "sha256-SxUXSOQDZ0/3zlFI4R84J56/1fkw2jhge4mexNF6Pco=", + "owner": "Tencent", + "repo": "rapidjson", + "rev": "f54b0e47a08782a6131cc3d60f94d038fa6e0a51", + "type": "github" + }, + "original": { + "owner": "Tencent", + "repo": "rapidjson", + "rev": "f54b0e47a08782a6131cc3d60f94d038fa6e0a51", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": [ @@ -637,6 +930,24 @@ "type": "github" } }, + "rv-utils_3": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1716459074, + "narHash": "sha256-IpahO+EkWdGl9QP7B2YXfJWpSfghjxgpz4ab47nRJY4=", + "owner": "runtimeverification", + "repo": "rv-nix-tools", + "rev": "a65058865cda201de504f5546271b8e997a0be9c", + "type": "github" + }, + "original": { + "owner": "runtimeverification", + "repo": "rv-nix-tools", + "type": "github" + } + }, "solc": { "inputs": { "flake-utils": [ @@ -688,6 +999,21 @@ "type": "github" } }, + "stacklock2nix_2": { + "locked": { + "lastModified": 1705051190, + "narHash": "sha256-xgH0gaD3dNtOzZzX3A40hZTiHJP5cIGmifbmfcS2OGI=", + "owner": "cdepillabout", + "repo": "stacklock2nix", + "rev": "22676dfc45fa1c33899ba1da1a23665172a18ba7", + "type": "github" + }, + "original": { + "owner": "cdepillabout", + "repo": "stacklock2nix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -748,6 +1074,50 @@ } }, "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -765,6 +1135,7 @@ "inputs": { "nixpkgs": [ "kevm", + "blockchain-k-plugin", "k-framework", "poetry2nix", "nixpkgs" @@ -785,6 +1156,29 @@ } }, "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "kevm", + "k-framework", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1697388351, + "narHash": "sha256-63N2eBpKaziIy4R44vjpUu8Nz5fCJY7okKrkixvDQmY=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "aae39f64f5ecbe89792d05eacea5cb241891292a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "kevm", @@ -825,6 +1219,24 @@ "type": "github" } }, + "utils_2": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "xbyak": { "flake": false, "locked": { @@ -843,6 +1255,23 @@ } }, "z3": { + "flake": false, + "locked": { + "lastModified": 1674011426, + "narHash": "sha256-7cuUf29TMpX62PwO1ab3ZuzmzlcrRjTKB1CyXnYgYus=", + "owner": "Z3Prover", + "repo": "z3", + "rev": "3012293c35eadbfd73e5b94adbe50b0cc44ffb83", + "type": "github" + }, + "original": { + "owner": "Z3Prover", + "ref": "z3-4.12.1", + "repo": "z3", + "type": "github" + } + }, + "z3_2": { "flake": false, "locked": { "lastModified": 1709835916, diff --git a/flake.nix b/flake.nix index 17c0fea66..1b3b8a181 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Kontrol"; inputs = { - kevm.url = "github:runtimeverification/evm-semantics/v1.0.686"; + kevm.url = "github:runtimeverification/evm-semantics/v1.0.690"; nixpkgs.follows = "kevm/nixpkgs"; nixpkgs-pyk.follows = "kevm/nixpkgs-pyk"; k-framework.follows = "kevm/k-framework"; @@ -27,7 +27,7 @@ let nixLibs = pkgs: with pkgs; - "-I${procps}/include -L${procps}/lib -I${openssl.dev}/include -L${openssl.out}/lib -I${secp256k1}/include -L${secp256k1}/lib"; + "-I${openssl.dev}/include -L${openssl.out}/lib -I${secp256k1}/include -L${secp256k1}/lib"; overlay = final: prev: let nixpkgs-pyk = import inputs.nixpkgs-pyk { @@ -77,11 +77,13 @@ prev.kevm-pyk (kontrol-pyk { inherit solc_version; }) k-framework.packages.${prev.system}.k + boost libtool + mpfr openssl.dev gmp pkg-config - procps + secp256k1 ]; nativeBuildInputs = [ prev.makeWrapper ]; @@ -96,7 +98,7 @@ prev.lib.optionalString (prev.stdenv.isAarch64 && prev.stdenv.isDarwin) "APPLE_SILICON=true" - } kdist build kontrol.foundry + } kdist -v build kontrol.foundry ''; installPhase = '' diff --git a/poetry.lock b/poetry.lock index 6adb53eb8..8615a735f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -588,13 +588,13 @@ pyreadline3 = {version = "*", markers = "sys_platform == \"win32\" and python_ve [[package]] name = "hypothesis" -version = "6.111.0" +version = "6.111.1" description = "A library for property-based testing" optional = false python-versions = ">=3.8" files = [ - {file = "hypothesis-6.111.0-py3-none-any.whl", hash = "sha256:7a51f678da3719a04a3ef61cd241384dd93b49f35d7cce22833745c66ac1d507"}, - {file = "hypothesis-6.111.0.tar.gz", hash = "sha256:04d0703621d9fdd61c079a4dda07babbe7ebf6d34eee6ad9484a2af0ee721801"}, + {file = "hypothesis-6.111.1-py3-none-any.whl", hash = "sha256:9422adbac4b2104f6cf92dc6604b5c9df975efc08ffc7145ecc39bc617243835"}, + {file = "hypothesis-6.111.1.tar.gz", hash = "sha256:6ab6185a858fa692bf125c0d0a936134edc318bee01c05e407c71c9ead0b61c5"}, ] [package.dependencies] @@ -665,7 +665,7 @@ colors = ["colorama (>=0.4.6)"] [[package]] name = "kevm-pyk" -version = "1.0.686" +version = "1.0.690" description = "" optional = false python-versions = "^3.10" @@ -673,26 +673,26 @@ files = [] develop = false [package.dependencies] -kframework = "7.1.108" +kframework = "7.1.111" pathos = "*" tomlkit = "^0.11.6" [package.source] type = "git" url = "https://github.com/runtimeverification/evm-semantics.git" -reference = "v1.0.686" -resolved_reference = "e7f80cad7ddf22b729afe8102d6359e5962daecb" +reference = "v1.0.690" +resolved_reference = "c52ef6982feb2c7bf40dad3e9e3d0859acb72f3c" subdirectory = "kevm-pyk" [[package]] name = "kframework" -version = "7.1.108" +version = "7.1.111" description = "" optional = false python-versions = "<4.0,>=3.10" files = [ - {file = "kframework-7.1.108-py3-none-any.whl", hash = "sha256:f6f1f55e155af4574a019a117ab5f94d377fc81918fe851887f39feb3a92c7d4"}, - {file = "kframework-7.1.108.tar.gz", hash = "sha256:8033b0ccaab0d5f0c505f9a97883413df51b0ce26b77dd14fd0ff6dc5f1a8aa4"}, + {file = "kframework-7.1.111-py3-none-any.whl", hash = "sha256:456ef27c7fcb830947c34f5286c9ecdab4bedd6475a33c95bc39793d9dee1ad1"}, + {file = "kframework-7.1.111.tar.gz", hash = "sha256:e9651b8df38fbf975e6eb82e7d0097d0c3461d442b4a9f38d587029a47143663"}, ] [package.dependencies] @@ -1403,4 +1403,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "be51fff4f3473c8ca9ebb55047b420cce8a166dc5edfecf38771bac343905549" +content-hash = "2da46460b3a41c297ebde82c2c0bb7f51d366064f0ac3855796a60adc553a9f1" diff --git a/pyproject.toml b/pyproject.toml index f985def7a..b95afd5c4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ authors = [ [tool.poetry.dependencies] python = "^3.10" -kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.686", subdirectory = "kevm-pyk" } +kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.690", subdirectory = "kevm-pyk" } eth-utils = "^4.1.1" pycryptodome = "^3.20.0"