diff --git a/deps/blockchain-k-plugin_release b/deps/blockchain-k-plugin_release index 4699ffbb..ffe2cde4 100644 --- a/deps/blockchain-k-plugin_release +++ b/deps/blockchain-k-plugin_release @@ -1 +1 @@ -f4c41bfa5e44f5bc29e5d9151557ce735bcde087 +f8a93660317c377fc7a16b3d49b0518892354a28 diff --git a/flake.lock b/flake.lock index a0422763..c221c679 100644 --- a/flake.lock +++ b/flake.lock @@ -26,25 +26,36 @@ "k-framework", "flake-utils" ], + "k-framework": "k-framework", "libff": "libff", "nixpkgs": [ "k-framework", "nixpkgs" ], + "poetry2nix": [ + "blockchain-k-plugin", + "k-framework", + "poetry2nix" + ], + "rv-utils": [ + "blockchain-k-plugin", + "k-framework", + "rv-utils" + ], "xbyak": "xbyak" }, "locked": { - "lastModified": 1721856182, - "narHash": "sha256-JlaAOJ5MnoTsJI6w5glPOeUZ0O5rJvXndUMdBejK3ls=", + "lastModified": 1722014632, + "narHash": "sha256-/oOXPQPb877r6lgpLN3kD7xQJZ7xU8hHKteIG2qlq7I=", "owner": "runtimeverification", "repo": "blockchain-k-plugin", - "rev": "f4c41bfa5e44f5bc29e5d9151557ce735bcde087", + "rev": "f8a93660317c377fc7a16b3d49b0518892354a28", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "blockchain-k-plugin", - "rev": "f4c41bfa5e44f5bc29e5d9151557ce735bcde087", + "rev": "f8a93660317c377fc7a16b3d49b0518892354a28", "type": "github" } }, @@ -114,6 +125,22 @@ "type": "github" } }, + "flake-compat_3": { + "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" @@ -134,7 +161,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1694529238, @@ -168,6 +195,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_10" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fmt-src": { "flake": false, "locked": { @@ -202,14 +247,33 @@ "type": "github" } }, + "fmt-src_3": { + "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" + } + }, "haskell-backend": { "inputs": { "nixpkgs": [ + "blockchain-k-plugin", "k-framework", "llvm-backend", "nixpkgs" ], "rv-utils": [ + "blockchain-k-plugin", "k-framework", "llvm-backend", "rv-utils" @@ -217,6 +281,36 @@ "stacklock2nix": "stacklock2nix", "z3": "z3" }, + "locked": { + "lastModified": 1721894065, + "narHash": "sha256-6tpy2tMfaT9kL4TE0vOxuVHDzER3fVe0GKZmMAfJLmg=", + "owner": "runtimeverification", + "repo": "haskell-backend", + "rev": "2792e92b66d762c955a5f65e813521d508ab43b2", + "type": "github" + }, + "original": { + "owner": "runtimeverification", + "ref": "v0.1.49", + "repo": "haskell-backend", + "type": "github" + } + }, + "haskell-backend_2": { + "inputs": { + "nixpkgs": [ + "k-framework", + "llvm-backend", + "nixpkgs" + ], + "rv-utils": [ + "k-framework", + "llvm-backend", + "rv-utils" + ], + "stacklock2nix": "stacklock2nix_2", + "z3": "z3_2" + }, "locked": { "lastModified": 1721890597, "narHash": "sha256-9UkFS+/Fv7bIwqNVzifSaH3MyI+LaTvpeZ1Oc8K0o0M=", @@ -232,7 +326,7 @@ "type": "github" } }, - "haskell-backend_2": { + "haskell-backend_3": { "inputs": { "nixpkgs": [ "wasm-semantics", @@ -246,8 +340,8 @@ "llvm-backend", "rv-utils" ], - "stacklock2nix": "stacklock2nix_2", - "z3": "z3_2" + "stacklock2nix": "stacklock2nix_3", + "z3": "z3_3" }, "locked": { "lastModified": 1721890597, @@ -298,9 +392,27 @@ "type": "github" } }, + "immer-src_3": { + "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": [ + "blockchain-k-plugin", "k-framework", "llvm-backend", "utils" @@ -308,11 +420,49 @@ "haskell-backend": "haskell-backend", "llvm-backend": "llvm-backend", "nixpkgs": [ + "blockchain-k-plugin", "k-framework", "llvm-backend", "nixpkgs" ], "poetry2nix": "poetry2nix", + "rv-utils": [ + "blockchain-k-plugin", + "k-framework", + "llvm-backend", + "rv-utils" + ] + }, + "locked": { + "lastModified": 1722008542, + "narHash": "sha256-iqdX0/7LlMywxYldGRLR9nqbflNuqDWo5f/+grGVE/I=", + "owner": "runtimeverification", + "repo": "k", + "rev": "cf865bb159c3c443bd1ad7717c6d8b3b752c05f3", + "type": "github" + }, + "original": { + "owner": "runtimeverification", + "ref": "v7.1.85", + "repo": "k", + "type": "github" + } + }, + "k-framework_2": { + "inputs": { + "flake-utils": [ + "k-framework", + "llvm-backend", + "utils" + ], + "haskell-backend": "haskell-backend_2", + "llvm-backend": "llvm-backend_2", + "nixpkgs": [ + "k-framework", + "llvm-backend", + "nixpkgs" + ], + "poetry2nix": "poetry2nix_2", "rv-utils": [ "k-framework", "llvm-backend", @@ -334,7 +484,7 @@ "type": "github" } }, - "k-framework_2": { + "k-framework_3": { "inputs": { "flake-utils": [ "wasm-semantics", @@ -342,15 +492,15 @@ "llvm-backend", "utils" ], - "haskell-backend": "haskell-backend_2", - "llvm-backend": "llvm-backend_2", + "haskell-backend": "haskell-backend_3", + "llvm-backend": "llvm-backend_3", "nixpkgs": [ "wasm-semantics", "k-framework", "llvm-backend", "nixpkgs" ], - "poetry2nix": "poetry2nix_3", + "poetry2nix": "poetry2nix_4", "rv-utils": [ "wasm-semantics", "k-framework", @@ -396,6 +546,7 @@ "fmt-src": "fmt-src", "immer-src": "immer-src", "nixpkgs": [ + "blockchain-k-plugin", "k-framework", "llvm-backend", "rv-utils", @@ -427,7 +578,6 @@ "fmt-src": "fmt-src_2", "immer-src": "immer-src_2", "nixpkgs": [ - "wasm-semantics", "k-framework", "llvm-backend", "rv-utils", @@ -435,7 +585,7 @@ ], "pybind11-src": "pybind11-src_2", "rapidjson-src": "rapidjson-src_2", - "rv-utils": "rv-utils_4", + "rv-utils": "rv-utils_2", "utils": "utils_2" }, "locked": { @@ -453,9 +603,42 @@ "type": "github" } }, + "llvm-backend_3": { + "inputs": { + "flake-compat": "flake-compat_3", + "fmt-src": "fmt-src_3", + "immer-src": "immer-src_3", + "nixpkgs": [ + "wasm-semantics", + "k-framework", + "llvm-backend", + "rv-utils", + "nixpkgs" + ], + "pybind11-src": "pybind11-src_3", + "rapidjson-src": "rapidjson-src_3", + "rv-utils": "rv-utils_5", + "utils": "utils_3" + }, + "locked": { + "lastModified": 1721983376, + "narHash": "sha256-pP56X9zoqV+x6QdjIHWH7gcXcwhz+Q08yD8RwBqiIRQ=", + "owner": "runtimeverification", + "repo": "llvm-backend", + "rev": "79011fff66455dd451d39821534bd58f5468227b", + "type": "github" + }, + "original": { + "owner": "runtimeverification", + "ref": "v0.1.64", + "repo": "llvm-backend", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ + "blockchain-k-plugin", "k-framework", "poetry2nix", "nixpkgs" @@ -478,7 +661,7 @@ "nix-github-actions_2": { "inputs": { "nixpkgs": [ - "pyk", + "k-framework", "poetry2nix", "nixpkgs" ] @@ -498,6 +681,28 @@ } }, "nix-github-actions_3": { + "inputs": { + "nixpkgs": [ + "pyk", + "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_4": { "inputs": { "nixpkgs": [ "wasm-semantics", @@ -584,11 +789,28 @@ "type": "github" } }, + "nixpkgs_5": { + "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": [ + "blockchain-k-plugin", "k-framework", "llvm-backend", "nixpkgs" @@ -616,10 +838,11 @@ "flake-utils": "flake-utils_2", "nix-github-actions": "nix-github-actions_2", "nixpkgs": [ - "pyk", + "k-framework", + "llvm-backend", "nixpkgs" ], - "systems": "systems_5", + "systems": "systems_6", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -641,14 +864,40 @@ "inputs": { "flake-utils": "flake-utils_3", "nix-github-actions": "nix-github-actions_3", + "nixpkgs": [ + "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" + } + }, + "poetry2nix_4": { + "inputs": { + "flake-utils": "flake-utils_4", + "nix-github-actions": "nix-github-actions_4", "nixpkgs": [ "wasm-semantics", "k-framework", "llvm-backend", "nixpkgs" ], - "systems": "systems_8", - "treefmt-nix": "treefmt-nix_3" + "systems": "systems_11", + "treefmt-nix": "treefmt-nix_4" }, "locked": { "lastModified": 1698640399, @@ -699,6 +948,23 @@ "type": "github" } }, + "pybind11-src_3": { + "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": [ @@ -711,8 +977,8 @@ "rv-utils", "nixpkgs" ], - "poetry2nix": "poetry2nix_2", - "rv-utils": "rv-utils_2" + "poetry2nix": "poetry2nix_3", + "rv-utils": "rv-utils_3" }, "locked": { "dir": "pyk", @@ -765,6 +1031,23 @@ "type": "github" } }, + "rapidjson-src_3": { + "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": { "blockchain-k-plugin": "blockchain-k-plugin", @@ -772,7 +1055,7 @@ "k-framework", "flake-utils" ], - "k-framework": "k-framework", + "k-framework": "k-framework_2", "nixpkgs": [ "k-framework", "nixpkgs" @@ -786,7 +1069,7 @@ "poetry2nix" ], "pyk": "pyk", - "rv-utils": "rv-utils_3", + "rv-utils": "rv-utils_4", "wasm-semantics": "wasm-semantics" } }, @@ -862,6 +1145,24 @@ "type": "github" } }, + "rv-utils_5": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "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" + } + }, "stacklock2nix": { "locked": { "lastModified": 1705051190, @@ -892,6 +1193,21 @@ "type": "github" } }, + "stacklock2nix_3": { + "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, @@ -907,7 +1223,7 @@ "type": "github" } }, - "systems_2": { + "systems_10": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -922,7 +1238,7 @@ "type": "github" } }, - "systems_3": { + "systems_11": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -936,7 +1252,7 @@ "type": "indirect" } }, - "systems_4": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -951,7 +1267,7 @@ "type": "github" } }, - "systems_5": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -965,7 +1281,22 @@ "type": "indirect" } }, - "systems_6": { + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -980,6 +1311,20 @@ "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, @@ -1009,9 +1354,25 @@ "type": "indirect" } }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ + "blockchain-k-plugin", "k-framework", "poetry2nix", "nixpkgs" @@ -1034,7 +1395,7 @@ "treefmt-nix_2": { "inputs": { "nixpkgs": [ - "pyk", + "k-framework", "poetry2nix", "nixpkgs" ] @@ -1054,6 +1415,28 @@ } }, "treefmt-nix_3": { + "inputs": { + "nixpkgs": [ + "pyk", + "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_4": { "inputs": { "nixpkgs": [ "wasm-semantics", @@ -1096,7 +1479,25 @@ }, "utils_2": { "inputs": { - "systems": "systems_6" + "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" + } + }, + "utils_3": { + "inputs": { + "systems": "systems_9" }, "locked": { "lastModified": 1705309234, @@ -1119,7 +1520,7 @@ "k-framework", "flake-utils" ], - "k-framework": "k-framework_2", + "k-framework": "k-framework_3", "nixpkgs": [ "wasm-semantics", "k-framework", @@ -1201,6 +1602,23 @@ "repo": "z3", "type": "github" } + }, + "z3_3": { + "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index bf4cbcb3..fb27a1db 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ poetry2nix.follows = "pyk/poetry2nix"; blockchain-k-plugin = { url = - "github:runtimeverification/blockchain-k-plugin/f4c41bfa5e44f5bc29e5d9151557ce735bcde087"; + "github:runtimeverification/blockchain-k-plugin/f8a93660317c377fc7a16b3d49b0518892354a28"; inputs.flake-utils.follows = "k-framework/flake-utils"; inputs.nixpkgs.follows = "k-framework/nixpkgs"; }; diff --git a/kmultiversx/pyproject.toml b/kmultiversx/pyproject.toml index 0f676033..9912a3f5 100644 --- a/kmultiversx/pyproject.toml +++ b/kmultiversx/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kmultiversx" -version = "0.1.103" +version = "0.1.104" description = "Python tools for Elrond semantics" authors = [ "Runtime Verification, Inc. ", diff --git a/kmultiversx/src/kmultiversx/kdist/plugin b/kmultiversx/src/kmultiversx/kdist/plugin index f4c41bfa..f8a93660 160000 --- a/kmultiversx/src/kmultiversx/kdist/plugin +++ b/kmultiversx/src/kmultiversx/kdist/plugin @@ -1 +1 @@ -Subproject commit f4c41bfa5e44f5bc29e5d9151557ce735bcde087 +Subproject commit f8a93660317c377fc7a16b3d49b0518892354a28 diff --git a/package/version b/package/version index 5950146b..7c6c565c 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.103 +0.1.104