Merge branch 'master' into remove-keep-values

runtimeverification · Oct 2, 2024 · c13503a · c13503a
2 parents 046e325 + 1c94c89
commit c13503a
Show file tree

Hide file tree

Showing 21 changed files with 350 additions and 346 deletions.
diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
@@ -198,7 +198,7 @@ jobs:
           docker exec --user ${DOCKER_USER} --workdir ${FOUNDRY_ROOT} ${CONTAINER_NAME} forge install --no-git runtimeverification/kontrol-cheatcodes@a5dd4b0
           docker exec --user ${DOCKER_USER} --workdir ${FOUNDRY_ROOT} ${CONTAINER_NAME} forge build
       - name: 'Run kontrol build'
-        run: docker exec --user ${DOCKER_USER} --workdir ${FOUNDRY_ROOT} ${CONTAINER_NAME} kontrol build
+        run: docker exec --user ${DOCKER_USER} --workdir ${FOUNDRY_ROOT} ${CONTAINER_NAME} kontrol build -O2
       - name: 'Run kontrol prove'
         run: docker exec --user ${DOCKER_USER} --workdir ${FOUNDRY_ROOT} ${CONTAINER_NAME} kontrol prove --match-test 'AssertTest.test_assert_true()'
       - name: 'Run kontrol show'

diff --git a/.github/workflows/update-expected-output.yml b/.github/workflows/update-expected-output.yml
@@ -11,7 +11,7 @@ jobs:
     if: github.ref != 'refs/heads/master'
     name: 'Update Kontrol expected output'
     runs-on: [self-hosted, linux, normal, fast]
-    timeout-minutes: 60
+    timeout-minutes: 90
     steps:
       - name: 'Check out code'
         uses: actions/checkout@v4

diff --git a/deps/k_release b/deps/k_release
@@ -1 +1 @@
-7.1.145
+7.1.151
diff --git a/deps/kevm_release b/deps/kevm_release
@@ -1 +1 @@
-1.0.727
+1.0.732
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.727";
+    kevm.url = "github:runtimeverification/evm-semantics/v1.0.732";
     nixpkgs.follows = "kevm/nixpkgs";
     k-framework.follows = "kevm/k-framework";
     flake-utils.follows = "kevm/flake-utils";

diff --git a/funding.json b/funding.json
@@ -1,5 +1,5 @@
 {
   "opRetro": {
-    "projectId": "0x7348ae42266ff626319e8ea5398343b847603b3cc7101b03d8e4fb2b75ea8db3"
+    "projectId": "0x80393c05d524b7a6f7a78b0c141eadf0759642ae8d7e718134318cd2d73d5464"
   }
 }
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,7 +12,7 @@ authors = [
 
 [tool.poetry.dependencies]
 python = "^3.10"
-kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.727", subdirectory = "kevm-pyk" }
+kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.732", subdirectory = "kevm-pyk" }
 eth-utils = "^4.1.1"
 pycryptodome = "^3.20.0"
 pyevmasm = "^0.2.3"

diff --git a/src/kontrol/__main__.py b/src/kontrol/__main__.py
@@ -312,7 +312,7 @@ def exec_view_kcfg(options: ViewKcfgOptions) -> None:
     contract_name, _ = test_id.split('.')
     proof = foundry.get_apr_proof(test_id)
 
-    compilation_unit = CompilationUnit.load_build_info(options.foundry_root)
+    compilation_unit = CompilationUnit.load_build_info(foundry.build_info)
 
     def _short_info(cterm: CTerm) -> Iterable[str]:
         return foundry.short_info_for_contract(contract_name, cterm)