Update dependency: deps/kevm_release (#217)

* deps/kevm_release: Set Version 1.0.380 * Sync Poetry files: kevm-pyk version 1.0.380 * deps/k_release: sync release file version 6.1.34 * flake.{nix,lock}: update Nix derivations * Fix linting issues * Replace `kevm_pyk.kdist` by `pyk.kdist` * Set Version: 0.1.78 * Update expected output in `testFail_expect_revert` * Sync Poetry files: kevm-pyk version 1.0.380 * deps/kevm_release: Set Version 1.0.381 * Sync Poetry files: kevm-pyk version 1.0.381 * deps/k_release: sync release file version 6.1.35 * flake.{nix,lock}: update Nix derivations --------- Co-authored-by: devops <[email protected]> Co-authored-by: Tamás Tóth <[email protected]> Co-authored-by: palinatolmach <[email protected]>
runtimeverification · Dec 4, 2023 · 91ebc71 · 91ebc71
1 parent 498541a
commit 91ebc71
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 70 deletions.
diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
@@ -81,7 +81,7 @@ jobs:
       - name: 'Build KEVM'
         run: |
             docker exec -u github-user kontrol-ci-profile-${GITHUB_SHA} /bin/bash -c 'poetry install'
-            docker exec -u github-user kontrol-ci-profile-${GITHUB_SHA} /bin/bash -c 'CXX=clang++-14 poetry run kevm-dist --verbose build -j`nproc` evm-semantics.plugin kontrol.foundry'
+            docker exec -u github-user kontrol-ci-profile-${GITHUB_SHA} /bin/bash -c 'CXX=clang++-14 poetry run kdist --verbose build -j`nproc` kontrol.foundry'
       - name: 'Run profiling'
         run: |
           PROF_ARGS=--numprocesses=8
@@ -113,7 +113,7 @@ jobs:
       - name: 'Build KEVM'
         run: |
             docker exec -u github-user kontrol-ci-integration-${GITHUB_SHA} /bin/bash -c 'poetry install'
-            docker exec -u github-user kontrol-ci-integration-${GITHUB_SHA} /bin/bash -c 'CXX=clang++-14 poetry run kevm-dist --verbose build -j`nproc` evm-semantics.plugin evm-semantics.haskell kontrol.foundry'
+            docker exec -u github-user kontrol-ci-integration-${GITHUB_SHA} /bin/bash -c 'CXX=clang++-14 poetry run kdist --verbose build -j`nproc` evm-semantics.haskell kontrol.foundry'
       - name: 'Run integration tests'
         run: |
           TEST_ARGS=--numprocesses=8

diff --git a/Dockerfile b/Dockerfile
@@ -44,4 +44,4 @@ USER user
 ENV PATH=/home/user/.local/bin:${PATH}
 RUN    pip install ./kontrol \
     && rm -rf kontrol        \
-    && CXX=clang++-14 kevm-dist --verbose build -j4
+    && CXX=clang++-14 kdist --verbose build -j4
diff --git a/README.md b/README.md
@@ -30,25 +30,25 @@ poetry install
 
 In order to build `kontrol`, you need to build these specific targets:
 ```sh
-poetry run kevm-dist --verbose build -j3 evm-semantics.plugin evm-semantics.haskell kontrol.foundry
+poetry run kdist --verbose build -j3 evm-semantics.haskell kontrol.foundry
 ```
 
 To change the default compiler:
 ```sh
-CXX=clang++-14 poetry run kevm-dist --verbose build -j3 evm-semantics.plugin evm-semantics.haskell kontrol.foundry
+CXX=clang++-14 poetry run kdist --verbose build -j3 evm-semantics.haskell kontrol.foundry
 ```
 
 On Apple Silicon:
 ```sh
-APPLE_SILICON=true poetry run kevm-dist --verbose build -j3 evm-semantics.plugin evm-semantics.haskell kontrol.foundry
+APPLE_SILICON=true poetry run kdist --verbose build -j3 evm-semantics.haskell kontrol.foundry
 ```
 
 Targets can be cleaned with:
 ```sh
-poetry run kevm-dist clean
+poetry run kdist clean
 ```
 
-For more information, refer to `kevm-dist --help`.
+For more information, refer to `kdist --help`.
 
 
 ## For developers

diff --git a/deps/k_release b/deps/k_release
@@ -1 +1 @@
-6.1.25
+6.1.35
diff --git a/deps/kevm_release b/deps/kevm_release
@@ -1 +1 @@
-1.0.372
+1.0.381
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.372";
+    kevm.url = "github:runtimeverification/evm-semantics/v1.0.381";
     nixpkgs.follows = "kevm/nixpkgs";
     nixpkgs-pyk.follows = "kevm/nixpkgs-pyk";
     k-framework.follows = "kevm/k-framework";
@@ -76,7 +76,7 @@
                 cmake
                 # This is somewhat hacky but it's only a build time dependency.
                 # We basically override kevm-pyk to add kontrol as a runtime dependency
-                # so that kevm-dist finds the foundry target.
+                # so that kdist finds the foundry target.
                 (prev.kevm-pyk.overridePythonAttrs (old: {
                   propagatedBuildInputs = (old.propagatedBuildInputs or [ ])
                     ++ [
@@ -104,7 +104,7 @@
                   prev.lib.optionalString
                   (prev.stdenv.isAarch64 && prev.stdenv.isDarwin)
                   "APPLE_SILICON=true"
-                } kevm-dist build kontrol.foundry
+                } kdist build kontrol.foundry
               '';
 
               installPhase = ''
@@ -122,7 +122,7 @@
                       final.foundry-bin
                       (solc.mkDefault final solc_version)
                     ])
-                } --set NIX_LIBS "${nixLibs prev}" --set KEVM_DIST_DIR $out
+                } --set NIX_LIBS "${nixLibs prev}" --set KDIST_DIR $out
               '';
 
               passthru = if solc_version == null then {

diff --git a/package/version b/package/version
@@ -1 +1 @@
-0.1.77
+0.1.78
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.77"
+version = "0.1.78"
 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.372", subdirectory = "kevm-pyk" }
+kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.381", 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.77'
+VERSION: Final = '0.1.78'
diff --git a/src/kontrol/__main__.py b/src/kontrol/__main__.py
@@ -153,7 +153,7 @@ def exec_build(
     _ignore_arg(kwargs, 'o2', '-O2')
     _ignore_arg(kwargs, 'o3', '-O3')
     if target is None:
-        target = KompileTarget.HASKELL_BOOSTER
+        target = KompileTarget.HASKELL
     foundry_kompile(
         foundry_root=foundry_root,
         includes=includes,

diff --git a/src/kontrol/cli.py b/src/kontrol/cli.py
@@ -60,8 +60,8 @@ def kompile_target_args(self) -> ArgumentParser:
         args.add_argument(
             '--target',
             type=KompileTarget,
-            choices=[KompileTarget.HASKELL_BOOSTER, KompileTarget.MAUDE],
-            help='[haskell-booster|maude]',
+            choices=[KompileTarget.HASKELL, KompileTarget.MAUDE],
+            help='[haskell|maude]',
         )
         return args