@woof-software/contracts-tools-sdk-ethers 0.0.18 → 0.0.20

package/lib/config.d.ts

@@ -18,6 +18,7 @@ export declare const config: {
             multiplier: number;
         };
         batchDelayMs: number;
+        maxAsyncReadBatches: number;
     };
     contract: {
         staticCalls: {

package/lib/config.js

@@ -1,4 +1,4 @@
-import { DEFAULT_LOGS_BLOCKS_STEP, DEFAULT_LOGS_DELAY_MS, DEFAULT_MULTICALL_ALLOW_FAILURE, DEFAULT_MULTICALL_BATCH_DELAY_MS, DEFAULT_MULTICALL_MUTABLE_CALLS_BATCH_LIMIT, DEFAULT_MULTICALL_STATIC_CALLS_BATCH_LIMIT, DEFAULT_MULTICALL_WAIT_FOR_TXS, DEFAULT_MUTABLE_CALLS_TIMEOUT_MS, DEFAULT_PRIORITY_CALL_MULTIPLIER, DEFAULT_STATIC_CALLS_TIMEOUT_MS, DEFAULT_WAIT_CALLS_TIMEOUT_MS, MULTICALL_ADDRESS, } from "./constant.js";
+import { DEFAULT_LOGS_BLOCKS_STEP, DEFAULT_LOGS_DELAY_MS, DEFAULT_MULTICALL_ALLOW_FAILURE, DEFAULT_MULTICALL_ASYNC_READ_BATCHES, DEFAULT_MULTICALL_BATCH_DELAY_MS, DEFAULT_MULTICALL_MUTABLE_CALLS_BATCH_LIMIT, DEFAULT_MULTICALL_STATIC_CALLS_BATCH_LIMIT, DEFAULT_MULTICALL_WAIT_FOR_TXS, DEFAULT_MUTABLE_CALLS_TIMEOUT_MS, DEFAULT_PRIORITY_CALL_MULTIPLIER, DEFAULT_STATIC_CALLS_TIMEOUT_MS, DEFAULT_WAIT_CALLS_TIMEOUT_MS, MULTICALL_ADDRESS, } from "./constant.js";
 export const config = {
     multicallUnit: {
         address: MULTICALL_ADDRESS,
@@ -19,6 +19,7 @@ export const config = {
             multiplier: DEFAULT_PRIORITY_CALL_MULTIPLIER,
         },
         batchDelayMs: DEFAULT_MULTICALL_BATCH_DELAY_MS,
+        maxAsyncReadBatches: DEFAULT_MULTICALL_ASYNC_READ_BATCHES,
     },
     contract: {
         staticCalls: {

package/lib/constant.d.ts

@@ -4,6 +4,7 @@ export declare const DEFAULT_MULTICALL_ALLOW_FAILURE = false;
 export declare const DEFAULT_MULTICALL_STATIC_CALLS_BATCH_LIMIT = 50;
 export declare const DEFAULT_MULTICALL_MUTABLE_CALLS_BATCH_LIMIT = 10;
 export declare const DEFAULT_MULTICALL_BATCH_DELAY_MS = 0;
+export declare const DEFAULT_MULTICALL_ASYNC_READ_BATCHES = 1;
 export declare const DEFAULT_PRIORITY_CALL_MULTIPLIER = 1.3;
 export declare const DEFAULT_LOGS_BLOCKS_STEP = 5000;
 export declare const DEFAULT_LOGS_DELAY_MS = 1000;

package/lib/constant.js

@@ -4,6 +4,7 @@ export const DEFAULT_MULTICALL_ALLOW_FAILURE = false;
 export const DEFAULT_MULTICALL_STATIC_CALLS_BATCH_LIMIT = 50;
 export const DEFAULT_MULTICALL_MUTABLE_CALLS_BATCH_LIMIT = 10;
 export const DEFAULT_MULTICALL_BATCH_DELAY_MS = 0;
+export const DEFAULT_MULTICALL_ASYNC_READ_BATCHES = 1;
 export const DEFAULT_PRIORITY_CALL_MULTIPLIER = 1.3;
 export const DEFAULT_LOGS_BLOCKS_STEP = 5000;
 export const DEFAULT_LOGS_DELAY_MS = 1000;

package/lib/multicall/multicall-unit.js

@@ -39,6 +39,7 @@ export class MulticallUnit extends BaseContract {
             waitForTxs: config.multicallUnit.waitForTxs,
             waitCallsTimeoutMs: config.multicallUnit.waitCalls.timeoutMs,
             batchDelayMs: config.multicallUnit.batchDelayMs,
+            maxAsyncReadBatches: config.multicallUnit.maxAsyncReadBatches,
             ...options,
         };
     }
@@ -133,13 +134,22 @@ export class MulticallUnit extends BaseContract {
                 await waitWithSignals(runOptions.batchDelayMs, runOptions.signals);
             }
             // Process static
-            for (let i = 0; i < staticCalls.length; i += runOptions.maxStaticCallsStack) {
+            const staticBatchSize = runOptions.maxStaticCallsStack;
+            const maxAsync = runOptions.maxAsyncReadBatches;
+            const staticBatches = [];
+            const staticIndexesBatches = [];
+            for (let i = 0; i < staticCalls.length; i += staticBatchSize) {
+                staticBatches.push(staticCalls.slice(i, i + staticBatchSize));
+                staticIndexesBatches.push(staticIndexes.slice(i, i + staticBatchSize));
+            }
+            for (let i = 0; i < staticBatches.length; i += maxAsync) {
                 checkSignals(runOptions.signals);
-                const border = Math.min(i + runOptions.maxStaticCallsStack, staticCalls.length);
-                const iterationCalls = staticCalls.slice(i, border); // half-opened interval
-                const iterationIndexes = staticIndexes.slice(i, border); // half-opened interval
-                const iterationResponse = await this.processStaticCalls(iterationCalls, runOptions);
-                this.saveResponse(iterationResponse, iterationIndexes, tags);
+                const batchGroup = staticBatches.slice(i, i + maxAsync);
+                const indexGroup = staticIndexesBatches.slice(i, i + maxAsync);
+                const results = await Promise.all(batchGroup.map((batch) => this.processStaticCalls(batch, runOptions)));
+                for (let j = 0; j < results.length; j++) {
+                    this.saveResponse(results[j], indexGroup[j], tags);
+                }
                 await waitWithSignals(runOptions.batchDelayMs, runOptions.signals);
             }
         }
@@ -161,15 +171,14 @@ export class MulticallUnit extends BaseContract {
         const tags = this.tags;
         const calls = this.calls;
         checkSignals(runOptions.signals);
-        const { mutableCalls, mutableTags } = this.splitCalls(calls, tags, options.forceMutability);
+        const { mutableCalls } = this.splitCalls(calls, tags, options.forceMutability);
         const estimates = [];
         // Process mutable
         for (let i = 0; i < mutableCalls.length; i += runOptions.maxMutableCallsStack) {
             checkSignals(runOptions.signals);
             const border = Math.min(i + runOptions.maxMutableCallsStack, mutableCalls.length);
             const iterationCalls = mutableCalls.slice(i, border); // half-opened interval
-            const iterationTags = mutableTags.slice(i, border);
-            const estimation = await this.estimateMutableCallsBatch(iterationCalls, iterationTags, runOptions);
+            const estimation = await this.estimateMutableCallsBatch(iterationCalls, runOptions);
             estimates.push(estimation);
         }
         return estimates;
@@ -249,7 +258,7 @@ export class MulticallUnit extends BaseContract {
         }
         return result;
     }
-    async estimateMutableCallsBatch(iterationCalls, iterationTags, runOptions) {
+    async estimateMutableCallsBatch(iterationCalls, runOptions) {
         return this.estimate(aggregate3, [iterationCalls], {
             forceMutability: CallMutability.Mutable,
             highPriorityTx: runOptions.highPriorityTxs,

package/lib/types/multicall/multicall-options.d.ts

@@ -12,4 +12,5 @@ export interface MulticallOptions {
     mutableCallsTimeoutMs?: number;
     waitCallsTimeoutMs?: number;
     batchDelayMs?: number;
+    maxAsyncReadBatches?: number;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@woof-software/contracts-tools-sdk-ethers",
   "description": "Module simplify smart contract interactions and multicall3 aggregation on the Ethereum blockchain and other EVM-compatible networks.",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/woof-compound/sandbox-sdks.git"