@virtuals-protocol/acp-node 0.3.0-beta.26 → 0.3.0-beta.28

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.26",
+      version: "0.3.0-beta.28",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -1242,7 +1242,18 @@ import {
 } from "viem";
 
 // src/configs/acpConfigs.ts
-import { baseSepolia, base } from "@account-kit/infra";
+import {
+  baseSepolia,
+  base,
+  bscTestnet,
+  bsc,
+  mainnet,
+  sepolia,
+  polygon,
+  polygonAmoy,
+  arbitrum,
+  arbitrumSepolia
+} from "@account-kit/infra";
 
 // src/acpFare.ts
 import {
@@ -1270,27 +1281,42 @@ var acpError_default = AcpError;
 
 // src/acpFare.ts
 var Fare = class _Fare {
-  constructor(contractAddress, decimals) {
+  constructor(contractAddress, decimals, chainId) {
     this.contractAddress = contractAddress;
     this.decimals = decimals;
+    this.chainId = chainId;
   }
   formatAmount(amount) {
     return parseUnits(amount.toString(), this.decimals);
   }
-  static async fromContractAddress(contractAddress, config = baseAcpConfig) {
+  static async fromContractAddress(contractAddress, config = baseAcpConfig, chainId = config.chain.id) {
     if (contractAddress === config.baseFare.contractAddress) {
       return config.baseFare;
     }
+    let chainConfig = config.chain;
+    let rpcUrl = config.rpcEndpoint;
+    if (chainId !== config.chain.id) {
+      const selectedChainConfig = config.chains.find(
+        (chain) => chain.id === chainId
+      );
+      if (!selectedChainConfig) {
+        throw new acpError_default(
+          `Chain configuration for chainId ${chainId} not found.`
+        );
+      }
+      chainConfig = selectedChainConfig;
+      rpcUrl = `${config.alchemyRpcUrl}?chainId=${chainId}`;
+    }
     const publicClient = createPublicClient({
-      chain: config.chain,
-      transport: http(config.rpcEndpoint)
+      chain: chainConfig,
+      transport: http(rpcUrl)
     });
     const decimals = await publicClient.readContract({
       address: contractAddress,
       abi: erc20Abi,
       functionName: "decimals"
     });
-    return new _Fare(contractAddress, decimals);
+    return new _Fare(contractAddress, decimals, chainId);
   }
 };
 var FareAmountBase = class {
@@ -1709,6 +1735,34 @@ 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" },
@@ -1893,7 +1947,12 @@ var ACP_V2_ABI = [
             name: "nextPhase",
             type: "uint8"
           },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" }
+          { internalType: "uint256", name: "expiredAt", type: "uint256" },
+          {
+            internalType: "enum ACPTypes.MemoState",
+            name: "state",
+            type: "uint8"
+          }
         ],
         internalType: "struct ACPTypes.Memo[]",
         name: "memos",
@@ -1940,7 +1999,12 @@ var ACP_V2_ABI = [
             name: "nextPhase",
             type: "uint8"
           },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" }
+          { internalType: "uint256", name: "expiredAt", type: "uint256" },
+          {
+            internalType: "enum ACPTypes.MemoState",
+            name: "state",
+            type: "uint8"
+          }
         ],
         internalType: "struct ACPTypes.Memo[]",
         name: "memos",
@@ -1983,7 +2047,12 @@ var ACP_V2_ABI = [
             name: "nextPhase",
             type: "uint8"
           },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" }
+          { internalType: "uint256", name: "expiredAt", type: "uint256" },
+          {
+            internalType: "enum ACPTypes.MemoState",
+            name: "state",
+            type: "uint8"
+          }
         ],
         internalType: "struct ACPTypes.Memo[]",
         name: "memos",
@@ -2238,8 +2307,27 @@ var acpAbiV2_default = ACP_V2_ABI;
 // src/configs/acpConfigs.ts
 var V1_MAX_RETRIES = 10;
 var V2_MAX_RETRIES = 3;
+var TESTNET_CHAINS = [
+  baseSepolia,
+  sepolia,
+  polygonAmoy,
+  arbitrumSepolia,
+  bscTestnet
+];
+var MAINNET_CHAINS = [
+  base,
+  mainnet,
+  polygon,
+  arbitrum,
+  bsc
+];
+var DEFAULT_RETRY_CONFIG = {
+  intervalMs: 200,
+  multiplier: 1.1,
+  maxRetries: 10
+};
 var AcpContractConfig2 = class {
-  constructor(chain, contractAddress, baseFare, alchemyRpcUrl, acpUrl, abi, maxRetries, rpcEndpoint, x402Config, retryConfig) {
+  constructor(chain, contractAddress, baseFare, alchemyRpcUrl, acpUrl, abi, maxRetries, rpcEndpoint, x402Config, retryConfig, chains = []) {
     this.chain = chain;
     this.contractAddress = contractAddress;
     this.baseFare = baseFare;
@@ -2250,6 +2338,7 @@ var AcpContractConfig2 = class {
     this.rpcEndpoint = rpcEndpoint;
     this.x402Config = x402Config;
     this.retryConfig = retryConfig;
+    this.chains = chains;
   }
 };
 var baseSepoliaAcpConfig = new AcpContractConfig2(
@@ -2261,7 +2350,9 @@ var baseSepoliaAcpConfig = new AcpContractConfig2(
   acpAbi_default,
   V1_MAX_RETRIES,
   void 0,
-  void 0
+  void 0,
+  DEFAULT_RETRY_CONFIG,
+  TESTNET_CHAINS
 );
 var baseSepoliaAcpX402Config = new AcpContractConfig2(
   baseSepolia,
@@ -2274,7 +2365,9 @@ var baseSepoliaAcpX402Config = new AcpContractConfig2(
   void 0,
   {
     url: "https://dev-acp-x402.virtuals.io"
-  }
+  },
+  DEFAULT_RETRY_CONFIG,
+  TESTNET_CHAINS
 );
 var baseSepoliaAcpConfigV2 = new AcpContractConfig2(
   baseSepolia,
@@ -2285,7 +2378,9 @@ var baseSepoliaAcpConfigV2 = new AcpContractConfig2(
   acpAbiV2_default,
   V2_MAX_RETRIES,
   void 0,
-  void 0
+  void 0,
+  DEFAULT_RETRY_CONFIG,
+  TESTNET_CHAINS
 );
 var baseSepoliaAcpX402ConfigV2 = new AcpContractConfig2(
   baseSepolia,
@@ -2298,7 +2393,9 @@ var baseSepoliaAcpX402ConfigV2 = new AcpContractConfig2(
   void 0,
   {
     url: "https://dev-acp-x402.virtuals.io"
-  }
+  },
+  DEFAULT_RETRY_CONFIG,
+  TESTNET_CHAINS
 );
 var baseAcpConfig = new AcpContractConfig2(
   base,
@@ -2309,7 +2406,9 @@ var baseAcpConfig = new AcpContractConfig2(
   acpAbi_default,
   V1_MAX_RETRIES,
   void 0,
-  void 0
+  void 0,
+  DEFAULT_RETRY_CONFIG,
+  MAINNET_CHAINS
 );
 var baseAcpX402Config = new AcpContractConfig2(
   base,
@@ -2322,7 +2421,9 @@ var baseAcpX402Config = new AcpContractConfig2(
   void 0,
   {
     url: "https://acp-x402.virtuals.io"
-  }
+  },
+  DEFAULT_RETRY_CONFIG,
+  MAINNET_CHAINS
 );
 var baseAcpConfigV2 = new AcpContractConfig2(
   base,
@@ -2333,7 +2434,9 @@ var baseAcpConfigV2 = new AcpContractConfig2(
   acpAbiV2_default,
   V2_MAX_RETRIES,
   void 0,
-  void 0
+  void 0,
+  DEFAULT_RETRY_CONFIG,
+  MAINNET_CHAINS
 );
 var baseAcpX402ConfigV2 = new AcpContractConfig2(
   base,
@@ -2346,7 +2449,9 @@ var baseAcpX402ConfigV2 = new AcpContractConfig2(
   void 0,
   {
     url: "https://acp-x402.virtuals.io"
-  }
+  },
+  DEFAULT_RETRY_CONFIG,
+  MAINNET_CHAINS
 );
 
 // src/abis/wethAbi.ts
@@ -3477,7 +3582,10 @@ 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"
@@ -3525,6 +3633,7 @@ 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;
@@ -3624,12 +3733,12 @@ ${JSON.stringify(
       throw new acpError_default("Failed to create job", error);
     }
   }
-  approveAllowance(amountBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress) {
+  approveAllowance(amountBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress, targetAddress) {
     try {
       const data = encodeFunctionData({
         abi: erc20Abi2,
         functionName: "approve",
-        args: [this.contractAddress, amountBaseUnit]
+        args: [targetAddress ?? this.contractAddress, amountBaseUnit]
       });
       const payload = {
         data,
@@ -3668,6 +3777,35 @@ ${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,
+          Math.floor(expiredAt.getTime() / 1e3),
+          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({
@@ -3684,6 +3822,22 @@ ${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({
@@ -3769,9 +3923,58 @@ ${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"
+    });
+  }
+  async getERC20Decimals(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: "decimals"
+    });
+  }
 };
 var baseAcpContractClient_default = BaseAcpContractClient;
 
+// src/acpJob.ts
+import { formatUnits } from "viem";
+
 // src/interfaces.ts
 var AcpMemoStatus = /* @__PURE__ */ ((AcpMemoStatus2) => {
   AcpMemoStatus2["PENDING"] = "PENDING";
@@ -3779,6 +3982,14 @@ 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["FAILED"] = 3] = "FAILED";
+  AcpMemoState2[AcpMemoState2["COMPLETED"] = 4] = "COMPLETED";
+  return AcpMemoState2;
+})(AcpMemoState || {});
 var AcpAgentSort = /* @__PURE__ */ ((AcpAgentSort2) => {
   AcpAgentSort2["SUCCESSFUL_JOB_COUNT"] = "successfulJobCount";
   AcpAgentSort2["SUCCESS_RATE"] = "successRate";
@@ -3800,6 +4011,19 @@ var AcpOnlineStatus = /* @__PURE__ */ ((AcpOnlineStatus2) => {
 })(AcpOnlineStatus || {});
 
 // 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);
@@ -3816,6 +4040,56 @@ 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}`);
+}
+function getDestinationChainId(endpointId) {
+  switch (endpointId) {
+    case 40245:
+      return baseSepolia3.id;
+    case 40161:
+      return sepolia3.id;
+    case 40267:
+      return polygonAmoy3.id;
+    case 40231:
+      return arbitrumSepolia3.id;
+    case 40102:
+      return bscTestnet3.id;
+    case 30184:
+      return base3.id;
+    case 30101:
+      return mainnet3.id;
+    case 30109:
+      return polygon3.id;
+    case 30110:
+      return arbitrum3.id;
+    case 30102:
+      return bsc3.id;
+  }
+  throw new Error(`Unsupported endpoint ID: ${endpointId}`);
+}
 
 // src/acpJobOffering.ts
 import { zeroAddress as zeroAddress2 } from "viem";
@@ -4023,29 +4297,50 @@ var AcpJob = class {
     }
     const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
     const isPercentagePricing = this.priceType === "percentage" /* PERCENTAGE */;
-    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
-      )
-    );
+    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
+        )
+      );
+    }
     return await this.acpContractClient.handleOperation(operations);
   }
   async payAndAcceptRequirement(reason) {
     const memo = this.memos.find(
-      (m) => m.nextPhase === 2 /* TRANSACTION */
+      (m) => m.nextPhase === 2 /* TRANSACTION */ || m.nextPhase === 4 /* COMPLETED */
     );
     if (!memo) {
       throw new acpError_default("No notification memo found");
     }
+    if (memo.type === 6 /* PAYABLE_REQUEST */ && memo.state !== 1 /* PENDING */ && memo.payableDetails?.lzDstEid !== void 0 && memo.payableDetails?.lzDstEid !== 0) {
+      return;
+    }
     const operations = [];
     const baseFareAmount = new FareAmount(this.price, this.baseFare);
     const transferAmount = memo.payableDetails ? await FareAmountBase.fromContractAddress(
@@ -4078,6 +4373,53 @@ var AcpJob = class {
         3 /* EVALUATION */
       )
     );
+    if (memo.payableDetails) {
+      const destinationChainId = memo.payableDetails.lzDstEid ? getDestinationChainId(memo.payableDetails.lzDstEid) : this.config.chain.id;
+      if (destinationChainId !== this.config.chain.id) {
+        if (memo.type === 6 /* PAYABLE_REQUEST */) {
+          const tokenBalance = await this.acpContractClient.getERC20Balance(
+            destinationChainId,
+            memo.payableDetails.token,
+            this.acpContractClient.agentWalletAddress
+          );
+          if (tokenBalance < memo.payableDetails.amount) {
+            const tokenDecimals = await this.acpContractClient.getERC20Decimals(
+              destinationChainId,
+              memo.payableDetails.token
+            );
+            const tokenSymbol = await this.acpContractClient.getERC20Symbol(
+              destinationChainId,
+              memo.payableDetails.token
+            );
+            throw new Error(
+              `You do not have enough funds to pay for the job which costs ${formatUnits(
+                memo.payableDetails.amount,
+                tokenDecimals
+              )} ${tokenSymbol} on chainId ${destinationChainId}`
+            );
+          }
+          const assetManagerAddress = await this.acpContractClient.getAssetManager();
+          const allowance = await this.acpContractClient.getERC20Allowance(
+            destinationChainId,
+            memo.payableDetails.token,
+            this.acpContractClient.agentWalletAddress,
+            assetManagerAddress
+          );
+          const destinationChainOperations = [];
+          destinationChainOperations.push(
+            this.acpContractClient.approveAllowance(
+              memo.payableDetails.amount + allowance,
+              memo.payableDetails.token,
+              assetManagerAddress
+            )
+          );
+          await this.acpContractClient.handleOperation(
+            destinationChainOperations,
+            destinationChainId
+          );
+        }
+      }
+    }
     if (this.price > 0) {
       const x402PaymentDetails = await this.acpContractClient.getX402PaymentDetails(this.id);
       if (x402PaymentDetails.isX402) {
@@ -4150,9 +4492,6 @@ var AcpJob = class {
     return await this.acpContractClient.handleOperation(operations);
   }
   async deliver(deliverable) {
-    if (this.phase !== 2 /* TRANSACTION */) {
-      throw new acpError_default("Job is not in transaction phase");
-    }
     const operations = [];
     operations.push(
       this.acpContractClient.createMemo(
@@ -4166,8 +4505,13 @@ var AcpJob = class {
     return await this.acpContractClient.handleOperation(operations);
   }
   async deliverPayable(deliverable, amount, skipFee = false, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
-    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,
+        preparePayload(deliverable),
+        amount,
+        skipFee
+      );
     }
     const operations = [];
     operations.push(
@@ -4181,7 +4525,6 @@ var AcpJob = class {
     operations.push(
       this.acpContractClient.createPayableMemo(
         this.id,
-        // memoContent.url,
         preparePayload(deliverable),
         amount.amount,
         this.clientAddress,
@@ -4300,6 +4643,56 @@ var AcpJob = class {
       waitMs = Math.min(waitMs * 2, maxWaitMs);
     }
   }
+  async deliverCrossChainPayable(recipient, content, amount, skipFee = 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 feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
+    const isPercentagePricing = this.priceType === "percentage" /* PERCENTAGE */ && !skipFee;
+    const createMemoOperation = 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 */,
+      7 /* PAYABLE_TRANSFER */,
+      new Date(Date.now() + 1e3 * 60 * 5),
+      4 /* COMPLETED */,
+      getDestinationEndpointId(chainId)
+    );
+    await this.acpContractClient.handleOperation([createMemoOperation]);
+  }
   [util.inspect.custom]() {
     return {
       id: this.id,
@@ -4323,7 +4716,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) {
+  constructor(contractClient, id, type, content, nextPhase, status, senderAddress, signedReason, expiry, payableDetails, txHash, signedTxHash, state) {
     this.contractClient = contractClient;
     this.id = id;
     this.type = type;
@@ -4336,6 +4729,7 @@ 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);
@@ -4618,7 +5012,8 @@ var AcpClient = class {
         memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
         memo.payableDetails,
         memo.txHash,
-        memo.signedTxHash
+        memo.signedTxHash,
+        memo.state
       );
     } catch (err) {
       throw new acpError_default(`Failed to hydrate memo ${memo.id}`, err);
@@ -4694,6 +5089,8 @@ var AcpClient = class {
       cluster,
       sortBy,
       topK = 5,
+      sort_by,
+      top_k = 5,
       graduationStatus,
       onlineStatus,
       showHiddenOfferings
@@ -4701,10 +5098,11 @@ var AcpClient = class {
     const params = {
       search: keyword
     };
-    params.top_k = topK;
+    params.top_k = topK || top_k;
     params.walletAddressesToExclude = this.walletAddress;
-    if (sortBy && sortBy.length > 0) {
-      params.sortBy = sortBy.join(",");
+    const sortByArray = sortBy || sort_by;
+    if (sortByArray && sortByArray.length > 0) {
+      params.sortBy = sortByArray.join(",");
     }
     if (cluster) {
       params.cluster = cluster;
@@ -5314,6 +5712,9 @@ 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";
   }
@@ -6037,91 +6438,1249 @@ var JOB_MANAGER_ABI = [
 var jobManagerAbi_default = JOB_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.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
-      }
-    });
-    this._acpX402 = new AcpX402(
-      this.config,
-      this.sessionKeyClient,
-      this.publicClient
-    );
-    const account = this.sessionKeyClient.account;
-    const sessionSignerAddress = await account.getSigner().getAddress();
-    if (!await account.isAccountDeployed()) {
-      throw new acpError_default(
-        `ACP Contract Client validation failed: agent account ${this.agentWalletAddress} is not deployed on-chain`
-      );
-    }
-    await this.validateSessionKeyOnChain(
-      sessionSignerAddress,
-      sessionEntityKeyId
+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.RETRY_CONFIG = {
+      intervalMs: 200,
+      multiplier: 1.1,
+      maxRetries: 10
+    };
+    this._sessionKeyClients = {};
+  }
+  static async build(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfigV2) {
+    const publicClients = {};
+    for (const chain of config.chains) {
+      publicClients[chain.id] = createPublicClient4({
+        chain,
+        transport: http3(`${config.alchemyRpcUrl}?chainId=${chain.id}`)
+      });
+    }
+    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
+      }
+    });
+    for (const chain of this.config.chains) {
+      this._sessionKeyClients[chain.id] = await createModularAccountV2Client2({
+        chain,
+        transport: alchemy2({
+          rpcUrl: `${this.config.alchemyRpcUrl}?chainId=${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,
+      this.publicClient
+    );
+    const account = this.sessionKeyClient.account;
+    const sessionSignerAddress = await account.getSigner().getAddress();
+    if (!await account.isAccountDeployed()) {
+      throw new acpError_default(
+        `ACP Contract Client validation failed: agent account ${this.agentWalletAddress} is not deployed on-chain`
+      );
+    }
+    await this.validateSessionKeyOnChain(
+      sessionSignerAddress,
+      sessionEntityKeyId
     );
     this.RETRY_CONFIG = this.config.retryConfig || this.RETRY_CONFIG;
     console.log("Connected to ACP:", {
@@ -6151,11 +7710,20 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     }
     return this._acpX402;
   }
-  async calculateGasFees() {
+  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;
+    }
     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) {
+  async handleOperation(operations, chainId) {
+    const sessionKeyClient = chainId ? this._sessionKeyClients[chainId] : this.sessionKeyClient;
+    if (!sessionKeyClient) {
+      throw new acpError_default("Session key client not initialized");
+    }
     const basePayload = {
       uo: operations.map((operation) => ({
         target: operation.contractAddress,
@@ -6180,12 +7748,17 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
             }
           }
         };
-        const { hash } = await this.sessionKeyClient.sendUserOperation(payload);
-        const txnHash = await this.sessionKeyClient.waitForUserOperationTransaction({
+        const { hash } = await sessionKeyClient.sendUserOperation(payload);
+        const checkTransactionConfig = {
           hash,
-          tag: "pending",
           retries: this.RETRY_CONFIG
-        });
+        };
+        if (!chainId || chainId === baseSepolia4.id || chainId === base4.id) {
+          checkTransactionConfig["tag"] = "pending";
+        }
+        const txnHash = await sessionKeyClient.waitForUserOperationTransaction(
+          checkTransactionConfig
+        );
         return { userOpHash: hash, txnHash };
       } catch (error) {
         iteration++;
@@ -6248,6 +7821,13 @@ 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";
   }
@@ -6271,6 +7851,7 @@ export {
   acpJob_default as AcpJob,
   AcpJobPhases,
   acpMemo_default as AcpMemo,
+  AcpMemoState,
   AcpMemoStatus,
   AcpOnlineStatus,
   baseAcpContractClient_default as BaseAcpContractClient,
@@ -6284,6 +7865,7 @@ export {
   baseAcpX402ConfigV2,
   baseSepoliaAcpConfig,
   baseSepoliaAcpConfigV2,
+  baseSepoliaAcpX402ConfigV2,
   index_default as default,
   ethFare,
   preparePayload,