Update dependency: kevm-pyk/src/kevm_pyk/kproj/plugin (#2355)

* kevm-pyk/src/kevm_pyk/kproj/plugin: Set Version c9698c764521e71d9b8049eb41e4cc2a46343c64 * Set Version: 1.0.498 * deps/blockchain-k-plugin_release: sync release file version c9698c764521e71d9b8049eb41e4cc2a46343c64 * kevm-pyk/src/kevm_pyk/kproj/plugin: Set Version 05c2003c23c4a8fa1ddd3fb497cd610f03dadb05 * Set Version: 1.0.499 * deps/blockchain-k-plugin_release: sync release file version 05c2003c23c4a8fa1ddd3fb497cd610f03dadb05 * Set Version: 1.0.500 * kevm-pyk/: sync poetry files pyk version v0.1.714 * Set Version: 1.0.501 * pull in changes from #2351 relating to the updated plugin * fix flake * update flake to the new version of the plugin --------- Co-authored-by: devops <[email protected]> Co-authored-by: Noah Watson <[email protected]> Co-authored-by: Andrei Văcaru <[email protected]> Co-authored-by: Sam Balco <[email protected]>
runtimeverification · Mar 19, 2024 · da23179 · da23179
1 parent 3887377
commit da23179
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 34 deletions.
diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile
@@ -23,6 +23,7 @@ RUN    apt-get update                  \
             libboost-test-dev          \
             libcrypto++-dev            \
             libprocps-dev              \
+            libsecp256k1-dev           \
             libssl-dev                 \
             libyaml-dev                \
             llvm-${LLVM_VERSION}-dev   \

diff --git a/deps/blockchain-k-plugin_release b/deps/blockchain-k-plugin_release
@@ -1 +1 @@
-c9698c764521e71d9b8049eb41e4cc2a46343c64
+05c2003c23c4a8fa1ddd3fb497cd610f03dadb05
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -11,7 +11,7 @@
     poetry2nix.follows = "pyk/poetry2nix";
     blockchain-k-plugin = {
       url =
-        "github:runtimeverification/blockchain-k-plugin/c9698c764521e71d9b8049eb41e4cc2a46343c64";
+        "github:runtimeverification/blockchain-k-plugin/05c2003c23c4a8fa1ddd3fb497cd610f03dadb05";
       inputs.flake-utils.follows = "k-framework/flake-utils";
       inputs.nixpkgs.follows = "k-framework/nixpkgs";
     };
@@ -68,6 +68,7 @@
             version = self.rev or "dirty";
             buildInputs = buildInputs final ++ [ final.kevm-pyk ];
             nativeBuildInputs = [ prev.makeWrapper ];
+            propagatedBuildInputs = [ final.secp256k1 ];
 
             src = prev.stdenv.mkDerivation {
               name = "kevm-${self.rev or "dirty"}-src";

diff --git a/kevm-pyk/pyproject.toml b/kevm-pyk/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "kevm-pyk"
-version = "1.0.500"
+version = "1.0.501"
 description = ""
 authors = [
     "Runtime Verification, Inc. <[email protected]>",

diff --git a/kevm-pyk/src/kevm_pyk/__init__.py b/kevm-pyk/src/kevm_pyk/__init__.py
@@ -6,4 +6,4 @@
     from typing import Final
 
 
-VERSION: Final = '1.0.500'
+VERSION: Final = '1.0.501'
diff --git a/kevm-pyk/src/kevm_pyk/kdist/plugin.py b/kevm-pyk/src/kevm_pyk/kdist/plugin.py
@@ -65,13 +65,12 @@ def build(self, output_dir: Path, deps: dict[str, Any], args: dict[str, Any], ve
 
         copy_tree(str(config.PLUGIN_DIR), '.')
         run_process(
-            ['make', 'libcryptopp', 'libff', 'libsecp256k1', '-j3'],
+            ['make', 'libcryptopp', 'libff', '-j8'],
             pipe_stdout=not verbose,
         )
 
         copy_tree('./build/libcryptopp', str(output_dir / 'libcryptopp'))
         copy_tree('./build/libff', str(output_dir / 'libff'))
-        copy_tree('./build/libsecp256k1', str(output_dir / 'libsecp256k1'))
 
     def source(self) -> tuple[Path]:
         return (config.PLUGIN_DIR,)

diff --git a/kevm-pyk/src/kevm_pyk/kompile.py b/kevm-pyk/src/kevm_pyk/kompile.py
@@ -211,17 +211,14 @@ def lib_ccopts(plugin_dir: Path, debug_build: bool = False) -> list[str]:
     if debug_build:
         ccopts += ['-g']
 
-    ccopts += ['-lssl', '-lcrypto']
+    ccopts += ['-lssl', '-lcrypto', '-lsecp256k1']
 
     libff_dir = plugin_dir / 'libff'
     ccopts += [f'{libff_dir}/lib/libff.a', f'-I{libff_dir}/include']
 
     libcryptopp_dir = plugin_dir / 'libcryptopp'
     ccopts += [f'{libcryptopp_dir}/lib/libcryptopp.a', f'-I{libcryptopp_dir}/include']
 
-    libsecp256k1_dir = plugin_dir / 'libsecp256k1'
-    ccopts += [f'{libsecp256k1_dir}/lib/libsecp256k1.a', f'-I{libsecp256k1_dir}/include']
-
     plugin_include = plugin_dir / 'plugin-c'
     ccopts += [
         f'{plugin_include}/plugin_util.cpp',

diff --git a/kevm-pyk/src/kevm_pyk/kproj/plugin b/kevm-pyk/src/kevm_pyk/kproj/plugin
diff --git a/package/version b/package/version
@@ -1 +1 @@
-1.0.500
+1.0.501
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c9698c764521e71d9b8049eb41e4cc2a46343c64
		05c2003c23c4a8fa1ddd3fb497cd610f03dadb05
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@
		from typing import Final


		VERSION: Final = '1.0.500'
		VERSION: Final = '1.0.501'
+1 −0		.github/workflows/Dockerfile
+1 −1		.github/workflows/test-pr.yml
+2 −12		Makefile
+17 −17		flake.lock
+3 −9		flake.nix
+2 −2		tests/krypto-hooks/kryptotest.mak