@virtuals-protocol/acp-node 0.3.0-beta.20 → 0.3.0-beta.22

package/dist/index.d.mts

@@ -561,7 +561,16 @@ declare class AcpContractConfig {
     maxRetries: number;
     rpcEndpoint?: string | undefined;
     x402Config?: X402Config | undefined;
-    constructor(chain: typeof baseSepolia | typeof base, contractAddress: Address$1, baseFare: Fare, alchemyRpcUrl: string, acpUrl: string, abi: typeof ACP_ABI | typeof ACP_V2_ABI, maxRetries: number, rpcEndpoint?: string | undefined, x402Config?: X402Config | undefined);
+    retryConfig?: {
+        intervalMs: number;
+        multiplier: number;
+        maxRetries: number;
+    } | undefined;
+    constructor(chain: typeof baseSepolia | typeof base, contractAddress: Address$1, baseFare: Fare, alchemyRpcUrl: string, acpUrl: string, abi: typeof ACP_ABI | typeof ACP_V2_ABI, maxRetries: number, rpcEndpoint?: string | undefined, x402Config?: X402Config | undefined, retryConfig?: {
+        intervalMs: number;
+        multiplier: number;
+        maxRetries: number;
+    } | undefined);
 }
 declare const baseSepoliaAcpConfig: AcpContractConfig;
 declare const baseSepoliaAcpConfigV2: AcpContractConfig;
@@ -710,6 +719,7 @@ declare class AcpContractClient extends BaseAcpContractClient {
     protected PRIORITY_FEE_MULTIPLIER: number;
     protected MAX_FEE_PER_GAS: number;
     protected MAX_PRIORITY_FEE_PER_GAS: number;
+    private RETRY_CONFIG;
     private _sessionKeyClient;
     private _acpX402;
     constructor(agentWalletAddress: Address$1, config?: AcpContractConfig);
@@ -8994,6 +9004,8 @@ declare class AcpContractClientV2 extends BaseAcpContractClient {
     private PRIORITY_FEE_MULTIPLIER;
     private MAX_FEE_PER_GAS;
     private MAX_PRIORITY_FEE_PER_GAS;
+    private GAS_FEE_MULTIPLIER;
+    private RETRY_CONFIG;
     private _sessionKeyClient;
     private _acpX402;
     constructor(jobManagerAddress: Address$1, memoManagerAddress: Address$1, accountManagerAddress: Address$1, agentWalletAddress: Address$1, config?: AcpContractConfig);

package/dist/index.d.ts

@@ -561,7 +561,16 @@ declare class AcpContractConfig {
     maxRetries: number;
     rpcEndpoint?: string | undefined;
     x402Config?: X402Config | undefined;
-    constructor(chain: typeof baseSepolia | typeof base, contractAddress: Address$1, baseFare: Fare, alchemyRpcUrl: string, acpUrl: string, abi: typeof ACP_ABI | typeof ACP_V2_ABI, maxRetries: number, rpcEndpoint?: string | undefined, x402Config?: X402Config | undefined);
+    retryConfig?: {
+        intervalMs: number;
+        multiplier: number;
+        maxRetries: number;
+    } | undefined;
+    constructor(chain: typeof baseSepolia | typeof base, contractAddress: Address$1, baseFare: Fare, alchemyRpcUrl: string, acpUrl: string, abi: typeof ACP_ABI | typeof ACP_V2_ABI, maxRetries: number, rpcEndpoint?: string | undefined, x402Config?: X402Config | undefined, retryConfig?: {
+        intervalMs: number;
+        multiplier: number;
+        maxRetries: number;
+    } | undefined);
 }
 declare const baseSepoliaAcpConfig: AcpContractConfig;
 declare const baseSepoliaAcpConfigV2: AcpContractConfig;
@@ -710,6 +719,7 @@ declare class AcpContractClient extends BaseAcpContractClient {
     protected PRIORITY_FEE_MULTIPLIER: number;
     protected MAX_FEE_PER_GAS: number;
     protected MAX_PRIORITY_FEE_PER_GAS: number;
+    private RETRY_CONFIG;
     private _sessionKeyClient;
     private _acpX402;
     constructor(agentWalletAddress: Address$1, config?: AcpContractConfig);
@@ -8994,6 +9004,8 @@ declare class AcpContractClientV2 extends BaseAcpContractClient {
     private PRIORITY_FEE_MULTIPLIER;
     private MAX_FEE_PER_GAS;
     private MAX_PRIORITY_FEE_PER_GAS;
+    private GAS_FEE_MULTIPLIER;
+    private RETRY_CONFIG;
     private _sessionKeyClient;
     private _acpX402;
     constructor(jobManagerAddress: Address$1, memoManagerAddress: Address$1, accountManagerAddress: Address$1, agentWalletAddress: Address$1, config?: AcpContractConfig);

package/dist/index.js

@@ -35,12 +35,13 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.3.0-beta.20",
+      version: "0.3.0-beta.22",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
       scripts: {
         test: "jest",
+        "test:unit": "jest test/unit test/component",
         "test:ci": "jest --ci --reporters=default --reporters=jest-junit",
         "test:watch": "jest --watch",
         "test:coverage": "jest --coverage",
@@ -2282,7 +2283,7 @@ var acpAbiV2_default = ACP_V2_ABI;
 var V1_MAX_RETRIES = 10;
 var V2_MAX_RETRIES = 3;
 var AcpContractConfig2 = class {
-  constructor(chain, contractAddress, baseFare, alchemyRpcUrl, acpUrl, abi, maxRetries, rpcEndpoint, x402Config) {
+  constructor(chain, contractAddress, baseFare, alchemyRpcUrl, acpUrl, abi, maxRetries, rpcEndpoint, x402Config, retryConfig) {
     this.chain = chain;
     this.contractAddress = contractAddress;
     this.baseFare = baseFare;
@@ -2292,6 +2293,7 @@ var AcpContractConfig2 = class {
     this.maxRetries = maxRetries;
     this.rpcEndpoint = rpcEndpoint;
     this.x402Config = x402Config;
+    this.retryConfig = retryConfig;
   }
 };
 var baseSepoliaAcpConfig = new AcpContractConfig2(
@@ -5141,12 +5143,14 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
     this.PRIORITY_FEE_MULTIPLIER = 2;
     this.MAX_FEE_PER_GAS = 2e7;
     this.MAX_PRIORITY_FEE_PER_GAS = 21e6;
+    this.RETRY_CONFIG = {
+      intervalMs: 200,
+      multiplier: 1.1,
+      maxRetries: 10
+    };
   }
   static async build(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig) {
-    const acpContractClient = new _AcpContractClient(
-      agentWalletAddress,
-      config
-    );
+    const acpContractClient = new _AcpContractClient(agentWalletAddress, config);
     await acpContractClient.init(walletPrivateKey, sessionEntityKeyId);
     return acpContractClient;
   }
@@ -5177,7 +5181,11 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
         `ACP Contract Client validation failed: agent account ${this.agentWalletAddress} is not deployed on-chain`
       );
     }
-    await this.validateSessionKeyOnChain(sessionSignerAddress, sessionEntityKeyId);
+    await this.validateSessionKeyOnChain(
+      sessionSignerAddress,
+      sessionEntityKeyId
+    );
+    this.RETRY_CONFIG = this.config.retryConfig || this.RETRY_CONFIG;
     console.log("Connected to ACP with v1 Contract Client (Legacy):", {
       agentWalletAddress: this.agentWalletAddress,
       whitelistedWalletAddress: sessionSignerAddress,
@@ -5210,44 +5218,52 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
     return finalMaxFeePerGas;
   }
   async handleOperation(operations) {
-    const payload = {
+    const basePayload = {
       uo: operations.map((op) => ({
         target: op.contractAddress,
         data: op.data,
         value: op.value
-      })),
-      overrides: {
-        nonceKey: this.getRandomNonce()
-      }
+      }))
     };
-    let retries = this.config.maxRetries;
+    let iteration = 0;
     let finalError;
-    while (retries > 0) {
+    while (iteration < this.config.maxRetries) {
       try {
-        if (this.config.maxRetries > retries) {
-          const gasFees = await this.calculateGasFees();
-          payload["overrides"] = {
-            maxFeePerGas: `0x${gasFees.toString(16)}`
-          };
-        }
+        const currentMultiplier = 1 + 0.1 * (iteration + 1);
+        const payload = {
+          ...basePayload,
+          overrides: {
+            nonceKey: this.getRandomNonce(),
+            maxFeePerGas: {
+              multiplier: currentMultiplier
+            },
+            maxPriorityFeePerGas: {
+              multiplier: currentMultiplier
+            }
+          }
+        };
         const { hash } = await this.sessionKeyClient.sendUserOperation(payload);
         const txnHash = await this.sessionKeyClient.waitForUserOperationTransaction({
-          hash
+          hash,
+          tag: "pending",
+          retries: this.RETRY_CONFIG
         });
         return { userOpHash: hash, txnHash };
       } catch (error) {
-        retries -= 1;
-        if (retries === 0) {
+        iteration++;
+        if (iteration === this.config.maxRetries) {
           finalError = error;
           break;
         }
-        await new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
+        await new Promise((resolve) => setTimeout(resolve, 2e3 * iteration));
       }
     }
     throw new acpError_default(`Failed to send user operation`, finalError);
   }
   async getJobId(createJobUserOpHash, clientAddress, providerAddress) {
-    const result = await this.sessionKeyClient.getUserOperationReceipt(createJobUserOpHash);
+    const result = await this.sessionKeyClient.getUserOperationReceipt(
+      createJobUserOpHash
+    );
     if (!result) {
       throw new acpError_default("Failed to get user operation receipt");
     }
@@ -6069,6 +6085,12 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     this.PRIORITY_FEE_MULTIPLIER = 2;
     this.MAX_FEE_PER_GAS = 2e7;
     this.MAX_PRIORITY_FEE_PER_GAS = 21e6;
+    this.GAS_FEE_MULTIPLIER = 0.5;
+    this.RETRY_CONFIG = {
+      intervalMs: 200,
+      multiplier: 1.1,
+      maxRetries: 10
+    };
   }
   static async build(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfigV2) {
     const publicClient = (0, import_viem7.createPublicClient)({
@@ -6136,7 +6158,11 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
         `ACP Contract Client validation failed: agent account ${this.agentWalletAddress} is not deployed on-chain`
       );
     }
-    await this.validateSessionKeyOnChain(sessionSignerAddress, sessionEntityKeyId);
+    await this.validateSessionKeyOnChain(
+      sessionSignerAddress,
+      sessionEntityKeyId
+    );
+    this.RETRY_CONFIG = this.config.retryConfig || this.RETRY_CONFIG;
     console.log("Connected to ACP:", {
       agentWalletAddress: this.agentWalletAddress,
       whitelistedWalletAddress: sessionSignerAddress,
@@ -6169,44 +6195,44 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     return finalMaxFeePerGas;
   }
   async handleOperation(operations) {
-    const payload = {
+    const basePayload = {
       uo: operations.map((operation) => ({
         target: operation.contractAddress,
         data: operation.data,
         value: operation.value
-      })),
-      overrides: {
-        nonceKey: this.getRandomNonce()
-      }
+      }))
     };
-    let retries = this.config.maxRetries;
+    let iteration = 0;
     let finalError;
-    while (retries > 0) {
+    while (iteration < this.config.maxRetries) {
       try {
-        if (this.config.maxRetries > retries) {
-          const gasFees = await this.calculateGasFees();
-          payload["overrides"] = {
-            maxFeePerGas: `0x${gasFees.toString(16)}`
-          };
-        }
+        const currentMultiplier = 1 + 0.1 * (iteration + 1);
+        const payload = {
+          ...basePayload,
+          overrides: {
+            nonceKey: this.getRandomNonce(),
+            maxFeePerGas: {
+              multiplier: currentMultiplier
+            },
+            maxPriorityFeePerGas: {
+              multiplier: currentMultiplier
+            }
+          }
+        };
         const { hash } = await this.sessionKeyClient.sendUserOperation(payload);
         const txnHash = await this.sessionKeyClient.waitForUserOperationTransaction({
           hash,
           tag: "pending",
-          retries: {
-            intervalMs: 200,
-            multiplier: 1.1,
-            maxRetries: 10
-          }
+          retries: this.RETRY_CONFIG
         });
         return { userOpHash: hash, txnHash };
       } catch (error) {
-        retries -= 1;
-        if (retries === 0) {
+        iteration++;
+        if (iteration === this.config.maxRetries) {
           finalError = error;
           break;
         }
-        await new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
+        await new Promise((resolve) => setTimeout(resolve, 2e3 * iteration));
       }
     }
     throw new acpError_default(`Failed to send user operation`, finalError);

package/dist/index.mjs

@@ -8,12 +8,13 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.3.0-beta.20",
+      version: "0.3.0-beta.22",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
       scripts: {
         test: "jest",
+        "test:unit": "jest test/unit test/component",
         "test:ci": "jest --ci --reporters=default --reporters=jest-junit",
         "test:watch": "jest --watch",
         "test:coverage": "jest --coverage",
@@ -2235,7 +2236,7 @@ var acpAbiV2_default = ACP_V2_ABI;
 var V1_MAX_RETRIES = 10;
 var V2_MAX_RETRIES = 3;
 var AcpContractConfig2 = class {
-  constructor(chain, contractAddress, baseFare, alchemyRpcUrl, acpUrl, abi, maxRetries, rpcEndpoint, x402Config) {
+  constructor(chain, contractAddress, baseFare, alchemyRpcUrl, acpUrl, abi, maxRetries, rpcEndpoint, x402Config, retryConfig) {
     this.chain = chain;
     this.contractAddress = contractAddress;
     this.baseFare = baseFare;
@@ -2245,6 +2246,7 @@ var AcpContractConfig2 = class {
     this.maxRetries = maxRetries;
     this.rpcEndpoint = rpcEndpoint;
     this.x402Config = x402Config;
+    this.retryConfig = retryConfig;
   }
 };
 var baseSepoliaAcpConfig = new AcpContractConfig2(
@@ -5098,12 +5100,14 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
     this.PRIORITY_FEE_MULTIPLIER = 2;
     this.MAX_FEE_PER_GAS = 2e7;
     this.MAX_PRIORITY_FEE_PER_GAS = 21e6;
+    this.RETRY_CONFIG = {
+      intervalMs: 200,
+      multiplier: 1.1,
+      maxRetries: 10
+    };
   }
   static async build(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig) {
-    const acpContractClient = new _AcpContractClient(
-      agentWalletAddress,
-      config
-    );
+    const acpContractClient = new _AcpContractClient(agentWalletAddress, config);
     await acpContractClient.init(walletPrivateKey, sessionEntityKeyId);
     return acpContractClient;
   }
@@ -5134,7 +5138,11 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
         `ACP Contract Client validation failed: agent account ${this.agentWalletAddress} is not deployed on-chain`
       );
     }
-    await this.validateSessionKeyOnChain(sessionSignerAddress, sessionEntityKeyId);
+    await this.validateSessionKeyOnChain(
+      sessionSignerAddress,
+      sessionEntityKeyId
+    );
+    this.RETRY_CONFIG = this.config.retryConfig || this.RETRY_CONFIG;
     console.log("Connected to ACP with v1 Contract Client (Legacy):", {
       agentWalletAddress: this.agentWalletAddress,
       whitelistedWalletAddress: sessionSignerAddress,
@@ -5167,44 +5175,52 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
     return finalMaxFeePerGas;
   }
   async handleOperation(operations) {
-    const payload = {
+    const basePayload = {
       uo: operations.map((op) => ({
         target: op.contractAddress,
         data: op.data,
         value: op.value
-      })),
-      overrides: {
-        nonceKey: this.getRandomNonce()
-      }
+      }))
     };
-    let retries = this.config.maxRetries;
+    let iteration = 0;
     let finalError;
-    while (retries > 0) {
+    while (iteration < this.config.maxRetries) {
       try {
-        if (this.config.maxRetries > retries) {
-          const gasFees = await this.calculateGasFees();
-          payload["overrides"] = {
-            maxFeePerGas: `0x${gasFees.toString(16)}`
-          };
-        }
+        const currentMultiplier = 1 + 0.1 * (iteration + 1);
+        const payload = {
+          ...basePayload,
+          overrides: {
+            nonceKey: this.getRandomNonce(),
+            maxFeePerGas: {
+              multiplier: currentMultiplier
+            },
+            maxPriorityFeePerGas: {
+              multiplier: currentMultiplier
+            }
+          }
+        };
         const { hash } = await this.sessionKeyClient.sendUserOperation(payload);
         const txnHash = await this.sessionKeyClient.waitForUserOperationTransaction({
-          hash
+          hash,
+          tag: "pending",
+          retries: this.RETRY_CONFIG
         });
         return { userOpHash: hash, txnHash };
       } catch (error) {
-        retries -= 1;
-        if (retries === 0) {
+        iteration++;
+        if (iteration === this.config.maxRetries) {
           finalError = error;
           break;
         }
-        await new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
+        await new Promise((resolve) => setTimeout(resolve, 2e3 * iteration));
       }
     }
     throw new acpError_default(`Failed to send user operation`, finalError);
   }
   async getJobId(createJobUserOpHash, clientAddress, providerAddress) {
-    const result = await this.sessionKeyClient.getUserOperationReceipt(createJobUserOpHash);
+    const result = await this.sessionKeyClient.getUserOperationReceipt(
+      createJobUserOpHash
+    );
     if (!result) {
       throw new acpError_default("Failed to get user operation receipt");
     }
@@ -6028,6 +6044,12 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     this.PRIORITY_FEE_MULTIPLIER = 2;
     this.MAX_FEE_PER_GAS = 2e7;
     this.MAX_PRIORITY_FEE_PER_GAS = 21e6;
+    this.GAS_FEE_MULTIPLIER = 0.5;
+    this.RETRY_CONFIG = {
+      intervalMs: 200,
+      multiplier: 1.1,
+      maxRetries: 10
+    };
   }
   static async build(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfigV2) {
     const publicClient = createPublicClient4({
@@ -6095,7 +6117,11 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
         `ACP Contract Client validation failed: agent account ${this.agentWalletAddress} is not deployed on-chain`
       );
     }
-    await this.validateSessionKeyOnChain(sessionSignerAddress, sessionEntityKeyId);
+    await this.validateSessionKeyOnChain(
+      sessionSignerAddress,
+      sessionEntityKeyId
+    );
+    this.RETRY_CONFIG = this.config.retryConfig || this.RETRY_CONFIG;
     console.log("Connected to ACP:", {
       agentWalletAddress: this.agentWalletAddress,
       whitelistedWalletAddress: sessionSignerAddress,
@@ -6128,44 +6154,44 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     return finalMaxFeePerGas;
   }
   async handleOperation(operations) {
-    const payload = {
+    const basePayload = {
       uo: operations.map((operation) => ({
         target: operation.contractAddress,
         data: operation.data,
         value: operation.value
-      })),
-      overrides: {
-        nonceKey: this.getRandomNonce()
-      }
+      }))
     };
-    let retries = this.config.maxRetries;
+    let iteration = 0;
     let finalError;
-    while (retries > 0) {
+    while (iteration < this.config.maxRetries) {
       try {
-        if (this.config.maxRetries > retries) {
-          const gasFees = await this.calculateGasFees();
-          payload["overrides"] = {
-            maxFeePerGas: `0x${gasFees.toString(16)}`
-          };
-        }
+        const currentMultiplier = 1 + 0.1 * (iteration + 1);
+        const payload = {
+          ...basePayload,
+          overrides: {
+            nonceKey: this.getRandomNonce(),
+            maxFeePerGas: {
+              multiplier: currentMultiplier
+            },
+            maxPriorityFeePerGas: {
+              multiplier: currentMultiplier
+            }
+          }
+        };
         const { hash } = await this.sessionKeyClient.sendUserOperation(payload);
         const txnHash = await this.sessionKeyClient.waitForUserOperationTransaction({
           hash,
           tag: "pending",
-          retries: {
-            intervalMs: 200,
-            multiplier: 1.1,
-            maxRetries: 10
-          }
+          retries: this.RETRY_CONFIG
         });
         return { userOpHash: hash, txnHash };
       } catch (error) {
-        retries -= 1;
-        if (retries === 0) {
+        iteration++;
+        if (iteration === this.config.maxRetries) {
           finalError = error;
           break;
         }
-        await new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
+        await new Promise((resolve) => setTimeout(resolve, 2e3 * iteration));
       }
     }
     throw new acpError_default(`Failed to send user operation`, finalError);

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@virtuals-protocol/acp-node",
-  "version": "0.3.0-beta.20",
+  "version": "0.3.0-beta.22",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "scripts": {
     "test": "jest",
+    "test:unit": "jest test/unit test/component",
     "test:ci": "jest --ci --reporters=default --reporters=jest-junit",
     "test:watch": "jest --watch",
     "test:coverage": "jest --coverage",