From da23179f9a533401fd70e9c9ead0d787837a6e9e Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Tue, 19 Mar 2024 11:24:29 -0600 Subject: [PATCH] Update dependency: kevm-pyk/src/kevm_pyk/kproj/plugin (#2355) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Co-authored-by: Noah Watson Co-authored-by: Andrei Văcaru <16517508+anvacaru@users.noreply.github.com> Co-authored-by: Sam Balco --- .github/workflows/Dockerfile | 1 + deps/blockchain-k-plugin_release | 2 +- flake.lock | 26 ++++---------------------- flake.nix | 3 ++- kevm-pyk/pyproject.toml | 2 +- kevm-pyk/src/kevm_pyk/__init__.py | 2 +- kevm-pyk/src/kevm_pyk/kdist/plugin.py | 3 +-- kevm-pyk/src/kevm_pyk/kompile.py | 5 +---- kevm-pyk/src/kevm_pyk/kproj/plugin | 2 +- package/version | 2 +- 10 files changed, 14 insertions(+), 34 deletions(-) diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile index 6a48852598..2efbfd3494 100644 --- 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 index 405713d94a..51d376a937 100644 --- a/deps/blockchain-k-plugin_release +++ b/deps/blockchain-k-plugin_release @@ -1 +1 @@ -c9698c764521e71d9b8049eb41e4cc2a46343c64 +05c2003c23c4a8fa1ddd3fb497cd610f03dadb05 diff --git a/flake.lock b/flake.lock index 7b88ceffff..06c317f1c5 100644 --- a/flake.lock +++ b/flake.lock @@ -31,21 +31,20 @@ "k-framework", "nixpkgs" ], - "secp256k1": "secp256k1", "xbyak": "xbyak" }, "locked": { - "lastModified": 1710411880, - "narHash": "sha256-iTbgeFebg3YPBl3ABOVLn6P067mlXahGCJXGv4y89uQ=", + "lastModified": 1710532197, + "narHash": "sha256-ezvRq0Ww1bxzgIJZ+oW73DTr4FjzzmTZY74k8IOry40=", "owner": "runtimeverification", "repo": "blockchain-k-plugin", - "rev": "c9698c764521e71d9b8049eb41e4cc2a46343c64", + "rev": "05c2003c23c4a8fa1ddd3fb497cd610f03dadb05", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "blockchain-k-plugin", - "rev": "c9698c764521e71d9b8049eb41e4cc2a46343c64", + "rev": "05c2003c23c4a8fa1ddd3fb497cd610f03dadb05", "type": "github" } }, @@ -613,23 +612,6 @@ "type": "github" } }, - "secp256k1": { - "flake": false, - "locked": { - "lastModified": 1502408521, - "narHash": "sha256-PyqNZGER9VypH35S/aU4EBeepieI3BGXrYsJ141os24=", - "owner": "bitcoin-core", - "repo": "secp256k1", - "rev": "f532bdc9f77f7bbf7e93faabfbe9c483f0a9f75f", - "type": "github" - }, - "original": { - "owner": "bitcoin-core", - "repo": "secp256k1", - "rev": "f532bdc9f77f7bbf7e93faabfbe9c483f0a9f75f", - "type": "github" - } - }, "stacklock2nix": { "locked": { "lastModified": 1705051190, diff --git a/flake.nix b/flake.nix index a84bf66fe4..3faad99237 100644 --- 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 index 96ae119afb..9733fe5c49 100644 --- 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. ", diff --git a/kevm-pyk/src/kevm_pyk/__init__.py b/kevm-pyk/src/kevm_pyk/__init__.py index 1a69512ecb..26c6282369 100644 --- 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 index 0bcec8b66c..7bf743e817 100644 --- 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 index 699fc552e5..d3eccde2b4 100644 --- a/kevm-pyk/src/kevm_pyk/kompile.py +++ b/kevm-pyk/src/kevm_pyk/kompile.py @@ -211,7 +211,7 @@ 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'] @@ -219,9 +219,6 @@ 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'] - 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 index c9698c7645..05c2003c23 160000 --- a/kevm-pyk/src/kevm_pyk/kproj/plugin +++ b/kevm-pyk/src/kevm_pyk/kproj/plugin @@ -1 +1 @@ -Subproject commit c9698c764521e71d9b8049eb41e4cc2a46343c64 +Subproject commit 05c2003c23c4a8fa1ddd3fb497cd610f03dadb05 diff --git a/package/version b/package/version index f7d7753248..4201f0d539 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -1.0.500 +1.0.501