privacycash 1.1.5 → 1.1.7

package/dist/deposit.js

@@ -338,6 +338,7 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
     const encryptedOutputStr = Buffer.from(encryptedOutput1).toString('hex');
     let start = Date.now();
     while (true) {
+        logger.info('Confirming transaction..');
         logger.debug(`retryTimes: ${retryTimes}`);
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
         logger.debug('Fetching updated tree state...');

package/dist/depositSPL.js

@@ -396,6 +396,7 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     const encryptedOutputStr = Buffer.from(encryptedOutput1).toString('hex');
     let start = Date.now();
     while (true) {
+        logger.info('Confirming transaction..');
         logger.debug(`retryTimes: ${retryTimes}`);
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
         logger.debug('Fetching updated tree state...');

package/dist/index.d.ts

@@ -45,9 +45,10 @@ export declare class PrivacyCash {
      *
      * Lamports is the amount of SOL in lamports. e.g. if you want to withdraw 0.01 SOL (10000000 lamports), call withdraw({ lamports: 10000000 })
      */
-    withdraw({ lamports, recipientAddress }: {
+    withdraw({ lamports, recipientAddress, referrer }: {
         lamports: number;
         recipientAddress?: string;
+        referrer?: string;
     }): Promise<{
         isPartial: boolean;
         tx: string;
@@ -60,9 +61,10 @@ export declare class PrivacyCash {
       *
       * base_units is the amount of USDC in base unit. e.g. if you want to withdraw 1 USDC (1,000,000 base unit), call withdraw({ base_units: 1000000, recipientAddress: 'some_address' })
       */
-    withdrawUSDC({ base_units, recipientAddress }: {
+    withdrawUSDC({ base_units, recipientAddress, referrer }: {
         base_units: number;
         recipientAddress?: string;
+        referrer?: string;
     }): Promise<{
         isPartial: boolean;
         tx: string;
@@ -110,11 +112,12 @@ export declare class PrivacyCash {
     /**
       * Withdraw SPL from the Privacy Cash.
       */
-    withdrawSPL({ base_units, mintAddress, recipientAddress, amount }: {
+    withdrawSPL({ base_units, mintAddress, recipientAddress, amount, referrer }: {
         base_units?: number;
         amount?: number;
         mintAddress: PublicKey | string;
         recipientAddress?: string;
+        referrer?: string;
     }): Promise<{
         isPartial: boolean;
         tx: string;

package/dist/index.js

@@ -123,7 +123,7 @@ export class PrivacyCash {
      *
      * Lamports is the amount of SOL in lamports. e.g. if you want to withdraw 0.01 SOL (10000000 lamports), call withdraw({ lamports: 10000000 })
      */
-    async withdraw({ lamports, recipientAddress }) {
+    async withdraw({ lamports, recipientAddress, referrer }) {
         this.isRuning = true;
         logger.info('start withdrawing');
         let lightWasm = await WasmFactory.getInstance();
@@ -136,7 +136,8 @@ export class PrivacyCash {
             publicKey: this.publicKey,
             recipient,
             keyBasePath: path.join(import.meta.dirname, '..', 'circuit2', 'transaction2'),
-            storage
+            storage,
+            referrer
         });
         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;
@@ -147,7 +148,7 @@ export class PrivacyCash {
       *
       * base_units is the amount of USDC in base unit. e.g. if you want to withdraw 1 USDC (1,000,000 base unit), call withdraw({ base_units: 1000000, recipientAddress: 'some_address' })
       */
-    async withdrawUSDC({ base_units, recipientAddress }) {
+    async withdrawUSDC({ base_units, recipientAddress, referrer }) {
         this.isRuning = true;
         logger.info('start withdrawing');
         let lightWasm = await WasmFactory.getInstance();
@@ -161,7 +162,8 @@ export class PrivacyCash {
             publicKey: this.publicKey,
             recipient,
             keyBasePath: path.join(import.meta.dirname, '..', 'circuit2', 'transaction2'),
-            storage
+            storage,
+            referrer
         });
         logger.debug(`Withdraw successful. Recipient ${recipient} received ${base_units} USDC units`);
         this.isRuning = false;
@@ -248,7 +250,7 @@ export class PrivacyCash {
     /**
       * Withdraw SPL from the Privacy Cash.
       */
-    async withdrawSPL({ base_units, mintAddress, recipientAddress, amount }) {
+    async withdrawSPL({ base_units, mintAddress, recipientAddress, amount, referrer }) {
         this.isRuning = true;
         logger.info('start withdrawing');
         let lightWasm = await WasmFactory.getInstance();
@@ -263,7 +265,8 @@ export class PrivacyCash {
             recipient,
             keyBasePath: path.join(import.meta.dirname, '..', 'circuit2', 'transaction2'),
             storage,
-            mintAddress
+            mintAddress,
+            referrer
         });
         logger.debug(`Withdraw successful. Recipient ${recipient} received ${base_units} USDC units`);
         this.isRuning = false;

package/dist/utils/constants.d.ts

@@ -13,9 +13,9 @@ export declare const SIGN_MESSAGE = "Privacy Money account sign in";
 export declare const LSK_FETCH_OFFSET = "fetch_offset";
 export declare const LSK_ENCRYPTED_OUTPUTS = "encrypted_outputs";
 export declare const USDC_MINT: PublicKey;
-declare const tokenList: readonly ["sol", "usdc", "usdt", "zec"];
+declare const tokenList: readonly ["sol", "usdc", "usdt", "zec", "ore"];
 export type TokenList = typeof tokenList[number];
-declare const splList: readonly ["usdc", "usdt", "zec"];
+declare const splList: readonly ["usdc", "usdt", "zec", "ore"];
 export type SplList = typeof splList[number];
 export type Token = {
     name: TokenList;

package/dist/utils/constants.js

@@ -14,8 +14,8 @@ export const SIGN_MESSAGE = `Privacy Money account sign in`;
 export const LSK_FETCH_OFFSET = 'fetch_offset';
 export const LSK_ENCRYPTED_OUTPUTS = 'encrypted_outputs';
 export const USDC_MINT = process.env.NEXT_PUBLIC_USDC_MINT ? new PublicKey(process.env.NEXT_PUBLIC_USDC_MINT) : new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
-const tokenList = ['sol', 'usdc', 'usdt', 'zec'];
-const splList = ['usdc', 'usdt', 'zec'];
+const tokenList = ['sol', 'usdc', 'usdt', 'zec', 'ore'];
+const splList = ['usdc', 'usdt', 'zec', 'ore'];
 export const tokens = [
     {
         name: 'sol',
@@ -41,4 +41,10 @@ export const tokens = [
         prefix: 'zec_',
         units_per_token: 1e8
     },
+    {
+        name: 'ore',
+        pubkey: process.env.NEXT_PUBLIC_ORE_MINT ? new PublicKey(process.env.NEXT_PUBLIC_ORE_MINT) : new PublicKey('oreoU2P8bN6jkk3jbaiVxYnG1dCXcYxwhwyK9jSybcp'),
+        prefix: 'ore_',
+        units_per_token: 1e11
+    },
 ];

package/dist/withdraw.d.ts

@@ -10,8 +10,9 @@ type WithdrawParams = {
     lightWasm: hasher.LightWasm;
     recipient: PublicKey;
     storage: Storage;
+    referrer?: string;
 };
-export declare function withdraw({ recipient, lightWasm, storage, publicKey, connection, amount_in_lamports, encryptionService, keyBasePath }: WithdrawParams): Promise<{
+export declare function withdraw({ recipient, lightWasm, storage, publicKey, connection, amount_in_lamports, encryptionService, keyBasePath, referrer }: WithdrawParams): Promise<{
     isPartial: boolean;
     tx: string;
     recipient: string;

package/dist/withdraw.js

@@ -35,7 +35,7 @@ async function submitWithdrawToIndexer(params) {
         throw error;
     }
 }
-export async function withdraw({ recipient, lightWasm, storage, publicKey, connection, amount_in_lamports, encryptionService, keyBasePath }) {
+export async function withdraw({ recipient, lightWasm, storage, publicKey, connection, amount_in_lamports, encryptionService, keyBasePath, referrer }) {
     let fee_in_lamports = amount_in_lamports * (await getConfig('withdraw_fee_rate')) + LAMPORTS_PER_SOL * (await getConfig('withdraw_rent_fee'));
     amount_in_lamports -= fee_in_lamports;
     let isPartial = false;
@@ -240,7 +240,8 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
         encryptedOutput2: encryptedOutput2.toString('base64'),
         fee: fee_in_lamports,
         lookupTableAddress: ALT_ADDRESS.toString(),
-        senderAddress: publicKey.toString()
+        senderAddress: publicKey.toString(),
+        referralWalletAddress: referrer
     };
     logger.debug('Prepared withdraw parameters for indexer backend');
     // Submit to indexer backend instead of directly to Solana
@@ -253,7 +254,8 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
     const encryptedOutputStr = Buffer.from(encryptedOutput1).toString('hex');
     let start = Date.now();
     while (true) {
-        logger.info(`retryTimes: ${retryTimes}`);
+        logger.info('Confirming transaction..');
+        logger.debug(`retryTimes: ${retryTimes}`);
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
         logger.info('Fetching updated tree state...');
         let res = await fetch(RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr);

package/dist/withdrawSPL.d.ts

@@ -12,8 +12,9 @@ type WithdrawParams = {
     recipient: PublicKey;
     mintAddress: PublicKey | string;
     storage: Storage;
+    referrer?: string;
 };
-export declare function withdrawSPL({ recipient, lightWasm, storage, publicKey, connection, base_units, amount, encryptionService, keyBasePath, mintAddress }: WithdrawParams): Promise<{
+export declare function withdrawSPL({ recipient, lightWasm, storage, publicKey, connection, base_units, amount, encryptionService, keyBasePath, mintAddress, referrer }: WithdrawParams): Promise<{
     isPartial: boolean;
     tx: string;
     recipient: string;

package/dist/withdrawSPL.js

@@ -36,7 +36,7 @@ async function submitWithdrawToIndexer(params) {
         throw error;
     }
 }
-export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, connection, base_units, amount, encryptionService, keyBasePath, mintAddress }) {
+export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, connection, base_units, amount, encryptionService, keyBasePath, mintAddress, referrer }) {
     if (typeof mintAddress == 'string') {
         mintAddress = new PublicKey(mintAddress);
     }
@@ -276,7 +276,8 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
         treeAta: treeAta.toString(),
         recipientAta: recipient_ata.toString(),
         mintAddress: token.pubkey.toString(),
-        feeRecipientTokenAccount: feeRecipientTokenAccount.toString()
+        feeRecipientTokenAccount: feeRecipientTokenAccount.toString(),
+        referralWalletAddress: referrer
     };
     logger.debug('Prepared withdraw parameters for indexer backend');
     // Submit to indexer backend instead of directly to Solana
@@ -289,7 +290,8 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
     const encryptedOutputStr = Buffer.from(encryptedOutput1).toString('hex');
     let start = Date.now();
     while (true) {
-        logger.info(`retryTimes: ${retryTimes}`);
+        logger.info('Confirming transaction..');
+        logger.debug(`retryTimes: ${retryTimes}`);
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
         logger.info('Fetching updated tree state...');
         let res = await fetch(RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr + '?token=' + token.name);

package/package.json

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

package/src/deposit.ts

@@ -420,6 +420,7 @@ export async function deposit({ lightWasm, storage, keyBasePath, publicKey, conn
     const encryptedOutputStr = Buffer.from(encryptedOutput1).toString('hex')
     let start = Date.now()
     while (true) {
+        logger.info('Confirming transaction..')
         logger.debug(`retryTimes: ${retryTimes}`)
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
         logger.debug('Fetching updated tree state...');

package/src/depositSPL.ts

@@ -511,6 +511,7 @@ export async function depositSPL({ lightWasm, storage, keyBasePath, publicKey, c
     const encryptedOutputStr = Buffer.from(encryptedOutput1).toString('hex')
     let start = Date.now()
     while (true) {
+        logger.info('Confirming transaction..')
         logger.debug(`retryTimes: ${retryTimes}`)
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
         logger.debug('Fetching updated tree state...');

package/src/index.ts

@@ -141,9 +141,10 @@ export class PrivacyCash {
      * 
      * Lamports is the amount of SOL in lamports. e.g. if you want to withdraw 0.01 SOL (10000000 lamports), call withdraw({ lamports: 10000000 })
      */
-    async withdraw({ lamports, recipientAddress }: {
+    async withdraw({ lamports, recipientAddress, referrer }: {
         lamports: number,
-        recipientAddress?: string
+        recipientAddress?: string,
+        referrer?: string
     }) {
         this.isRuning = true
         logger.info('start withdrawing')
@@ -157,7 +158,8 @@ export class PrivacyCash {
             publicKey: this.publicKey,
             recipient,
             keyBasePath: path.join(import.meta.dirname, '..', 'circuit2', 'transaction2'),
-            storage
+            storage,
+            referrer
         })
         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
@@ -169,9 +171,10 @@ export class PrivacyCash {
       * 
       * base_units is the amount of USDC in base unit. e.g. if you want to withdraw 1 USDC (1,000,000 base unit), call withdraw({ base_units: 1000000, recipientAddress: 'some_address' })
       */
-    async withdrawUSDC({ base_units, recipientAddress }: {
+    async withdrawUSDC({ base_units, recipientAddress, referrer }: {
         base_units: number,
-        recipientAddress?: string
+        recipientAddress?: string,
+        referrer?: string
     }) {
         this.isRuning = true
         logger.info('start withdrawing')
@@ -186,7 +189,8 @@ export class PrivacyCash {
             publicKey: this.publicKey,
             recipient,
             keyBasePath: path.join(import.meta.dirname, '..', 'circuit2', 'transaction2'),
-            storage
+            storage,
+            referrer
         })
         logger.debug(`Withdraw successful. Recipient ${recipient} received ${base_units} USDC units`)
         this.isRuning = false
@@ -284,11 +288,12 @@ export class PrivacyCash {
     /**
       * Withdraw SPL from the Privacy Cash.
       */
-    async withdrawSPL({ base_units, mintAddress, recipientAddress, amount }: {
+    async withdrawSPL({ base_units, mintAddress, recipientAddress, amount, referrer }: {
         base_units?: number,
         amount?: number,
         mintAddress: PublicKey | string,
-        recipientAddress?: string
+        recipientAddress?: string,
+        referrer?: string
     }) {
         this.isRuning = true
         logger.info('start withdrawing')
@@ -305,7 +310,8 @@ export class PrivacyCash {
             recipient,
             keyBasePath: path.join(import.meta.dirname, '..', 'circuit2', 'transaction2'),
             storage,
-            mintAddress
+            mintAddress,
+            referrer
         })
         logger.debug(`Withdraw successful. Recipient ${recipient} received ${base_units} USDC units`)
         this.isRuning = false

package/src/utils/constants.ts

@@ -27,9 +27,9 @@ export const LSK_ENCRYPTED_OUTPUTS = 'encrypted_outputs'
 
 export const USDC_MINT = process.env.NEXT_PUBLIC_USDC_MINT ? new PublicKey(process.env.NEXT_PUBLIC_USDC_MINT) : new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v')
 
-const tokenList = ['sol', 'usdc', 'usdt', 'zec'] as const;
+const tokenList = ['sol', 'usdc', 'usdt', 'zec', 'ore'] as const;
 export type TokenList = typeof tokenList[number];
-const splList = ['usdc', 'usdt', 'zec'] as const;
+const splList = ['usdc', 'usdt', 'zec', 'ore'] as const;
 export type SplList = typeof splList[number];
 export type Token = {
     name: TokenList
@@ -62,4 +62,10 @@ export const tokens: Token[] = [
         prefix: 'zec_',
         units_per_token: 1e8
     },
+    {
+        name: 'ore',
+        pubkey: process.env.NEXT_PUBLIC_ORE_MINT ? new PublicKey(process.env.NEXT_PUBLIC_ORE_MINT) : new PublicKey('oreoU2P8bN6jkk3jbaiVxYnG1dCXcYxwhwyK9jSybcp'),
+        prefix: 'ore_',
+        units_per_token: 1e11
+    },
 ]

package/src/withdraw.ts

@@ -52,10 +52,11 @@ type WithdrawParams = {
     encryptionService: EncryptionService,
     lightWasm: hasher.LightWasm,
     recipient: PublicKey,
-    storage: Storage
+    storage: Storage,
+    referrer?: string,
 }
 
-export async function withdraw({ recipient, lightWasm, storage, publicKey, connection, amount_in_lamports, encryptionService, keyBasePath }: WithdrawParams) {
+export async function withdraw({ recipient, lightWasm, storage, publicKey, connection, amount_in_lamports, encryptionService, keyBasePath, referrer }: WithdrawParams) {
     let fee_in_lamports = amount_in_lamports * (await getConfig('withdraw_fee_rate')) + LAMPORTS_PER_SOL * (await getConfig('withdraw_rent_fee'))
     amount_in_lamports -= fee_in_lamports
     let isPartial = false
@@ -298,7 +299,8 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
         encryptedOutput2: encryptedOutput2.toString('base64'),
         fee: fee_in_lamports,
         lookupTableAddress: ALT_ADDRESS.toString(),
-        senderAddress: publicKey.toString()
+        senderAddress: publicKey.toString(),
+        referralWalletAddress: referrer
     };
 
 
@@ -314,7 +316,8 @@ export async function withdraw({ recipient, lightWasm, storage, publicKey, conne
     const encryptedOutputStr = Buffer.from(encryptedOutput1).toString('hex')
     let start = Date.now()
     while (true) {
-        logger.info(`retryTimes: ${retryTimes}`)
+        logger.info('Confirming transaction..')
+        logger.debug(`retryTimes: ${retryTimes}`)
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
         logger.info('Fetching updated tree state...');
         let res = await fetch(RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr)

package/src/withdrawSPL.ts

@@ -55,9 +55,10 @@ type WithdrawParams = {
     recipient: PublicKey,
     mintAddress: PublicKey | string,
     storage: Storage,
+    referrer?: string,
 }
 
-export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, connection, base_units, amount, encryptionService, keyBasePath, mintAddress }: WithdrawParams) {
+export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, connection, base_units, amount, encryptionService, keyBasePath, mintAddress, referrer }: WithdrawParams) {
     if (typeof mintAddress == 'string') {
         mintAddress = new PublicKey(mintAddress)
     }
@@ -363,10 +364,10 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
         treeAta: treeAta.toString(),
         recipientAta: recipient_ata.toString(),
         mintAddress: token.pubkey.toString(),
-        feeRecipientTokenAccount: feeRecipientTokenAccount.toString()
+        feeRecipientTokenAccount: feeRecipientTokenAccount.toString(),
+        referralWalletAddress: referrer
     };
 
-
     logger.debug('Prepared withdraw parameters for indexer backend');
 
     // Submit to indexer backend instead of directly to Solana
@@ -379,7 +380,8 @@ export async function withdrawSPL({ recipient, lightWasm, storage, publicKey, co
     const encryptedOutputStr = Buffer.from(encryptedOutput1).toString('hex')
     let start = Date.now()
     while (true) {
-        logger.info(`retryTimes: ${retryTimes}`)
+        logger.info('Confirming transaction..')
+        logger.debug(`retryTimes: ${retryTimes}`)
         await new Promise(resolve => setTimeout(resolve, itv * 1000));
         logger.info('Fetching updated tree state...');
         let res = await fetch(RELAYER_API_URL + '/utxos/check/' + encryptedOutputStr + '?token=' + token.name)