privacycash 1.1.17 → 1.1.18

package/dist/deposit.js

@@ -68,10 +68,6 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
     const { treeAccount, treeTokenAccount, globalConfigAccount } = getProgramAccounts();
     // Create the merkle tree with the pre-initialized poseidon hash
     const tree = new MerkleTree(MERKLE_TREE_DEPTH, lightWasm);
-    // Initialize root and nextIndex variables
-    const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState();
-    logger.debug(`Using tree root: ${root}`);
-    logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
     // Generate a deterministic private key derived from the wallet keypair
     // const utxoPrivateKey = encryptionService.deriveUtxoPrivateKey();
     const utxoPrivateKey = encryptionService.getUtxoPrivateKeyV2();
@@ -92,6 +88,10 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
     let extData;
     let encryptedOutput1;
     let getProve = async () => {
+        // Initialize root and nextIndex variables
+        const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState();
+        logger.debug(`Using tree root: ${root}`);
+        logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
         if (existingUnspentUtxos.length === 0) {
             // Scenario 1: Fresh deposit with dummy inputs - add new funds to the system
             extAmount = amount_in_lamports;
@@ -275,6 +275,7 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
             if (getProveRetryCount >= 2) {
                 throw new Error('Proof generation failed after 2 attempts. Please try again later.');
             }
+            await new Promise(resolve => setTimeout(resolve, 500));
         }
     }
     const { proof, publicSignals } = getProveResult;

package/dist/depositSPL.js

@@ -106,10 +106,6 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     const { globalConfigAccount } = getProgramAccounts();
     // Create the merkle tree with the pre-initialized poseidon hash
     const tree = new MerkleTree(MERKLE_TREE_DEPTH, lightWasm);
-    // Initialize root and nextIndex variables
-    const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState(token.name);
-    logger.debug(`Using tree root: ${root}`);
-    logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
     // Generate a deterministic private key derived from the wallet keypair
     // const utxoPrivateKey = encryptionService.deriveUtxoPrivateKey();
     const utxoPrivateKey = encryptionService.getUtxoPrivateKeyV2();
@@ -130,6 +126,10 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     let extData;
     let encryptedOutput1;
     let getProve = async () => {
+        // Initialize root and nextIndex variables
+        const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState(token.name);
+        logger.debug(`Using tree root: ${root}`);
+        logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
         if (mintUtxos.length === 0) {
             // Scenario 1: Fresh deposit with dummy inputs - add new funds to the system
             extAmount = base_units;
@@ -316,6 +316,7 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
             if (getProveRetryCount >= 2) {
                 throw new Error('Proof generation failed after 2 attempts. Please try again later.');
             }
+            await new Promise(resolve => setTimeout(resolve, 500));
         }
     }
     const { proof, publicSignals } = getProveResult;

package/dist/withdraw.js

@@ -41,10 +41,6 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
     let isPartial = false;
     logger.debug('Encryption key generated from user keypair');
     const { treeAccount, treeTokenAccount, globalConfigAccount } = getProgramAccounts();
-    // Get current tree state
-    const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState();
-    logger.debug(`Using tree root: ${root}`);
-    logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
     // Generate a deterministic private key derived from the wallet keypair
     const utxoPrivateKey = encryptionService.deriveUtxoPrivateKey();
     // Create a UTXO keypair that will be used for all inputs and outputs
@@ -95,6 +91,10 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
     let encryptedOutput1;
     let encryptedOutput2;
     let getProve = async () => {
+        // Get current tree state
+        const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState();
+        logger.debug(`Using tree root: ${root}`);
+        logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
         // Get Merkle proofs for both input UTXOs
         const inputMerkleProofs = await Promise.all(inputs.map(async (utxo, index) => {
             // For dummy UTXO (amount is 0), use a zero-filled proof
@@ -214,6 +214,7 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
             if (getProveRetryCount >= 2) {
                 throw new Error('Proof generation failed after 2 attempts. Please try again later.');
             }
+            await new Promise(resolve => setTimeout(resolve, 500));
         }
     }
     const { proof, publicSignals } = getProveResult;

package/dist/withdrawSPL.js

@@ -71,10 +71,6 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
     // Derive tree account PDA with mint address for SPL (different from SOL version)
     const [treeAccount] = PublicKey.findProgramAddressSync([Buffer.from('merkle_tree'), token.pubkey.toBuffer()], PROGRAM_ID);
     const { globalConfigAccount, treeTokenAccount } = getProgramAccounts();
-    // Get current tree state
-    const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState(token.name);
-    logger.debug(`Using tree root: ${root}`);
-    logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
     // Generate a deterministic private key derived from the wallet keypair
     const utxoPrivateKey = encryptionService.deriveUtxoPrivateKey();
     // Create a UTXO keypair that will be used for all inputs and outputs
@@ -125,6 +121,10 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
     let extData;
     let encryptedOutput1;
     let getProve = async () => {
+        // Get current tree state
+        const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState(token.name);
+        logger.debug(`Using tree root: ${root}`);
+        logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
         // Get Merkle proofs for both input UTXOs
         const inputMerkleProofs = await Promise.all(inputs.map(async (utxo, index) => {
             // For dummy UTXO (amount is 0), use a zero-filled proof
@@ -245,6 +245,7 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
             if (getProveRetryCount >= 2) {
                 throw new Error('Proof generation failed after 2 attempts. Please try again later.');
             }
+            await new Promise(resolve => setTimeout(resolve, 500));
         }
     }
     const { proof, publicSignals } = getProveResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "privacycash",
-  "version": "1.1.17",
+  "version": "1.1.18",
   "description": "",
   "main": "dist/index.js",
   "repository": "https://github.com/Privacy-Cash/privacy-cash-sdk",

package/src/deposit.ts

@@ -97,12 +97,6 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
     // Create the merkle tree with the pre-initialized poseidon hash
     const tree = new MerkleTree(MERKLE_TREE_DEPTH, lightWasm);
 
-    // Initialize root and nextIndex variables
-    const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState();
-
-    logger.debug(`Using tree root: ${root}`);
-    logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
-
     // Generate a deterministic private key derived from the wallet keypair
     // const utxoPrivateKey = encryptionService.deriveUtxoPrivateKey();
     const utxoPrivateKey = encryptionService.getUtxoPrivateKeyV2();
@@ -128,6 +122,11 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
     let extData: any
     let encryptedOutput1: any
     let getProve = async () => {
+        // Initialize root and nextIndex variables
+        const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState();
+        logger.debug(`Using tree root: ${root}`);
+        logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
+
         if (existingUnspentUtxos.length === 0) {
             // Scenario 1: Fresh deposit with dummy inputs - add new funds to the system
             extAmount = amount_in_lamports;
@@ -340,6 +339,7 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
             if (getProveRetryCount >= 2) {
                 throw new Error('Proof generation failed after 2 attempts. Please try again later.');
             }
+            await new Promise(resolve => setTimeout(resolve, 500));
         }
     }
 

package/src/depositSPL.ts

@@ -162,12 +162,6 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     // Create the merkle tree with the pre-initialized poseidon hash
     const tree = new MerkleTree(MERKLE_TREE_DEPTH, lightWasm);
 
-    // Initialize root and nextIndex variables
-    const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState(token.name);
-
-    logger.debug(`Using tree root: ${root}`);
-    logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
-
     // Generate a deterministic private key derived from the wallet keypair
     // const utxoPrivateKey = encryptionService.deriveUtxoPrivateKey();
     const utxoPrivateKey = encryptionService.getUtxoPrivateKeyV2();
@@ -193,6 +187,11 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     let extData: any
     let encryptedOutput1: any
     let getProve = async () => {
+        // Initialize root and nextIndex variables
+        const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState(token.name);
+        logger.debug(`Using tree root: ${root}`);
+        logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
+
         if (mintUtxos.length === 0) {
             // Scenario 1: Fresh deposit with dummy inputs - add new funds to the system
             extAmount = base_units;
@@ -406,6 +405,7 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
             if (getProveRetryCount >= 2) {
                 throw new Error('Proof generation failed after 2 attempts. Please try again later.');
             }
+            await new Promise(resolve => setTimeout(resolve, 500));
         }
     }
     const { proof, publicSignals } = getProveResult;

package/src/withdraw.ts

@@ -65,11 +65,6 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
 
     const { treeAccount, treeTokenAccount, globalConfigAccount } = getProgramAccounts()
 
-    // Get current tree state
-    const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState();
-    logger.debug(`Using tree root: ${root}`);
-    logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
-
     // Generate a deterministic private key derived from the wallet keypair
     const utxoPrivateKey = encryptionService.deriveUtxoPrivateKey();
 
@@ -132,6 +127,11 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
     let encryptedOutput2: any
 
     let getProve = async () => {
+        // Get current tree state
+        const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState();
+        logger.debug(`Using tree root: ${root}`);
+        logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
+
         // Get Merkle proofs for both input UTXOs
         const inputMerkleProofs = await Promise.all(
             inputs.map(async (utxo, index) => {
@@ -268,6 +268,7 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
             if (getProveRetryCount >= 2) {
                 throw new Error('Proof generation failed after 2 attempts. Please try again later.');
             }
+            await new Promise(resolve => setTimeout(resolve, 500));
         }
     }
 

package/src/withdrawSPL.ts

@@ -120,11 +120,6 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
 
     const { globalConfigAccount, treeTokenAccount } = getProgramAccounts()
 
-    // Get current tree state
-    const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState(token.name);
-    logger.debug(`Using tree root: ${root}`);
-    logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
-
     // Generate a deterministic private key derived from the wallet keypair
     const utxoPrivateKey = encryptionService.deriveUtxoPrivateKey();
 
@@ -188,6 +183,11 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
     let encryptedOutput1: any
 
     let getProve = async () => {
+        // Get current tree state
+        const { root, nextIndex: currentNextIndex } = await queryRemoteTreeState(token.name);
+        logger.debug(`Using tree root: ${root}`);
+        logger.debug(`New UTXOs will be inserted at indices: ${currentNextIndex} and ${currentNextIndex + 1}`);
+
         // Get Merkle proofs for both input UTXOs
         const inputMerkleProofs = await Promise.all(
             inputs.map(async (utxo, index) => {
@@ -325,6 +325,7 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
             if (getProveRetryCount >= 2) {
                 throw new Error('Proof generation failed after 2 attempts. Please try again later.');
             }
+            await new Promise(resolve => setTimeout(resolve, 500));
         }
     }