Update dependency: deps/kevm_release (#156)

* deps/kevm_release: Set Version 1.0.334 * Set Version: 0.1.50 * Sync Poetry files: kevm-pyk version 1.0.334 * flake.{nix,lock}: update Nix derivations * deps/kevm_release: Set Version 1.0.335 * Sync Poetry files: kevm-pyk version 1.0.335 * flake.{nix,lock}: update Nix derivations * Refactor `kevm_prove` into `run_prover` * Set Version: 0.1.51 * Reorder imports --------- Co-authored-by: devops <[email protected]> Co-authored-by: palinatolmach <[email protected]>
runtimeverification · Nov 6, 2023 · af2c9bf · af2c9bf
1 parent acf81a1
commit af2c9bf
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 19 deletions.
diff --git a/deps/kevm_release b/deps/kevm_release
@@ -1 +1 @@
-1.0.333
+1.0.335
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "Kontrol";
 
   inputs = {
-    kevm.url = "github:runtimeverification/evm-semantics/v1.0.333";
+    kevm.url = "github:runtimeverification/evm-semantics/v1.0.335";
     nixpkgs.follows = "kevm/nixpkgs";
     nixpkgs-pyk.follows = "kevm/nixpkgs-pyk";
     k-framework.follows = "kevm/k-framework";

diff --git a/package/version b/package/version
@@ -1 +1 @@
-0.1.50
+0.1.51
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,15 +4,15 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "kontrol"
-version = "0.1.50"
+version = "0.1.51"
 description = "Foundry integration for KEVM"
 authors = [
     "Runtime Verification, Inc. <[email protected]>",
 ]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.333", subdirectory = "kevm-pyk" }
+kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.335", subdirectory = "kevm-pyk" }
 
 [tool.poetry.group.dev.dependencies]
 autoflake = "*"

diff --git 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.50'
+VERSION: Final = '0.1.51'
diff --git a/src/kontrol/prove.py b/src/kontrol/prove.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING, NamedTuple
 
 from kevm_pyk.kevm import KEVM, KEVMSemantics
-from kevm_pyk.utils import KDefinition__expand_macros, abstract_cell_vars, kevm_prove, legacy_explore
+from kevm_pyk.utils import KDefinition__expand_macros, abstract_cell_vars, legacy_explore, run_prover
 from pathos.pools import ProcessPool  # type: ignore
 from pyk.cterm import CTerm
 from pyk.kast.inner import KApply, KSequence, KVariable, Subst
@@ -204,15 +204,14 @@ def init_and_run_proof(test: FoundryTest) -> Proof:
                 run_constructor=options.run_constructor,
             )
 
-            kevm_prove(
+            run_prover(
                 foundry.kevm,
                 proof,
                 kcfg_explore,
                 max_depth=options.max_depth,
                 max_iterations=options.max_iterations,
-                break_every_step=options.break_every_step,
-                break_on_jumpi=options.break_on_jumpi,
-                break_on_calls=options.break_on_calls,
+                cut_point_rules=KEVMSemantics.cut_point_rules(options.break_on_jumpi, options.break_on_calls),
+                terminal_rules=KEVMSemantics.terminal_rules(options.break_every_step),
             )
             return proof