diff options
| author | Kamen Mladenov <kamen@syndamia.com> | 2025-03-21 13:01:52 +0200 |
|---|---|---|
| committer | Kamen Mladenov <kamen@syndamia.com> | 2025-04-04 11:03:00 +0300 |
| commit | c7a0a23f5c6dfacc933526d02e8da59384898758 (patch) | |
| tree | eb1793a1067a839040b05db23936b5ff42b7a046 /zkvms/zkm/default.nix | |
| parent | 2c82f0faf8371c9da8c9c16f69eb935addd5c76b (diff) | |
| download | zkVMs-benchmarks-c7a0a23f5c6dfacc933526d02e8da59384898758.tar zkVMs-benchmarks-c7a0a23f5c6dfacc933526d02e8da59384898758.tar.gz zkVMs-benchmarks-c7a0a23f5c6dfacc933526d02e8da59384898758.zip | |
feat(zkvms/zkm): Remove SDK override, Go lib build, update SDK usage
Update SDK usage, according to their new methods.
ZKM moved their Go library to the zkVM repo. Their updated SDK also
don't require the patch.
Diffstat (limited to 'zkvms/zkm/default.nix')
| -rw-r--r-- | zkvms/zkm/default.nix | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/zkvms/zkm/default.nix b/zkvms/zkm/default.nix index 4b4cfe2..c6c2230 100644 --- a/zkvms/zkm/default.nix +++ b/zkvms/zkm/default.nix @@ -1,30 +1,6 @@ { zkvmLib, lib, just, metacraft-labs, metacraft-labs-old, protobuf , pkg-config, openssl, buildGoModule, fetchFromGitHub, craneLib-default, }: let - zkm_libsnark = buildGoModule rec { - pname = "zkm_libsnark"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "zkMIPS"; - repo = "zkm-project-template"; - sparseCheckout = [ "sdk/src/local/libsnark" ]; - rev = "155221dfa05daf31d7bfe6b601116ef5a03b82c9"; - hash = "sha256-6hT7cMD3iXN65SFFgMHIPKzzQ212/uhZNIpjJNZ0Dek="; - }; - - sourceRoot = "${src.name}/sdk/src/local/libsnark"; - - vendorHash = "sha256-tGajRfJ8G4M89QSiJnjpTzQ3+VA2RLkavD1ipANeOSI="; - - buildPhase = "sh ./compile.sh"; - - installPhase = '' - mkdir -p "$out"/lib - mv libsnark.so "$out"/lib/ - ''; - }; - commonArgs = { pname = "zkm"; inherit (metacraft-labs.zkm) version; @@ -37,14 +13,6 @@ let }; nativeBuildInputs = [ pkg-config openssl protobuf metacraft-labs.zkm ]; - - overrideVendorGitCheckout = ps: drv: - if drv.src.shortRev == "155221d" - && builtins.any (p: p.name == "zkm-sdk") ps then - drv.overrideAttrs - (_: { patches = [ ./0001-chore-Increase-DEGREE_BITS_RANGE.patch ]; }) - else - drv; }; craneLib = craneLib-default.overrideToolchain metacraft-labs.zkm; @@ -60,12 +28,12 @@ in zkvmLib.buildPackage craneLib (commonArgs // { ''; preBuild = '' - export RUSTFLAGS="-L ${zkm_libsnark}/lib" + export RUSTFLAGS="-L ${metacraft-labs.zkm}/lib" ''; hostToolchain = metacraft-labs-old.zkm; - preRunLibraries = [ openssl zkm_libsnark ]; + preRunLibraries = [ openssl metacraft-labs.zkm ]; preRun = '' export ELF_PATH="$out/bin/guest" |
