bstest001 0.0.8 → 0.0.9

package/dist/deposit.js

@@ -30,6 +30,7 @@ export async function deposit({ depositAmountInput, keyBasePath, signature, addr
         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',
@@ -69,14 +70,13 @@ export async function deposit({ depositAmountInput, keyBasePath, signature, addr
     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,
@@ -98,8 +98,9 @@ export async function deposit({ depositAmountInput, keyBasePath, signature, addr
         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/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

@@ -64,6 +64,7 @@ export async function withdraw({ provider: rawProvider, withdrawAmountInput, rec
         logger.debug(`Change UTXO: ${ethers.utils.formatEther(changeAmount)} ETH`);
     }
     logger.debug(`\nWithdrawing ${realAriveAmount} ETH to ${recipient}...`);
+    logger.info('generating ZK proof');
     const { args, extData } = await prepareTransaction({
         inputs,
         outputs,
@@ -73,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: {
@@ -95,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.8",
+  "version": "0.0.9",
   "description": "",
   "main": "dist/index.js",
   "exports": {

package/src/deposit.ts

@@ -46,6 +46,7 @@ export async function deposit({ depositAmountInput, keyBasePath, signature, addr
     }
 
     // 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',
@@ -89,6 +90,8 @@ export async function deposit({ depositAmountInput, keyBasePath, signature, addr
 
     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],
@@ -96,9 +99,6 @@ export async function deposit({ depositAmountInput, keyBasePath, signature, addr
         keyBasePath,
     });
 
-    // Build the transaction (Populate)
-    logger.info('Building transaction...');
-
     const partialTx = await etherPool.populateTransaction.transact(args, extData, {
         value: depositAmount,
         gasLimit: 3000000,
@@ -120,8 +120,9 @@ export async function deposit({ depositAmountInput, keyBasePath, signature, addr
         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/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

@@ -88,6 +88,7 @@ export async function withdraw({ provider: rawProvider, withdrawAmountInput, rec
     }
 
     logger.debug(`\nWithdrawing ${realAriveAmount} ETH to ${recipient}...`);
+    logger.info('generating ZK proof')
 
     const { args, extData } = await prepareTransaction({
         inputs,
@@ -99,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: {
@@ -124,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')