fmt

Author: tilo-14

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/nullifier/programs/nullifier/src/lib.rs

@@ -4,10 +4,8 @@
 use anchor_lang::prelude::*;
 use nullifier_creation::{create_nullifiers, NullifierInstructionData};
 
-
 declare_id!("Bw8aty8LJY5Kg2b6djghjWGwt6cBc1tVQUoreUehvVq4");
 
-
 #[program]
 pub mod nullifier {
     use super::*;
@@ -44,9 +42,6 @@ pub struct CreateNullifierAccounts<'info> {
     pub signer: Signer<'info>,
 }
 
-
-
-
 pub mod nullifier_creation {
     use super::*;
     use borsh::{BorshDeserialize, BorshSerialize};
@@ -66,7 +61,6 @@ pub mod nullifier_creation {
         AccountNotEnoughKeys,
     }
 
-
     #[derive(Clone, Debug, Default, BorshSerialize, BorshDeserialize, LightDiscriminator)]
     pub struct NullifierAccount {}
 
@@ -142,4 +136,4 @@ pub mod nullifier_creation {
 
         Ok(())
     }
-}
+}

zk/nullifier/programs/nullifier/tests/test.rs

@@ -1,7 +1,9 @@
 use anchor_lang::{InstructionData, ToAccountMetas};
-use light_program_test::{program_test::LightProgramTest, Indexer, ProgramTestConfig, Rpc, RpcError};
-use solana_sdk::{instruction::Instruction, pubkey::Pubkey, signature::Signer};
+use light_program_test::{
+    program_test::LightProgramTest, Indexer, ProgramTestConfig, Rpc, RpcError,
+};
 use nullifier::nullifier_creation::NullifierInstructionData;
+use solana_sdk::{instruction::Instruction, pubkey::Pubkey, signature::Signer};
 
 #[tokio::test]
 async fn test_create_single_nullifier() {
@@ -11,12 +13,10 @@ async fn test_create_single_nullifier() {
 
     let nullifier = Pubkey::new_unique().to_bytes();
 
-    let (data, remaining_accounts) = build_create_nullifier_instruction_data(
-        &mut rpc,
-        &[nullifier],
-    )
-    .await
-    .unwrap();
+    let (data, remaining_accounts) =
+        build_create_nullifier_instruction_data(&mut rpc, &[nullifier])
+            .await
+            .unwrap();
 
     let instruction_data = nullifier::instruction::CreateNullifier {
         data,
@@ -38,12 +38,10 @@ async fn test_create_single_nullifier() {
     assert_nullifiers_exist(&mut rpc, &[nullifier]).await;
 
     // Duplicate should fail
-    let (dup_data, dup_remaining_accounts) = build_create_nullifier_instruction_data(
-        &mut rpc,
-        &[nullifier],
-    )
-    .await
-    .unwrap();
+    let (dup_data, dup_remaining_accounts) =
+        build_create_nullifier_instruction_data(&mut rpc, &[nullifier])
+            .await
+            .unwrap();
 
     let dup_instruction_data = nullifier::instruction::CreateNullifier {
         data: dup_data,
@@ -72,12 +70,9 @@ async fn test_create_multiple_nullifiers() {
 
     let nullifiers: Vec<[u8; 32]> = (0..3).map(|_| Pubkey::new_unique().to_bytes()).collect();
 
-    let (data, remaining_accounts) = build_create_nullifier_instruction_data(
-        &mut rpc,
-        &nullifiers,
-    )
-    .await
-    .unwrap();
+    let (data, remaining_accounts) = build_create_nullifier_instruction_data(&mut rpc, &nullifiers)
+        .await
+        .unwrap();
 
     let instruction_data = nullifier::instruction::CreateNullifier {
         data,
@@ -132,12 +127,21 @@ where
 async fn build_create_nullifier_instruction_data<R>(
     rpc: &mut R,
     nullifiers: &[[u8; 32]],
-) -> Result<(NullifierInstructionData, Vec<solana_sdk::instruction::AccountMeta>), RpcError>
+) -> Result<
+    (
+        NullifierInstructionData,
+        Vec<solana_sdk::instruction::AccountMeta>,
+    ),
+    RpcError,
+>
 where
     R: Rpc + Indexer,
 {
     use light_program_test::AddressWithTree;
-    use light_sdk::{address::v2::derive_address, instruction::{PackedAccounts, SystemAccountMetaConfig}};
+    use light_sdk::{
+        address::v2::derive_address,
+        instruction::{PackedAccounts, SystemAccountMetaConfig},
+    };
     use nullifier::nullifier_creation::NULLIFIER_PREFIX;
 
     let address_tree_info = rpc.get_address_tree_v2();
@@ -174,7 +178,8 @@ where
         .get_random_state_tree_info()?
         .pack_output_tree_index(&mut remaining_accounts)?;
 
-    let (remaining_accounts_metas, system_accounts_offset, _) = remaining_accounts.to_account_metas();
+    let (remaining_accounts_metas, system_accounts_offset, _) =
+        remaining_accounts.to_account_metas();
 
     let data = NullifierInstructionData {
         proof: rpc_result.proof,

zk/zk-id/programs/zk-id/src/lib.rs

@@ -85,14 +85,17 @@ pub mod zk_id {
 
         LightSystemProgramCpi::new_cpi(LIGHT_CPI_SIGNER, proof)
             .with_light_account(issuer_account)?
-            .with_new_addresses(&[address_tree_info.into_new_address_params_assigned_packed(address_seed, Some(0))])
+            .with_new_addresses(&[
+                address_tree_info.into_new_address_params_assigned_packed(address_seed, Some(0))
+            ])
             .invoke(light_cpi_accounts)?;
 
         Ok(())
     }
 
     /// Creates a new credential compressed account storing a pubkey
     /// Requires a valid issuer account - only the issuer can create credentials
+    #[allow(clippy::too_many_arguments)]
     pub fn add_credential<'info>(
         ctx: Context<'_, '_, '_, 'info, GenericAnchorAccounts<'info>>,
         proof: ValidityProof,
@@ -158,13 +161,16 @@ pub mod zk_id {
         LightSystemProgramCpi::new_cpi(LIGHT_CPI_SIGNER, proof)
             .with_light_account(issuer_account)?
             .with_light_account_poseidon(credential_account)?
-            .with_new_addresses(&[address_tree_info.into_new_address_params_assigned_packed(address_seed, Some(1))])
+            .with_new_addresses(&[
+                address_tree_info.into_new_address_params_assigned_packed(address_seed, Some(1))
+            ])
             .invoke(light_cpi_accounts)?;
 
         Ok(())
     }
 
     /// Verifies a ZK proof of credential ownership and creates an encrypted event account.
+    #[allow(clippy::too_many_arguments)]
     pub fn zk_verify_credential<'info>(
         ctx: Context<'_, '_, '_, 'info, VerifyAccounts<'info>>,
         proof: ValidityProof,
@@ -206,8 +212,7 @@ pub mod zk_id {
         let expected_root = read_state_merkle_tree_root(
             &ctx.accounts.input_merkle_tree.to_account_info(),
             input_root_index,
-        )
-        .map_err(|e| ProgramError::from(e))?;
+        )?;
 
         let merkle_tree_pubkey = ctx.accounts.input_merkle_tree.key();
         let merkle_tree_hashed =
@@ -232,8 +237,8 @@ pub mod zk_id {
         let mut hash_input = Vec::new();
         hash_input.extend_from_slice(&(event_account.data.len() as u32).to_le_bytes());
         hash_input.extend_from_slice(&event_account.data);
-        let mut event_data_hash = Sha256::hash(&hash_input)
-            .map_err(|_| ProgramError::InvalidAccountData)?;
+        let mut event_data_hash =
+            Sha256::hash(&hash_input).map_err(|_| ProgramError::InvalidAccountData)?;
         event_data_hash[0] = 0; // Ensure hash is in BN254 field
 
         {
@@ -289,7 +294,9 @@ pub mod zk_id {
         }
         LightSystemProgramCpi::new_cpi(LIGHT_CPI_SIGNER, proof)
             .with_light_account(event_account)?
-            .with_new_addresses(&[address_tree_info.into_new_address_params_assigned_packed(address_seed, Some(0))])
+            .with_new_addresses(&[
+                address_tree_info.into_new_address_params_assigned_packed(address_seed, Some(0))
+            ])
             .invoke(light_cpi_accounts)?;
 
         Ok(())