bstest001 0.0.7 → 0.0.9

package/dist/deposit.d.ts

@@ -1,5 +1,4 @@
-export declare function deposit({ provider: rawProvider, depositAmountInput, keyBasePath, signature, address, txSender }: {
-    provider: any;
+export declare function deposit({ depositAmountInput, keyBasePath, signature, address, txSender }: {
     depositAmountInput: number;
     keyBasePath: string;
     signature: string;

package/dist/deposit.js

@@ -1,19 +1,20 @@
 import { BigNumber, ethers } from 'ethers';
 import EtherPoolAbi from './utils/EtherPool.abi.json' with { type: 'json' };
-import { BASE_SEPOLIA_RPC, CONTRACT_ADDRESS, INDEXER_URL } from './utils/constants.js';
+import { BASE_SEPOLIA_RPC, CONTRACT_ADDRESS, INDEXER_URL, MIN_DEPOSIT_AMOUNT } from './utils/constants.js';
 import { deriveKeys } from './utils/encryption.js';
 import { logger } from './utils/logger';
 import { findUnspentUtxos, prepareTransaction, toFixedHex } from './utils/utils.js';
 import { Utxo } from './utils/utxo.js';
-export async function deposit({ provider: rawProvider, depositAmountInput, keyBasePath, signature, address, txSender }) {
-    const provider = rawProvider?.request
-        ? new ethers.providers.Web3Provider(rawProvider)
-        : rawProvider;
+export async function deposit({ depositAmountInput, keyBasePath, signature, address, txSender }) {
     const readProvider = new ethers.providers.JsonRpcProvider(BASE_SEPOLIA_RPC);
     const etherPoolAddress = CONTRACT_ADDRESS;
     if (!etherPoolAddress) {
         throw new Error('Missing CONTRACT_ADDRESS in environment');
     }
+    // check if depositAmountInput is above minimum
+    if (depositAmountInput < MIN_DEPOSIT_AMOUNT) {
+        throw new Error(`Deposit amount must be at least ${MIN_DEPOSIT_AMOUNT} ETH`);
+    }
     const contractAddress = ethers.utils.getAddress(etherPoolAddress);
     logger.debug(`Depositor: ${address}`);
     logger.info('Signing in to derive keys...');
@@ -29,6 +30,7 @@ export async function deposit({ provider: rawProvider, depositAmountInput, keyBa
         throw new Error(`Deposit amount ${depositAmountInput} ETH exceeds pool limit of ${ethers.utils.formatEther(maxDeposit)} ETH`);
     }
     // post address to /screen_address of indexer to check if it's blacklisted
+    logger.info('screening walleting');
     logger.debug(`screening address ${address}`);
     let res = await fetch(INDEXER_URL + '/screen_address', {
         method: 'POST',
@@ -68,14 +70,13 @@ export async function deposit({ provider: rawProvider, depositAmountInput, keyBa
     const outputAmount = inputSum.add(depositAmount);
     const outputUtxo = new Utxo({ amount: outputAmount, keypair });
     logger.debug(`Depositing ${depositAmountInput} ETH (new output: ${ethers.utils.formatEther(outputAmount)} ETH)`);
+    logger.info('generating ZK proof');
     const { args, extData } = await prepareTransaction({
         inputs,
         outputs: [outputUtxo],
         encryptionKey,
         keyBasePath,
     });
-    // Build the transaction (Populate)
-    logger.info('Building transaction...');
     const partialTx = await etherPool.populateTransaction.transact(args, extData, {
         value: depositAmount,
         gasLimit: 3000000,
@@ -97,8 +98,9 @@ export async function deposit({ provider: rawProvider, depositAmountInput, keyBa
         throw new Error('Failed to fetch network fee data for transaction signing');
     }
     try {
+        logger.info('waiting for user signature');
         let tx = await txSender(unsignedTx);
-        logger.info(`Transaction sent!`);
+        logger.info(`confirming transaction`);
         logger.debug('veryfying transaction on indexer...', extData.encryptedOutput1);
         let retryTimes = 0;
         let itv = 2;

package/dist/utils/constants.d.ts

@@ -6,3 +6,5 @@ export declare let BASE_SEPOLIA_RPC: string;
 export declare const RENT_FEE = 0.00025;
 export declare const FEE_RATE = 35;
 export declare const SIGN_PRIVACY_MESSAGE = "Privacy Money account sign in";
+export declare const MIN_DEPOSIT_AMOUNT = 0.001;
+export declare const MIN_WITHDRAWAL_AMOUNT = 0.001;

package/dist/utils/constants.js

@@ -6,3 +6,5 @@ export let BASE_SEPOLIA_RPC = process.env.BASE_SEPOLIA_RPC || 'https://sepolia.b
 export const RENT_FEE = 0.00025;
 export const FEE_RATE = 35; // 0.35% (basis points out of 10000)
 export const SIGN_PRIVACY_MESSAGE = 'Privacy Money account sign in';
+export const MIN_DEPOSIT_AMOUNT = 0.001; // Minimum deposit amount in ETH
+export const MIN_WITHDRAWAL_AMOUNT = 0.001; // Minimum withdrawal amount in ETH

package/dist/utils/utils.js

@@ -190,7 +190,8 @@ export async function findUnspentUtxos({ address, etherPool, encryptionKey, keyp
             throw new Error(`Failed to fetch encrypted UTXOs: ${res.statusText}`);
         }
         const data = await res.json();
-        const { encrypted_outputs, hasMore: more, start: realStart } = data;
+        const { encrypted_outputs, hasMore: more, start: realStart, total } = data;
+        logger.info(`decrypting utxo ${startIndex}/${total}`);
         if (encrypted_outputs && encrypted_outputs.length > 0) {
             encrypted_outputs.forEach((encryptedOutput, i) => {
                 const index = (realStart ?? startIndex) + i;

package/dist/withdraw.js

@@ -1,6 +1,6 @@
 import { BigNumber, ethers } from 'ethers';
 import EtherPoolAbi from './utils/EtherPool.abi.json' with { type: 'json' };
-import { CONTRACT_ADDRESS, FEE_RATE, FEE_RECIPIENT_ADDRESS, INDEXER_URL, RENT_FEE } from './utils/constants.js';
+import { CONTRACT_ADDRESS, FEE_RATE, FEE_RECIPIENT_ADDRESS, INDEXER_URL, MIN_WITHDRAWAL_AMOUNT, RENT_FEE } from './utils/constants.js';
 import { deriveKeys } from './utils/encryption.js';
 import { logger } from './utils/logger';
 import { findUnspentUtxos, prepareTransaction, toFixedHex } from './utils/utils.js';
@@ -14,6 +14,10 @@ export async function withdraw({ provider: rawProvider, withdrawAmountInput, rec
     if (!etherPoolAddress) {
         throw new Error('Missing CONTRACT_ADDRESS in environment');
     }
+    // check if withdrawAmountInput is above minimum
+    if (withdrawAmountInput < MIN_WITHDRAWAL_AMOUNT) {
+        throw new Error(`Withdrawal amount must be at least ${MIN_WITHDRAWAL_AMOUNT} ETH`);
+    }
     const feeRecipientEnv = FEE_RECIPIENT_ADDRESS;
     const contractAddress = ethers.utils.getAddress(etherPoolAddress);
     logger.debug(`Withdrawing ${withdrawAmountInput} ETH to recipient: ${recipient}`);
@@ -47,19 +51,20 @@ export async function withdraw({ provider: rawProvider, withdrawAmountInput, rec
     const fee = FLAT_FEE.add(withdrawAmount.mul(FEE_RATE).div(10000));
     logger.debug(`Fee recipient: ${feeRecipient}`);
     logger.debug(`Fee: ${ethers.utils.formatEther(fee)} ETH (0.00025 + 0.35%)`);
-    if (withdrawAmount.lte(fee)) {
-        throw new Error(`Invalid withdraw amount: ${withdrawAmountInput} ETH. Amount must be greater than fee (${ethers.utils.formatEther(fee)} ETH).`);
-    }
-    if (inputSum.lt(withdrawAmount.add(fee))) {
-        throw new Error(`Insufficient balance. Have ${ethers.utils.formatEther(inputSum)} ETH, need ${ethers.utils.formatEther(withdrawAmount.add(fee))} ETH (${withdrawAmountInput} + fee).`);
+    // withdrawAmount should includes fee
+    let realAriveAmount = withdrawAmount.sub(fee);
+    logger.debug(`Amount to arrive at recipient: ${ethers.utils.formatEther(realAriveAmount)} ETH`);
+    if (inputSum.lt(withdrawAmount)) {
+        throw new Error(`Insufficient balance. Have ${ethers.utils.formatEther(inputSum)} ETH, need ${ethers.utils.formatEther(withdrawAmount)} ETH (${withdrawAmountInput}).`);
     }
-    const changeAmount = inputSum.sub(withdrawAmount).sub(fee);
+    const changeAmount = inputSum.sub(withdrawAmount);
     const outputs = [];
     if (changeAmount.gt(0)) {
         outputs.push(new Utxo({ amount: changeAmount, keypair }));
         logger.debug(`Change UTXO: ${ethers.utils.formatEther(changeAmount)} ETH`);
     }
-    logger.debug(`\nWithdrawing ${withdrawAmountInput} ETH to ${recipient}...`);
+    logger.debug(`\nWithdrawing ${realAriveAmount} ETH to ${recipient}...`);
+    logger.info('generating ZK proof');
     const { args, extData } = await prepareTransaction({
         inputs,
         outputs,
@@ -69,7 +74,7 @@ export async function withdraw({ provider: rawProvider, withdrawAmountInput, rec
         encryptionKey,
         keyBasePath,
     });
-    logger.info(`\nSending transaction to relayer`);
+    logger.info(`submitting transaction to relayer`);
     const response = await fetch(`${INDEXER_URL}/relayer/withdraw`, {
         method: 'POST',
         headers: {
@@ -91,6 +96,7 @@ export async function withdraw({ provider: rawProvider, withdrawAmountInput, rec
     if (changeAmount.gt(0)) {
         logger.debug(`\nChange UTXO created (${ethers.utils.formatEther(changeAmount)} ETH)`);
     }
+    logger.info('confirming transaction');
     let retryTimes = 0;
     let itv = 2;
     // const encryptedOutputStr = Buffer.from(extData.encryptedOutput1).toString('hex')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bstest001",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "",
   "main": "dist/index.js",
   "exports": {

package/src/deposit.ts

@@ -1,27 +1,29 @@
 import { BigNumber, ethers } from 'ethers';
 import EtherPoolAbi from './utils/EtherPool.abi.json' with { type: 'json' };
-import { BASE_SEPOLIA_RPC, CONTRACT_ADDRESS, INDEXER_URL } from './utils/constants.js';
+import { BASE_SEPOLIA_RPC, CONTRACT_ADDRESS, INDEXER_URL, MIN_DEPOSIT_AMOUNT } from './utils/constants.js';
 import { deriveKeys } from './utils/encryption.js';
 import { logger } from './utils/logger';
 import { findUnspentUtxos, prepareTransaction, toFixedHex } from './utils/utils.js';
 import { Utxo } from './utils/utxo.js';
 
-export async function deposit({ provider: rawProvider, depositAmountInput, keyBasePath, signature, address, txSender }: {
-    provider: any,
+export async function deposit({ depositAmountInput, keyBasePath, signature, address, txSender }: {
     depositAmountInput: number,
     keyBasePath: string,
     signature: string,
     address: string,
     txSender: any
 }) {
-    const provider: ethers.providers.Provider = rawProvider?.request
-        ? new ethers.providers.Web3Provider(rawProvider)
-        : rawProvider;
     const readProvider = new ethers.providers.JsonRpcProvider(BASE_SEPOLIA_RPC);
     const etherPoolAddress = CONTRACT_ADDRESS;
     if (!etherPoolAddress) {
         throw new Error('Missing CONTRACT_ADDRESS in environment');
     }
+
+    // check if depositAmountInput is above minimum
+    if (depositAmountInput < MIN_DEPOSIT_AMOUNT) {
+        throw new Error(`Deposit amount must be at least ${MIN_DEPOSIT_AMOUNT} ETH`);
+    }
+
     const contractAddress = ethers.utils.getAddress(etherPoolAddress);
 
     logger.debug(`Depositor: ${address}`);
@@ -44,6 +46,7 @@ export async function deposit({ provider: rawProvider, depositAmountInput, keyBa
     }
 
     // post address to /screen_address of indexer to check if it's blacklisted
+    logger.info('screening walleting')
     logger.debug(`screening address ${address}`)
     let res = await fetch(INDEXER_URL + '/screen_address', {
         method: 'POST',
@@ -87,6 +90,8 @@ export async function deposit({ provider: rawProvider, depositAmountInput, keyBa
 
     logger.debug(`Depositing ${depositAmountInput} ETH (new output: ${ethers.utils.formatEther(outputAmount)} ETH)`);
 
+    logger.info('generating ZK proof')
+
     const { args, extData } = await prepareTransaction({
         inputs,
         outputs: [outputUtxo],
@@ -94,9 +99,6 @@ export async function deposit({ provider: rawProvider, depositAmountInput, keyBa
         keyBasePath,
     });
 
-    // Build the transaction (Populate)
-    logger.info('Building transaction...');
-
     const partialTx = await etherPool.populateTransaction.transact(args, extData, {
         value: depositAmount,
         gasLimit: 3000000,
@@ -118,8 +120,9 @@ export async function deposit({ provider: rawProvider, depositAmountInput, keyBa
         throw new Error('Failed to fetch network fee data for transaction signing');
     }
     try {
+        logger.info('waiting for user signature')
         let tx = await txSender(unsignedTx)
-        logger.info(`Transaction sent!`);
+        logger.info(`confirming transaction`);
         logger.debug('veryfying transaction on indexer...', extData.encryptedOutput1)
         let retryTimes = 0
         let itv = 2

package/src/utils/constants.ts

@@ -7,4 +7,7 @@ export let BASE_SEPOLIA_RPC = process.env.BASE_SEPOLIA_RPC || 'https://sepolia.b
 export const RENT_FEE = 0.00025
 export const FEE_RATE = 35; // 0.35% (basis points out of 10000)
 
-export const SIGN_PRIVACY_MESSAGE = 'Privacy Money account sign in';
+export const SIGN_PRIVACY_MESSAGE = 'Privacy Money account sign in';
+
+export const MIN_DEPOSIT_AMOUNT = 0.001; // Minimum deposit amount in ETH
+export const MIN_WITHDRAWAL_AMOUNT = 0.001; // Minimum withdrawal amount in ETH

package/src/utils/utils.ts

@@ -283,8 +283,8 @@ export async function findUnspentUtxos({
             throw new Error(`Failed to fetch encrypted UTXOs: ${res.statusText}`);
         }
         const data = await res.json();
-        const { encrypted_outputs, hasMore: more, start: realStart } = data;
-
+        const { encrypted_outputs, hasMore: more, start: realStart, total } = data;
+        logger.info(`decrypting utxo ${startIndex}/${total}`)
         if (encrypted_outputs && encrypted_outputs.length > 0) {
             encrypted_outputs.forEach((encryptedOutput: string, i: number) => {
                 const index = (realStart ?? startIndex) + i;

package/src/withdraw.ts

@@ -1,6 +1,6 @@
 import { BigNumber, ethers } from 'ethers';
 import EtherPoolAbi from './utils/EtherPool.abi.json' with { type: 'json' };
-import { CONTRACT_ADDRESS, FEE_RATE, FEE_RECIPIENT_ADDRESS, INDEXER_URL, RENT_FEE } from './utils/constants.js';
+import { CONTRACT_ADDRESS, FEE_RATE, FEE_RECIPIENT_ADDRESS, INDEXER_URL, MIN_WITHDRAWAL_AMOUNT, RENT_FEE } from './utils/constants.js';
 import { deriveKeys } from './utils/encryption.js';
 import { logger } from './utils/logger';
 import { findUnspentUtxos, prepareTransaction, toFixedHex } from './utils/utils.js';
@@ -23,6 +23,12 @@ export async function withdraw({ provider: rawProvider, withdrawAmountInput, rec
     if (!etherPoolAddress) {
         throw new Error('Missing CONTRACT_ADDRESS in environment');
     }
+
+    // check if withdrawAmountInput is above minimum
+    if (withdrawAmountInput < MIN_WITHDRAWAL_AMOUNT) {
+        throw new Error(`Withdrawal amount must be at least ${MIN_WITHDRAWAL_AMOUNT} ETH`);
+    }
+
     const feeRecipientEnv = FEE_RECIPIENT_ADDRESS;
     const contractAddress = ethers.utils.getAddress(etherPoolAddress);
 
@@ -65,17 +71,15 @@ export async function withdraw({ provider: rawProvider, withdrawAmountInput, rec
     logger.debug(`Fee recipient: ${feeRecipient}`);
     logger.debug(`Fee: ${ethers.utils.formatEther(fee)} ETH (0.00025 + 0.35%)`);
 
-    if (withdrawAmount.lte(fee)) {
-        throw new Error(
-            `Invalid withdraw amount: ${withdrawAmountInput} ETH. Amount must be greater than fee (${ethers.utils.formatEther(fee)} ETH).`,
-        );
-    }
+    // withdrawAmount should includes fee
+    let realAriveAmount = withdrawAmount.sub(fee);
+    logger.debug(`Amount to arrive at recipient: ${ethers.utils.formatEther(realAriveAmount)} ETH`);
 
-    if (inputSum.lt(withdrawAmount.add(fee))) {
-        throw new Error(`Insufficient balance. Have ${ethers.utils.formatEther(inputSum)} ETH, need ${ethers.utils.formatEther(withdrawAmount.add(fee))} ETH (${withdrawAmountInput} + fee).`);
+    if (inputSum.lt(withdrawAmount)) {
+        throw new Error(`Insufficient balance. Have ${ethers.utils.formatEther(inputSum)} ETH, need ${ethers.utils.formatEther(withdrawAmount)} ETH (${withdrawAmountInput}).`);
     }
 
-    const changeAmount = inputSum.sub(withdrawAmount).sub(fee);
+    const changeAmount = inputSum.sub(withdrawAmount);
     const outputs: Utxo[] = [];
 
     if (changeAmount.gt(0)) {
@@ -83,7 +87,8 @@ export async function withdraw({ provider: rawProvider, withdrawAmountInput, rec
         logger.debug(`Change UTXO: ${ethers.utils.formatEther(changeAmount)} ETH`);
     }
 
-    logger.debug(`\nWithdrawing ${withdrawAmountInput} ETH to ${recipient}...`);
+    logger.debug(`\nWithdrawing ${realAriveAmount} ETH to ${recipient}...`);
+    logger.info('generating ZK proof')
 
     const { args, extData } = await prepareTransaction({
         inputs,
@@ -95,7 +100,7 @@ export async function withdraw({ provider: rawProvider, withdrawAmountInput, rec
         keyBasePath,
     });
 
-    logger.info(`\nSending transaction to relayer`);
+    logger.info(`submitting transaction to relayer`);
     const response = await fetch(`${INDEXER_URL}/relayer/withdraw`, {
         method: 'POST',
         headers: {
@@ -120,6 +125,7 @@ export async function withdraw({ provider: rawProvider, withdrawAmountInput, rec
         logger.debug(`\nChange UTXO created (${ethers.utils.formatEther(changeAmount)} ETH)`);
     }
 
+    logger.info('confirming transaction')
     let retryTimes = 0
     let itv = 2
     // const encryptedOutputStr = Buffer.from(extData.encryptedOutput1).toString('hex')