Merge branch 'master' into natspec-precondition

deps/k_release

@@ -1 +1 @@
-7.1.102
+7.1.103

deps/kevm_release

@@ -1 +1 @@
-1.0.677
+1.0.680

flake.nix

@@ -2,7 +2,7 @@
   description = "Kontrol";
 
   inputs = {
-    kevm.url = "github:runtimeverification/evm-semantics/v1.0.677";
+    kevm.url = "github:runtimeverification/evm-semantics/v1.0.680";
     nixpkgs.follows = "kevm/nixpkgs";
     nixpkgs-pyk.follows = "kevm/nixpkgs-pyk";
     k-framework.follows = "kevm/k-framework";

package/version

@@ -1 +1 @@
-0.1.400
+0.1.403

pyproject.toml

@@ -4,15 +4,15 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "kontrol"
-version = "0.1.400"
+version = "0.1.403"
 description = "Foundry integration for KEVM"
 authors = [
     "Runtime Verification, Inc. <contact@runtimeverification.com>",
 ]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.677", subdirectory = "kevm-pyk" }
+kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.680", subdirectory = "kevm-pyk" }
 eth-utils = "^4.1.1"
 pycryptodome = "^3.20.0"
 antlr4-python3-runtime = "^4.13.1"

src/kontrol/__init__.py

@@ -5,4 +5,4 @@
 if TYPE_CHECKING:
     from typing import Final
 
-VERSION: Final = '0.1.400'
+VERSION: Final = '0.1.403'

src/kontrol/cli.py

@@ -216,17 +216,18 @@ def kompile_target_args(self) -> ArgumentParser:
     def rpc_args(self) -> ArgumentParser:
         args = ArgumentParser(add_help=False)
         args.add_argument(
-            '--trace-rewrites',
-            dest='trace_rewrites',
+            '--no-log-rewrites',
+            dest='log_succ_rewrites',
             default=None,
-            action='store_true',
-            help='Log traces of all simplification and rewrite rule applications.',
+            action='store_false',
+            help='Do not log traces of any simplification and rewrite rule application.',
         )
         args.add_argument(
-            '--kore-rpc-command',
-            dest='kore_rpc_command',
-            type=str,
-            help='Custom command to start RPC server.',
+            '--log-fail-rewrites',
+            dest='log_fail_rewrites',
+            default=None,
+            action='store_true',
+            help='Log traces of all simplification and rewrite rule applications.',
         )
         args.add_argument(
             '--use-booster',

src/kontrol/foundry.py

@@ -1058,7 +1058,8 @@ def foundry_simplify_node(
         smt_timeout=options.smt_timeout,
         smt_retry_limit=options.smt_retry_limit,
         smt_tactic=options.smt_tactic,
-        trace_rewrites=options.trace_rewrites,
+        log_succ_rewrites=options.log_succ_rewrites,
+        log_fail_rewrites=options.log_fail_rewrites,
         start_server=start_server,
         port=options.port,
         maude_port=options.maude_port,
@@ -1146,7 +1147,8 @@ def foundry_step_node(
         smt_timeout=options.smt_timeout,
         smt_retry_limit=options.smt_retry_limit,
         smt_tactic=options.smt_tactic,
-        trace_rewrites=options.trace_rewrites,
+        log_succ_rewrites=options.log_succ_rewrites,
+        log_fail_rewrites=options.log_fail_rewrites,
         start_server=start_server,
         port=options.port,
         maude_port=options.maude_port,
@@ -1222,7 +1224,8 @@ def foundry_section_edge(
         smt_timeout=options.smt_timeout,
         smt_retry_limit=options.smt_retry_limit,
         smt_tactic=options.smt_tactic,
-        trace_rewrites=options.trace_rewrites,
+        log_succ_rewrites=options.log_succ_rewrites,
+        log_fail_rewrites=options.log_fail_rewrites,
         start_server=start_server,
         port=options.port,
         maude_port=options.maude_port,
@@ -1273,7 +1276,8 @@ def foundry_get_model(
         smt_timeout=options.smt_timeout,
         smt_retry_limit=options.smt_retry_limit,
         smt_tactic=options.smt_tactic,
-        trace_rewrites=options.trace_rewrites,
+        log_succ_rewrites=options.log_succ_rewrites,
+        log_fail_rewrites=options.log_fail_rewrites,
         start_server=start_server,
         port=options.port,
         maude_port=options.maude_port,

src/kontrol/options.py

@@ -49,7 +49,8 @@ def get_argument_type() -> dict[str, Callable]:
 
 
 class RpcOptions(Options):
-    trace_rewrites: bool
+    log_succ_rewrites: bool
+    log_fail_rewrites: bool
     kore_rpc_command: str | None
     use_booster: bool
     port: int | None
@@ -58,7 +59,8 @@ class RpcOptions(Options):
     @staticmethod
     def default() -> dict[str, Any]:
         return {
-            'trace_rewrites': False,
+            'log_succ_rewrites': True,
+            'log_fail_rewrites': False,
             'kore_rpc_command': None,
             'use_booster': True,
             'port': None,

src/kontrol/prove.py

@@ -382,7 +382,8 @@ def create_kcfg_explore() -> KCFGExplore:
                 cterm_symbolic = CTermSymbolic(
                     client,
                     foundry.kevm.definition,
-                    trace_rewrites=options.trace_rewrites,
+                    log_succ_rewrites=options.log_succ_rewrites,
+                    log_fail_rewrites=options.log_fail_rewrites,
                 )
                 return KCFGExplore(
                     cterm_symbolic,

src/kontrol/utils.py

@@ -72,7 +72,7 @@ def append_to_file(file_path: Path, content: str) -> None:
 
 
 def empty_lemmas_file_contents() -> str:
-    return """require "foundry.md"
+    return """requires "foundry.md"
 
 module KONTROL-LEMMAS
 

src/tests/integration/test-data/foundry/foundry.toml

@@ -4,3 +4,6 @@ out = 'out'
 test = 'test'
 extra_output = ['storageLayout', 'abi', 'evm.methodIdentifiers', 'evm.deployedBytecode.object', 'devdoc']
 rpc_endpoints = { optimism = "https://optimism.alchemyapi.io/v2/...", mainnet = "${RPC_MAINNET}" }
+
+bytecode_hash = "none"
+cbor_metadata = false