privacycash 1.1.20 → 1.1.22

package/dist/deposit.js

@@ -28,13 +28,14 @@ async function relayDepositToIndexer(signedTransaction, publicKey, referrer) {
             },
             body: JSON.stringify(params)
         });
+        let data = await response.json();
         if (!response.ok) {
-            logger.error('res text:', await response.text());
-            throw new Error('response not ok');
-            // const errorData = await response.json() as { error?: string };
-            // throw new Error(`Deposit relay failed: ${response.status} ${response.statusText} - ${errorData.error || 'Unknown error'}`);
+            throw new Error(data.error || 'Request failed');
         }
-        const result = await response.json();
+        if (!data.success) {
+            throw new Error(data.error);
+        }
+        const result = data;
         logger.debug('Pre-signed deposit transaction relayed successfully!');
         logger.debug('Response:', result);
         return result.signature;
@@ -229,7 +230,7 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
     // Create the deposit ExtData with real encrypted outputs
     const extData = {
         // recipient - just a placeholder, not actually used for deposits. 
-        recipient: new PublicKey('AWexibGxNFKTa1b5R5MN4PJr9HWnWRwf8EW9g8cLx3dM'),
+        recipient: new PublicKey(FEE_RECIPIENT).toString(), // Using fee recipient as dummy recipient for deposit
         extAmount: new BN(extAmount),
         encryptedOutput1: encryptedOutput1,
         encryptedOutput2: encryptedOutput2,
@@ -306,7 +307,7 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
             { pubkey: treeTokenAccount, isSigner: false, isWritable: true },
             { pubkey: globalConfigAccount, isSigner: false, isWritable: false },
             // recipient - just a placeholder, not actually used for deposits. using an ALT address to save bytes
-            { pubkey: new PublicKey('AWexibGxNFKTa1b5R5MN4PJr9HWnWRwf8EW9g8cLx3dM'), isSigner: false, isWritable: true },
+            { pubkey: new PublicKey(FEE_RECIPIENT.toString()), isSigner: false, isWritable: true },
             // fee recipient
             { pubkey: FEE_RECIPIENT, isSigner: false, isWritable: true },
             // signer

package/dist/depositSPL.js

@@ -72,7 +72,7 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     }
     // let mintInfo = await getMint(connection, token.pubkey)
     // let units_per_token = 10 ** mintInfo.decimals
-    let recipient = new PublicKey('AWexibGxNFKTa1b5R5MN4PJr9HWnWRwf8EW9g8cLx3dM');
+    let recipient = new PublicKey(FEE_RECIPIENT.toString()); // Using fee recipient as dummy recipient for deposit
     let recipient_ata = getAssociatedTokenAddressSync(token.pubkey, recipient, true);
     let feeRecipientTokenAccount = getAssociatedTokenAddressSync(token.pubkey, FEE_RECIPIENT, true);
     let signerTokenAccount = getAssociatedTokenAddressSync(token.pubkey, signer);

package/dist/utils/constants.js

@@ -2,7 +2,7 @@ import { PublicKey } from '@solana/web3.js';
 import BN from 'bn.js';
 export const FIELD_SIZE = new BN('21888242871839275222246405745257275088548364400416034343698204186575808495617');
 export const PROGRAM_ID = process.env.NEXT_PUBLIC_PROGRAM_ID ? new PublicKey(process.env.NEXT_PUBLIC_PROGRAM_ID) : new PublicKey('9fhQBbumKEFuXtMBDw8AaQyAjCorLGJQiS3skWZdQyQD');
-export const FEE_RECIPIENT = new PublicKey('AWexibGxNFKTa1b5R5MN4PJr9HWnWRwf8EW9g8cLx3dM');
+export const FEE_RECIPIENT = new PublicKey('97rSMQUukMDjA7PYErccyx7ZxbHvSDaeXp2ig5BwSrTf');
 export const FETCH_UTXOS_GROUP_SIZE = 20_000;
 export const TRANSACT_IX_DISCRIMINATOR = Buffer.from([217, 149, 130, 143, 221, 52, 252, 119]);
 export const TRANSACT_SPL_IX_DISCRIMINATOR = Buffer.from([154, 66, 244, 204, 78, 225, 163, 151]);

package/package.json

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

package/src/deposit.ts

@@ -35,14 +35,15 @@ async function relayDepositToIndexer(signedTransaction: string, publicKey: Publi
             body: JSON.stringify(params)
         });
 
+        let data = await response.json()
         if (!response.ok) {
-            logger.error('res text:', await response.text())
-            throw new Error('response not ok')
-            // const errorData = await response.json() as { error?: string };
-            // throw new Error(`Deposit relay failed: ${response.status} ${response.statusText} - ${errorData.error || 'Unknown error'}`);
+            throw new Error(data.error || 'Request failed');
+        }
+        if (!data.success) {
+            throw new Error(data.error);
         }
 
-        const result = await response.json() as { signature: string, success: boolean };
+        const result = data as { signature: string, success: boolean };
         logger.debug('Pre-signed deposit transaction relayed successfully!');
         logger.debug('Response:', result);
 
@@ -284,7 +285,7 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
     // Create the deposit ExtData with real encrypted outputs
     const extData = {
         // recipient - just a placeholder, not actually used for deposits. 
-        recipient: new PublicKey('AWexibGxNFKTa1b5R5MN4PJr9HWnWRwf8EW9g8cLx3dM'),
+        recipient: new PublicKey(FEE_RECIPIENT).toString(), // Using fee recipient as dummy recipient for deposit
         extAmount: new BN(extAmount),
         encryptedOutput1: encryptedOutput1,
         encryptedOutput2: encryptedOutput2,
@@ -375,7 +376,7 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
             { pubkey: treeTokenAccount, isSigner: false, isWritable: true },
             { pubkey: globalConfigAccount, isSigner: false, isWritable: false },
             // recipient - just a placeholder, not actually used for deposits. using an ALT address to save bytes
-            { pubkey: new PublicKey('AWexibGxNFKTa1b5R5MN4PJr9HWnWRwf8EW9g8cLx3dM'), isSigner: false, isWritable: true },
+            { pubkey: new PublicKey(FEE_RECIPIENT.toString()), isSigner: false, isWritable: true },
             // fee recipient
             { pubkey: FEE_RECIPIENT, isSigner: false, isWritable: true },
             // signer

package/src/depositSPL.ts

@@ -104,7 +104,7 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     // let mintInfo = await getMint(connection, token.pubkey)
     // let units_per_token = 10 ** mintInfo.decimals
 
-    let recipient = new PublicKey('AWexibGxNFKTa1b5R5MN4PJr9HWnWRwf8EW9g8cLx3dM')
+    let recipient = new PublicKey(FEE_RECIPIENT.toString()) // Using fee recipient as dummy recipient for deposit
     let recipient_ata = getAssociatedTokenAddressSync(
         token.pubkey,
         recipient,

package/src/utils/constants.ts

@@ -5,7 +5,7 @@ export const FIELD_SIZE = new BN('2188824287183927522224640574525727508854836440
 
 export const PROGRAM_ID = process.env.NEXT_PUBLIC_PROGRAM_ID ? new PublicKey(process.env.NEXT_PUBLIC_PROGRAM_ID) : new PublicKey('9fhQBbumKEFuXtMBDw8AaQyAjCorLGJQiS3skWZdQyQD');
 
-export const FEE_RECIPIENT = new PublicKey('AWexibGxNFKTa1b5R5MN4PJr9HWnWRwf8EW9g8cLx3dM')
+export const FEE_RECIPIENT = new PublicKey('97rSMQUukMDjA7PYErccyx7ZxbHvSDaeXp2ig5BwSrTf')
 
 export const FETCH_UTXOS_GROUP_SIZE = 20_000