update network utils and bump version

auxo-zk · Apr 10, 2024 · 105780b · 105780b
1 parent a4d40d5
commit 105780b
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 40 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@auxo-dev/auxo-libs",
-    "version": "0.4.11",
+    "version": "0.5.0",
     "description": "",
     "author": "",
     "license": "Apache-2.0",
@@ -59,6 +59,6 @@
         "typescript": "^4.7.2"
     },
     "dependencies": {
-        "o1js": "./pkg/o1js-0.17.0.tgz"
+        "o1js": "0.18.0"
     }
 }
diff --git a/pkg/o1js-0.17.0.tgz b/pkg/o1js-0.17.0.tgz
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
@@ -47,8 +47,9 @@ type Profiler = {
 };
 
 type Logger = {
-    info: boolean;
-    memoryUsage: boolean;
+    info?: boolean;
+    error?: boolean;
+    memoryUsage?: boolean;
 };
 
 type Program = {

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -29,6 +29,7 @@ export {
     proveAndSendTx,
     deployZkApps,
     sendTx,
+    fetchNonce,
     fetchActions,
     fetchEvents,
     fetchZkAppState,

diff --git a/src/utils/network.test.ts b/src/utils/network.test.ts
@@ -46,6 +46,7 @@ describe('Network', () => {
     const cache = Cache.FileSystem('caches');
     const logger = {
         info: true,
+        error: true,
         memoryUsage: true,
     };
     const profiler = getProfiler('Test', fs);
@@ -108,7 +109,7 @@ describe('Network', () => {
     });
 
     it('should compile contract', async () => {
-        if (doProofs) await compile(TestContract, cache, logger, profiler);
+        if (doProofs) await compile(TestContract, cache, profiler, logger);
     });
 
     it('should deploy zkApp', async () => {
@@ -128,8 +129,8 @@ describe('Network', () => {
             TestContract.name,
             'test',
             (testZkApp.contract as TestContract).test(Field(1), Field(1)),
-            logger,
-            profiler
+            profiler,
+            logger
         );
     });
 
@@ -155,9 +156,9 @@ describe('Network', () => {
             async () =>
                 (testZkApp.contract as TestContract).test(Field(1), Field(1)),
             feePayer,
-            logger,
+            true,
             profiler,
-            true
+            logger
         );
     });
 

diff --git a/src/utils/network.ts b/src/utils/network.ts
@@ -56,8 +56,8 @@ function randomAccounts<K extends string>(
 async function compile(
     program: Program,
     cache?: Cache,
-    logger?: Logger,
-    profiler?: Profiler
+    profiler?: Profiler,
+    logger?: Logger
 ): Promise<{
     verificationKey: { data: string; hash: Field };
 }> {
@@ -79,8 +79,8 @@ async function prove<T>(
     programName: string,
     methodName: string,
     proofGeneration: Promise<T>,
-    logger?: Logger,
-    profiler?: Profiler
+    profiler?: Profiler,
+    logger?: Logger
 ): Promise<T> {
     if (logger && logger.memoryUsage)
         console.log('Current memory usage:', getMemoryUsage(), 'MB');
@@ -95,7 +95,8 @@ async function prove<T>(
 
 async function sendTx(
     tx: Transaction,
-    waitForBlock = false
+    waitForBlock = false,
+    logger?: Logger
 ): Promise<TxResult> {
     let retries = MAX_RETRY;
     let result;
@@ -106,27 +107,30 @@ async function sendTx(
                 if (waitForBlock)
                     return await (result as PendingTransaction).wait();
             } else if (result.status === 'rejected') {
-                console.error('Transaction failed with errors:');
+                if (logger && logger.error)
+                    console.error('Failed to send Tx with errors:');
                 throw result.errors;
             }
             return result;
         } catch (error) {
             retries--;
-            console.log('Transaction failed to be sent with error:', error);
-            console.log(`Retrying...`);
+            if (logger && logger.error) {
+                console.error('Failed to send Tx with errors:', error);
+                console.log(`Retrying...`);
+            }
         }
     }
-    throw new Error(`Transaction cannot be sent after ${MAX_RETRY} retries!`);
+    throw new Error(`Failed to send Tx after ${MAX_RETRY} retries!`);
 }
 
 async function proveAndSendTx(
     contractName: string,
     methodName: string,
     functionCall: () => Promise<void>,
     feePayer: FeePayer,
-    logger?: Logger,
+    waitForBlock = false,
     profiler?: Profiler,
-    waitForBlock = false
+    logger?: Logger
 ) {
     if (logger && logger.memoryUsage)
         console.log('Current memory usage:', getMemoryUsage(), 'MB');
@@ -163,8 +167,8 @@ async function deployZkApps(
         }
     ],
     feePayer: FeePayer,
-    logger?: Logger,
-    waitForBlock = false
+    waitForBlock = false,
+    logger?: Logger
 ): Promise<TxResult> {
     for (let i = 0; i < deployData.length; i++) {
         if (deployData[i].zkApp.contract === undefined)
@@ -214,16 +218,18 @@ async function deployZkApps(
     return result;
 }
 
-async function fetchNonce(publicKey: PublicKey): Promise<number | undefined> {
+async function fetchNonce(
+    publicKey: PublicKey,
+    logger?: Logger
+): Promise<number | undefined> {
     try {
         let { account, error } = await fetchAccount({
             publicKey: publicKey,
         });
         if (account == undefined) throw error;
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return Number(account.nonce);
     } catch (error) {
-        console.error(error);
+        if (logger && logger.error) console.error(error);
     }
 }