@virtuals-protocol/acp-node 0.3.0-beta.21 → 0.3.0-beta.23

package/dist/index.d.mts

@@ -579,8 +579,17 @@ declare class AcpContractConfig {
     maxRetries: number;
     rpcEndpoint?: string | undefined;
     x402Config?: X402Config | undefined;
+    retryConfig?: {
+        intervalMs: number;
+        multiplier: number;
+        maxRetries: number;
+    } | undefined;
     chains: ChainConfig[];
-    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, chains?: ChainConfig[]);
+    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, chains?: ChainConfig[]);
 }
 declare const baseSepoliaAcpConfig: AcpContractConfig;
 declare const baseSepoliaAcpConfigV2: AcpContractConfig;
@@ -737,6 +746,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);
@@ -9023,6 +9033,7 @@ declare class AcpContractClientV2 extends BaseAcpContractClient {
     private MAX_FEE_PER_GAS;
     private MAX_PRIORITY_FEE_PER_GAS;
     private GAS_FEE_MULTIPLIER;
+    private RETRY_CONFIG;
     private _sessionKeyClient;
     private _sessionKeyClients;
     private _acpX402;

package/dist/index.d.ts

@@ -579,8 +579,17 @@ declare class AcpContractConfig {
     maxRetries: number;
     rpcEndpoint?: string | undefined;
     x402Config?: X402Config | undefined;
+    retryConfig?: {
+        intervalMs: number;
+        multiplier: number;
+        maxRetries: number;
+    } | undefined;
     chains: ChainConfig[];
-    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, chains?: ChainConfig[]);
+    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, chains?: ChainConfig[]);
 }
 declare const baseSepoliaAcpConfig: AcpContractConfig;
 declare const baseSepoliaAcpConfigV2: AcpContractConfig;
@@ -737,6 +746,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);
@@ -9023,6 +9033,7 @@ declare class AcpContractClientV2 extends BaseAcpContractClient {
     private MAX_FEE_PER_GAS;
     private MAX_PRIORITY_FEE_PER_GAS;
     private GAS_FEE_MULTIPLIER;
+    private RETRY_CONFIG;
     private _sessionKeyClient;
     private _sessionKeyClients;
     private _acpX402;

package/dist/index.js

@@ -35,7 +35,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.3.0-beta.21",
+      version: "0.3.0-beta.23",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -2343,7 +2343,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, chains = []) {
+  constructor(chain, contractAddress, baseFare, alchemyRpcUrl, acpUrl, abi, maxRetries, rpcEndpoint, x402Config, retryConfig, chains = []) {
     this.chain = chain;
     this.contractAddress = contractAddress;
     this.baseFare = baseFare;
@@ -2353,6 +2353,7 @@ var AcpContractConfig2 = class {
     this.maxRetries = maxRetries;
     this.rpcEndpoint = rpcEndpoint;
     this.x402Config = x402Config;
+    this.retryConfig = retryConfig;
     this.chains = chains;
   }
 };
@@ -5408,6 +5409,11 @@ 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);
@@ -5445,6 +5451,7 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
       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,
@@ -5477,38 +5484,44 @@ 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);
@@ -7476,6 +7489,11 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     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
+    };
     this._sessionKeyClients = {};
   }
   static async build(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfigV2) {
@@ -7571,6 +7589,7 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
       sessionSignerAddress,
       sessionEntityKeyId
     );
+    this.RETRY_CONFIG = this.config.retryConfig || this.RETRY_CONFIG;
     console.log("Connected to ACP:", {
       agentWalletAddress: this.agentWalletAddress,
       whitelistedWalletAddress: sessionSignerAddress,
@@ -7612,34 +7631,34 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     if (!sessionKeyClient) {
       throw new acpError_default("Session key client not initialized");
     }
-    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 sessionKeyClient.sendUserOperation(payload);
         const checkTransactionConfig = {
           hash,
-          retries: {
-            intervalMs: 200,
-            multiplier: 1.1,
-            maxRetries: 10
-          }
+          retries: this.RETRY_CONFIG
         };
         if (!chainId || chainId === import_chains3.baseSepolia.id || chainId === import_chains3.base.id) {
           checkTransactionConfig["tag"] = "pending";
@@ -7649,12 +7668,12 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
         );
         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,7 +8,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.3.0-beta.21",
+      version: "0.3.0-beta.23",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -2297,7 +2297,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, chains = []) {
+  constructor(chain, contractAddress, baseFare, alchemyRpcUrl, acpUrl, abi, maxRetries, rpcEndpoint, x402Config, retryConfig, chains = []) {
     this.chain = chain;
     this.contractAddress = contractAddress;
     this.baseFare = baseFare;
@@ -2307,6 +2307,7 @@ var AcpContractConfig2 = class {
     this.maxRetries = maxRetries;
     this.rpcEndpoint = rpcEndpoint;
     this.x402Config = x402Config;
+    this.retryConfig = retryConfig;
     this.chains = chains;
   }
 };
@@ -5380,6 +5381,11 @@ 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);
@@ -5417,6 +5423,7 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
       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,
@@ -5449,38 +5456,44 @@ 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);
@@ -7450,6 +7463,11 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     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
+    };
     this._sessionKeyClients = {};
   }
   static async build(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfigV2) {
@@ -7545,6 +7563,7 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
       sessionSignerAddress,
       sessionEntityKeyId
     );
+    this.RETRY_CONFIG = this.config.retryConfig || this.RETRY_CONFIG;
     console.log("Connected to ACP:", {
       agentWalletAddress: this.agentWalletAddress,
       whitelistedWalletAddress: sessionSignerAddress,
@@ -7586,34 +7605,34 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     if (!sessionKeyClient) {
       throw new acpError_default("Session key client not initialized");
     }
-    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 sessionKeyClient.sendUserOperation(payload);
         const checkTransactionConfig = {
           hash,
-          retries: {
-            intervalMs: 200,
-            multiplier: 1.1,
-            maxRetries: 10
-          }
+          retries: this.RETRY_CONFIG
         };
         if (!chainId || chainId === baseSepolia4.id || chainId === base4.id) {
           checkTransactionConfig["tag"] = "pending";
@@ -7623,12 +7642,12 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
         );
         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,6 +1,6 @@
 {
   "name": "@virtuals-protocol/acp-node",
-  "version": "0.3.0-beta.21",
+  "version": "0.3.0-beta.23",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",