minor fixes (#40)

* check mint proof account size when created

* touch program file

* only iterate through conditions once; add vec length to anchor constant

* patch bump program version

Author: samuelvanderwaal

Cargo.lock

@@ -29,7 +29,7 @@ import {
 } from '../src/index.js';
 
 export const MAX_PROOF_LENGTH = 28;
-
+export const MINT_PROOF_V2_SIZE = 945;
 export const CURRENT_WHITELIST_VERSION = 1;
 export const SLOT_DELAY = 100;
 

clients/js/test/_common.ts

@@ -1,3 +1,7 @@
+import {
+  ANCHOR_ERROR__ACCOUNT_DISCRIMINATOR_MISMATCH,
+  ANCHOR_ERROR__ACCOUNT_NOT_INITIALIZED,
+} from '@coral-xyz/anchor-errors';
 import {
   SOLANA_ERROR__JSON_RPC__INVALID_PARAMS,
   appendTransactionMessageInstruction,
@@ -30,19 +34,17 @@ import {
 } from '../src';
 import {
   MAX_PROOF_LENGTH,
+  MINT_PROOF_V2_SIZE,
   SLOT_DELAY,
   TRANSACTION_FEE,
   createMintProofThrows,
   createWhitelist,
   expectCustomError,
+  getAccountDataLength,
   updateWhitelist,
   upsertMintProof,
 } from './_common';
 import { generateTreeOfSize } from './_merkle';
-import {
-  ANCHOR_ERROR__ACCOUNT_DISCRIMINATOR_MISMATCH,
-  ANCHOR_ERROR__ACCOUNT_NOT_INITIALIZED,
-} from '@coral-xyz/anchor-errors';
 
 test('it can create and update mint proof v2', async (t) => {
   const client = createDefaultSolanaClient();
@@ -95,6 +97,12 @@ test('it can create and update mint proof v2', async (t) => {
     },
   }));
 
+  const mintProofV2AccountLength = await getAccountDataLength(
+    client,
+    mintProof
+  );
+  t.assert(mintProofV2AccountLength === MINT_PROOF_V2_SIZE);
+
   // Mint a second NFT
   const { mint: mint2 } = await createDefaultNft({
     client,

clients/js/test/mintProof.test.ts

@@ -1,6 +1,6 @@
 [package]
 name = "whitelist-program"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 readme = "./README.md"
 license-file = "../LICENSE"

program/Cargo.toml

@@ -1,5 +1,5 @@
 {
-  "version": "0.2.1",
+  "version": "0.2.2",
   "name": "whitelist_program",
   "constants": [
     {
@@ -33,7 +33,7 @@
       "type": {
         "defined": "usize"
       },
-      "value": "8 + 1 + 1 + 32 + 1 + 32 + 32 + 32"
+      "value": "8 + 1 + 1 + 32 + 1 + 32 + 32 + 32 + 4"
     },
     {
       "name": "WHITELIST_V2_CONDITIONS_LENGTH",

program/idl.json

@@ -160,13 +160,13 @@ impl Whitelist {
         collection: Option<Collection>,
         creators: Option<Vec<Creator>>,
     ) -> Result<()> {
-        //Priority 1: Merkle proof (because we manually control this = highest priority)
+        // Priority 1: Merkle proof (because we manually control this = highest priority)
         if self.root_hash != ZERO_ARRAY {
             // TODO: currently unsupported for tcomp
             throw_err!(ErrorCode::FailedMerkleProofVerification);
         }
 
-        //Priority 2: VOC
+        // Priority 2: VOC
         if self.voc.is_some() {
             match collection {
                 Some(collection) => {
@@ -187,7 +187,7 @@ impl Whitelist {
             return Ok(());
         }
 
-        //Priority 3: FVC
+        // Priority 3: FVC
         if self.fvc.is_some() {
             match creators {
                 Some(creators) => {

program/src/state/whitelist.rs

@@ -18,6 +18,7 @@ pub const WHITELIST_V2_BASE_SIZE: usize =
     + 32  // update_authority
     + 32  // namespace
     + 32  // freeze_authority
+    + 4   // conditions vector length bytes
 ;
 
 /// Maximum number of conditions allowed in a whitelist.
@@ -92,24 +93,28 @@ impl WhitelistV2 {
             throw_err!(ErrorCode::TooManyConditions);
         }
 
-        // Only one merkle proof per whitelist allowed.
-        let merkle_proofs = conditions
-            .iter()
-            .filter(|c| c.mode == Mode::MerkleTree)
-            .count();
+        // Track the first merkle proof index and count them in one pass
+        let mut merkle_proof_count = 0;
+        let mut first_merkle_index = None;
 
-        if merkle_proofs > 1 {
+        for (i, condition) in conditions.iter().enumerate() {
+            if condition.mode == Mode::MerkleTree {
+                merkle_proof_count += 1;
+                if first_merkle_index.is_none() {
+                    first_merkle_index = Some(i);
+                }
+            }
+        }
+
+        if merkle_proof_count > 1 {
             throw_err!(ErrorCode::TooManyMerkleProofs);
         }
 
-        // Ensure the merkle proof is the first item in the vector, if it exists.
-        if let Some(index) = conditions
-            .iter()
-            .enumerate()
-            .find(|(_, c)| c.mode == Mode::MerkleTree)
-            .map(|(index, _)| index)
-        {
-            conditions.rotate_left(index);
+        // Rotate if we found a merkle proof that wasn't first
+        if let Some(index) = first_merkle_index {
+            if index > 0 {
+                conditions.rotate_left(index);
+            }
         }
 
         Ok(())