fix: revert address tree check in zk-id, remove zk-merkle-proof from CI

tilo-14 · tilo-14 · commit d22fbeb74f21 · 2026-01-14T20:06:43.000Z
diff --git a/.github/workflows/typescript-tests.yml b/.github/workflows/typescript-tests.yml
@@ -79,7 +79,6 @@ jobs:
         example:
           - zk/zk-id
           - zk/zk-nullifier
-          - zk/zk-merkle-proof
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ pot
 # ZK examples - not ready
 zk/mixer/
 zk/shielded-pool/
+zk/zk-merkle-proof/
diff --git a/README.md b/README.md
@@ -49,14 +49,10 @@ Full compressed account lifecycle (create, increment, decrement, reset, close):
 
 ### ZK Programs
 
-**Full Examples:**
 
 - **[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.
 
-**Basic Examples:**
-
-- **[zk-nullifier](./zk/zk-nullifier)** - Creates one or four nullifiers. Uses Groth16 proofs and compressed accounts.
-- **[zk-merkle-proof](./zk/zk-merkle-proof)** - Creates compressed accounts and verifies with Groth16 proofs (without nullifier).
 
   
 ## Light Protocol dependencies
diff --git a/zk/Makefile b/zk/Makefile
@@ -9,7 +9,7 @@
 SHELL := /bin/bash
 
 # ZK example directories
-ZK_EXAMPLES := zk-nullifier zk-id zk-merkle-proof
+ZK_EXAMPLES := zk-nullifier zk-id
 
 .PHONY: all build deploy test-rust test-ts clean setup help $(ZK_EXAMPLES)
 
@@ -28,7 +28,6 @@ help:
 	@echo "Individual examples:"
 	@echo "  make zk-nullifier      - Build and test zk-nullifier"
 	@echo "  make zk-id             - Build and test zk-id"
-	@echo "  make zk-merkle-proof   - Build and test zk-merkle-proof"
 
 all: build test-rust test-ts
 	@echo "All examples built and tested successfully!"
@@ -143,11 +142,3 @@ zk-id:
 	fi
 	@echo "zk-id completed!"
 
-zk-merkle-proof:
-	@echo "Building, deploying, and testing zk-merkle-proof..."
-	@cd zk-merkle-proof && cargo build-sbf && cargo test-sbf
-	@solana program deploy zk-merkle-proof/target/deploy/zk_merkle_proof.so
-	@if [ -f "zk-merkle-proof/package.json" ]; then \
-		cd zk-merkle-proof && npm run test:ts; \
-	fi
-	@echo "zk-merkle-proof completed!"
diff --git a/zk/README.md b/zk/README.md
@@ -10,14 +10,8 @@ You can use Light to:
 
 ## Examples
 
-**Full Examples:**
-
 - **[zk-id](./zk-id)** - Identity verification using Groth16 proofs. Issuers create credentials; users prove ownership without revealing the credential.
-
-**Basic Examples:**
-
-- **[zk-nullifier](./zk-nullifier)** - Creates one or four nullifiers. Uses Groth16 proofs and compressed accounts.
-- **[zk-merkle-proof](./zk-merkle-proof)** - Creates compressed accounts and verifies with Groth16 proofs (without nullifier).
+- **[nullifier](./nullifier)** - Simple Program to Create Nullifiers. Requires no custom circuit.
 
 ## Building and Testing
 
@@ -42,7 +36,6 @@ make all
 # Individual examples
 make zk-nullifier
 make zk-id
-make zk-merkle-proof
 
 # Show all available commands
 make help
diff --git a/zk/nullifier/Anchor.toml b/zk/nullifier/Anchor.toml
@@ -6,7 +6,7 @@ resolution = true
 skip-lint = false
 
 [programs.localnet]
-zk_nullifier = "Bw8aty8LJY5Kg2b6djghjWGwt6cBc1tVQUoreUehvVq4"
+nullifier = "Bw8aty8LJY5Kg2b6djghjWGwt6cBc1tVQUoreUehvVq4"
 
 [registry]
 url = "https://api.apr.dev"
diff --git a/zk/nullifier/Cargo.toml b/zk/nullifier/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["programs/zk-nullifier"]
+members = ["programs/nullifier"]
 resolver = "2"
 
 [profile.release]
diff --git a/zk/nullifier/README.md b/zk/nullifier/README.md
@@ -45,7 +45,7 @@ Creates nullifier accounts for provided values.
 From the parent `zk/` directory:
 
 ```bash
-make zk-nullifier    # Build, deploy, test
+make nullifier    # Build, deploy, test
 make build           # Build all programs
 make deploy          # Deploy to local validator
 make test-ts         # Run TypeScript tests
@@ -76,8 +76,8 @@ npm run test:ts
 ## Structure
 
 ```
-zk-nullifier/
-├── programs/zk-nullifier/
+nullifier/
+├── programs/nullifier/
 │   ├── src/lib.rs           # Program with create_nullifiers helper
 │   └── tests/test.rs        # Rust integration tests
 └── ts-tests/
diff --git a/zk/nullifier/package-lock.json b/zk/nullifier/package-lock.json
diff --git a/zk/nullifier/package.json b/zk/nullifier/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "zk-nullifier",
+  "name": "nullifier",
   "version": "1.0.0",
   "description": "Minimal ZK nullifier example for privacy-preserving applications",
   "scripts": {
diff --git a/zk/nullifier/programs/nullifier/Cargo.toml b/zk/nullifier/programs/nullifier/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "zk-nullifier"
+name = "nullifier"
 version = "0.1.0"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]
-name = "zk_nullifier"
+name = "nullifier"
 
 [features]
 default = []
diff --git a/zk/nullifier/programs/nullifier/Xargo.toml b/zk/nullifier/programs/nullifier/Xargo.toml
diff --git a/zk/nullifier/programs/nullifier/src/lib.rs b/zk/nullifier/programs/nullifier/src/lib.rs
@@ -9,7 +9,7 @@ declare_id!("Bw8aty8LJY5Kg2b6djghjWGwt6cBc1tVQUoreUehvVq4");
 
 
 #[program]
-pub mod zk_nullifier {
+pub mod nullifier {
     use super::*;
 
     /// Creates nullifier accounts for the provided nullifier values.
diff --git a/zk/nullifier/programs/nullifier/tests/test.rs b/zk/nullifier/programs/nullifier/tests/test.rs
@@ -11,11 +11,11 @@ use solana_sdk::{
     pubkey::Pubkey,
     signature::{Keypair, Signer},
 };
-use zk_nullifier::nullifier_creation::{NullifierInstructionData, NULLIFIER_PREFIX};
+use nullifier::nullifier_creation::{NullifierInstructionData, NULLIFIER_PREFIX};
 
 #[tokio::test]
 async fn test_create_single_nullifier() {
-    let config = ProgramTestConfig::new(true, Some(vec![("zk_nullifier", zk_nullifier::ID)]));
+    let config = ProgramTestConfig::new(true, Some(vec![("nullifier", nullifier::ID)]));
     let mut rpc = LightProgramTest::new(config).await.unwrap();
     let payer = rpc.get_payer().insecure_clone();
 
@@ -26,7 +26,7 @@ async fn test_create_single_nullifier() {
     let (nullifier_address, _) = derive_address(
         &[NULLIFIER_PREFIX, nullifier.as_slice()],
         &address_tree_info.tree,
-        &zk_nullifier::ID,
+        &nullifier::ID,
     );
 
     let instruction = build_create_nullifier_instruction(
@@ -44,7 +44,7 @@ async fn test_create_single_nullifier() {
         .unwrap();
 
     let nullifier_accounts = rpc
-        .get_compressed_accounts_by_owner(&zk_nullifier::ID, None, None)
+        .get_compressed_accounts_by_owner(&nullifier::ID, None, None)
         .await
         .unwrap();
     assert_eq!(nullifier_accounts.value.items.len(), 1);
@@ -68,7 +68,7 @@ async fn test_create_single_nullifier() {
 
 #[tokio::test]
 async fn test_create_multiple_nullifiers() {
-    let config = ProgramTestConfig::new(true, Some(vec![("zk_nullifier", zk_nullifier::ID)]));
+    let config = ProgramTestConfig::new(true, Some(vec![("nullifier", nullifier::ID)]));
     let mut rpc = LightProgramTest::new(config).await.unwrap();
     let payer = rpc.get_payer().insecure_clone();
 
@@ -82,7 +82,7 @@ async fn test_create_multiple_nullifiers() {
             let (addr, _) = derive_address(
                 &[NULLIFIER_PREFIX, n.as_slice()],
                 &address_tree_info.tree,
-                &zk_nullifier::ID,
+                &nullifier::ID,
             );
             addr
         })
@@ -103,7 +103,7 @@ async fn test_create_multiple_nullifiers() {
         .unwrap();
 
     let nullifier_accounts = rpc
-        .get_compressed_accounts_by_owner(&zk_nullifier::ID, None, None)
+        .get_compressed_accounts_by_owner(&nullifier::ID, None, None)
         .await
         .unwrap();
     assert_eq!(nullifier_accounts.value.items.len(), 3);
@@ -121,7 +121,7 @@ where
 {
     let mut remaining_accounts = PackedAccounts::default();
     remaining_accounts.add_pre_accounts_signer(payer.pubkey());
-    let config = SystemAccountMetaConfig::new(zk_nullifier::ID);
+    let config = SystemAccountMetaConfig::new(nullifier::ID);
     remaining_accounts.add_system_accounts_v2(config)?;
 
     let address_with_trees: Vec<AddressWithTree> = addresses
@@ -154,17 +154,17 @@ where
         system_accounts_offset: system_accounts_offset as u8,
     };
 
-    let instruction_data = zk_nullifier::instruction::CreateNullifier {
+    let instruction_data = nullifier::instruction::CreateNullifier {
         data,
         nullifiers: nullifiers.to_vec(),
     };
 
-    let accounts = zk_nullifier::accounts::CreateNullifierAccounts {
+    let accounts = nullifier::accounts::CreateNullifierAccounts {
         signer: payer.pubkey(),
     };
 
     Ok(Instruction {
-        program_id: zk_nullifier::ID,
+        program_id: nullifier::ID,
         accounts: [accounts.to_account_metas(None), remaining_accounts_metas].concat(),
         data: instruction_data.data(),
     })
diff --git a/zk/nullifier/ts-tests/nullifier.test.ts b/zk/nullifier/ts-tests/nullifier.test.ts
@@ -5,7 +5,7 @@ import * as path from "path";
 import * as fs from "fs";
 
 const IDL = JSON.parse(
-  fs.readFileSync(path.join(process.cwd(), "target/idl/zk_nullifier.json"), "utf8")
+  fs.readFileSync(path.join(process.cwd(), "target/idl/nullifier.json"), "utf8")
 );
 
 const PROGRAM_ID = new web3.PublicKey(IDL.address);
@@ -69,7 +69,7 @@ async function createNullifierInstruction(
     .instruction();
 }
 
-describe("zk-nullifier", () => {
+describe("nullifier", () => {
   let rpc: Rpc;
   let signer: web3.Keypair;
   let program: Program;
diff --git a/zk/zk-id/programs/zk-id/src/lib.rs b/zk/zk-id/programs/zk-id/src/lib.rs
@@ -129,6 +129,11 @@ pub mod zk_id {
             .get_tree_pubkey(&light_cpi_accounts)
             .map_err(|_| ErrorCode::AccountNotEnoughKeys)?;
 
+        if address_tree_pubkey.to_bytes() != light_sdk::constants::ADDRESS_TREE_V2 {
+            msg!("Invalid address tree");
+            return Err(ProgramError::InvalidAccountData.into());
+        }
+
         let (address, address_seed) = derive_address(
             &[CREDENTIAL, credential_pubkey.as_ref()],
             &address_tree_pubkey,

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "zk-nullifier",`
	`2`	`+ "name": "nullifier",`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"description": "Minimal ZK nullifier example for privacy-preserving applications",`
`5`	`5`	`"scripts": {`