Add zk-nullifier example and reorganize zk/ folder

.github/actions/setup/action.yml

@@ -69,6 +69,7 @@ runs:
 
     - name: Cache AVM and Anchor
       if: inputs.node-version != ''
+      id: cache-avm
       uses: actions/cache@v4
       with:
         path: |
@@ -78,6 +79,7 @@ runs:
 
     - name: Cache Photon indexer
       if: inputs.photon-indexer == 'true'
+      id: cache-photon
       uses: actions/cache@v4
       with:
         path: ~/.cargo/bin/photon
@@ -97,13 +99,18 @@ runs:
         fi
 
     - name: Install Anchor CLI
-      if: inputs.node-version != ''
+      if: inputs.node-version != '' && steps.cache-avm.outputs.cache-hit != 'true'
       shell: bash
       run: |
         cargo install --git https://github.com/coral-xyz/anchor avm --locked --force
         avm install ${{ inputs.anchor-version }}
         avm use ${{ inputs.anchor-version }}
 
+    - name: Set Anchor version
+      if: inputs.node-version != '' && steps.cache-avm.outputs.cache-hit == 'true'
+      shell: bash
+      run: avm use ${{ inputs.anchor-version }}
+
     - name: Install Light CLI
       shell: bash
       run: npm install -g @lightprotocol/zk-compression-cli@0.27.1-alpha.2
@@ -137,7 +144,7 @@ runs:
       run: npm install -g snarkjs
 
     - name: Install Photon indexer
-      if: inputs.photon-indexer == 'true'
+      if: inputs.photon-indexer == 'true' && steps.cache-photon.outputs.cache-hit != 'true'
       shell: bash
       env:
         RUSTFLAGS: "-A dead-code"

.github/workflows/rust-tests.yml

@@ -29,7 +29,6 @@ jobs:
           - counter/native
           - counter/pinocchio
           - account-comparison
-          - zk-id
           - airdrop-implementations/simple-claim/program
         include:
           - example: basic-operations/native
@@ -51,12 +50,6 @@ jobs:
           example: ${{ matrix.example }}
           solana-cli-version: ${{ env.SOLANA_CLI_VERSION }}
           rust-toolchain: ${{ env.RUST_TOOLCHAIN }}
-          install-circom: ${{ matrix.example == 'zk-id' }}
-
-      - name: Setup ZK circuits
-        if: matrix.example == 'zk-id'
-        working-directory: ${{ matrix.example }}
-        run: ./scripts/setup.sh
 
       - name: Build and test
         working-directory: ${{ matrix.example }}

.github/workflows/typescript-tests.yml

@@ -34,6 +34,8 @@ jobs:
           - basic-operations/anchor/update
           - basic-operations/anchor/close
           - basic-operations/anchor/reinit
+          - zk/zk-id
+          - zk/nullifier
     steps:
       - uses: actions/checkout@v4
 
@@ -45,6 +47,12 @@ jobs:
           solana-cli-version: ${{ env.SOLANA_CLI_VERSION }}
           rust-toolchain: ${{ env.RUST_TOOLCHAIN }}
           photon-indexer: "true"
+          install-circom: ${{ matrix.example == 'zk/zk-id' }}
+
+      - name: Setup ZK circuits
+        if: matrix.example == 'zk/zk-id'
+        working-directory: ${{ matrix.example }}
+        run: ./scripts/setup.sh
 
       - name: Install dependencies
         working-directory: ${{ matrix.example }}

.gitignore

@@ -8,3 +8,8 @@ test-ledger
 .claude
 build
 pot
+
+# ZK examples - not ready
+zk/mixer/
+zk/shielded-pool/
+zk/zk-merkle-proof/

README.md

@@ -12,16 +12,18 @@
 For simple client side distribution visit [this example](https://github.com/Lightprotocol/example-token-distribution).
 
 ### Basic Operations
-- **[create-nullifier](./basic-operations/anchor/create-nullifier)** - Basic Anchor example to create nullifiers.
-- **[basic-operations/anchor](./basic-operations/anchor/)** - Anchor program with Rust and TypeScript tests
-- **[basic-operations/native-rust](./basic-operations/native-rust/)** - Native Solana program with light-sdk and Rust tests.
 
-Basic Operations include:
-- **create** - Initialize a new compressed account.
-- **update** - Modify data in an existing compressed account.
-- **close** - Clear account data and preserve its address.
-- **reinit** - Reinitialize a closed account with the same address.
-- **burn** - Permanently delete a compressed account.
+- **[create-nullifier](./basic-operations/anchor/create-nullifier)** - Basic Anchor example to create nullifiers for payments.
+- **create** - Initialize a new compressed account
+  - [Anchor](./basic-operations/anchor/create) | [Native](./basic-operations/native/programs/create)
+- **update** - Modify data in an existing compressed account
+  - [Anchor](./basic-operations/anchor/update) | [Native](./basic-operations/native/programs/update)
+- **close** - Clear account data and preserve its address
+  - [Anchor](./basic-operations/anchor/close) | [Native](./basic-operations/native/programs/close)
+- **reinit** - Reinitialize a closed account with the same address
+  - [Anchor](./basic-operations/anchor/reinit) | [Native](./basic-operations/native/programs/reinit)
+- **burn** - Permanently delete a compressed account
+  - [Anchor](./basic-operations/anchor/burn) | [Native](./basic-operations/native/programs/burn)
 
 ### Counter Program
 
@@ -45,9 +47,12 @@ Full compressed account lifecycle (create, increment, decrement, reset, close):
 
 - **[account-comparison](./account-comparison/)** - Compare compressed vs regular Solana accounts.
 
-### zk-id Program
+### ZK Programs
+
+
+- **[zk-id](./zk/zk-id)** - Identity verification using Groth16 proofs. Issuers create credentials; users prove ownership without revealing the credential.
+- **[nullifier](./zk/nullifier)** - Simple Program to Create Nullifiers. Requires no custom circuit.
 
-- **[zk-id](./zk-id)** - A minimal zk id Solana program that uses zero-knowledge proofs for identity verification with compressed accounts.
 
 
 ## Light Protocol dependencies

scripts/format.sh

@@ -8,6 +8,8 @@ cargo +nightly fmt --manifest-path counter/anchor/Cargo.toml
 cargo +nightly fmt --manifest-path counter/native/Cargo.toml
 cargo +nightly fmt --manifest-path counter/pinocchio/Cargo.toml
 cargo +nightly fmt --manifest-path account-comparison/Cargo.toml
+cargo +nightly fmt --manifest-path zk/nullifier/Cargo.toml
+cargo +nightly fmt --manifest-path zk/zk-id/Cargo.toml
 
 # Run clippy on each project individually
 cargo clippy --manifest-path create-and-update/Cargo.toml \
@@ -59,3 +61,23 @@ cargo clippy --manifest-path account-comparison/Cargo.toml \
            -A unexpected-cfgs \
            -A clippy::doc_lazy_continuation \
         -D warnings
+
+cargo clippy --manifest-path zk/nullifier/Cargo.toml \
+        --no-deps \
+        --all-features \
+        -- -A clippy::result_large_err \
+           -A clippy::empty-docs \
+           -A clippy::to-string-trait-impl \
+           -A unexpected-cfgs \
+           -A clippy::doc_lazy_continuation \
+        -D warnings
+
+cargo clippy --manifest-path zk/zk-id/Cargo.toml \
+        --no-deps \
+        --all-features \
+        -- -A clippy::result_large_err \
+           -A clippy::empty-docs \
+           -A clippy::to-string-trait-impl \
+           -A unexpected-cfgs \
+           -A clippy::doc_lazy_continuation \
+        -D warnings

scripts/lint.sh

@@ -20,6 +20,12 @@ cd counter/pinocchio && cargo fmt --check && cd ../..
 echo "Checking account-comparison..."
 cd account-comparison && cargo fmt --check && cd ..
 
+echo "Checking zk/nullifier..."
+cd zk/nullifier && cargo fmt --check && cd ../..
+
+echo "Checking zk/zk-id..."
+cd zk/zk-id && cargo fmt --check && cd ../..
+
 echo "Running clippy..."
 
 # Run clippy for each crate
@@ -38,4 +44,10 @@ cargo clippy --manifest-path counter/pinocchio/Cargo.toml --all-targets --all-fe
 echo "Running clippy on account-comparison..."
 cargo clippy --manifest-path account-comparison/Cargo.toml --all-targets --all-features -- -D warnings
 
+echo "Running clippy on zk/nullifier..."
+cargo clippy --manifest-path zk/nullifier/Cargo.toml --all-targets --all-features -- -D warnings
+
+echo "Running clippy on zk/zk-id..."
+cargo clippy --manifest-path zk/zk-id/Cargo.toml --all-targets --all-features -- -D warnings
+
 echo "Lint checks completed successfully!"

zk/Makefile

@@ -0,0 +1,144 @@
+# Makefile for building and testing all ZK examples
+# Usage:
+#   make all        - Build and test all examples
+#   make build      - Build all Solana programs
+#   make test-rust  - Run all Rust tests
+#   make test-ts    - Run all TypeScript tests
+#   make clean      - Clean all build artifacts
+
+SHELL := /bin/bash
+
+# ZK example directories
+ZK_EXAMPLES := nullifier zk-id
+
+.PHONY: all build deploy test-rust test-ts clean setup help $(ZK_EXAMPLES)
+
+help:
+	@echo "ZK Examples Makefile"
+	@echo ""
+	@echo "Usage:"
+	@echo "  make all        - Build and test all examples (Rust + TypeScript)"
+	@echo "  make build      - Build all Solana programs"
+	@echo "  make deploy     - Deploy all programs to validator (builds first)"
+	@echo "  make test-rust  - Run all Rust tests (cargo test-sbf)"
+	@echo "  make test-ts    - Run all TypeScript tests (deploys first)"
+	@echo "  make setup      - Setup circuits for all examples"
+	@echo "  make clean      - Clean all build artifacts"
+	@echo ""
+	@echo "Individual examples:"
+	@echo "  make nullifier      - Build and test nullifier"
+	@echo "  make zk-id             - Build and test zk-id"
+
+all: build test-rust test-ts
+	@echo "All examples built and tested successfully!"
+
+build:
+	@echo "Building all ZK examples..."
+	@for dir in $(ZK_EXAMPLES); do \
+		echo "Building $$dir..."; \
+		cd $$dir && cargo build-sbf && cd ..; \
+		if [ $$? -ne 0 ]; then \
+			echo "Failed to build $$dir"; \
+			exit 1; \
+		fi; \
+		echo "$$dir built successfully"; \
+	done
+	@echo "All programs built successfully!"
+
+deploy: build
+	@echo "Deploying all ZK programs..."
+	@for dir in $(ZK_EXAMPLES); do \
+		echo "Deploying $$dir..."; \
+		if [ -f "$$dir/target/deploy/"*.so ]; then \
+			solana program deploy $$dir/target/deploy/*.so; \
+			if [ $$? -ne 0 ]; then \
+				echo "Failed to deploy $$dir"; \
+				exit 1; \
+			fi; \
+			echo "$$dir deployed successfully"; \
+		else \
+			echo "No .so file found for $$dir, skipping deploy"; \
+		fi; \
+	done
+	@echo "All programs deployed!"
+
+test-rust:
+	@echo "Running Rust tests for all ZK examples..."
+	@for dir in $(ZK_EXAMPLES); do \
+		echo "Testing $$dir (Rust)..."; \
+		cd $$dir && cargo test-sbf && cd ..; \
+		if [ $$? -ne 0 ]; then \
+			echo "Rust tests failed for $$dir"; \
+			exit 1; \
+		fi; \
+		echo "$$dir Rust tests passed"; \
+	done
+	@echo "All Rust tests passed!"
+
+test-ts: deploy
+	@echo "Running TypeScript tests for all ZK examples..."
+	@for dir in $(ZK_EXAMPLES); do \
+		echo "Testing $$dir (TypeScript)..."; \
+		if [ -f "$$dir/package.json" ]; then \
+			cd $$dir && npm run test:ts && cd ..; \
+			if [ $$? -ne 0 ]; then \
+				echo "TypeScript tests failed for $$dir"; \
+				exit 1; \
+			fi; \
+			echo "$$dir TypeScript tests passed"; \
+		else \
+			echo "No package.json found in $$dir, skipping TS tests"; \
+		fi; \
+	done
+	@echo "All TypeScript tests passed!"
+
+setup:
+	@echo "Setting up circuits for all ZK examples..."
+	@for dir in $(ZK_EXAMPLES); do \
+		echo "Setting up $$dir..."; \
+		if [ -f "$$dir/scripts/setup.sh" ]; then \
+			cd $$dir && ./scripts/setup.sh && cd ..; \
+			if [ $$? -ne 0 ]; then \
+				echo "Setup failed for $$dir"; \
+				exit 1; \
+			fi; \
+			echo "$$dir setup completed"; \
+		else \
+			echo "No setup script found in $$dir"; \
+		fi; \
+	done
+	@echo "All setups completed!"
+
+clean:
+	@echo "Cleaning all ZK examples..."
+	@for dir in $(ZK_EXAMPLES); do \
+		echo "Cleaning $$dir..."; \
+		cd $$dir && cargo clean && cd ..; \
+		if [ -d "$$dir/build" ]; then \
+			rm -rf $$dir/build; \
+		fi; \
+		if [ -d "$$dir/node_modules" ]; then \
+			rm -rf $$dir/node_modules; \
+		fi; \
+	done
+	@echo "All examples cleaned!"
+
+# Individual example targets
+nullifier:
+	@echo "Building, deploying, and testing nullifier..."
+	@cd nullifier && cargo build-sbf && cargo test-sbf
+	@solana program deploy nullifier/target/deploy/nullifier.so
+	@if [ -f "nullifier/package.json" ]; then \
+		cd nullifier && npm run test:ts; \
+	fi
+	@echo "nullifier completed!"
+
+zk-id:
+	@echo "Building, deploying, and testing zk-id..."
+	@cd zk-id && cargo build-sbf && cargo test-sbf
+	@solana program deploy zk-id/target/deploy/zk_id.so
+	@if [ -f "zk-id/package.json" ]; then \
+		cd zk-id && npm run test:ts; \
+	fi
+	@echo "zk-id completed!"
+