@virtuals-protocol/acp-node 0.3.0-beta.16 → 0.3.0-beta.18

package/dist/index.js

@@ -35,12 +35,13 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.3.0-beta.16",
+      version: "0.3.0-beta.18",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
       scripts: {
         test: "jest",
+        "test:ci": "jest --ci --reporters=default --reporters=jest-junit",
         "test:watch": "jest --watch",
         "test:coverage": "jest --coverage",
         tsup: "tsup src/index.ts --dts --format cjs,esm --out-dir dist"
@@ -56,6 +57,7 @@ var require_package = __commonJS({
         "babel-jest": "^30.2.0",
         dotenv: "^17.2.3",
         jest: "^30.2.0",
+        "jest-junit": "^16.0.0",
         "ts-jest": "^29.4.5",
         typescript: "^5.8.3"
       },
@@ -89,6 +91,7 @@ __export(index_exports, {
   AcpJob: () => acpJob_default,
   AcpJobPhases: () => AcpJobPhases,
   AcpMemo: () => acpMemo_default,
+  AcpMemoState: () => AcpMemoState,
   AcpMemoStatus: () => AcpMemoStatus,
   AcpOnlineStatus: () => AcpOnlineStatus,
   BaseAcpContractClient: () => baseAcpContractClient_default,
@@ -1282,7 +1285,7 @@ var ACP_ABI = [
 var acpAbi_default = ACP_ABI;
 
 // src/acpClient.ts
-var import_viem4 = require("viem");
+var import_viem6 = require("viem");
 var import_socket = require("socket.io-client");
 
 // src/contractClients/baseAcpContractClient.ts
@@ -1311,27 +1314,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 (0, import_viem.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 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 = (0, import_viem.createPublicClient)({
-      chain: config.chain,
-      transport: (0, import_viem.http)(config.rpcEndpoint)
+      chain: chainConfig,
+      transport: (0, import_viem.http)(rpcUrl)
     });
     const decimals = await publicClient.readContract({
       address: contractAddress,
       abi: import_viem.erc20Abi,
       functionName: "decimals"
     });
-    return new _Fare(contractAddress, decimals);
+    return new _Fare(contractAddress, decimals, chainId);
   }
 };
 var FareAmountBase = class {
@@ -1750,6 +1768,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" },
@@ -1934,7 +1980,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",
@@ -1981,7 +2032,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",
@@ -2024,7 +2080,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",
@@ -2280,7 +2341,7 @@ var acpAbiV2_default = ACP_V2_ABI;
 var V1_MAX_RETRIES = 10;
 var V2_MAX_RETRIES = 3;
 var AcpContractConfig2 = class {
-  constructor(chain, contractAddress, baseFare, alchemyRpcUrl, acpUrl, abi, maxRetries, rpcEndpoint, x402Config) {
+  constructor(chain, contractAddress, baseFare, alchemyRpcUrl, acpUrl, abi, maxRetries, rpcEndpoint, x402Config, chains = []) {
     this.chain = chain;
     this.contractAddress = contractAddress;
     this.baseFare = baseFare;
@@ -2290,6 +2351,7 @@ var AcpContractConfig2 = class {
     this.maxRetries = maxRetries;
     this.rpcEndpoint = rpcEndpoint;
     this.x402Config = x402Config;
+    this.chains = chains;
   }
 };
 var baseSepoliaAcpConfig = new AcpContractConfig2(
@@ -3535,6 +3597,16 @@ var HTTP_STATUS_CODES = {
   PAYMENT_REQUIRED: 402
 };
 var SINGLE_SIGNER_VALIDATION_MODULE_ADDRESS = "0x00000000000099DE0BF6fA90dEB851E2A2df7d83";
+var ASSET_MANAGER_ADDRESSES = {
+  [import_chains.bscTestnet.id]: "0xfCf52B02936623852dd5132007E9414f9060168b",
+  [import_chains.bsc.id]: "",
+  [import_chains.polygonAmoy.id]: "0xfCf52B02936623852dd5132007E9414f9060168b",
+  [import_chains.polygon.id]: "",
+  [import_chains.arbitrum.id]: "",
+  [import_chains.arbitrumSepolia.id]: "0xfCf52B02936623852dd5132007E9414f9060168b",
+  [import_chains.sepolia.id]: "0xfCf52B02936623852dd5132007E9414f9060168b",
+  [import_chains.mainnet.id]: ""
+};
 
 // src/contractClients/baseAcpContractClient.ts
 var MemoType = /* @__PURE__ */ ((MemoType3) => {
@@ -3549,6 +3621,7 @@ var MemoType = /* @__PURE__ */ ((MemoType3) => {
   MemoType3[MemoType3["PAYABLE_TRANSFER_ESCROW"] = 8] = "PAYABLE_TRANSFER_ESCROW";
   MemoType3[MemoType3["NOTIFICATION"] = 9] = "NOTIFICATION";
   MemoType3[MemoType3["PAYABLE_NOTIFICATION"] = 10] = "PAYABLE_NOTIFICATION";
+  MemoType3[MemoType3["TRANSFER_EVENT"] = 11] = "TRANSFER_EVENT";
   return MemoType3;
 })(MemoType || {});
 var AcpJobPhases = /* @__PURE__ */ ((AcpJobPhases3) => {
@@ -3565,6 +3638,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;
@@ -3664,12 +3738,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 = (0, import_viem2.encodeFunctionData)({
         abi: import_viem2.erc20Abi,
         functionName: "approve",
-        args: [this.contractAddress, amountBaseUnit]
+        args: [targetAddress ?? this.contractAddress, amountBaseUnit]
       });
       const payload = {
         data,
@@ -3708,6 +3782,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 = (0, import_viem2.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 = (0, import_viem2.encodeFunctionData)({
@@ -3724,6 +3827,22 @@ ${JSON.stringify(
       throw new acpError_default("Failed to create memo", error);
     }
   }
+  createMemoWithMetadata(jobId, content, type, isSecured, nextPhase, metadata) {
+    try {
+      const data = (0, import_viem2.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 = (0, import_viem2.encodeFunctionData)({
@@ -3809,9 +3928,47 @@ ${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: import_viem2.erc20Abi,
+      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: import_viem2.erc20Abi,
+      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: import_viem2.erc20Abi,
+      functionName: "symbol"
+    });
+  }
 };
 var baseAcpContractClient_default = BaseAcpContractClient;
 
+// src/acpJob.ts
+var import_viem5 = require("viem");
+
 // src/interfaces.ts
 var AcpMemoStatus = /* @__PURE__ */ ((AcpMemoStatus2) => {
   AcpMemoStatus2["PENDING"] = "PENDING";
@@ -3819,6 +3976,15 @@ var AcpMemoStatus = /* @__PURE__ */ ((AcpMemoStatus2) => {
   AcpMemoStatus2["REJECTED"] = "REJECTED";
   return AcpMemoStatus2;
 })(AcpMemoStatus || {});
+var AcpMemoState = /* @__PURE__ */ ((AcpMemoState2) => {
+  AcpMemoState2["NONE"] = "NONE";
+  AcpMemoState2["PENDING"] = "PENDING";
+  AcpMemoState2["IN_PROGRESS"] = "IN_PROGRESS";
+  AcpMemoState2["READY"] = "READY";
+  AcpMemoState2["COMPLETED"] = "COMPLETED";
+  AcpMemoState2["REJECTED"] = "REJECTED";
+  return AcpMemoState2;
+})(AcpMemoState || {});
 var AcpAgentSort = /* @__PURE__ */ ((AcpAgentSort2) => {
   AcpAgentSort2["SUCCESSFUL_JOB_COUNT"] = "successfulJobCount";
   AcpAgentSort2["SUCCESS_RATE"] = "successRate";
@@ -3857,6 +4023,8 @@ var PositionDirection = /* @__PURE__ */ ((PositionDirection2) => {
 })(PositionDirection || {});
 
 // src/utils.ts
+var import_viem3 = require("viem");
+var import_chains2 = require("viem/chains");
 function tryParseJson(content) {
   try {
     return JSON.parse(content);
@@ -3873,9 +4041,34 @@ function safeBase64Encode(data) {
   }
   return Buffer.from(data).toString("base64");
 }
+function getDestinationEndpointId(chainId) {
+  switch (chainId) {
+    case import_chains2.baseSepolia.id:
+      return 40245;
+    case import_chains2.sepolia.id:
+      return 40161;
+    case import_chains2.polygonAmoy.id:
+      return 40267;
+    case import_chains2.arbitrumSepolia.id:
+      return 40231;
+    case import_chains2.bscTestnet.id:
+      return 40102;
+    case import_chains2.base.id:
+      return 30184;
+    case import_chains2.mainnet.id:
+      return 30101;
+    case import_chains2.polygon.id:
+      return 30109;
+    case import_chains2.arbitrum.id:
+      return 30110;
+    case import_chains2.bsc.id:
+      return 30102;
+  }
+  throw new Error(`Unsupported chain ID: ${chainId}`);
+}
 
 // src/acpJobOffering.ts
-var import_viem3 = require("viem");
+var import_viem4 = require("viem");
 var import_ajv = __toESM(require("ajv"));
 var AcpJobOffering = class {
   constructor(acpClient, acpContractClient, providerAddress, name, price, priceType = "fixed" /* FIXED */, requirement) {
@@ -3934,7 +4127,7 @@ var AcpJobOffering = class {
     } else {
       createJobPayload = this.acpContractClient.createJobWithAccount(
         account.id,
-        evaluatorAddress || import_viem3.zeroAddress,
+        evaluatorAddress || import_viem4.zeroAddress,
         fareAmount.amount,
         fareAmount.fare.contractAddress,
         expiredAt,
@@ -4075,20 +4268,38 @@ 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) {
@@ -4130,9 +4341,11 @@ var AcpJob = class {
         3 /* EVALUATION */
       )
     );
-    const x402PaymentDetails = await this.acpContractClient.getX402PaymentDetails(this.id);
-    if (x402PaymentDetails.isX402) {
-      await this.performX402Payment(this.price);
+    if (this.price > 0) {
+      const x402PaymentDetails = await this.acpContractClient.getX402PaymentDetails(this.id);
+      if (x402PaymentDetails.isX402) {
+        await this.performX402Payment(this.price);
+      }
     }
     return await this.acpContractClient.handleOperation(operations);
   }
@@ -4219,6 +4432,9 @@ 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(
@@ -4349,6 +4565,56 @@ var AcpJob = class {
       waitMs = Math.min(waitMs * 2, maxWaitMs);
     }
   }
+  async deliverCrossChainPayable(recipient, amount) {
+    if (!amount.fare.chainId) {
+      throw new acpError_default("Chain ID is required for cross chain payable");
+    }
+    const chainId = amount.fare.chainId;
+    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,
+      ASSET_MANAGER_ADDRESSES[chainId]
+    );
+    const approveAllowanceOperation = this.acpContractClient.approveAllowance(
+      amount.amount + currentAllowance,
+      amount.fare.contractAddress,
+      ASSET_MANAGER_ADDRESSES[chainId]
+    );
+    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 ${(0, import_viem5.formatUnits)(
+        amount.amount,
+        amount.fare.decimals
+      )} ${tokenSymbol} to ${recipient}`,
+      amount.fare.contractAddress,
+      amount.amount,
+      recipient,
+      BigInt(0),
+      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,
@@ -4372,7 +4638,7 @@ var acpJob_default = AcpJob;
 // src/acpMemo.ts
 var import_util = __toESM(require("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;
@@ -4385,6 +4651,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);
@@ -4535,7 +4802,8 @@ var AcpClient = class {
                 memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
                 memo.payableDetails,
                 memo.txHash,
-                memo.signedTxHash
+                memo.signedTxHash,
+                memo.state
               );
             }),
             data.phase,
@@ -4573,7 +4841,8 @@ var AcpClient = class {
                 memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
                 memo.payableDetails,
                 memo.txHash,
-                memo.signedTxHash
+                memo.signedTxHash,
+                memo.state
               );
             }),
             data.phase,
@@ -4598,7 +4867,14 @@ 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) {
@@ -4680,7 +4956,7 @@ var AcpClient = class {
       baseAcpConfig.contractAddress,
       baseAcpX402Config.contractAddress
     ].includes(this.acpContractClient.config.contractAddress);
-    const defaultEvaluatorAddress = isV1 && !evaluatorAddress ? this.walletAddress : import_viem4.zeroAddress;
+    const defaultEvaluatorAddress = isV1 && !evaluatorAddress ? this.walletAddress : import_viem6.zeroAddress;
     const chainId = this.acpContractClient.config.chain.id;
     const isUsdcPaymentToken = USDC_TOKEN_ADDRESS[chainId].toLowerCase() === fareAmount.fare.contractAddress.toLowerCase();
     const isX402Job = this.acpContractClient.config.x402Config && isUsdcPaymentToken;
@@ -4789,7 +5065,8 @@ var AcpClient = class {
             memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
             memo.payableDetails,
             memo.txHash,
-            memo.signedTxHash
+            memo.signedTxHash,
+            memo.state
           )
         );
         jobs.push(
@@ -4863,7 +5140,8 @@ var AcpClient = class {
           memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
           memo.payableDetails,
           memo.txHash,
-          memo.signedTxHash
+          memo.signedTxHash,
+          memo.state
         )
       );
       return new acpJob_default(
@@ -4922,7 +5200,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(
@@ -4986,10 +5265,10 @@ var acpClient_default = AcpClient;
 var import_core = require("@aa-sdk/core");
 var import_infra2 = require("@account-kit/infra");
 var import_smart_contracts = require("@account-kit/smart-contracts");
-var import_viem6 = require("viem");
+var import_viem8 = require("viem");
 
 // src/acpX402.ts
-var import_viem5 = require("viem");
+var import_viem7 = require("viem");
 var import_crypto = require("crypto");
 var AcpX402 = class {
   constructor(config, sessionKeyClient, publicClient) {
@@ -5031,6 +5310,9 @@ var AcpX402 = class {
       const acpJob = await response.json();
       return acpJob;
     } catch (error) {
+      if (error instanceof acpError_default) {
+        throw error;
+      }
       throw new acpError_default("Failed to update job X402 nonce", error);
     }
   }
@@ -5044,7 +5326,7 @@ var AcpX402 = class {
         contracts: [
           {
             address: USDC_CONTRACT,
-            abi: import_viem5.erc20Abi,
+            abi: import_viem7.erc20Abi,
             functionName: "name"
           },
           {
@@ -5119,6 +5401,9 @@ var AcpX402 = class {
         data
       };
     } catch (error) {
+      if (error instanceof acpError_default) {
+        throw error;
+      }
       throw new acpError_default("Failed to perform X402 request", error);
     }
   }
@@ -5244,7 +5529,7 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
     const contractLogs = result.logs.filter((log) => {
       return log.address.toLowerCase() === this.contractAddress.toLowerCase();
     }).map(
-      (log) => (0, import_viem6.decodeEventLog)({
+      (log) => (0, import_viem8.decodeEventLog)({
         abi: this.abi,
         data: log.data,
         topics: log.topics
@@ -5260,7 +5545,7 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
   }
   createJob(providerAddress, evaluatorAddress, expireAt, paymentTokenAddress, budgetBaseUnit, metadata, isX402Job) {
     try {
-      const data = (0, import_viem6.encodeFunctionData)({
+      const data = (0, import_viem8.encodeFunctionData)({
         abi: this.abi,
         functionName: isX402Job ? "createJobWithX402" : "createJob",
         args: [
@@ -5280,7 +5565,7 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
   }
   setBudgetWithPaymentToken(jobId, budgetBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress) {
     try {
-      const data = (0, import_viem6.encodeFunctionData)({
+      const data = (0, import_viem8.encodeFunctionData)({
         abi: this.abi,
         functionName: "setBudgetWithPaymentToken",
         args: [jobId, budgetBaseUnit, paymentTokenAddress]
@@ -5296,7 +5581,7 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
   }
   createPayableMemo(jobId, content, amountBaseUnit, recipient, feeAmountBaseUnit, feeType, nextPhase, type, expiredAt, token = this.config.baseFare.contractAddress, secured = true) {
     try {
-      const data = (0, import_viem6.encodeFunctionData)({
+      const data = (0, import_viem8.encodeFunctionData)({
         abi: this.abi,
         functionName: "createPayableMemo",
         args: [
@@ -5346,7 +5631,7 @@ var acpContractClient_default = AcpContractClient;
 var import_core2 = require("@aa-sdk/core");
 var import_infra3 = require("@account-kit/infra");
 var import_smart_contracts2 = require("@account-kit/smart-contracts");
-var import_viem7 = require("viem");
+var import_viem9 = require("viem");
 
 // src/abis/jobManagerAbi.ts
 var JOB_MANAGER_ABI = [
@@ -6050,6 +6335,7 @@ var JOB_MANAGER_ABI = [
 var jobManagerAbi_default = JOB_MANAGER_ABI;
 
 // src/contractClients/acpContractClientV2.ts
+var import_chains3 = require("viem/chains");
 var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClient_default {
   constructor(jobManagerAddress, memoManagerAddress, accountManagerAddress, agentWalletAddress, config = baseAcpConfigV2) {
     super(agentWalletAddress, config);
@@ -6059,11 +6345,20 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     this.PRIORITY_FEE_MULTIPLIER = 2;
     this.MAX_FEE_PER_GAS = 2e7;
     this.MAX_PRIORITY_FEE_PER_GAS = 21e6;
+    this.GAS_FEE_MULTIPLIER = 0.5;
+    this._sessionKeyClients = {};
   }
   static async build(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfigV2) {
-    const publicClient = (0, import_viem7.createPublicClient)({
+    const publicClients = {};
+    for (const chain of config.chains) {
+      publicClients[chain.chain.id] = (0, import_viem9.createPublicClient)({
+        chain: chain.chain,
+        transport: (0, import_viem9.http)(chain.rpcUrl)
+      });
+    }
+    const publicClient = (0, import_viem9.createPublicClient)({
       chain: config.chain,
-      transport: (0, import_viem7.http)(config.rpcEndpoint)
+      transport: (0, import_viem9.http)(config.rpcEndpoint)
     });
     const [jobManagerAddress, memoManagerAddress, accountManagerAddress] = await publicClient.multicall({
       contracts: [
@@ -6096,6 +6391,7 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
       agentWalletAddress,
       config
     );
+    acpContractClient.publicClients = publicClients;
     await acpContractClient.init(walletPrivateKey, sessionEntityKeyId);
     return acpContractClient;
   }
@@ -6114,6 +6410,21 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
         isGlobalValidation: true
       }
     });
+    for (const chain of this.config.chains) {
+      this._sessionKeyClients[chain.chain.id] = await (0, import_smart_contracts2.createModularAccountV2Client)({
+        chain: chain.chain,
+        transport: (0, import_infra3.alchemy)({
+          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,
@@ -6126,7 +6437,10 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
         `ACP Contract Client validation failed: agent account ${this.agentWalletAddress} is not deployed on-chain`
       );
     }
-    await this.validateSessionKeyOnChain(sessionSignerAddress, sessionEntityKeyId);
+    await this.validateSessionKeyOnChain(
+      sessionSignerAddress,
+      sessionEntityKeyId
+    );
     console.log("Connected to ACP:", {
       agentWalletAddress: this.agentWalletAddress,
       whitelistedWalletAddress: sessionSignerAddress,
@@ -6154,11 +6468,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 payload = {
       uo: operations.map((operation) => ({
         target: operation.contractAddress,
@@ -6179,16 +6502,21 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
             maxFeePerGas: `0x${gasFees.toString(16)}`
           };
         }
-        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: {
             intervalMs: 200,
             multiplier: 1.1,
             maxRetries: 10
           }
-        });
+        };
+        if (!chainId || chainId === import_chains3.baseSepolia.id || chainId === import_chains3.base.id) {
+          checkTransactionConfig["tag"] = "pending";
+        }
+        const txnHash = await sessionKeyClient.waitForUserOperationTransaction(
+          checkTransactionConfig
+        );
         return { userOpHash: hash, txnHash };
       } catch (error) {
         retries -= 1;
@@ -6212,7 +6540,7 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     const contractLogs = result.logs.filter((log) => {
       return log.address.toLowerCase() === this.jobManagerAddress.toLowerCase();
     }).map(
-      (log) => (0, import_viem7.decodeEventLog)({
+      (log) => (0, import_viem9.decodeEventLog)({
         abi: jobManagerAbi_default,
         data: log.data,
         topics: log.topics
@@ -6271,6 +6599,7 @@ var index_default = acpClient_default;
   AcpJob,
   AcpJobPhases,
   AcpMemo,
+  AcpMemoState,
   AcpMemoStatus,
   AcpOnlineStatus,
   BaseAcpContractClient,