feat: Replace global workspace with zkvm-local workspace

5 files changed, 34 insertions, 16 deletions

diff --git a/flake.nix b/flake.nix
index a28d708..35d2a40 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,22 +22,24 @@
 
     withZKVMPhases = currentPackage: with currentPackage; {
         buildPhase = ''
-          root_dir="$PWD"
+          export INPUTS="$PWD/Vertices-010.in"
+
+          pushd zkvms/${currentPackage.pname}
           runHook preBuild
-          cd "$root_dir"
 
-          export INPUTS="$PWD/Vertices-010.in"
           cargo build --bin ${hostBin} --release
 
           runHook postBuild
+          popd
         '';
 
         installPhase = ''
           runHook preInstall
 
           mkdir -p "$out"/bin
-          for bin in $(find . -type f -regex ".*release/[^/]*" -executable -print)
+          for bin in $(find . -type f -regex "./zkvms/.*release/[^/]*" -executable -print)
           do
+            echo "$bin"
             mv "$bin" "$out"/bin/
           done
 
@@ -54,9 +56,22 @@
         doNotPostBuildInstallCargoBinaries = true;
       } // currentPackage;
 
+    fixZKVMDeps = commonArgs: commonArgs // {
+        postUnpack = ''
+          ln -s ../../../guests ./source/zkvms/${commonArgs.pname}/guest/
+          ln -s ../../../guests_macro ./source/zkvms/${commonArgs.pname}/guest/
+          ln -s ../../Cargo.lock ./source/zkvms/${commonArgs.pname}/
+        '';
+
+        preBuild = ''
+          cd zkvms/${commonArgs.pname}
+        '';
+      };
+
     args-zkVM = {
       craneLib-default = crane.mkLib pkgs;
       inherit withZKVMPhases;
+      inherit fixZKVMDeps;
     };
   in {
     packages.${system}.risc0 = callPackage ./zkvms/risc0/default.nix args-zkVM;
diff --git a/Cargo.lock b/zkvms/risc0/Cargo.lock
index f72a428..145227c 100644
--- a/Cargo.lock
+++ b/zkvms/risc0/Cargo.lock
@@ -303,9 +303,9 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.5.3"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03"
+checksum = "9fb65153674e51d3a42c8f27b05b9508cea85edfaade8aa46bc8fc18cecdfef3"
 dependencies = [
  "borsh-derive",
  "cfg_aliases",
@@ -313,9 +313,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "1.5.3"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244"
+checksum = "a396e17ad94059c650db3d253bb6e25927f1eb462eede7e7a153bb6e75dce0a7"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
@@ -1174,9 +1174,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
  "adler2",
 ]
diff --git a/Cargo.toml b/zkvms/risc0/Cargo.toml
index 86417e1..608d075 100644
--- a/Cargo.toml
+++ b/zkvms/risc0/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
 members = [
-  "guests/*",
-  "zkvms/*/host",
+  "host",
+  "guest/guests/*",
 ]
diff --git a/zkvms/risc0/default.nix b/zkvms/risc0/default.nix
index 7f1a5d2..5444eb6 100644
--- a/zkvms/risc0/default.nix
+++ b/zkvms/risc0/default.nix
@@ -5,6 +5,7 @@
   pkg-config,
   craneLib-default,
   withZKVMPhases,
+  fixZKVMDeps,
 }:
 let
   fs = lib.fileset;
@@ -19,15 +20,15 @@ let
           ./.
           ../../guests
           ../../guests_macro
-          ../../Cargo.lock
-          ../../Cargo.toml
           ../../Vertices-010.in
       ]);
     };
+
+    cargoLock = ./Cargo.lock;
   };
 
   craneLib = craneLib-default.overrideToolchain metacraft-labs.risc0;
-  cargoArtifacts = craneLib.buildDepsOnly commonArgs;
+  cargoArtifacts = craneLib.buildDepsOnly (fixZKVMDeps commonArgs);
 in
   craneLib.buildPackage (withZKVMPhases (commonArgs
     // {
@@ -42,9 +43,10 @@ in
       '';
 
       preBuild = ''
-        cd zkvms/risc0/guest
+        pushd ./guest
         cargo build --release --target riscv32im-risc0-zkvm-elf
         ln -s ../../../../zkvms/risc0/guest/target/riscv32im-risc0-zkvm-elf/release/guest ../host/src/guest
+        popd
 
         # Used for verification
         # https://github.com/risc0/risc0/blob/881e512732eca72849b2d0e263a1242aba3158af/risc0/build/src/lib.rs#L192-L195
diff --git a/zkvms/risc0/guest/guests b/zkvms/risc0/guest/guests
new file mode 120000
index 0000000..69bc8ed
--- /dev/null
+++ b/zkvms/risc0/guest/guests
@@ -0,0 +1 @@
+../../../guests
\ No newline at end of file