privacycash 1.1.0 → 1.1.1

package/README.md

@@ -9,11 +9,11 @@ THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR I
 ### Usage
 This SDK provides APIs for developers to interact with Privacy Cash relayers easily. Developers can easily deposit/withdraw/query balances in Privacy Cash solana program.
 
-Main APIs for this SDK are:
-a. for SOL:
-deposit(), withdraw(), getPrivateBalance()
-b. for USDC:
-depositUSDC(), withdrawUSDC(), getPrivateBalanceUSDC()
+Main APIs for this SDK are: 
+a. for SOL: 
+deposit(), withdraw(), getPrivateBalance() 
+b. for SPL (currently supporting USDC and USDT): 
+depositSPL(), withdrawSPL(), getPrivateBalanceSpl()
 
 Check the example project under /example folder. The code should be fairly self-explanatory.
 

package/dist/deposit.js

@@ -363,7 +363,7 @@ async function checkDepositLimit(connection) {
             console.error('❌ Tree account not found. Make sure the program is initialized.' + PROGRAM_ID);
             return;
         }
-        console.log(`Account data size: ${accountInfo.data.length} bytes`);
+        logger.debug(`Account data size: ${accountInfo.data.length} bytes`);
         const authority = new PublicKey(accountInfo.data.slice(8, 40));
         const nextIndex = new BN(accountInfo.data.slice(40, 48), 'le');
         const rootIndex = new BN(accountInfo.data.slice(4112, 4120), 'le');

package/dist/depositSPL.js

@@ -31,18 +31,25 @@ async function relayDepositToIndexer({ signedTransaction, publicKey, referrer, m
             body: JSON.stringify(params)
         });
         if (!response.ok) {
-            console.log('res text:', await response.json());
+            logger.debug('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'}`);
         }
-        const result = await response.json();
-        logger.debug('Pre-signed deposit transaction relayed successfully!');
-        logger.debug('Response:', result);
+        let result;
+        try {
+            result = await response.json();
+            logger.debug('Pre-signed deposit transaction relayed successfully!');
+            logger.debug('Response:', result);
+        }
+        catch (e) {
+            console.log('response.text', await response.text());
+            throw new Error('failed to parse json');
+        }
         return result.signature;
     }
     catch (error) {
-        console.error('Failed to relay deposit transaction to indexer:', error);
+        console.error('Failed to relay deposit transaction to indexer:', error.message);
         throw error;
     }
 }
@@ -82,8 +89,8 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     const accountInfo = await getAccount(connection, signerTokenAccount);
     let balance = Number(accountInfo.amount);
     logger.debug(`wallet balance: ${balance / token.units_per_token}  ${token.name.toUpperCase()}`);
-    console.log('balance', balance);
-    console.log('base_units + fee_base_units', base_units + fee_base_units);
+    logger.debug('balance', balance);
+    logger.debug('base_units + fee_base_units', base_units + fee_base_units);
     if (balance < (base_units + fee_base_units)) {
         throw new Error(`Insufficient balance. Need at least ${(base_units + fee_base_units) / token.units_per_token}  ${token.name.toUpperCase()}.`);
     }
@@ -161,7 +168,6 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
         logger.debug(`Output amount (existing UTXOs + deposit - fee): ${outputAmount}`);
         logger.debug(`External amount (deposit): ${extAmount}`);
         logger.debug('\nFirst UTXO to be consolidated:');
-        await firstUtxo.log();
         // Use first existing UTXO as first input, and either second UTXO or dummy UTXO as second input
         const secondUtxo = mintUtxos.length > 1 ? mintUtxos[1] : new Utxo({
             lightWasm,
@@ -240,10 +246,10 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     logger.debug('\nEncrypting UTXOs with keypair data...');
     const encryptedOutput1 = encryptionService.encryptUtxo(outputs[0]);
     const encryptedOutput2 = encryptionService.encryptUtxo(outputs[1]);
-    logger.debug(`\nOutput[0] (with value):`);
-    await outputs[0].log();
-    logger.debug(`\nOutput[1] (empty):`);
-    await outputs[1].log();
+    // logger.debug(`\nOutput[0] (with value):`);
+    // await outputs[0].log();
+    // logger.debug(`\nOutput[1] (empty):`);
+    // await outputs[1].log();
     logger.debug(`\nEncrypted output 1 size: ${encryptedOutput1.length} bytes`);
     logger.debug(`Encrypted output 2 size: ${encryptedOutput2.length} bytes`);
     logger.debug(`Total encrypted outputs size: ${encryptedOutput1.length + encryptedOutput2.length} bytes`);

package/dist/getUtxosSPL.js

@@ -64,7 +64,7 @@ export async function getUtxosSPL({ publicKey, connection, encryptionService, st
             if (offset) {
                 fetch_utxo_offset = Math.max(offset, fetch_utxo_offset);
             }
-            console.log(' ####fetch_utxo_offset', fetch_utxo_offset);
+            logger.debug(' ####fetch_utxo_offset', fetch_utxo_offset);
             let fetch_utxo_end = fetch_utxo_offset + FETCH_UTXOS_GROUP_SIZE;
             let fetch_utxo_url = `${RELAYER_API_URL}/utxos/range?token=${token.name}&start=${fetch_utxo_offset}&end=${fetch_utxo_end}`;
             let fetched = await fetchUserUtxos({ url: fetch_utxo_url, encryptionService, storage, publicKey_ata, tokenName: token.name });
@@ -122,13 +122,7 @@ export async function getUtxosSPL({ publicKey, connection, encryptionService, st
     valid_strings = [...new Set(valid_strings)];
     logger.debug(`valid_strings len after set: ${valid_strings.length}`);
     storage.setItem(LSK_ENCRYPTED_OUTPUTS + localstorageKey(publicKey_ata), JSON.stringify(valid_strings));
-    // reorgnize
-    if (valid_utxos.length) {
-        console.log('filter mint', valid_utxos[0].mintAddress, token.pubkey.toString());
-    }
-    let filtered_utxos = valid_utxos.filter(u => u.mintAddress == token.pubkey.toString());
-    console.log('filtered_utxos.len', filtered_utxos.length);
-    return filtered_utxos;
+    return valid_utxos.filter(u => u.mintAddress == token.pubkey.toString());
 }
 async function fetchUserUtxos({ url, storage, encryptionService, publicKey_ata, tokenName }) {
     const lightWasm = await WasmFactory.getInstance();

package/dist/index.js

@@ -138,7 +138,7 @@ export class PrivacyCash {
             keyBasePath: path.join(import.meta.dirname, '..', 'circuit2', 'transaction2'),
             storage
         });
-        console.log(`Withdraw successful. Recipient ${recipient} received ${res.amount_in_lamports / LAMPORTS_PER_SOL} SOL, with ${res.fee_in_lamports / LAMPORTS_PER_SOL} SOL relayers fees`);
+        logger.debug(`Withdraw successful. Recipient ${recipient} received ${res.amount_in_lamports / LAMPORTS_PER_SOL} SOL, with ${res.fee_in_lamports / LAMPORTS_PER_SOL} SOL relayers fees`);
         this.isRuning = false;
         return res;
     }
@@ -163,7 +163,7 @@ export class PrivacyCash {
             keyBasePath: path.join(import.meta.dirname, '..', 'circuit2', 'transaction2'),
             storage
         });
-        console.log(`Withdraw successful. Recipient ${recipient} received ${base_units} USDC units`);
+        logger.debug(`Withdraw successful. Recipient ${recipient} received ${base_units} USDC units`);
         this.isRuning = false;
         return res;
     }
@@ -265,7 +265,7 @@ export class PrivacyCash {
             storage,
             mintAddress
         });
-        console.log(`Withdraw successful. Recipient ${recipient} received ${base_units} USDC units`);
+        logger.debug(`Withdraw successful. Recipient ${recipient} received ${base_units} USDC units`);
         this.isRuning = false;
         return res;
     }

package/dist/utils/address_lookup_table.js

@@ -1,18 +1,19 @@
 import { PublicKey, SystemProgram, ComputeBudgetProgram } from '@solana/web3.js';
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { logger } from './logger';
 /**
  * Helper function to use an existing ALT (recommended for production)
  * Use create_alt.ts to create the ALT once, then hardcode the address and use this function
  */
 export async function useExistingALT(connection, altAddress) {
     try {
-        console.log(`Using existing ALT: ${altAddress.toString()}`);
+        logger.debug(`Using existing ALT: ${altAddress.toString()}`);
         const altAccount = await connection.getAddressLookupTable(altAddress);
         if (altAccount.value) {
-            console.log(`✅ ALT found with ${altAccount.value.state.addresses.length} addresses`);
+            logger.debug(`✅ ALT found with ${altAccount.value.state.addresses.length} addresses`);
         }
         else {
-            console.log('❌ ALT not found');
+            logger.error('❌ ALT not found');
         }
         return altAccount;
     }

package/dist/withdraw.js

@@ -253,12 +253,12 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
     const encryptedOutputStr = Buffer.from(encryptedOutput1).toString('hex');
     let start = Date.now();
     while (true) {
-        console.log(`retryTimes: ${retryTimes}`);
+        logger.info(`retryTimes: ${retryTimes}`);
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
-        console.log('Fetching updated tree state...');
+        logger.info('Fetching updated tree state...');
         let res = await fetch(RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr);
         let resJson = await res.json();
-        console.log('resJson:', resJson);
+        logger.debug('resJson:', resJson);
         if (resJson.exists) {
             return { isPartial, tx: signature, recipient: recipient.toString(), amount_in_lamports, fee_in_lamports };
         }

package/dist/withdrawSPL.js

@@ -289,12 +289,12 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
     const encryptedOutputStr = Buffer.from(encryptedOutput1).toString('hex');
     let start = Date.now();
     while (true) {
-        console.log(`retryTimes: ${retryTimes}`);
+        logger.info(`retryTimes: ${retryTimes}`);
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
-        console.log('Fetching updated tree state...');
+        logger.info('Fetching updated tree state...');
         let res = await fetch(RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr + '?token=' + token.name);
         let resJson = await res.json();
-        console.log('resJson:', resJson);
+        logger.debug('resJson:', resJson);
         if (resJson.exists) {
             return { isPartial, tx: signature, recipient: recipient.toString(), base_units, fee_base_units };
         }

package/package.json

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

package/src/deposit.ts

@@ -456,7 +456,7 @@ async function checkDepositLimit(connection: Connection) {
             return;
         }
 
-        console.log(`Account data size: ${accountInfo.data.length} bytes`);
+        logger.debug(`Account data size: ${accountInfo.data.length} bytes`);
         const authority = new PublicKey(accountInfo.data.slice(8, 40));
         const nextIndex = new BN(accountInfo.data.slice(40, 48), 'le');
         const rootIndex = new BN(accountInfo.data.slice(4112, 4120), 'le');

package/src/depositSPL.ts

@@ -45,19 +45,23 @@ async function relayDepositToIndexer({ signedTransaction, publicKey, referrer, m
         });
 
         if (!response.ok) {
-            console.log('res text:', await response.json())
+            logger.debug('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'}`);
         }
-
-        const result = await response.json() as { signature: string, success: boolean };
-        logger.debug('Pre-signed deposit transaction relayed successfully!');
-        logger.debug('Response:', result);
-
+        let result: { signature: string, success: boolean }
+        try {
+            result = await response.json()
+            logger.debug('Pre-signed deposit transaction relayed successfully!');
+            logger.debug('Response:', result);
+        } catch (e) {
+            console.log('response.text', await response.text())
+            throw new Error('failed to parse json')
+        }
         return result.signature;
-    } catch (error) {
-        console.error('Failed to relay deposit transaction to indexer:', error);
+    } catch (error: any) {
+        console.error('Failed to relay deposit transaction to indexer:', error.message);
         throw error;
     }
 }
@@ -134,8 +138,8 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     const accountInfo = await getAccount(connection, signerTokenAccount)
     let balance = Number(accountInfo.amount)
     logger.debug(`wallet balance: ${balance / token.units_per_token}  ${token.name.toUpperCase()}`);
-    console.log('balance', balance)
-    console.log('base_units + fee_base_units', base_units + fee_base_units)
+    logger.debug('balance', balance)
+    logger.debug('base_units + fee_base_units', base_units + fee_base_units)
 
     if (balance < (base_units + fee_base_units)) {
         throw new Error(`Insufficient balance. Need at least ${(base_units + fee_base_units) / token.units_per_token}  ${token.name.toUpperCase()}.`);
@@ -171,6 +175,7 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     // Fetch existing UTXOs for this user
     logger.debug('\nFetching existing UTXOs...');
     const mintUtxos = await getUtxosSPL({ connection, publicKey, encryptionService, storage, mintAddress });
+
     // Calculate output amounts and external amount based on scenario
     let extAmount: number;
     let outputAmount: string;
@@ -230,7 +235,6 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
         logger.debug(`External amount (deposit): ${extAmount}`);
 
         logger.debug('\nFirst UTXO to be consolidated:');
-        await firstUtxo.log();
 
         // Use first existing UTXO as first input, and either second UTXO or dummy UTXO as second input
         const secondUtxo = mintUtxos.length > 1 ? mintUtxos[1] : new Utxo({
@@ -324,10 +328,10 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     const encryptedOutput1 = encryptionService.encryptUtxo(outputs[0]);
     const encryptedOutput2 = encryptionService.encryptUtxo(outputs[1]);
 
-    logger.debug(`\nOutput[0] (with value):`);
-    await outputs[0].log();
-    logger.debug(`\nOutput[1] (empty):`);
-    await outputs[1].log();
+    // logger.debug(`\nOutput[0] (with value):`);
+    // await outputs[0].log();
+    // logger.debug(`\nOutput[1] (empty):`);
+    // await outputs[1].log();
 
     logger.debug(`\nEncrypted output 1 size: ${encryptedOutput1.length} bytes`);
     logger.debug(`Encrypted output 2 size: ${encryptedOutput2.length} bytes`);

package/src/getUtxosSPL.ts

@@ -105,7 +105,7 @@ export async function getUtxosSPL({ publicKey, connection, encryptionService, st
             if (offset) {
                 fetch_utxo_offset = Math.max(offset, fetch_utxo_offset)
             }
-            console.log(' ####fetch_utxo_offset', fetch_utxo_offset)
+            logger.debug(' ####fetch_utxo_offset', fetch_utxo_offset)
             let fetch_utxo_end = fetch_utxo_offset + FETCH_UTXOS_GROUP_SIZE
             let fetch_utxo_url = `${RELAYER_API_URL}/utxos/range?token=${token.name}&start=${fetch_utxo_offset}&end=${fetch_utxo_end}`
             let fetched = await fetchUserUtxos({ url: fetch_utxo_url, encryptionService, storage, publicKey_ata, tokenName: token.name })
@@ -162,13 +162,8 @@ export async function getUtxosSPL({ publicKey, connection, encryptionService, st
     valid_strings = [...new Set(valid_strings)];
     logger.debug(`valid_strings len after set: ${valid_strings.length}`)
     storage.setItem(LSK_ENCRYPTED_OUTPUTS + localstorageKey(publicKey_ata), JSON.stringify(valid_strings))
-    // reorgnize
-    if (valid_utxos.length) {
-        console.log('filter mint', valid_utxos[0].mintAddress, token.pubkey.toString())
-    }
-    let filtered_utxos = valid_utxos.filter(u => u.mintAddress == token.pubkey.toString())
-    console.log('filtered_utxos.len', filtered_utxos.length)
-    return filtered_utxos
+    return valid_utxos.filter(u => u.mintAddress == token.pubkey.toString())
+
 }
 
 async function fetchUserUtxos({ url, storage, encryptionService, publicKey_ata, tokenName }: {

package/src/index.ts

@@ -159,7 +159,7 @@ export class PrivacyCash {
             keyBasePath: path.join(import.meta.dirname, '..', 'circuit2', 'transaction2'),
             storage
         })
-        console.log(`Withdraw successful. Recipient ${recipient} received ${res.amount_in_lamports / LAMPORTS_PER_SOL} SOL, with ${res.fee_in_lamports / LAMPORTS_PER_SOL} SOL relayers fees`)
+        logger.debug(`Withdraw successful. Recipient ${recipient} received ${res.amount_in_lamports / LAMPORTS_PER_SOL} SOL, with ${res.fee_in_lamports / LAMPORTS_PER_SOL} SOL relayers fees`)
         this.isRuning = false
         return res
     }
@@ -188,7 +188,7 @@ export class PrivacyCash {
             keyBasePath: path.join(import.meta.dirname, '..', 'circuit2', 'transaction2'),
             storage
         })
-        console.log(`Withdraw successful. Recipient ${recipient} received ${base_units} USDC units`)
+        logger.debug(`Withdraw successful. Recipient ${recipient} received ${base_units} USDC units`)
         this.isRuning = false
         return res
     }
@@ -307,7 +307,7 @@ export class PrivacyCash {
             storage,
             mintAddress
         })
-        console.log(`Withdraw successful. Recipient ${recipient} received ${base_units} USDC units`)
+        logger.debug(`Withdraw successful. Recipient ${recipient} received ${base_units} USDC units`)
         this.isRuning = false
         return res
     }

package/src/utils/address_lookup_table.ts

@@ -11,6 +11,7 @@ import {
   TransactionMessage
 } from '@solana/web3.js';
 import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { logger } from './logger';
 
 
 /**
@@ -22,13 +23,13 @@ export async function useExistingALT(
   altAddress: PublicKey
 ): Promise<{ value: any } | null> {
   try {
-    console.log(`Using existing ALT: ${altAddress.toString()}`);
+    logger.debug(`Using existing ALT: ${altAddress.toString()}`);
     const altAccount = await connection.getAddressLookupTable(altAddress);
 
     if (altAccount.value) {
-      console.log(`✅ ALT found with ${altAccount.value.state.addresses.length} addresses`);
+      logger.debug(`✅ ALT found with ${altAccount.value.state.addresses.length} addresses`);
     } else {
-      console.log('❌ ALT not found');
+      logger.error('❌ ALT not found');
     }
 
     return altAccount;

package/src/withdraw.ts

@@ -314,12 +314,12 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
     const encryptedOutputStr = Buffer.from(encryptedOutput1).toString('hex')
     let start = Date.now()
     while (true) {
-        console.log(`retryTimes: ${retryTimes}`)
+        logger.info(`retryTimes: ${retryTimes}`)
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
-        console.log('Fetching updated tree state...');
+        logger.info('Fetching updated tree state...');
         let res = await fetch(RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr)
         let resJson = await res.json()
-        console.log('resJson:', resJson)
+        logger.debug('resJson:', resJson)
         if (resJson.exists) {
             return { isPartial, tx: signature, recipient: recipient.toString(), amount_in_lamports, fee_in_lamports }
         }

package/src/withdrawSPL.ts

@@ -379,12 +379,12 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
     const encryptedOutputStr = Buffer.from(encryptedOutput1).toString('hex')
     let start = Date.now()
     while (true) {
-        console.log(`retryTimes: ${retryTimes}`)
+        logger.info(`retryTimes: ${retryTimes}`)
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
-        console.log('Fetching updated tree state...');
+        logger.info('Fetching updated tree state...');
         let res = await fetch(RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr + '?token=' + token.name)
         let resJson = await res.json()
-        console.log('resJson:', resJson)
+        logger.debug('resJson:', resJson)
         if (resJson.exists) {
             return { isPartial, tx: signature, recipient: recipient.toString(), base_units, fee_base_units }
         }