diff --git a/deps/k_release b/deps/k_release index c67bc0e36..8119991d2 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -7.0.83 +7.0.89 diff --git a/deps/kevm_release b/deps/kevm_release index f3e19e059..b6135cfd2 100644 --- a/deps/kevm_release +++ b/deps/kevm_release @@ -1 +1 @@ -1.0.567 +1.0.571 diff --git a/flake.lock b/flake.lock index c6ee7f8aa..07d363544 100644 --- a/flake.lock +++ b/flake.lock @@ -84,40 +84,6 @@ "type": "github" } }, - "ethereum-legacytests": { - "flake": false, - "locked": { - "lastModified": 1633533576, - "narHash": "sha256-43lkAi6Z492pbHV+jySYXzvNtoGEGsndnBkxfYgmqFM=", - "owner": "ethereum", - "repo": "legacytests", - "rev": "d7abc42a7b352a7b44b1f66b58aca54e4af6a9d7", - "type": "github" - }, - "original": { - "owner": "ethereum", - "repo": "legacytests", - "rev": "d7abc42a7b352a7b44b1f66b58aca54e4af6a9d7", - "type": "github" - } - }, - "ethereum-tests": { - "flake": false, - "locked": { - "lastModified": 1637090666, - "narHash": "sha256-B3fMpp/dpnwtCQzxI45kptJVwIM/kMo9hptcMP2B5n0=", - "owner": "ethereum", - "repo": "tests", - "rev": "6401889dec4eee58e808fd178fb2c7f628a3e039", - "type": "github" - }, - "original": { - "owner": "ethereum", - "repo": "tests", - "rev": "6401889dec4eee58e808fd178fb2c7f628a3e039", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -225,17 +191,17 @@ "z3": "z3" }, "locked": { - "lastModified": 1716288119, - "narHash": "sha256-XGs+/L+SFWHli6IyQ9U6Q332PW2YnWz5b1pNz3YPofI=", + "lastModified": 1716472952, + "narHash": "sha256-po4boMu90ofZW7sEpjltscPAIqMKok8teKjic/nd7Wk=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "4c6a57a37dad6658c9e04728bbd9a1aac87274ef", + "rev": "6e195d1cdd2e3f56389521a23d28125edc607c6e", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "4c6a57a37dad6658c9e04728bbd9a1aac87274ef", + "rev": "6e195d1cdd2e3f56389521a23d28125edc607c6e", "type": "github" } }, @@ -270,16 +236,16 @@ "rv-utils": "rv-utils_3" }, "locked": { - "lastModified": 1716377039, - "narHash": "sha256-+z9AE6UAfnTaZ46gfXiUwOyr8BtbNJgX+pUmJHb33R0=", + "lastModified": 1716488862, + "narHash": "sha256-kmMAEAibU21Q1k4ZEd3Bl9+LTiNIgnMRVGxSOtpTPdw=", "owner": "runtimeverification", "repo": "k", - "rev": "9329acd4c068d6a8219b4967b10bce5370577624", + "rev": "c9868b85db7f0514c952d7c5f3889e7d1d8a54b5", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v7.0.83", + "ref": "v7.0.89", "repo": "k", "type": "github" } @@ -287,8 +253,6 @@ "kevm": { "inputs": { "blockchain-k-plugin": "blockchain-k-plugin", - "ethereum-legacytests": "ethereum-legacytests", - "ethereum-tests": "ethereum-tests", "flake-utils": [ "kevm", "k-framework", @@ -323,16 +287,16 @@ ] }, "locked": { - "lastModified": 1716388890, - "narHash": "sha256-GE1TblrhPjVOFUZ9Fb8oB1pYLmV6Q/cDZhf3C4whZ4A=", + "lastModified": 1716558093, + "narHash": "sha256-hl4Hw3U9syiO6qN3dmewzJ/fyCaYOdNGMm5lrv8VUd4=", "owner": "runtimeverification", "repo": "evm-semantics", - "rev": "3d6deb931f0e9440ff3f9090188cd059f42fc00c", + "rev": "fbea3508b6342462580d7171e649bef36ca96271", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v1.0.567", + "ref": "v1.0.571", "repo": "evm-semantics", "type": "github" } @@ -376,16 +340,16 @@ ] }, "locked": { - "lastModified": 1716284534, - "narHash": "sha256-VmqPIqkBn721S5xRB06ntrQBb3lhJpKjFm4gExQRGz8=", + "lastModified": 1716485030, + "narHash": "sha256-JL7OT8Sq1OCQpxHvV9jbE+UzdOBbyDIjKJ24zNAGCbo=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "b7069c4061a6c0713bd54cc2ddd3adaad4be1bb8", + "rev": "765f930b36275c577931aae3cb5a05d362d210f9", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.23", + "ref": "v0.1.28", "repo": "llvm-backend", "type": "github" } @@ -415,49 +379,49 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707163378, - "narHash": "sha256-oz+BzUDwtyircjjxv9aPYOS5gobxLCjD2il+gb/bCRo=", + "lastModified": 1716457947, + "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e2ffefe304d941bb98989847944f3b58e0adcdd5", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "e2ffefe304d941bb98989847944f3b58e0adcdd5", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1707163378, - "narHash": "sha256-oz+BzUDwtyircjjxv9aPYOS5gobxLCjD2il+gb/bCRo=", + "lastModified": 1716457947, + "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e2ffefe304d941bb98989847944f3b58e0adcdd5", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "e2ffefe304d941bb98989847944f3b58e0adcdd5", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1707163378, - "narHash": "sha256-oz+BzUDwtyircjjxv9aPYOS5gobxLCjD2il+gb/bCRo=", + "lastModified": 1716457947, + "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e2ffefe304d941bb98989847944f3b58e0adcdd5", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "e2ffefe304d941bb98989847944f3b58e0adcdd5", + "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", "type": "github" } }, @@ -533,17 +497,17 @@ }, "locked": { "dir": "pyk", - "lastModified": 1716377039, - "narHash": "sha256-+z9AE6UAfnTaZ46gfXiUwOyr8BtbNJgX+pUmJHb33R0=", + "lastModified": 1716488862, + "narHash": "sha256-kmMAEAibU21Q1k4ZEd3Bl9+LTiNIgnMRVGxSOtpTPdw=", "owner": "runtimeverification", "repo": "k", - "rev": "9329acd4c068d6a8219b4967b10bce5370577624", + "rev": "c9868b85db7f0514c952d7c5f3889e7d1d8a54b5", "type": "github" }, "original": { "dir": "pyk", "owner": "runtimeverification", - "ref": "v7.0.83", + "ref": "v7.0.89", "repo": "k", "type": "github" } @@ -605,11 +569,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1707492220, - "narHash": "sha256-KRndaUPzUumDlNcKF7KzA8F/EZKLYCvurh7Z13sw2PI=", + "lastModified": 1716459074, + "narHash": "sha256-IpahO+EkWdGl9QP7B2YXfJWpSfghjxgpz4ab47nRJY4=", "owner": "runtimeverification", "repo": "rv-nix-tools", - "rev": "abf86805a623948c941e603e2fc4c26a06ea6eb6", + "rev": "a65058865cda201de504f5546271b8e997a0be9c", "type": "github" }, "original": { @@ -623,11 +587,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707492220, - "narHash": "sha256-KRndaUPzUumDlNcKF7KzA8F/EZKLYCvurh7Z13sw2PI=", + "lastModified": 1716459074, + "narHash": "sha256-IpahO+EkWdGl9QP7B2YXfJWpSfghjxgpz4ab47nRJY4=", "owner": "runtimeverification", "repo": "rv-nix-tools", - "rev": "abf86805a623948c941e603e2fc4c26a06ea6eb6", + "rev": "a65058865cda201de504f5546271b8e997a0be9c", "type": "github" }, "original": { @@ -641,11 +605,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1715010438, - "narHash": "sha256-Do1CWSXjmmun4HvsIymchDhe6EvVS46BTpM466bwNcc=", + "lastModified": 1716459074, + "narHash": "sha256-IpahO+EkWdGl9QP7B2YXfJWpSfghjxgpz4ab47nRJY4=", "owner": "runtimeverification", "repo": "rv-nix-tools", - "rev": "dbffdf9266aa237da45c0b08f6750ced7c1cd686", + "rev": "a65058865cda201de504f5546271b8e997a0be9c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index eab764dba..1f4c3b9a4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Kontrol"; inputs = { - kevm.url = "github:runtimeverification/evm-semantics/v1.0.567"; + kevm.url = "github:runtimeverification/evm-semantics/v1.0.571"; 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 2ad162376..82d63e11d 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.285 +0.1.286 diff --git a/poetry.lock b/poetry.lock index c519acee5..e6bf02180 100644 --- a/poetry.lock +++ b/poetry.lock @@ -434,7 +434,7 @@ colors = ["colorama (>=0.4.6)"] [[package]] name = "kevm-pyk" -version = "1.0.567" +version = "1.0.571" description = "" optional = false python-versions = "^3.10" @@ -443,14 +443,14 @@ develop = false [package.dependencies] pathos = "*" -pyk = {git = "https://github.com/runtimeverification/k.git", tag = "v7.0.83", subdirectory = "pyk"} +pyk = {git = "https://github.com/runtimeverification/k.git", tag = "v7.0.89", subdirectory = "pyk"} tomlkit = "^0.11.6" [package.source] type = "git" url = "https://github.com/runtimeverification/evm-semantics.git" -reference = "v1.0.567" -resolved_reference = "3d6deb931f0e9440ff3f9090188cd059f42fc00c" +reference = "v1.0.571" +resolved_reference = "fbea3508b6342462580d7171e649bef36ca96271" subdirectory = "kevm-pyk" [[package]] @@ -809,7 +809,7 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pyk" -version = "7.0.83" +version = "7.0.89" description = "" optional = false python-versions = "^3.10" @@ -830,8 +830,8 @@ xdg-base-dirs = "^6.0.1" [package.source] type = "git" url = "https://github.com/runtimeverification/k.git" -reference = "v7.0.83" -resolved_reference = "9329acd4c068d6a8219b4967b10bce5370577624" +reference = "v7.0.89" +resolved_reference = "c9868b85db7f0514c952d7c5f3889e7d1d8a54b5" subdirectory = "pyk" [[package]] @@ -1048,13 +1048,13 @@ files = [ [[package]] name = "typing-extensions" -version = "4.11.0" +version = "4.12.0" description = "Backported and Experimental Type Hints for Python 3.8+" optional = false python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.11.0-py3-none-any.whl", hash = "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a"}, - {file = "typing_extensions-4.11.0.tar.gz", hash = "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0"}, + {file = "typing_extensions-4.12.0-py3-none-any.whl", hash = "sha256:b349c66bea9016ac22978d800cfff206d5f9816951f12a7d0ec5578b0a819594"}, + {file = "typing_extensions-4.12.0.tar.gz", hash = "sha256:8cbcdc8606ebcb0d95453ad7dc5065e6237b6aa230a31e81d0f440c30fed5fd8"}, ] [[package]] @@ -1111,4 +1111,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "931914f097f42b8abc935a28e80f9dd3ab78c5897534a63890bcf5a296edd430" +content-hash = "76b9ddda6d9df4cc5728eea48ee1dc70f2225882e8d2062c495161f2657e217b" diff --git a/pyproject.toml b/pyproject.toml index e69da358f..99217fc1a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kontrol" -version = "0.1.285" +version = "0.1.286" 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.567", subdirectory = "kevm-pyk" } +kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.571", subdirectory = "kevm-pyk" } [tool.poetry.group.dev.dependencies] autoflake = "*" diff --git a/src/kontrol/__init__.py b/src/kontrol/__init__.py index 9e945e85f..9197a1bd8 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.285' +VERSION: Final = '0.1.286' diff --git a/src/kontrol/kompile.py b/src/kontrol/kompile.py index c031a5405..1dc3f9ad7 100644 --- a/src/kontrol/kompile.py +++ b/src/kontrol/kompile.py @@ -154,7 +154,6 @@ def update_kompilation_digest() -> None: includes=includes, emit_json=True, ccopts=options.ccopts, - llvm_library=foundry.llvm_library, debug=options.debug, verbose=options.verbose, )