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

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.22",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -1239,10 +1239,7 @@ import {
 } from "viem";
 
 // src/configs/acpConfigs.ts
-import {
-  baseSepolia,
-  base
-} from "@account-kit/infra";
+import { baseSepolia, base } from "@account-kit/infra";
 
 // src/acpFare.ts
 import {
@@ -1270,42 +1267,27 @@ var acpError_default = AcpError;
 
 // src/acpFare.ts
 var Fare = class _Fare {
-  constructor(contractAddress, decimals, chainId) {
+  constructor(contractAddress, decimals) {
     this.contractAddress = contractAddress;
     this.decimals = decimals;
-    this.chainId = chainId;
   }
   formatAmount(amount) {
     return parseUnits(amount.toString(), this.decimals);
   }
-  static async fromContractAddress(contractAddress, config = baseAcpConfig, chainId = config.chain.id) {
+  static async fromContractAddress(contractAddress, config = baseAcpConfig) {
     if (contractAddress === config.baseFare.contractAddress) {
       return config.baseFare;
     }
-    let chainConfig = config.chain;
-    let rpcUrl = config.rpcEndpoint;
-    if (chainId !== config.chain.id) {
-      const selectedConfig = config.chains?.find(
-        (chain) => chain.chain.id === chainId
-      );
-      if (!selectedConfig) {
-        throw new acpError_default(
-          `Chain configuration for chainId ${chainId} not found.`
-        );
-      }
-      chainConfig = selectedConfig.chain;
-      rpcUrl = selectedConfig.rpcUrl;
-    }
     const publicClient = createPublicClient({
-      chain: chainConfig,
-      transport: http(rpcUrl)
+      chain: config.chain,
+      transport: http(config.rpcEndpoint)
     });
     const decimals = await publicClient.readContract({
       address: contractAddress,
       abi: erc20Abi,
       functionName: "decimals"
     });
-    return new _Fare(contractAddress, decimals, chainId);
+    return new _Fare(contractAddress, decimals);
   }
 };
 var FareAmountBase = class {
@@ -1724,34 +1706,6 @@ var ACP_V2_ABI = [
     stateMutability: "nonpayable",
     type: "function"
   },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "string", name: "content", type: "string" },
-      { internalType: "address", name: "token", type: "address" },
-      { internalType: "uint256", name: "amount", type: "uint256" },
-      { internalType: "address", name: "recipient", type: "address" },
-      { internalType: "uint256", name: "feeAmount", type: "uint256" },
-      { internalType: "enum ACPTypes.FeeType", name: "feeType", type: "uint8" },
-      {
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      { internalType: "uint256", name: "expiredAt", type: "uint256" },
-      { internalType: "bool", name: "isSecured", type: "bool" },
-      {
-        internalType: "enum ACPTypes.JobPhase",
-        name: "nextPhase",
-        type: "uint8"
-      },
-      { internalType: "uint32", name: "lzDstEid", type: "uint32" }
-    ],
-    name: "createCrossChainPayableMemo",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
   {
     inputs: [
       { internalType: "address", name: "provider", type: "address" },
@@ -1936,12 +1890,7 @@ var ACP_V2_ABI = [
             name: "nextPhase",
             type: "uint8"
           },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
+          { internalType: "uint256", name: "expiredAt", type: "uint256" }
         ],
         internalType: "struct ACPTypes.Memo[]",
         name: "memos",
@@ -1988,12 +1937,7 @@ var ACP_V2_ABI = [
             name: "nextPhase",
             type: "uint8"
           },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
+          { internalType: "uint256", name: "expiredAt", type: "uint256" }
         ],
         internalType: "struct ACPTypes.Memo[]",
         name: "memos",
@@ -2036,12 +1980,7 @@ var ACP_V2_ABI = [
             name: "nextPhase",
             type: "uint8"
           },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
+          { internalType: "uint256", name: "expiredAt", type: "uint256" }
         ],
         internalType: "struct ACPTypes.Memo[]",
         name: "memos",
@@ -2297,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, chains = []) {
+  constructor(chain, contractAddress, baseFare, alchemyRpcUrl, acpUrl, abi, maxRetries, rpcEndpoint, x402Config, retryConfig) {
     this.chain = chain;
     this.contractAddress = contractAddress;
     this.baseFare = baseFare;
@@ -2307,7 +2246,7 @@ var AcpContractConfig2 = class {
     this.maxRetries = maxRetries;
     this.rpcEndpoint = rpcEndpoint;
     this.x402Config = x402Config;
-    this.chains = chains;
+    this.retryConfig = retryConfig;
   }
 };
 var baseSepoliaAcpConfig = new AcpContractConfig2(
@@ -3535,10 +3474,7 @@ var SINGLE_SIGNER_VALIDATION_MODULE_ABI = [
 var singleSignerValidationModuleAbi_default = SINGLE_SIGNER_VALIDATION_MODULE_ABI;
 
 // src/constants.ts
-import {
-  base as base2,
-  baseSepolia as baseSepolia2
-} from "viem/chains";
+import { base as base2, baseSepolia as baseSepolia2 } from "viem/chains";
 var USDC_TOKEN_ADDRESS = {
   [baseSepolia2.id]: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
   [base2.id]: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
@@ -3586,7 +3522,6 @@ var BaseAcpContractClient = class {
   constructor(agentWalletAddress, config = baseAcpConfig) {
     this.agentWalletAddress = agentWalletAddress;
     this.config = config;
-    this.publicClients = {};
     this.chain = config.chain;
     this.abi = config.abi;
     this.contractAddress = config.contractAddress;
@@ -3686,12 +3621,12 @@ ${JSON.stringify(
       throw new acpError_default("Failed to create job", error);
     }
   }
-  approveAllowance(amountBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress, targetAddress) {
+  approveAllowance(amountBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress) {
     try {
       const data = encodeFunctionData({
         abi: erc20Abi2,
         functionName: "approve",
-        args: [targetAddress ?? this.contractAddress, amountBaseUnit]
+        args: [this.contractAddress, amountBaseUnit]
       });
       const payload = {
         data,
@@ -3730,35 +3665,6 @@ ${JSON.stringify(
       throw new acpError_default("Failed to create payable memo", error);
     }
   }
-  createCrossChainPayableMemo(jobId, content, token, amountBaseUnit, recipient, feeAmountBaseUnit, feeType, type, expiredAt, nextPhase, destinationEid, secured = true) {
-    try {
-      const data = encodeFunctionData({
-        abi: this.abi,
-        functionName: "createCrossChainPayableMemo",
-        args: [
-          jobId,
-          content,
-          token,
-          amountBaseUnit,
-          recipient,
-          feeAmountBaseUnit,
-          feeType,
-          type,
-          expiredAt,
-          secured,
-          nextPhase,
-          destinationEid
-        ]
-      });
-      const payload = {
-        data,
-        contractAddress: this.contractAddress
-      };
-      return payload;
-    } catch (error) {
-      throw new acpError_default("Failed to create cross chain payable memo", error);
-    }
-  }
   createMemo(jobId, content, type, isSecured, nextPhase) {
     try {
       const data = encodeFunctionData({
@@ -3775,22 +3681,6 @@ ${JSON.stringify(
       throw new acpError_default("Failed to create memo", error);
     }
   }
-  createMemoWithMetadata(jobId, content, type, isSecured, nextPhase, metadata) {
-    try {
-      const data = encodeFunctionData({
-        abi: this.abi,
-        functionName: "createMemoWithMetadata",
-        args: [jobId, content, type, isSecured, nextPhase, metadata]
-      });
-      const payload = {
-        data,
-        contractAddress: this.contractAddress
-      };
-      return payload;
-    } catch (error) {
-      throw new acpError_default("Failed to create memo with metadata", error);
-    }
-  }
   signMemo(memoId, isApproved, reason) {
     try {
       const data = encodeFunctionData({
@@ -3876,47 +3766,9 @@ ${JSON.stringify(
       throw new acpError_default("Failed to submit TransferWithAuthorization", error);
     }
   }
-  async getERC20Balance(chainId, tokenAddress, walletAddress) {
-    const publicClient = this.publicClients[chainId];
-    if (!publicClient) {
-      throw new acpError_default(`Public client for chainId ${chainId} not found`);
-    }
-    return await publicClient.readContract({
-      address: tokenAddress,
-      abi: erc20Abi2,
-      functionName: "balanceOf",
-      args: [walletAddress]
-    });
-  }
-  async getERC20Allowance(chainId, tokenAddress, walletAddress, spenderAddress) {
-    const publicClient = this.publicClients[chainId];
-    if (!publicClient) {
-      throw new acpError_default(`Public client for chainId ${chainId} not found`);
-    }
-    return await publicClient.readContract({
-      address: tokenAddress,
-      abi: erc20Abi2,
-      functionName: "allowance",
-      args: [walletAddress, spenderAddress]
-    });
-  }
-  async getERC20Symbol(chainId, tokenAddress) {
-    const publicClient = this.publicClients[chainId];
-    if (!publicClient) {
-      throw new acpError_default(`Public client for chainId ${chainId} not found`);
-    }
-    return await publicClient.readContract({
-      address: tokenAddress,
-      abi: erc20Abi2,
-      functionName: "symbol"
-    });
-  }
 };
 var baseAcpContractClient_default = BaseAcpContractClient;
 
-// src/acpJob.ts
-import { formatUnits } from "viem";
-
 // src/interfaces.ts
 var AcpMemoStatus = /* @__PURE__ */ ((AcpMemoStatus2) => {
   AcpMemoStatus2["PENDING"] = "PENDING";
@@ -3924,15 +3776,6 @@ var AcpMemoStatus = /* @__PURE__ */ ((AcpMemoStatus2) => {
   AcpMemoStatus2["REJECTED"] = "REJECTED";
   return AcpMemoStatus2;
 })(AcpMemoStatus || {});
-var AcpMemoState = /* @__PURE__ */ ((AcpMemoState2) => {
-  AcpMemoState2[AcpMemoState2["NONE"] = 0] = "NONE";
-  AcpMemoState2[AcpMemoState2["PENDING"] = 1] = "PENDING";
-  AcpMemoState2[AcpMemoState2["IN_PROGRESS"] = 2] = "IN_PROGRESS";
-  AcpMemoState2[AcpMemoState2["READY"] = 3] = "READY";
-  AcpMemoState2[AcpMemoState2["COMPLETED"] = 4] = "COMPLETED";
-  AcpMemoState2[AcpMemoState2["REJECTED"] = 5] = "REJECTED";
-  return AcpMemoState2;
-})(AcpMemoState || {});
 var AcpAgentSort = /* @__PURE__ */ ((AcpAgentSort2) => {
   AcpAgentSort2["SUCCESSFUL_JOB_COUNT"] = "successfulJobCount";
   AcpAgentSort2["SUCCESS_RATE"] = "successRate";
@@ -3971,19 +3814,6 @@ var PositionDirection = /* @__PURE__ */ ((PositionDirection2) => {
 })(PositionDirection || {});
 
 // src/utils.ts
-import { decodeAbiParameters, encodeAbiParameters } from "viem";
-import {
-  arbitrum as arbitrum3,
-  arbitrumSepolia as arbitrumSepolia3,
-  base as base3,
-  baseSepolia as baseSepolia3,
-  bsc as bsc3,
-  bscTestnet as bscTestnet3,
-  mainnet as mainnet3,
-  polygon as polygon3,
-  polygonAmoy as polygonAmoy3,
-  sepolia as sepolia3
-} from "viem/chains";
 function tryParseJson(content) {
   try {
     return JSON.parse(content);
@@ -4000,31 +3830,6 @@ function safeBase64Encode(data) {
   }
   return Buffer.from(data).toString("base64");
 }
-function getDestinationEndpointId(chainId) {
-  switch (chainId) {
-    case baseSepolia3.id:
-      return 40245;
-    case sepolia3.id:
-      return 40161;
-    case polygonAmoy3.id:
-      return 40267;
-    case arbitrumSepolia3.id:
-      return 40231;
-    case bscTestnet3.id:
-      return 40102;
-    case base3.id:
-      return 30184;
-    case mainnet3.id:
-      return 30101;
-    case polygon3.id:
-      return 30109;
-    case arbitrum3.id:
-      return 30110;
-    case bsc3.id:
-      return 30102;
-  }
-  throw new Error(`Unsupported chain ID: ${chainId}`);
-}
 
 // src/acpJobOffering.ts
 import { zeroAddress as zeroAddress2 } from "viem";
@@ -4227,43 +4032,25 @@ var AcpJob = class {
     }
     const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
     const isPercentagePricing = this.priceType === "percentage" /* PERCENTAGE */;
-    if (amount.fare.chainId && amount.fare.chainId !== this.acpContractClient.config.chain.id) {
-      operations.push(
-        this.acpContractClient.createCrossChainPayableMemo(
-          this.id,
-          content,
-          amount.fare.contractAddress,
-          amount.amount,
-          recipient,
-          isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
-          isPercentagePricing ? 3 /* PERCENTAGE_FEE */ : 0 /* NO_FEE */,
-          type,
-          expiredAt,
-          2 /* TRANSACTION */,
-          getDestinationEndpointId(amount.fare.chainId)
-        )
-      );
-    } else {
-      operations.push(
-        this.acpContractClient.createPayableMemo(
-          this.id,
-          content,
-          amount.amount,
-          recipient,
-          isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
-          isPercentagePricing ? 3 /* PERCENTAGE_FEE */ : 0 /* NO_FEE */,
-          2 /* TRANSACTION */,
-          type,
-          expiredAt,
-          amount.fare.contractAddress
-        )
-      );
-    }
+    operations.push(
+      this.acpContractClient.createPayableMemo(
+        this.id,
+        content,
+        amount.amount,
+        recipient,
+        isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
+        isPercentagePricing ? 3 /* PERCENTAGE_FEE */ : 0 /* NO_FEE */,
+        2 /* TRANSACTION */,
+        type,
+        expiredAt,
+        amount.fare.contractAddress
+      )
+    );
     return await this.acpContractClient.handleOperation(operations);
   }
   async payAndAcceptRequirement(reason) {
     const memo = this.memos.find(
-      (m) => m.nextPhase === 2 /* TRANSACTION */ || m.nextPhase === 4 /* COMPLETED */
+      (m) => m.nextPhase === 2 /* TRANSACTION */
     );
     if (!memo) {
       throw new acpError_default("No notification memo found");
@@ -4391,9 +4178,6 @@ var AcpJob = class {
     if (this.latestMemo?.nextPhase !== 3 /* EVALUATION */) {
       throw new acpError_default("No transaction memo found");
     }
-    if (amount.fare.chainId !== this.acpContractClient.config.chain.id) {
-      return await this.deliverCrossChainPayable(this.clientAddress, amount);
-    }
     const operations = [];
     operations.push(
       this.acpContractClient.approveAllowance(
@@ -4524,57 +4308,6 @@ var AcpJob = class {
       waitMs = Math.min(waitMs * 2, maxWaitMs);
     }
   }
-  async deliverCrossChainPayable(recipient, amount, isRequest = false) {
-    if (!amount.fare.chainId) {
-      throw new acpError_default("Chain ID is required for cross chain payable");
-    }
-    const chainId = amount.fare.chainId;
-    const assetManagerAddress = await this.acpContractClient.getAssetManager();
-    const tokenBalance = await this.acpContractClient.getERC20Balance(
-      chainId,
-      amount.fare.contractAddress,
-      this.acpContractClient.agentWalletAddress
-    );
-    if (tokenBalance < amount.amount) {
-      throw new acpError_default("Insufficient token balance for cross chain payable");
-    }
-    const currentAllowance = await this.acpContractClient.getERC20Allowance(
-      chainId,
-      amount.fare.contractAddress,
-      this.acpContractClient.agentWalletAddress,
-      assetManagerAddress
-    );
-    const approveAllowanceOperation = this.acpContractClient.approveAllowance(
-      amount.amount + currentAllowance,
-      amount.fare.contractAddress,
-      assetManagerAddress
-    );
-    await this.acpContractClient.handleOperation(
-      [approveAllowanceOperation],
-      chainId
-    );
-    const tokenSymbol = await this.acpContractClient.getERC20Symbol(
-      chainId,
-      amount.fare.contractAddress
-    );
-    const createMemoOperation = this.acpContractClient.createCrossChainPayableMemo(
-      this.id,
-      `Performing cross chain payable transfer of ${formatUnits(
-        amount.amount,
-        amount.fare.decimals
-      )} ${tokenSymbol} to ${recipient}`,
-      amount.fare.contractAddress,
-      amount.amount,
-      recipient,
-      BigInt(0),
-      0 /* NO_FEE */,
-      isRequest ? 6 /* PAYABLE_REQUEST */ : 7 /* PAYABLE_TRANSFER */,
-      new Date(Date.now() + 1e3 * 60 * 5),
-      isRequest ? 2 /* TRANSACTION */ : 4 /* COMPLETED */,
-      getDestinationEndpointId(chainId)
-    );
-    await this.acpContractClient.handleOperation([createMemoOperation]);
-  }
   [util.inspect.custom]() {
     return {
       id: this.id,
@@ -4598,7 +4331,7 @@ var acpJob_default = AcpJob;
 // src/acpMemo.ts
 import util2 from "util";
 var AcpMemo = class {
-  constructor(contractClient, id, type, content, nextPhase, status, senderAddress, signedReason, expiry, payableDetails, txHash, signedTxHash, state) {
+  constructor(contractClient, id, type, content, nextPhase, status, senderAddress, signedReason, expiry, payableDetails, txHash, signedTxHash) {
     this.contractClient = contractClient;
     this.id = id;
     this.type = type;
@@ -4611,7 +4344,6 @@ var AcpMemo = class {
     this.payableDetails = payableDetails;
     this.txHash = txHash;
     this.signedTxHash = signedTxHash;
-    this.state = state;
     if (this.payableDetails) {
       this.payableDetails.amount = BigInt(this.payableDetails.amount);
       this.payableDetails.feeAmount = BigInt(this.payableDetails.feeAmount);
@@ -4762,8 +4494,7 @@ var AcpClient = class {
                 memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
                 memo.payableDetails,
                 memo.txHash,
-                memo.signedTxHash,
-                memo.state
+                memo.signedTxHash
               );
             }),
             data.phase,
@@ -4801,8 +4532,7 @@ var AcpClient = class {
                 memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
                 memo.payableDetails,
                 memo.txHash,
-                memo.signedTxHash,
-                memo.state
+                memo.signedTxHash
               );
             }),
             data.phase,
@@ -4827,14 +4557,7 @@ var AcpClient = class {
     process.on("SIGTERM", cleanup);
   }
   async browseAgents(keyword, options) {
-    let {
-      cluster,
-      sort_by,
-      top_k,
-      graduationStatus,
-      onlineStatus,
-      showHiddenOfferings
-    } = options;
+    let { cluster, sort_by, top_k, graduationStatus, onlineStatus, showHiddenOfferings } = options;
     top_k = top_k ?? 5;
     let url = `${this.acpUrl}/api/agents/v4/search?search=${keyword}`;
     if (sort_by && sort_by.length > 0) {
@@ -5025,8 +4748,7 @@ var AcpClient = class {
             memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
             memo.payableDetails,
             memo.txHash,
-            memo.signedTxHash,
-            memo.state
+            memo.signedTxHash
           )
         );
         jobs.push(
@@ -5100,8 +4822,7 @@ var AcpClient = class {
           memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
           memo.payableDetails,
           memo.txHash,
-          memo.signedTxHash,
-          memo.state
+          memo.signedTxHash
         )
       );
       return new acpJob_default(
@@ -5160,8 +4881,7 @@ var AcpClient = class {
         memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
         memo.payableDetails,
         memo.txHash,
-        memo.signedTxHash,
-        memo.state
+        memo.signedTxHash
       );
     } catch (err) {
       throw new acpError_default(
@@ -5380,6 +5100,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 +5142,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 +5175,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);
@@ -5587,9 +5319,6 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
   async performX402Request(url, version2, budget, signature) {
     return await this.acpX402.performRequest(url, version2, budget, signature);
   }
-  async getAssetManager() {
-    throw new Error("Asset Manager not supported");
-  }
   getAcpVersion() {
     return "1";
   }
@@ -6306,1229 +6035,76 @@ var JOB_MANAGER_ABI = [
 var jobManagerAbi_default = JOB_MANAGER_ABI;
 
 // src/contractClients/acpContractClientV2.ts
-import { base as base4, baseSepolia as baseSepolia4 } from "viem/chains";
-
-// src/abis/memoManagerAbi.ts
-var MEMO_MANAGER_ABI = [
-  { inputs: [], stateMutability: "nonpayable", type: "constructor" },
-  { inputs: [], name: "AccessControlBadConfirmation", type: "error" },
-  {
-    inputs: [
-      { internalType: "address", name: "account", type: "address" },
-      { internalType: "bytes32", name: "neededRole", type: "bytes32" }
-    ],
-    name: "AccessControlUnauthorizedAccount",
-    type: "error"
-  },
-  {
-    inputs: [{ internalType: "address", name: "target", type: "address" }],
-    name: "AddressEmptyCode",
-    type: "error"
-  },
-  { inputs: [], name: "AlreadyVoted", type: "error" },
-  { inputs: [], name: "CannotApproveMemo", type: "error" },
-  { inputs: [], name: "CannotUpdateApprovedMemo", type: "error" },
-  { inputs: [], name: "CannotUpdateMemo", type: "error" },
-  { inputs: [], name: "CannotWithdrawYet", type: "error" },
-  { inputs: [], name: "DestinationChainNotConfigured", type: "error" },
-  {
-    inputs: [
-      { internalType: "address", name: "implementation", type: "address" }
-    ],
-    name: "ERC1967InvalidImplementation",
-    type: "error"
-  },
-  { inputs: [], name: "ERC1967NonPayable", type: "error" },
-  { inputs: [], name: "EmptyContent", type: "error" },
-  { inputs: [], name: "FailedInnerCall", type: "error" },
-  { inputs: [], name: "InvalidInitialization", type: "error" },
-  { inputs: [], name: "InvalidMemoState", type: "error" },
-  { inputs: [], name: "InvalidMemoStateTransition", type: "error" },
-  { inputs: [], name: "InvalidMemoType", type: "error" },
-  { inputs: [], name: "JobAlreadyCompleted", type: "error" },
-  { inputs: [], name: "JobDoesNotExist", type: "error" },
-  { inputs: [], name: "MemoAlreadyApproved", type: "error" },
-  { inputs: [], name: "MemoAlreadyExecuted", type: "error" },
-  { inputs: [], name: "MemoAlreadySigned", type: "error" },
-  { inputs: [], name: "MemoCannotBeSigned", type: "error" },
-  { inputs: [], name: "MemoDoesNotExist", type: "error" },
-  { inputs: [], name: "MemoDoesNotRequireApproval", type: "error" },
-  { inputs: [], name: "MemoExpired", type: "error" },
-  { inputs: [], name: "MemoNotApproved", type: "error" },
-  { inputs: [], name: "MemoNotReadyToBeSigned", type: "error" },
-  { inputs: [], name: "MemoStateUnchanged", type: "error" },
-  { inputs: [], name: "NoAmountToTransfer", type: "error" },
-  { inputs: [], name: "NoPaymentAmount", type: "error" },
-  { inputs: [], name: "NotEscrowTransferMemoType", type: "error" },
-  { inputs: [], name: "NotInitializing", type: "error" },
-  { inputs: [], name: "NotPayableMemoType", type: "error" },
-  { inputs: [], name: "OnlyACPContract", type: "error" },
-  { inputs: [], name: "OnlyAssetManager", type: "error" },
-  { inputs: [], name: "OnlyClientOrProvider", type: "error" },
-  { inputs: [], name: "OnlyCounterParty", type: "error" },
-  { inputs: [], name: "OnlyEvaluator", type: "error" },
-  { inputs: [], name: "OnlyMemoSender", type: "error" },
-  { inputs: [], name: "ReentrancyGuardReentrantCall", type: "error" },
-  { inputs: [], name: "UUPSUnauthorizedCallContext", type: "error" },
-  {
-    inputs: [{ internalType: "bytes32", name: "slot", type: "bytes32" }],
-    name: "UUPSUnsupportedProxiableUUID",
-    type: "error"
-  },
-  { inputs: [], name: "ZeroAcpContractAddress", type: "error" },
-  { inputs: [], name: "ZeroAddressRecipient", type: "error" },
-  { inputs: [], name: "ZeroAddressToken", type: "error" },
-  { inputs: [], name: "ZeroAssetManagerAddress", type: "error" },
-  { inputs: [], name: "ZeroJobManagerAddress", type: "error" },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint64",
-        name: "version",
-        type: "uint64"
-      }
-    ],
-    name: "Initialized",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "memoId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "approver",
-        type: "address"
-      },
-      { indexed: false, internalType: "bool", name: "approved", type: "bool" },
-      {
-        indexed: false,
-        internalType: "string",
-        name: "reason",
-        type: "string"
-      }
-    ],
-    name: "MemoSigned",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "memoId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "enum ACPTypes.MemoState",
-        name: "oldState",
-        type: "uint8"
-      },
-      {
-        indexed: false,
-        internalType: "enum ACPTypes.MemoState",
-        name: "newState",
-        type: "uint8"
-      }
-    ],
-    name: "MemoStateUpdated",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "memoId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "jobId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      {
-        indexed: false,
-        internalType: "enum ACPTypes.JobPhase",
-        name: "nextPhase",
-        type: "uint8"
-      },
-      {
-        indexed: false,
-        internalType: "string",
-        name: "content",
-        type: "string"
-      }
-    ],
-    name: "NewMemo",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "jobId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "memoId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "token",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "PayableFeeRefunded",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "jobId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "memoId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "token",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "PayableFundsRefunded",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "memoId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "jobId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "executor",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "PayableMemoExecuted",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, internalType: "bytes32", name: "role", type: "bytes32" },
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "previousAdminRole",
-        type: "bytes32"
-      },
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "newAdminRole",
-        type: "bytes32"
-      }
-    ],
-    name: "RoleAdminChanged",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, internalType: "bytes32", name: "role", type: "bytes32" },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "account",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      }
-    ],
-    name: "RoleGranted",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, internalType: "bytes32", name: "role", type: "bytes32" },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "account",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      }
-    ],
-    name: "RoleRevoked",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "implementation",
-        type: "address"
-      }
-    ],
-    name: "Upgraded",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "ACP_CONTRACT_ROLE",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "ADMIN_ROLE",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "DEFAULT_ADMIN_ROLE",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "UPGRADE_INTERFACE_VERSION",
-    outputs: [{ internalType: "string", name: "", type: "string" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "acpContract",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      { internalType: "address", name: "sender", type: "address" },
-      { internalType: "bool", name: "approved", type: "bool" },
-      { internalType: "string", name: "reason", type: "string" }
-    ],
-    name: "approveMemo",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "assetManager",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256[]", name: "memoIds", type: "uint256[]" },
-      { internalType: "bool", name: "approved", type: "bool" },
-      { internalType: "string", name: "reason", type: "string" }
-    ],
-    name: "bulkApproveMemos",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      { internalType: "address", name: "user", type: "address" }
-    ],
-    name: "canApproveMemo",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "address", name: "sender", type: "address" },
-      { internalType: "string", name: "content", type: "string" },
-      {
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      { internalType: "bool", name: "isSecured", type: "bool" },
-      {
-        internalType: "enum ACPTypes.JobPhase",
-        name: "nextPhase",
-        type: "uint8"
-      },
-      { internalType: "string", name: "metadata", type: "string" }
-    ],
-    name: "createMemo",
-    outputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "address", name: "sender", type: "address" },
-      { internalType: "string", name: "content", type: "string" },
-      {
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      { internalType: "bool", name: "isSecured", type: "bool" },
-      {
-        internalType: "enum ACPTypes.JobPhase",
-        name: "nextPhase",
-        type: "uint8"
-      },
-      {
-        components: [
-          { internalType: "address", name: "token", type: "address" },
-          { internalType: "uint256", name: "amount", type: "uint256" },
-          { internalType: "address", name: "recipient", type: "address" },
-          { internalType: "uint256", name: "feeAmount", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.FeeType",
-            name: "feeType",
-            type: "uint8"
-          },
-          { internalType: "bool", name: "isExecuted", type: "bool" },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          { internalType: "uint32", name: "lzSrcEid", type: "uint32" },
-          { internalType: "uint32", name: "lzDstEid", type: "uint32" }
-        ],
-        internalType: "struct ACPTypes.PayableDetails",
-        name: "payableDetails_",
-        type: "tuple"
-      },
-      { internalType: "uint256", name: "expiredAt", type: "uint256" }
-    ],
-    name: "createPayableMemo",
-    outputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "emergencyApproveMemo",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "executePayableMemo",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "getAssetManager",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "uint256", name: "offset", type: "uint256" },
-      { internalType: "uint256", name: "limit", type: "uint256" }
-    ],
-    name: "getJobMemos",
-    outputs: [
-      {
-        components: [
-          { internalType: "uint256", name: "id", type: "uint256" },
-          { internalType: "uint256", name: "jobId", type: "uint256" },
-          { internalType: "address", name: "sender", type: "address" },
-          { internalType: "string", name: "content", type: "string" },
-          {
-            internalType: "enum ACPTypes.MemoType",
-            name: "memoType",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "createdAt", type: "uint256" },
-          { internalType: "bool", name: "isApproved", type: "bool" },
-          { internalType: "address", name: "approvedBy", type: "address" },
-          { internalType: "uint256", name: "approvedAt", type: "uint256" },
-          { internalType: "bool", name: "requiresApproval", type: "bool" },
-          { internalType: "string", name: "metadata", type: "string" },
-          { internalType: "bool", name: "isSecured", type: "bool" },
-          {
-            internalType: "enum ACPTypes.JobPhase",
-            name: "nextPhase",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
-        ],
-        internalType: "struct ACPTypes.Memo[]",
-        name: "memoArray",
-        type: "tuple[]"
-      },
-      { internalType: "uint256", name: "total", type: "uint256" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "enum ACPTypes.JobPhase", name: "phase", type: "uint8" },
-      { internalType: "uint256", name: "offset", type: "uint256" },
-      { internalType: "uint256", name: "limit", type: "uint256" }
-    ],
-    name: "getJobMemosByPhase",
-    outputs: [
-      {
-        components: [
-          { internalType: "uint256", name: "id", type: "uint256" },
-          { internalType: "uint256", name: "jobId", type: "uint256" },
-          { internalType: "address", name: "sender", type: "address" },
-          { internalType: "string", name: "content", type: "string" },
-          {
-            internalType: "enum ACPTypes.MemoType",
-            name: "memoType",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "createdAt", type: "uint256" },
-          { internalType: "bool", name: "isApproved", type: "bool" },
-          { internalType: "address", name: "approvedBy", type: "address" },
-          { internalType: "uint256", name: "approvedAt", type: "uint256" },
-          { internalType: "bool", name: "requiresApproval", type: "bool" },
-          { internalType: "string", name: "metadata", type: "string" },
-          { internalType: "bool", name: "isSecured", type: "bool" },
-          {
-            internalType: "enum ACPTypes.JobPhase",
-            name: "nextPhase",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
-        ],
-        internalType: "struct ACPTypes.Memo[]",
-        name: "memoArray",
-        type: "tuple[]"
-      },
-      { internalType: "uint256", name: "total", type: "uint256" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      {
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      { internalType: "uint256", name: "offset", type: "uint256" },
-      { internalType: "uint256", name: "limit", type: "uint256" }
-    ],
-    name: "getJobMemosByType",
-    outputs: [
-      {
-        components: [
-          { internalType: "uint256", name: "id", type: "uint256" },
-          { internalType: "uint256", name: "jobId", type: "uint256" },
-          { internalType: "address", name: "sender", type: "address" },
-          { internalType: "string", name: "content", type: "string" },
-          {
-            internalType: "enum ACPTypes.MemoType",
-            name: "memoType",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "createdAt", type: "uint256" },
-          { internalType: "bool", name: "isApproved", type: "bool" },
-          { internalType: "address", name: "approvedBy", type: "address" },
-          { internalType: "uint256", name: "approvedAt", type: "uint256" },
-          { internalType: "bool", name: "requiresApproval", type: "bool" },
-          { internalType: "string", name: "metadata", type: "string" },
-          { internalType: "bool", name: "isSecured", type: "bool" },
-          {
-            internalType: "enum ACPTypes.JobPhase",
-            name: "nextPhase",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
-        ],
-        internalType: "struct ACPTypes.Memo[]",
-        name: "memoArray",
-        type: "tuple[]"
-      },
-      { internalType: "uint256", name: "total", type: "uint256" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "getLocalEid",
-    outputs: [{ internalType: "uint32", name: "", type: "uint32" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "getMemo",
-    outputs: [
-      {
-        components: [
-          { internalType: "uint256", name: "id", type: "uint256" },
-          { internalType: "uint256", name: "jobId", type: "uint256" },
-          { internalType: "address", name: "sender", type: "address" },
-          { internalType: "string", name: "content", type: "string" },
-          {
-            internalType: "enum ACPTypes.MemoType",
-            name: "memoType",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "createdAt", type: "uint256" },
-          { internalType: "bool", name: "isApproved", type: "bool" },
-          { internalType: "address", name: "approvedBy", type: "address" },
-          { internalType: "uint256", name: "approvedAt", type: "uint256" },
-          { internalType: "bool", name: "requiresApproval", type: "bool" },
-          { internalType: "string", name: "metadata", type: "string" },
-          { internalType: "bool", name: "isSecured", type: "bool" },
-          {
-            internalType: "enum ACPTypes.JobPhase",
-            name: "nextPhase",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
-        ],
-        internalType: "struct ACPTypes.Memo",
-        name: "",
-        type: "tuple"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "getMemoApprovalStatus",
-    outputs: [
-      { internalType: "bool", name: "isApproved", type: "bool" },
-      { internalType: "address", name: "approvedBy", type: "address" },
-      { internalType: "uint256", name: "approvedAt", type: "uint256" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "getMemoWithPayableDetails",
-    outputs: [
-      {
-        components: [
-          { internalType: "uint256", name: "id", type: "uint256" },
-          { internalType: "uint256", name: "jobId", type: "uint256" },
-          { internalType: "address", name: "sender", type: "address" },
-          { internalType: "string", name: "content", type: "string" },
-          {
-            internalType: "enum ACPTypes.MemoType",
-            name: "memoType",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "createdAt", type: "uint256" },
-          { internalType: "bool", name: "isApproved", type: "bool" },
-          { internalType: "address", name: "approvedBy", type: "address" },
-          { internalType: "uint256", name: "approvedAt", type: "uint256" },
-          { internalType: "bool", name: "requiresApproval", type: "bool" },
-          { internalType: "string", name: "metadata", type: "string" },
-          { internalType: "bool", name: "isSecured", type: "bool" },
-          {
-            internalType: "enum ACPTypes.JobPhase",
-            name: "nextPhase",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
-        ],
-        internalType: "struct ACPTypes.Memo",
-        name: "memo",
-        type: "tuple"
-      },
-      {
-        components: [
-          { internalType: "address", name: "token", type: "address" },
-          { internalType: "uint256", name: "amount", type: "uint256" },
-          { internalType: "address", name: "recipient", type: "address" },
-          { internalType: "uint256", name: "feeAmount", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.FeeType",
-            name: "feeType",
-            type: "uint8"
-          },
-          { internalType: "bool", name: "isExecuted", type: "bool" },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          { internalType: "uint32", name: "lzSrcEid", type: "uint32" },
-          { internalType: "uint32", name: "lzDstEid", type: "uint32" }
-        ],
-        internalType: "struct ACPTypes.PayableDetails",
-        name: "details",
-        type: "tuple"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "getPayableDetails",
-    outputs: [
-      {
-        components: [
-          { internalType: "address", name: "token", type: "address" },
-          { internalType: "uint256", name: "amount", type: "uint256" },
-          { internalType: "address", name: "recipient", type: "address" },
-          { internalType: "uint256", name: "feeAmount", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.FeeType",
-            name: "feeType",
-            type: "uint8"
-          },
-          { internalType: "bool", name: "isExecuted", type: "bool" },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          { internalType: "uint32", name: "lzSrcEid", type: "uint32" },
-          { internalType: "uint32", name: "lzDstEid", type: "uint32" }
-        ],
-        internalType: "struct ACPTypes.PayableDetails",
-        name: "",
-        type: "tuple"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "bytes32", name: "role", type: "bytes32" }],
-    name: "getRoleAdmin",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "bytes32", name: "role", type: "bytes32" },
-      { internalType: "address", name: "account", type: "address" }
-    ],
-    name: "grantRole",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "bytes32", name: "role", type: "bytes32" },
-      { internalType: "address", name: "account", type: "address" }
-    ],
-    name: "hasRole",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "acpContract_", type: "address" },
-      { internalType: "address", name: "jobManager_", type: "address" },
-      { internalType: "address", name: "paymentManager_", type: "address" }
-    ],
-    name: "initialize",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "address", name: "user", type: "address" }
-    ],
-    name: "isJobEvaluator",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      { internalType: "address", name: "user", type: "address" }
-    ],
-    name: "isMemoSigner",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "isPayable",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "jobManager",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "", type: "uint256" },
-      { internalType: "uint256", name: "", type: "uint256" }
-    ],
-    name: "jobMemos",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "", type: "uint256" },
-      { internalType: "enum ACPTypes.JobPhase", name: "", type: "uint8" },
-      { internalType: "uint256", name: "", type: "uint256" }
-    ],
-    name: "jobMemosByPhase",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "", type: "uint256" },
-      { internalType: "enum ACPTypes.MemoType", name: "", type: "uint8" },
-      { internalType: "uint256", name: "", type: "uint256" }
-    ],
-    name: "jobMemosByType",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "", type: "uint256" },
-      { internalType: "address", name: "", type: "address" }
-    ],
-    name: "memoApprovals",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "memoCounter",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    name: "memos",
-    outputs: [
-      { internalType: "uint256", name: "id", type: "uint256" },
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "address", name: "sender", type: "address" },
-      { internalType: "string", name: "content", type: "string" },
-      {
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      { internalType: "uint256", name: "createdAt", type: "uint256" },
-      { internalType: "bool", name: "isApproved", type: "bool" },
-      { internalType: "address", name: "approvedBy", type: "address" },
-      { internalType: "uint256", name: "approvedAt", type: "uint256" },
-      { internalType: "bool", name: "requiresApproval", type: "bool" },
-      { internalType: "string", name: "metadata", type: "string" },
-      { internalType: "bool", name: "isSecured", type: "bool" },
-      {
-        internalType: "enum ACPTypes.JobPhase",
-        name: "nextPhase",
-        type: "uint8"
-      },
-      { internalType: "uint256", name: "expiredAt", type: "uint256" },
-      { internalType: "enum ACPTypes.MemoState", name: "state", type: "uint8" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    name: "payableDetails",
-    outputs: [
-      { internalType: "address", name: "token", type: "address" },
-      { internalType: "uint256", name: "amount", type: "uint256" },
-      { internalType: "address", name: "recipient", type: "address" },
-      { internalType: "uint256", name: "feeAmount", type: "uint256" },
-      { internalType: "enum ACPTypes.FeeType", name: "feeType", type: "uint8" },
-      { internalType: "bool", name: "isExecuted", type: "bool" },
-      { internalType: "uint256", name: "expiredAt", type: "uint256" },
-      { internalType: "uint32", name: "lzSrcEid", type: "uint32" },
-      { internalType: "uint32", name: "lzDstEid", type: "uint32" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "paymentManager",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "proxiableUUID",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "bytes32", name: "role", type: "bytes32" },
-      { internalType: "address", name: "callerConfirmation", type: "address" }
-    ],
-    name: "renounceRole",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    name: "requiredApprovals",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "requiresApproval",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "bytes32", name: "role", type: "bytes32" },
-      { internalType: "address", name: "account", type: "address" }
-    ],
-    name: "revokeRole",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      { internalType: "uint256", name: "requiredApprovals_", type: "uint256" }
-    ],
-    name: "setApprovalRequirements",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "assetManager_", type: "address" }
-    ],
-    name: "setAssetManager",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      { internalType: "address", name: "sender", type: "address" },
-      { internalType: "bool", name: "isApproved", type: "bool" },
-      { internalType: "string", name: "reason", type: "string" }
-    ],
-    name: "signMemo",
-    outputs: [{ internalType: "uint256", name: "jobId", type: "uint256" }],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "bytes4", name: "interfaceId", type: "bytes4" }],
-    name: "supportsInterface",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "acpContract_", type: "address" },
-      { internalType: "address", name: "jobManager_", type: "address" },
-      { internalType: "address", name: "paymentManager_", type: "address" },
-      { internalType: "address", name: "assetManager_", type: "address" }
-    ],
-    name: "updateContracts",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      { internalType: "string", name: "newContent", type: "string" }
-    ],
-    name: "updateMemoContent",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      {
-        internalType: "enum ACPTypes.MemoState",
-        name: "newMemoState",
-        type: "uint8"
-      }
-    ],
-    name: "updateMemoState",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "newImplementation", type: "address" },
-      { internalType: "bytes", name: "data", type: "bytes" }
-    ],
-    name: "upgradeToAndCall",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "withdrawEscrowedFunds",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-var memoManagerAbi_default = MEMO_MANAGER_ABI;
-
-// src/contractClients/acpContractClientV2.ts
-var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClient_default {
-  constructor(jobManagerAddress, memoManagerAddress, accountManagerAddress, agentWalletAddress, config = baseAcpConfigV2) {
-    super(agentWalletAddress, config);
-    this.jobManagerAddress = jobManagerAddress;
-    this.memoManagerAddress = memoManagerAddress;
-    this.accountManagerAddress = accountManagerAddress;
-    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._sessionKeyClients = {};
-  }
-  static async build(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfigV2) {
-    const publicClients = {};
-    for (const chain of config.chains) {
-      publicClients[chain.chain.id] = createPublicClient4({
-        chain: chain.chain,
-        transport: http3(chain.rpcUrl)
-      });
-    }
-    const publicClient = createPublicClient4({
-      chain: config.chain,
-      transport: http3(config.rpcEndpoint)
-    });
-    const [jobManagerAddress, memoManagerAddress, accountManagerAddress] = await publicClient.multicall({
-      contracts: [
-        {
-          address: config.contractAddress,
-          abi: config.abi,
-          functionName: "jobManager"
-        },
-        {
-          address: config.contractAddress,
-          abi: config.abi,
-          functionName: "memoManager"
-        },
-        {
-          address: config.contractAddress,
-          abi: config.abi,
-          functionName: "accountManager"
-        }
-      ]
-    });
-    if (!jobManagerAddress || !memoManagerAddress || !accountManagerAddress) {
-      throw new acpError_default(
-        "Failed to get job manager, memo manager, or account manager address"
-      );
-    }
-    const acpContractClient = new _AcpContractClientV2(
-      jobManagerAddress.result,
-      memoManagerAddress.result,
-      accountManagerAddress.result,
-      agentWalletAddress,
-      config
-    );
-    acpContractClient.publicClients = publicClients;
-    await acpContractClient.init(walletPrivateKey, sessionEntityKeyId);
-    return acpContractClient;
-  }
-  async init(privateKey, sessionEntityKeyId) {
-    const sessionKeySigner = LocalAccountSigner2.privateKeyToAccountSigner(privateKey);
-    this._sessionKeyClient = await createModularAccountV2Client2({
-      chain: this.chain,
-      transport: alchemy2({
-        rpcUrl: this.config.alchemyRpcUrl
-      }),
-      signer: sessionKeySigner,
-      policyId: "186aaa4a-5f57-4156-83fb-e456365a8820",
-      accountAddress: this.agentWalletAddress,
-      signerEntity: {
-        entityId: sessionEntityKeyId,
-        isGlobalValidation: true
+var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClient_default {
+  constructor(jobManagerAddress, memoManagerAddress, accountManagerAddress, agentWalletAddress, config = baseAcpConfigV2) {
+    super(agentWalletAddress, config);
+    this.jobManagerAddress = jobManagerAddress;
+    this.memoManagerAddress = memoManagerAddress;
+    this.accountManagerAddress = accountManagerAddress;
+    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({
+      chain: config.chain,
+      transport: http3(config.rpcEndpoint)
+    });
+    const [jobManagerAddress, memoManagerAddress, accountManagerAddress] = await publicClient.multicall({
+      contracts: [
+        {
+          address: config.contractAddress,
+          abi: config.abi,
+          functionName: "jobManager"
+        },
+        {
+          address: config.contractAddress,
+          abi: config.abi,
+          functionName: "memoManager"
+        },
+        {
+          address: config.contractAddress,
+          abi: config.abi,
+          functionName: "accountManager"
+        }
+      ]
+    });
+    if (!jobManagerAddress || !memoManagerAddress || !accountManagerAddress) {
+      throw new acpError_default(
+        "Failed to get job manager, memo manager, or account manager address"
+      );
+    }
+    const acpContractClient = new _AcpContractClientV2(
+      jobManagerAddress.result,
+      memoManagerAddress.result,
+      accountManagerAddress.result,
+      agentWalletAddress,
+      config
+    );
+    await acpContractClient.init(walletPrivateKey, sessionEntityKeyId);
+    return acpContractClient;
+  }
+  async init(privateKey, sessionEntityKeyId) {
+    const sessionKeySigner = LocalAccountSigner2.privateKeyToAccountSigner(privateKey);
+    this._sessionKeyClient = await createModularAccountV2Client2({
+      chain: this.chain,
+      transport: alchemy2({
+        rpcUrl: this.config.alchemyRpcUrl
+      }),
+      signer: sessionKeySigner,
+      policyId: "186aaa4a-5f57-4156-83fb-e456365a8820",
+      accountAddress: this.agentWalletAddress,
+      signerEntity: {
+        entityId: sessionEntityKeyId,
+        isGlobalValidation: true
       }
     });
-    for (const chain of this.config.chains) {
-      this._sessionKeyClients[chain.chain.id] = await createModularAccountV2Client2({
-        chain: chain.chain,
-        transport: alchemy2({
-          rpcUrl: `${this.config.alchemyRpcUrl}?chainId=${chain.chain.id}`
-        }),
-        signer: sessionKeySigner,
-        policyId: "186aaa4a-5f57-4156-83fb-e456365a8820",
-        accountAddress: this.agentWalletAddress,
-        signerEntity: {
-          entityId: sessionEntityKeyId,
-          isGlobalValidation: true
-        }
-      });
-    }
     this._acpX402 = new AcpX402(
       this.config,
       this.sessionKeyClient,
@@ -7545,6 +6121,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,
@@ -7572,63 +6149,49 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     }
     return this._acpX402;
   }
-  async calculateGasFees(chainId) {
-    if (chainId) {
-      const { maxFeePerGas } = await this.publicClients[chainId].estimateFeesPerGas();
-      const increasedMaxFeePerGas = BigInt(maxFeePerGas) + BigInt(maxFeePerGas) * BigInt(this.GAS_FEE_MULTIPLIER * 100) / BigInt(100);
-      return increasedMaxFeePerGas;
-    }
+  async calculateGasFees() {
     const finalMaxFeePerGas = BigInt(this.MAX_FEE_PER_GAS) + BigInt(this.MAX_PRIORITY_FEE_PER_GAS) * BigInt(Math.max(0, this.PRIORITY_FEE_MULTIPLIER - 1));
     return finalMaxFeePerGas;
   }
-  async handleOperation(operations, chainId) {
-    const sessionKeyClient = chainId ? this._sessionKeyClients[chainId] : this.sessionKeyClient;
-    if (!sessionKeyClient) {
-      throw new acpError_default("Session key client not initialized");
-    }
-    const payload = {
+  async handleOperation(operations) {
+    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 { hash } = await sessionKeyClient.sendUserOperation(payload);
-        const checkTransactionConfig = {
-          hash,
-          retries: {
-            intervalMs: 200,
-            multiplier: 1.1,
-            maxRetries: 10
+        const currentMultiplier = 1 + 0.1 * (iteration + 1);
+        const payload = {
+          ...basePayload,
+          overrides: {
+            nonceKey: this.getRandomNonce(),
+            maxFeePerGas: {
+              multiplier: currentMultiplier
+            },
+            maxPriorityFeePerGas: {
+              multiplier: currentMultiplier
+            }
           }
         };
-        if (!chainId || chainId === baseSepolia4.id || chainId === base4.id) {
-          checkTransactionConfig["tag"] = "pending";
-        }
-        const txnHash = await sessionKeyClient.waitForUserOperationTransaction(
-          checkTransactionConfig
-        );
+        const { hash } = await this.sessionKeyClient.sendUserOperation(payload);
+        const txnHash = await this.sessionKeyClient.waitForUserOperationTransaction({
+          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);
@@ -7683,13 +6246,6 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
       throw new acpError_default("Failed to get X402 payment details", error);
     }
   }
-  async getAssetManager() {
-    return await this.publicClient.readContract({
-      address: this.memoManagerAddress,
-      abi: memoManagerAbi_default,
-      functionName: "assetManager"
-    });
-  }
   getAcpVersion() {
     return "2";
   }
@@ -7709,7 +6265,6 @@ export {
   acpJob_default as AcpJob,
   AcpJobPhases,
   acpMemo_default as AcpMemo,
-  AcpMemoState,
   AcpMemoStatus,
   AcpOnlineStatus,
   baseAcpContractClient_default as BaseAcpContractClient,
@@ -7725,7 +6280,6 @@ export {
   baseAcpX402ConfigV2,
   baseSepoliaAcpConfig,
   baseSepoliaAcpConfigV2,
-  baseSepoliaAcpX402ConfigV2,
   index_default as default,
   ethFare,
   preparePayload,