From 868b197a034b406f0b6dd7e8fb70da62f2509e8a Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Mon, 23 Oct 2023 15:22:44 -0600 Subject: [PATCH] Update dependency: deps/kevm_release (#119) * deps/kevm_release: Set Version 1.0.319 * Set Version: 0.1.34 * Sync Poetry files: kevm-pyk version 1.0.319 * flake.{nix,lock}: update Nix derivations * deps/kevm_release: Set Version 1.0.320 * Sync Poetry files: kevm-pyk version 1.0.320 * flake.{nix,lock}: update Nix derivations * deps/kevm_release: Set Version 1.0.321 * Sync Poetry files: kevm-pyk version 1.0.321 * flake.{nix,lock}: update Nix derivations * deps/kevm_release: Set Version 1.0.322 * Set Version: 0.1.35 * Sync Poetry files: kevm-pyk version 1.0.322 * flake.{nix,lock}: update Nix derivations * fetch plugin_dir * deps/kevm_release: Set Version 1.0.323 * Sync Poetry files: kevm-pyk version 1.0.323 * flake.{nix,lock}: update Nix derivations * Remove redundant add_argument for --fail-fast --------- Co-authored-by: devops Co-authored-by: Andrei Co-authored-by: Noah Watson --- deps/kevm_release | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- package/version | 2 +- poetry.lock | 16 ++++++++-------- pyproject.toml | 4 ++-- src/kontrol/__init__.py | 2 +- src/kontrol/__main__.py | 7 ------- src/kontrol/kompile.py | 4 ++++ 9 files changed, 22 insertions(+), 25 deletions(-) diff --git a/deps/kevm_release b/deps/kevm_release index 42ac1162b..99da80b77 100644 --- a/deps/kevm_release +++ b/deps/kevm_release @@ -1 +1 @@ -1.0.318 +1.0.323 diff --git a/flake.lock b/flake.lock index d7a12db09..4c082cc08 100644 --- a/flake.lock +++ b/flake.lock @@ -1080,16 +1080,16 @@ "solc": "solc" }, "locked": { - "lastModified": 1697717056, - "narHash": "sha256-WH8sI5onjX1yFHmh11Qk0JUuFfu9nR09pgxisF9wv1s=", + "lastModified": 1698075722, + "narHash": "sha256-Rwqa3UVAuHDVKtnlnYl5y609cDwEh1m+NmptUlXSOC8=", "owner": "runtimeverification", "repo": "evm-semantics", - "rev": "95f02e00f4fb92ec97a21d9d12373b521fc1c27b", + "rev": "30c3e4b8d466325ea07eabf70d0c7f109fe1137b", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v1.0.318", + "ref": "v1.0.323", "repo": "evm-semantics", "type": "github" } diff --git a/flake.nix b/flake.nix index c8b07c532..c8848655e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Kontrol"; inputs = { - kevm.url = "github:runtimeverification/evm-semantics/v1.0.318"; + kevm.url = "github:runtimeverification/evm-semantics/v1.0.323"; nixpkgs.follows = "kevm/nixpkgs"; k-framework.follows = "kevm/k-framework"; k-framework.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/package/version b/package/version index 9dd179330..a52e04166 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.34 +0.1.35 diff --git a/poetry.lock b/poetry.lock index a3fcf65d1..812ec038a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -430,7 +430,7 @@ requirements-deprecated-finder = ["pip-api", "pipreqs"] [[package]] name = "kevm-pyk" -version = "1.0.318" +version = "1.0.323" description = "" optional = false python-versions = "^3.10" @@ -446,8 +446,8 @@ xdg-base-dirs = "^6.0.0" [package.source] type = "git" url = "https://github.com/runtimeverification/evm-semantics.git" -reference = "v1.0.318" -resolved_reference = "95f02e00f4fb92ec97a21d9d12373b521fc1c27b" +reference = "v1.0.323" +resolved_reference = "30c3e4b8d466325ea07eabf70d0c7f109fe1137b" subdirectory = "kevm-pyk" [[package]] @@ -896,13 +896,13 @@ testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtuale [[package]] name = "pytest-mock" -version = "3.11.1" +version = "3.12.0" description = "Thin-wrapper around the mock package for easier use with pytest" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pytest-mock-3.11.1.tar.gz", hash = "sha256:7f6b125602ac6d743e523ae0bfa71e1a697a2f5534064528c6ff84c2f7c2fc7f"}, - {file = "pytest_mock-3.11.1-py3-none-any.whl", hash = "sha256:21c279fff83d70763b05f8874cc9cfb3fcacd6d354247a976f9529d19f9acf39"}, + {file = "pytest-mock-3.12.0.tar.gz", hash = "sha256:31a40f038c22cad32287bb43932054451ff5583ff094bca6f675df2f8bc1a6e9"}, + {file = "pytest_mock-3.12.0-py3-none-any.whl", hash = "sha256:0972719a7263072da3a21c7f4773069bcc7486027d7e8e1f81d98a47e701bc4f"}, ] [package.dependencies] @@ -1081,4 +1081,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "2782b1c8b1682bb01b697c966e4741fe449b349255737d066bf038ee68584cb2" +content-hash = "3a105acb184f4d19c73170567044aa7c73dda98753d1f24ce278b87fdb60a78d" diff --git a/pyproject.toml b/pyproject.toml index 947bf64d8..ed3c8caf1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kontrol" -version = "0.1.34" +version = "0.1.35" description = "Foundry integration for KEVM" authors = [ "Runtime Verification, Inc. ", @@ -15,7 +15,7 @@ kontrol = "kontrol.__main__:main" [tool.poetry.dependencies] python = "^3.10" -kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.318", subdirectory = "kevm-pyk" } +kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.323", subdirectory = "kevm-pyk" } [tool.poetry.group.dev.dependencies] autoflake = "*" diff --git a/src/kontrol/__init__.py b/src/kontrol/__init__.py index eba1e2e9f..026d9682c 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.34' +VERSION: Final = '0.1.35' diff --git a/src/kontrol/__main__.py b/src/kontrol/__main__.py index dc1b3a742..929119965 100644 --- a/src/kontrol/__main__.py +++ b/src/kontrol/__main__.py @@ -532,13 +532,6 @@ def _parse_test_version_tuple(value: str) -> tuple[str, int | None]: action='store_true', help='Include the contract constructor in the test execution.', ) - prove_args.add_argument( - '--fail-fast', - dest='fail_fast', - default=False, - action='store_true', - help='Stop execution on other branches if a failing node is detected.', - ) show_args = command_parser.add_parser( 'show', diff --git a/src/kontrol/kompile.py b/src/kontrol/kompile.py index 41f04781c..2dc4593b3 100644 --- a/src/kontrol/kompile.py +++ b/src/kontrol/kompile.py @@ -102,6 +102,9 @@ def foundry_kompile( kdist.get('foundry'), extra_unparsing_modules=(bin_runtime_definition.all_modules + contract_main_definition.all_modules), ) + + plugin_dir = kdist.get('plugin') + foundry_contracts_file.write_text(kevm.pretty_print(bin_runtime_definition, unalias=False) + '\n') _LOGGER.info(f'Wrote file: {foundry_contracts_file}') foundry.main_file.write_text(kevm.pretty_print(contract_main_definition) + '\n') @@ -142,6 +145,7 @@ def update_kompilation_digest() -> None: llvm_library=foundry.llvm_library, debug=debug, verbose=verbose, + plugin_dir=plugin_dir, ) update_kompilation_digest()