Merge pull request #32 from eigerco/chore/vendor-deps

chore: use forked crates instead of local patching

Author: zeapoz

.github/actions/setup-patched-deps/action.yml

@@ -1,5 +1,5 @@
 name: Setup Rust Build
-description: Install protoc, setup patched deps, install Rust toolchain, and configure cache
+description: Install protoc, install Rust toolchain, and configure cache
 
 inputs:
   toolchain:
@@ -18,8 +18,6 @@ runs:
   steps:
     - name: Install protoc
       uses: ./.github/actions/setup-protoc
-    - name: Setup patched dependencies
-      uses: ./.github/actions/setup-patched-deps
     - name: Install toolchain
       uses: dtolnay/rust-toolchain@f7ccc83f9ed1e5b9c81d8a67d7ad1a747e22a561 # branch=master
       id: toolchain

.github/actions/setup-rust-build/action.yml

@@ -105,8 +105,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag: v6.0.1
-      - name: Setup patched dependencies
-        uses: ./.github/actions/setup-patched-deps
       - name: Check licenses
         uses: EmbarkStudios/cargo-deny-action@76cd80eb775d7bbbd2d80292136d74d39e1b4918 # tag: v2.0.14
         with:

.github/workflows/ci.yml

@@ -14,9 +14,6 @@ Thumbs.db
 # Nix
 result
 result-*
-.patched-sapling-crypto
-.patched-orchard
-.patched-halo2-gadgets
 
 # Environment files
 .env

.gitignore

@@ -94,9 +94,9 @@ zeroize = "1.8"
 zip32 = "0.2.1"
 
 [patch.crates-io]
-halo2_gadgets = { path = "./.patched-halo2-gadgets" }
-orchard = { path = "./.patched-orchard" }
-sapling-crypto = { path = "./.patched-sapling-crypto" }
+halo2_gadgets = { git = "https://github.com/eigerco/halo2" }
+orchard = { git = "https://github.com/eigerco/orchard" }
+sapling-crypto = { git = "https://github.com/eigerco/sapling-crypto" }
 
 [workspace.lints.rust]
 missing_docs = { level = "warn", priority = -1 }

Cargo.lock

@@ -6,7 +6,7 @@ This section covers setting up the repository, building `zair`, and running a qu
 
 ### With Nix (recommended)
 
-The repo includes a Nix flake that provides all dependencies (Rust, `protoc`, patched crates):
+The repo includes a Nix flake that provides all dependencies (Rust, `protoc`):
 
 ```bash
 nix develop
@@ -20,25 +20,7 @@ cargo build --release
 - Rust 1.91+ (2024 edition)
 - Protobuf (`protoc`) for lightwalletd gRPC bindings
 
-#### Patching dependencies
-
-The airdrop circuits require patched versions of upstream Zcash crates. After cloning, run:
-
-```bash
-git clone --branch v0.11.0 --single-branch https://github.com/zcash/orchard.git .patched-orchard
-git -C .patched-orchard apply "../nix/airdrop-orchard-nullifier.patch"
-
-git clone --branch v0.5.0 --single-branch https://github.com/zcash/sapling-crypto.git .patched-sapling-crypto
-git -C .patched-sapling-crypto apply "../nix/airdrop-sapling-nullifier.patch"
-
-curl -sL https://static.crates.io/crates/halo2_gadgets/halo2_gadgets-0.3.1.crate | tar xz
-mv halo2_gadgets-0.3.1 .patched-halo2-gadgets
-patch -p1 -d .patched-halo2-gadgets < nix/airdrop-halo2-gadgets-sha256.patch
-```
-
-The patches mainly expose private internals needed by the airdrop circuits.
-
-Then build:
+Build with:
 
 ```bash
 cargo build --release

Cargo.toml

@@ -7,23 +7,6 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     rust-overlay.url = "github:oxalica/rust-overlay";
     treefmt-nix.url = "github:numtide/treefmt-nix";
-
-    # Pin to specific versions matching Cargo.toml
-    sapling-crypto = {
-      url = "github:zcash/sapling-crypto/v0.5.0";
-      flake = false;
-    };
-
-    orchard = {
-      url = "github:zcash/orchard/v0.11.0";
-      flake = false;
-    };
-
-    halo2 = {
-      # Commit used by crates.io `halo2_gadgets` 0.3.1 (`path_in_vcs = halo2_gadgets`).
-      url = "github:zcash/halo2/3bb6f5ccbcdc3d285babcea09925a741a4452281";
-      flake = false;
-    };
   };
 
   outputs =
@@ -40,7 +23,6 @@
       ];
 
       imports = [
-        ./nix/pkgs
         ./nix/lib.nix
         ./nix/devshell.nix
         ./nix/formatting.nix