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

* kevm-pyk/src/kevm_pyk/kproj/plugin: Set Version 5aa6993fab90675d971b8b98b3430d11f1ec2a2b * Set Version: 1.0.507 * kevm-pyk/: sync poetry files pyk version v0.1.731 * deps/blockchain-k-plugin_release: sync release file version 5aa6993fab90675d971b8b98b3430d11f1ec2a2b * integrate plugin changes to blake2 build * adapt flake files manually (change list in force-push) --------- Co-authored-by: devops <[email protected]> Co-authored-by: Jost Berthold <[email protected]>
runtimeverification · Mar 25, 2024 · e3e21b5 · e3e21b5
1 parent 92bdb3d
commit e3e21b5
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 22 deletions.
diff --git a/deps/blockchain-k-plugin_release b/deps/blockchain-k-plugin_release
@@ -1 +1 @@
-247588a696bdb7fcfc170c93a59bd86927a91b3c
+5aa6993fab90675d971b8b98b3430d11f1ec2a2b
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/da74e13951883cecbbc23a941d0fe1bb48821afe";
+        "github:runtimeverification/blockchain-k-plugin/5aa6993fab90675d971b8b98b3430d11f1ec2a2b";
       inputs.flake-utils.follows = "k-framework/flake-utils";
       inputs.nixpkgs.follows = "k-framework/nixpkgs";
     };

diff --git a/kevm-pyk/poetry.lock b/kevm-pyk/poetry.lock
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.506"
+version = "1.0.507"
 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.506'
+VERSION: Final = '1.0.507'
diff --git a/kevm-pyk/src/kevm_pyk/kdist/plugin.py b/kevm-pyk/src/kevm_pyk/kdist/plugin.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import shutil
 import sys
 from distutils.dir_util import copy_tree
 from typing import TYPE_CHECKING
@@ -65,13 +64,13 @@ 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', 'plugin-c/blake2.a', '-j8'],
+            ['make', 'libcryptopp', 'libff', 'blake2', '-j8'],
             pipe_stdout=not verbose,
         )
 
         copy_tree('./build/libcryptopp', str(output_dir / 'libcryptopp'))
         copy_tree('./build/libff', str(output_dir / 'libff'))
-        shutil.copy2('./plugin-c/blake2.a', output_dir / 'plugin-c' / 'blake2.a')
+        copy_tree('./build/blake2', str(output_dir / 'blake2'))
 
     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
@@ -219,11 +219,13 @@ def lib_ccopts(plugin_dir: Path, debug_build: bool = False) -> list[str]:
     libcryptopp_dir = plugin_dir / 'libcryptopp'
     ccopts += [f'{libcryptopp_dir}/lib/libcryptopp.a', f'-I{libcryptopp_dir}/include']
 
+    blake2_dir = plugin_dir / 'blake2'
+    ccopts += [f'{blake2_dir}/lib/blake2.a']
+
     plugin_include = plugin_dir / 'plugin-c'
     ccopts += [
         f'{plugin_include}/plugin_util.cpp',
         f'{plugin_include}/crypto.cpp',
-        f'{plugin_include}/blake2.a',
     ]
 
     if kernel == 'darwin':

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.506
+1.0.507
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		247588a696bdb7fcfc170c93a59bd86927a91b3c
		5aa6993fab90675d971b8b98b3430d11f1ec2a2b
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@
		from typing import Final


		VERSION: Final = '1.0.506'
		VERSION: Final = '1.0.507'
+0 −4		.gitmodules
+10 −6		Makefile
+0 −1		deps/secp256k1
+1 −1		flake.nix
+2 −2		tests/krypto-hooks/kryptotest.mak