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

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.23",
+      version: "0.3.0-beta.25",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -41,6 +41,8 @@ var require_package = __commonJS({
         "@account-kit/smart-contracts": "^4.73.0",
         "@virtuals-protocol/acp-node": "^0.3.0-beta.10",
         ajv: "^8.17.1",
+        axios: "^1.13.2",
+        "jwt-decode": "^4.0.0",
         "socket.io-client": "^4.8.1",
         tsup: "^8.5.0",
         viem: "^2.28.2"
@@ -1225,6 +1227,7 @@ var acpAbi_default = ACP_ABI;
 // src/acpClient.ts
 import { zeroAddress as zeroAddress3 } from "viem";
 import { io } from "socket.io-client";
+import { jwtDecode } from "jwt-decode";
 
 // src/contractClients/baseAcpContractClient.ts
 import {
@@ -1239,10 +1242,7 @@ import {
 } from "viem";
 
 // src/configs/acpConfigs.ts
-import {
-  baseSepolia,
-  base
-} from "@account-kit/infra";
+import { baseSepolia, base } from "@account-kit/infra";
 
 // src/acpFare.ts
 import {
@@ -1270,42 +1270,27 @@ var acpError_default = AcpError;
 
 // src/acpFare.ts
 var Fare = class _Fare {
-  constructor(contractAddress, decimals, chainId) {
+  constructor(contractAddress, decimals) {
     this.contractAddress = contractAddress;
     this.decimals = decimals;
-    this.chainId = chainId;
   }
   formatAmount(amount) {
     return parseUnits(amount.toString(), this.decimals);
   }
-  static async fromContractAddress(contractAddress, config = baseAcpConfig, chainId = config.chain.id) {
+  static async fromContractAddress(contractAddress, config = baseAcpConfig) {
     if (contractAddress === config.baseFare.contractAddress) {
       return config.baseFare;
     }
-    let chainConfig = config.chain;
-    let rpcUrl = config.rpcEndpoint;
-    if (chainId !== config.chain.id) {
-      const selectedConfig = config.chains?.find(
-        (chain) => chain.chain.id === chainId
-      );
-      if (!selectedConfig) {
-        throw new acpError_default(
-          `Chain configuration for chainId ${chainId} not found.`
-        );
-      }
-      chainConfig = selectedConfig.chain;
-      rpcUrl = selectedConfig.rpcUrl;
-    }
     const publicClient = createPublicClient({
-      chain: chainConfig,
-      transport: http(rpcUrl)
+      chain: config.chain,
+      transport: http(config.rpcEndpoint)
     });
     const decimals = await publicClient.readContract({
       address: contractAddress,
       abi: erc20Abi,
       functionName: "decimals"
     });
-    return new _Fare(contractAddress, decimals, chainId);
+    return new _Fare(contractAddress, decimals);
   }
 };
 var FareAmountBase = class {
@@ -1724,34 +1709,6 @@ var ACP_V2_ABI = [
     stateMutability: "nonpayable",
     type: "function"
   },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "string", name: "content", type: "string" },
-      { internalType: "address", name: "token", type: "address" },
-      { internalType: "uint256", name: "amount", type: "uint256" },
-      { internalType: "address", name: "recipient", type: "address" },
-      { internalType: "uint256", name: "feeAmount", type: "uint256" },
-      { internalType: "enum ACPTypes.FeeType", name: "feeType", type: "uint8" },
-      {
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      { internalType: "uint256", name: "expiredAt", type: "uint256" },
-      { internalType: "bool", name: "isSecured", type: "bool" },
-      {
-        internalType: "enum ACPTypes.JobPhase",
-        name: "nextPhase",
-        type: "uint8"
-      },
-      { internalType: "uint32", name: "lzDstEid", type: "uint32" }
-    ],
-    name: "createCrossChainPayableMemo",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
   {
     inputs: [
       { internalType: "address", name: "provider", type: "address" },
@@ -1936,12 +1893,7 @@ var ACP_V2_ABI = [
             name: "nextPhase",
             type: "uint8"
           },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
+          { internalType: "uint256", name: "expiredAt", type: "uint256" }
         ],
         internalType: "struct ACPTypes.Memo[]",
         name: "memos",
@@ -1988,12 +1940,7 @@ var ACP_V2_ABI = [
             name: "nextPhase",
             type: "uint8"
           },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
+          { internalType: "uint256", name: "expiredAt", type: "uint256" }
         ],
         internalType: "struct ACPTypes.Memo[]",
         name: "memos",
@@ -2036,12 +1983,7 @@ var ACP_V2_ABI = [
             name: "nextPhase",
             type: "uint8"
           },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
+          { internalType: "uint256", name: "expiredAt", type: "uint256" }
         ],
         internalType: "struct ACPTypes.Memo[]",
         name: "memos",
@@ -2297,7 +2239,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, retryConfig, chains = []) {
+  constructor(chain, contractAddress, baseFare, alchemyRpcUrl, acpUrl, abi, maxRetries, rpcEndpoint, x402Config, retryConfig) {
     this.chain = chain;
     this.contractAddress = contractAddress;
     this.baseFare = baseFare;
@@ -2308,7 +2250,6 @@ var AcpContractConfig2 = class {
     this.rpcEndpoint = rpcEndpoint;
     this.x402Config = x402Config;
     this.retryConfig = retryConfig;
-    this.chains = chains;
   }
 };
 var baseSepoliaAcpConfig = new AcpContractConfig2(
@@ -3536,10 +3477,7 @@ var SINGLE_SIGNER_VALIDATION_MODULE_ABI = [
 var singleSignerValidationModuleAbi_default = SINGLE_SIGNER_VALIDATION_MODULE_ABI;
 
 // src/constants.ts
-import {
-  base as base2,
-  baseSepolia as baseSepolia2
-} from "viem/chains";
+import { base as base2, baseSepolia as baseSepolia2 } from "viem/chains";
 var USDC_TOKEN_ADDRESS = {
   [baseSepolia2.id]: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
   [base2.id]: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
@@ -3587,7 +3525,6 @@ var BaseAcpContractClient = class {
   constructor(agentWalletAddress, config = baseAcpConfig) {
     this.agentWalletAddress = agentWalletAddress;
     this.config = config;
-    this.publicClients = {};
     this.chain = config.chain;
     this.abi = config.abi;
     this.contractAddress = config.contractAddress;
@@ -3687,12 +3624,12 @@ ${JSON.stringify(
       throw new acpError_default("Failed to create job", error);
     }
   }
-  approveAllowance(amountBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress, targetAddress) {
+  approveAllowance(amountBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress) {
     try {
       const data = encodeFunctionData({
         abi: erc20Abi2,
         functionName: "approve",
-        args: [targetAddress ?? this.contractAddress, amountBaseUnit]
+        args: [this.contractAddress, amountBaseUnit]
       });
       const payload = {
         data,
@@ -3731,35 +3668,6 @@ ${JSON.stringify(
       throw new acpError_default("Failed to create payable memo", error);
     }
   }
-  createCrossChainPayableMemo(jobId, content, token, amountBaseUnit, recipient, feeAmountBaseUnit, feeType, type, expiredAt, nextPhase, destinationEid, secured = true) {
-    try {
-      const data = encodeFunctionData({
-        abi: this.abi,
-        functionName: "createCrossChainPayableMemo",
-        args: [
-          jobId,
-          content,
-          token,
-          amountBaseUnit,
-          recipient,
-          feeAmountBaseUnit,
-          feeType,
-          type,
-          expiredAt,
-          secured,
-          nextPhase,
-          destinationEid
-        ]
-      });
-      const payload = {
-        data,
-        contractAddress: this.contractAddress
-      };
-      return payload;
-    } catch (error) {
-      throw new acpError_default("Failed to create cross chain payable memo", error);
-    }
-  }
   createMemo(jobId, content, type, isSecured, nextPhase) {
     try {
       const data = encodeFunctionData({
@@ -3776,22 +3684,6 @@ ${JSON.stringify(
       throw new acpError_default("Failed to create memo", error);
     }
   }
-  createMemoWithMetadata(jobId, content, type, isSecured, nextPhase, metadata) {
-    try {
-      const data = encodeFunctionData({
-        abi: this.abi,
-        functionName: "createMemoWithMetadata",
-        args: [jobId, content, type, isSecured, nextPhase, metadata]
-      });
-      const payload = {
-        data,
-        contractAddress: this.contractAddress
-      };
-      return payload;
-    } catch (error) {
-      throw new acpError_default("Failed to create memo with metadata", error);
-    }
-  }
   signMemo(memoId, isApproved, reason) {
     try {
       const data = encodeFunctionData({
@@ -3877,47 +3769,9 @@ ${JSON.stringify(
       throw new acpError_default("Failed to submit TransferWithAuthorization", error);
     }
   }
-  async getERC20Balance(chainId, tokenAddress, walletAddress) {
-    const publicClient = this.publicClients[chainId];
-    if (!publicClient) {
-      throw new acpError_default(`Public client for chainId ${chainId} not found`);
-    }
-    return await publicClient.readContract({
-      address: tokenAddress,
-      abi: erc20Abi2,
-      functionName: "balanceOf",
-      args: [walletAddress]
-    });
-  }
-  async getERC20Allowance(chainId, tokenAddress, walletAddress, spenderAddress) {
-    const publicClient = this.publicClients[chainId];
-    if (!publicClient) {
-      throw new acpError_default(`Public client for chainId ${chainId} not found`);
-    }
-    return await publicClient.readContract({
-      address: tokenAddress,
-      abi: erc20Abi2,
-      functionName: "allowance",
-      args: [walletAddress, spenderAddress]
-    });
-  }
-  async getERC20Symbol(chainId, tokenAddress) {
-    const publicClient = this.publicClients[chainId];
-    if (!publicClient) {
-      throw new acpError_default(`Public client for chainId ${chainId} not found`);
-    }
-    return await publicClient.readContract({
-      address: tokenAddress,
-      abi: erc20Abi2,
-      functionName: "symbol"
-    });
-  }
 };
 var baseAcpContractClient_default = BaseAcpContractClient;
 
-// src/acpJob.ts
-import { formatUnits } from "viem";
-
 // src/interfaces.ts
 var AcpMemoStatus = /* @__PURE__ */ ((AcpMemoStatus2) => {
   AcpMemoStatus2["PENDING"] = "PENDING";
@@ -3925,15 +3779,6 @@ var AcpMemoStatus = /* @__PURE__ */ ((AcpMemoStatus2) => {
   AcpMemoStatus2["REJECTED"] = "REJECTED";
   return AcpMemoStatus2;
 })(AcpMemoStatus || {});
-var AcpMemoState = /* @__PURE__ */ ((AcpMemoState2) => {
-  AcpMemoState2[AcpMemoState2["NONE"] = 0] = "NONE";
-  AcpMemoState2[AcpMemoState2["PENDING"] = 1] = "PENDING";
-  AcpMemoState2[AcpMemoState2["IN_PROGRESS"] = 2] = "IN_PROGRESS";
-  AcpMemoState2[AcpMemoState2["READY"] = 3] = "READY";
-  AcpMemoState2[AcpMemoState2["COMPLETED"] = 4] = "COMPLETED";
-  AcpMemoState2[AcpMemoState2["REJECTED"] = 5] = "REJECTED";
-  return AcpMemoState2;
-})(AcpMemoState || {});
 var AcpAgentSort = /* @__PURE__ */ ((AcpAgentSort2) => {
   AcpAgentSort2["SUCCESSFUL_JOB_COUNT"] = "successfulJobCount";
   AcpAgentSort2["SUCCESS_RATE"] = "successRate";
@@ -3953,38 +3798,8 @@ var AcpOnlineStatus = /* @__PURE__ */ ((AcpOnlineStatus2) => {
   AcpOnlineStatus2["OFFLINE"] = "offline";
   return AcpOnlineStatus2;
 })(AcpOnlineStatus || {});
-var PayloadType = /* @__PURE__ */ ((PayloadType2) => {
-  PayloadType2["FUND_RESPONSE"] = "fund_response";
-  PayloadType2["OPEN_POSITION"] = "open_position";
-  PayloadType2["SWAP_TOKEN"] = "swap_token";
-  PayloadType2["RESPONSE_SWAP_TOKEN"] = "response_swap_token";
-  PayloadType2["CLOSE_PARTIAL_POSITION"] = "close_partial_position";
-  PayloadType2["CLOSE_POSITION"] = "close_position";
-  PayloadType2["POSITION_FULFILLED"] = "position_fulfilled";
-  PayloadType2["CLOSE_JOB_AND_WITHDRAW"] = "close_job_and_withdraw";
-  PayloadType2["UNFULFILLED_POSITION"] = "unfulfilled_position";
-  return PayloadType2;
-})(PayloadType || {});
-var PositionDirection = /* @__PURE__ */ ((PositionDirection2) => {
-  PositionDirection2["LONG"] = "long";
-  PositionDirection2["SHORT"] = "short";
-  return PositionDirection2;
-})(PositionDirection || {});
 
 // src/utils.ts
-import { decodeAbiParameters, encodeAbiParameters } from "viem";
-import {
-  arbitrum as arbitrum3,
-  arbitrumSepolia as arbitrumSepolia3,
-  base as base3,
-  baseSepolia as baseSepolia3,
-  bsc as bsc3,
-  bscTestnet as bscTestnet3,
-  mainnet as mainnet3,
-  polygon as polygon3,
-  polygonAmoy as polygonAmoy3,
-  sepolia as sepolia3
-} from "viem/chains";
 function tryParseJson(content) {
   try {
     return JSON.parse(content);
@@ -4001,31 +3816,6 @@ function safeBase64Encode(data) {
   }
   return Buffer.from(data).toString("base64");
 }
-function getDestinationEndpointId(chainId) {
-  switch (chainId) {
-    case baseSepolia3.id:
-      return 40245;
-    case sepolia3.id:
-      return 40161;
-    case polygonAmoy3.id:
-      return 40267;
-    case arbitrumSepolia3.id:
-      return 40231;
-    case bscTestnet3.id:
-      return 40102;
-    case base3.id:
-      return 30184;
-    case mainnet3.id:
-      return 30101;
-    case polygon3.id:
-      return 30109;
-    case arbitrum3.id:
-      return 30110;
-    case bsc3.id:
-      return 30102;
-  }
-  throw new Error(`Unsupported chain ID: ${chainId}`);
-}
 
 // src/acpJobOffering.ts
 import { zeroAddress as zeroAddress2 } from "viem";
@@ -4042,6 +3832,11 @@ var AcpJobOffering = class {
     this.ajv = new Ajv({ allErrors: true });
   }
   async initiateJob(serviceRequirement, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
+    if (this.providerAddress === this.acpClient.walletAddress) {
+      throw new acpError_default(
+        "Provider address cannot be the same as the client address"
+      );
+    }
     if (this.requirement && typeof this.requirement === "object") {
       const validator = this.ajv.compile(this.requirement);
       const valid = validator(serviceRequirement);
@@ -4228,43 +4023,25 @@ var AcpJob = class {
     }
     const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
     const isPercentagePricing = this.priceType === "percentage" /* PERCENTAGE */;
-    if (amount.fare.chainId && amount.fare.chainId !== this.acpContractClient.config.chain.id) {
-      operations.push(
-        this.acpContractClient.createCrossChainPayableMemo(
-          this.id,
-          content,
-          amount.fare.contractAddress,
-          amount.amount,
-          recipient,
-          isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
-          isPercentagePricing ? 3 /* PERCENTAGE_FEE */ : 0 /* NO_FEE */,
-          type,
-          expiredAt,
-          2 /* TRANSACTION */,
-          getDestinationEndpointId(amount.fare.chainId)
-        )
-      );
-    } else {
-      operations.push(
-        this.acpContractClient.createPayableMemo(
-          this.id,
-          content,
-          amount.amount,
-          recipient,
-          isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
-          isPercentagePricing ? 3 /* PERCENTAGE_FEE */ : 0 /* NO_FEE */,
-          2 /* TRANSACTION */,
-          type,
-          expiredAt,
-          amount.fare.contractAddress
-        )
-      );
-    }
+    operations.push(
+      this.acpContractClient.createPayableMemo(
+        this.id,
+        content,
+        amount.amount,
+        recipient,
+        isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
+        isPercentagePricing ? 3 /* PERCENTAGE_FEE */ : 0 /* NO_FEE */,
+        2 /* TRANSACTION */,
+        type,
+        expiredAt,
+        amount.fare.contractAddress
+      )
+    );
     return await this.acpContractClient.handleOperation(operations);
   }
   async payAndAcceptRequirement(reason) {
     const memo = this.memos.find(
-      (m) => m.nextPhase === 2 /* TRANSACTION */ || m.nextPhase === 4 /* COMPLETED */
+      (m) => m.nextPhase === 2 /* TRANSACTION */
     );
     if (!memo) {
       throw new acpError_default("No notification memo found");
@@ -4373,8 +4150,8 @@ var AcpJob = class {
     return await this.acpContractClient.handleOperation(operations);
   }
   async deliver(deliverable) {
-    if (this.latestMemo?.nextPhase !== 3 /* EVALUATION */) {
-      throw new acpError_default("No transaction memo found");
+    if (this.phase !== 2 /* TRANSACTION */) {
+      throw new acpError_default("Job is not in transaction phase");
     }
     const operations = [];
     operations.push(
@@ -4392,9 +4169,6 @@ var AcpJob = class {
     if (this.latestMemo?.nextPhase !== 3 /* EVALUATION */) {
       throw new acpError_default("No transaction memo found");
     }
-    if (amount.fare.chainId !== this.acpContractClient.config.chain.id) {
-      return await this.deliverCrossChainPayable(this.clientAddress, amount);
-    }
     const operations = [];
     operations.push(
       this.acpContractClient.approveAllowance(
@@ -4407,6 +4181,7 @@ var AcpJob = class {
     operations.push(
       this.acpContractClient.createPayableMemo(
         this.id,
+        // memoContent.url,
         preparePayload(deliverable),
         amount.amount,
         this.clientAddress,
@@ -4525,57 +4300,6 @@ var AcpJob = class {
       waitMs = Math.min(waitMs * 2, maxWaitMs);
     }
   }
-  async deliverCrossChainPayable(recipient, amount, isRequest = false) {
-    if (!amount.fare.chainId) {
-      throw new acpError_default("Chain ID is required for cross chain payable");
-    }
-    const chainId = amount.fare.chainId;
-    const assetManagerAddress = await this.acpContractClient.getAssetManager();
-    const tokenBalance = await this.acpContractClient.getERC20Balance(
-      chainId,
-      amount.fare.contractAddress,
-      this.acpContractClient.agentWalletAddress
-    );
-    if (tokenBalance < amount.amount) {
-      throw new acpError_default("Insufficient token balance for cross chain payable");
-    }
-    const currentAllowance = await this.acpContractClient.getERC20Allowance(
-      chainId,
-      amount.fare.contractAddress,
-      this.acpContractClient.agentWalletAddress,
-      assetManagerAddress
-    );
-    const approveAllowanceOperation = this.acpContractClient.approveAllowance(
-      amount.amount + currentAllowance,
-      amount.fare.contractAddress,
-      assetManagerAddress
-    );
-    await this.acpContractClient.handleOperation(
-      [approveAllowanceOperation],
-      chainId
-    );
-    const tokenSymbol = await this.acpContractClient.getERC20Symbol(
-      chainId,
-      amount.fare.contractAddress
-    );
-    const createMemoOperation = this.acpContractClient.createCrossChainPayableMemo(
-      this.id,
-      `Performing cross chain payable transfer of ${formatUnits(
-        amount.amount,
-        amount.fare.decimals
-      )} ${tokenSymbol} to ${recipient}`,
-      amount.fare.contractAddress,
-      amount.amount,
-      recipient,
-      BigInt(0),
-      0 /* NO_FEE */,
-      isRequest ? 6 /* PAYABLE_REQUEST */ : 7 /* PAYABLE_TRANSFER */,
-      new Date(Date.now() + 1e3 * 60 * 5),
-      isRequest ? 2 /* TRANSACTION */ : 4 /* COMPLETED */,
-      getDestinationEndpointId(chainId)
-    );
-    await this.acpContractClient.handleOperation([createMemoOperation]);
-  }
   [util.inspect.custom]() {
     return {
       id: this.id,
@@ -4599,7 +4323,7 @@ var acpJob_default = AcpJob;
 // src/acpMemo.ts
 import util2 from "util";
 var AcpMemo = class {
-  constructor(contractClient, id, type, content, nextPhase, status, senderAddress, signedReason, expiry, payableDetails, txHash, signedTxHash, state) {
+  constructor(contractClient, id, type, content, nextPhase, status, senderAddress, signedReason, expiry, payableDetails, txHash, signedTxHash) {
     this.contractClient = contractClient;
     this.id = id;
     this.type = type;
@@ -4612,21 +4336,13 @@ 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);
     }
-    this.structuredContent = tryParseJson(this.content) || void 0;
-  }
-  get payloadType() {
-    return this.structuredContent?.type;
-  }
-  getStructuredContent() {
-    return this.structuredContent;
   }
   async create(jobId, isSecured = true) {
-    return await this.contractClient.createMemo(
+    return this.contractClient.createMemo(
       jobId,
       this.content,
       this.type,
@@ -4674,10 +4390,31 @@ var AcpAccount = class {
   }
 };
 
+// src/acpClient.ts
+import axios, { AxiosError } from "axios";
+
+// src/acpAgent.ts
+var AcpAgent = class {
+  constructor(args) {
+    this.id = String(args.id);
+    this.name = args.name;
+    this.contractAddress = args.contractAddress;
+    this.walletAddress = args.walletAddress;
+    this.jobOfferings = Object.freeze([...args.jobOfferings]);
+    this.description = args.description;
+    this.twitterHandle = args.twitterHandle;
+    this.metrics = args.metrics;
+    this.resources = args.resources;
+  }
+};
+var acpAgent_default = AcpAgent;
+
 // src/acpClient.ts
 var { version } = require_package();
 var AcpClient = class {
   constructor(options) {
+    this.accessToken = null;
+    this.accessTokenInflight = null;
     this.contractClients = Array.isArray(options.acpContractClient) ? options.acpContractClient : [options.acpContractClient];
     if (this.contractClients.length === 0) {
       throw new acpError_default("ACP contract client is required");
@@ -4689,10 +4426,86 @@ var AcpClient = class {
         );
       }
     });
+    this.acpClient = axios.create({
+      baseURL: `${this.acpUrl}/api`,
+      headers: {
+        "wallet-address": this.walletAddress
+      }
+    });
+    this.noAuthAcpClient = this.acpClient.create({
+      baseURL: `${this.acpUrl}/api`
+    });
+    this.acpClient.interceptors.request.use(async (config) => {
+      const accessToken = await this.getAccessToken();
+      config.headers["authorization"] = `Bearer ${accessToken}`;
+      return config;
+    });
     this.onNewTask = options.onNewTask;
     this.onEvaluate = options.onEvaluate || this.defaultOnEvaluate;
     this.init(options.skipSocketConnection);
   }
+  async getAccessToken() {
+    if (this.accessTokenInflight) {
+      return await this.accessTokenInflight;
+    }
+    let refreshToken = this.accessToken ? false : true;
+    if (this.accessToken) {
+      const decodedToken = jwtDecode(this.accessToken);
+      if (decodedToken.exp && decodedToken.exp - 60 * 5 < Math.floor(Date.now() / 1e3)) {
+        refreshToken = true;
+      }
+    }
+    if (!refreshToken) {
+      return this.accessToken;
+    }
+    this.accessTokenInflight = (async () => {
+      this.accessToken = await this.refreshToken();
+      return this.accessToken;
+    })().finally(() => {
+      this.accessTokenInflight = null;
+    });
+    return await this.accessTokenInflight;
+  }
+  async refreshToken() {
+    const challenge = await this.getAuthChallenge();
+    const signature = await this.acpContractClient.signTypedData(challenge);
+    const verified = await this.verifyAuthChallenge(
+      challenge.message["walletAddress"],
+      challenge.message["nonce"],
+      challenge.message["expiresAt"],
+      signature
+    );
+    return verified.accessToken;
+  }
+  async getAuthChallenge() {
+    try {
+      const response = await this.noAuthAcpClient.get("/auth/challenge", {
+        params: {
+          walletAddress: this.walletAddress
+        }
+      });
+      return response.data.data;
+    } catch (err) {
+      console.error(
+        "Failed to get auth challenge",
+        err.response?.data
+      );
+      throw new acpError_default("Failed to get auth challenge", err);
+    }
+  }
+  async verifyAuthChallenge(walletAddress, nonce, expiresAt, signature) {
+    try {
+      const response = await this.noAuthAcpClient.post("/auth/verify-typed-signature", {
+        walletAddress,
+        nonce,
+        expiresAt,
+        signature
+      });
+      return response.data.data;
+    } catch (err) {
+      throw new acpError_default("Failed to verify auth challenge", err);
+    }
+  }
   contractClientByAddress(address) {
     if (!address) {
       return this.contractClients[0];
@@ -4721,9 +4534,13 @@ var AcpClient = class {
     if (skipSocketConnection) {
       return;
     }
+    console.log("Initializing socket");
     const socket = io(this.acpUrl, {
-      auth: {
-        walletAddress: this.walletAddress
+      auth: async (cb) => {
+        cb({
+          walletAddress: this.walletAddress,
+          accessToken: await this.getAccessToken()
+        });
       },
       extraHeaders: {
         "x-sdk-version": version,
@@ -4737,87 +4554,23 @@ var AcpClient = class {
       console.log("Joined ACP Room");
       callback(true);
     });
-    socket.on(
-      "onEvaluate" /* ON_EVALUATE */,
-      async (data, callback) => {
-        callback(true);
-        if (this.onEvaluate) {
-          const job = new acpJob_default(
-            this,
-            data.id,
-            data.clientAddress,
-            data.providerAddress,
-            data.evaluatorAddress,
-            data.price,
-            data.priceTokenAddress,
-            data.memos.map((memo) => {
-              return new acpMemo_default(
-                this.contractClientByAddress(data.contractAddress),
-                memo.id,
-                memo.memoType,
-                memo.content,
-                memo.nextPhase,
-                memo.status,
-                memo.senderAddress,
-                memo.signedReason,
-                memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
-                memo.payableDetails,
-                memo.txHash,
-                memo.signedTxHash,
-                memo.state
-              );
-            }),
-            data.phase,
-            data.context,
-            data.contractAddress,
-            data.netPayableAmount
-          );
-          this.onEvaluate(job);
-        }
+    socket.on("onEvaluate" /* ON_EVALUATE */, async (data, callback) => {
+      callback(true);
+      if (this.onEvaluate) {
+        const job = this._hydrateJob(data);
+        this.onEvaluate(job);
       }
-    );
-    socket.on(
-      "onNewTask" /* ON_NEW_TASK */,
-      async (data, callback) => {
-        callback(true);
-        if (this.onNewTask) {
-          const job = new acpJob_default(
-            this,
-            data.id,
-            data.clientAddress,
-            data.providerAddress,
-            data.evaluatorAddress,
-            data.price,
-            data.priceTokenAddress,
-            data.memos.map((memo) => {
-              return new acpMemo_default(
-                this.contractClientByAddress(data.contractAddress),
-                memo.id,
-                memo.memoType,
-                memo.content,
-                memo.nextPhase,
-                memo.status,
-                memo.senderAddress,
-                memo.signedReason,
-                memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
-                memo.payableDetails,
-                memo.txHash,
-                memo.signedTxHash,
-                memo.state
-              );
-            }),
-            data.phase,
-            data.context,
-            data.contractAddress,
-            data.netPayableAmount
-          );
-          this.onNewTask(
-            job,
-            job.memos.find((m) => m.id == data.memoToSign)
-          );
-        }
+    });
+    socket.on("onNewTask" /* ON_NEW_TASK */, async (data, callback) => {
+      callback(true);
+      if (this.onNewTask) {
+        const job = this._hydrateJob(data);
+        this.onNewTask(
+          job,
+          job.memos.find((m) => m.id == data.memoToSign)
+        );
       }
-    );
+    });
     const cleanup = async () => {
       if (socket) {
         socket.disconnect();
@@ -4827,77 +4580,156 @@ var AcpClient = class {
     process.on("SIGINT", cleanup);
     process.on("SIGTERM", cleanup);
   }
-  async browseAgents(keyword, options) {
-    let {
+  async _fetch(url, method = "GET", params, data, errCallback) {
+    try {
+      const response = await this.acpClient.request({
+        url,
+        method,
+        params,
+        data
+      });
+      return response.data.data;
+    } catch (err) {
+      if (err instanceof AxiosError) {
+        if (errCallback) {
+          errCallback(err);
+        } else if (err.response?.data.error?.message) {
+          throw new acpError_default(err.response?.data.error.message);
+        }
+      } else {
+        throw new acpError_default(
+          `Failed to fetch ACP Endpoint: ${url} (network error)`,
+          err
+        );
+      }
+    }
+  }
+  _hydrateMemo(memo, contractClient) {
+    try {
+      return new acpMemo_default(
+        contractClient,
+        memo.id,
+        memo.memoType,
+        memo.content,
+        memo.nextPhase,
+        memo.status,
+        memo.senderAddress,
+        memo.signedReason,
+        memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
+        memo.payableDetails,
+        memo.txHash,
+        memo.signedTxHash
+      );
+    } catch (err) {
+      throw new acpError_default(`Failed to hydrate memo ${memo.id}`, err);
+    }
+  }
+  _hydrateJob(job) {
+    try {
+      return new acpJob_default(
+        this,
+        job.id,
+        job.clientAddress,
+        job.providerAddress,
+        job.evaluatorAddress,
+        job.price,
+        job.priceTokenAddress,
+        job.memos.map(
+          (memo) => this._hydrateMemo(
+            memo,
+            this.contractClientByAddress(job.contractAddress)
+          )
+        ),
+        job.phase,
+        job.context,
+        job.contractAddress,
+        job.netPayableAmount
+      );
+    } catch (err) {
+      throw new acpError_default(`Failed to hydrate job ${job.id}`, err);
+    }
+  }
+  _hydrateJobs(rawJobs, options) {
+    const jobs = rawJobs.map((job) => {
+      try {
+        return this._hydrateJob(job);
+      } catch (err) {
+        console.warn(`${options?.logPrefix ?? "Skipped"}`, err);
+        return null;
+      }
+    });
+    return jobs.filter((job) => !!job);
+  }
+  _hydrateAgent(agent) {
+    const acpContractClient = this.contractClients.find(
+      (client) => client.contractAddress.toLowerCase() === agent.contractAddress.toLowerCase()
+    );
+    if (!acpContractClient) {
+      throw new acpError_default("ACP contract client not found");
+    }
+    return new acpAgent_default({
+      id: agent.id,
+      name: agent.name,
+      description: agent.description,
+      jobOfferings: agent.jobs.map((jobs) => {
+        return new acpJobOffering_default(
+          this,
+          acpContractClient,
+          agent.walletAddress,
+          jobs.name,
+          jobs.priceV2.value,
+          jobs.priceV2.type,
+          jobs.requirement
+        );
+      }),
+      contractAddress: agent.contractAddress,
+      twitterHandle: agent.twitterHandle,
+      walletAddress: agent.walletAddress,
+      metrics: agent.metrics,
+      resources: agent.resources
+    });
+  }
+  async browseAgents(keyword, options = {}) {
+    const {
       cluster,
-      sort_by,
-      top_k,
+      sortBy,
+      topK = 5,
       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) {
-      url += `&sortBy=${sort_by.map((s) => s).join(",")}`;
-    }
-    if (top_k) {
-      url += `&top_k=${top_k}`;
-    }
-    if (this.walletAddress) {
-      url += `&walletAddressesToExclude=${this.walletAddress}`;
+    const params = {
+      search: keyword
+    };
+    params.top_k = topK;
+    params.walletAddressesToExclude = this.walletAddress;
+    if (sortBy && sortBy.length > 0) {
+      params.sortBy = sortBy.join(",");
     }
     if (cluster) {
-      url += `&cluster=${cluster}`;
+      params.cluster = cluster;
     }
     if (graduationStatus) {
-      url += `&graduationStatus=${graduationStatus}`;
+      params.graduationStatus = graduationStatus;
     }
     if (onlineStatus) {
-      url += `&onlineStatus=${onlineStatus}`;
+      params.onlineStatus = onlineStatus;
     }
     if (showHiddenOfferings) {
-      url += `&showHiddenOfferings=${showHiddenOfferings}`;
+      params.showHiddenOfferings = true;
     }
-    const response = await fetch(url);
-    const data = await response.json();
+    const agents = await this._fetch("/agents/v4/search", "GET", params) || [];
     const availableContractClientAddresses = this.contractClients.map(
       (client) => client.contractAddress.toLowerCase()
     );
-    return data.data.filter(
+    return agents.filter(
       (agent) => agent.walletAddress.toLowerCase() !== this.walletAddress.toLowerCase()
     ).filter(
       (agent) => availableContractClientAddresses.includes(
         agent.contractAddress.toLowerCase()
       )
     ).map((agent) => {
-      const acpContractClient = this.contractClients.find(
-        (client) => client.contractAddress.toLowerCase() === agent.contractAddress.toLowerCase()
-      );
-      if (!acpContractClient) {
-        throw new acpError_default("ACP contract client not found");
-      }
-      return {
-        id: agent.id,
-        name: agent.name,
-        description: agent.description,
-        jobOfferings: agent.jobs.map((jobs) => {
-          return new acpJobOffering_default(
-            this,
-            acpContractClient,
-            agent.walletAddress,
-            jobs.name,
-            jobs.priceV2.value,
-            jobs.priceV2.type,
-            jobs.requirement
-          );
-        }),
-        contractAddress: agent.contractAddress,
-        twitterHandle: agent.twitterHandle,
-        walletAddress: agent.walletAddress,
-        metrics: agent.metrics,
-        resources: agent.resources
-      };
+      return this._hydrateAgent(agent);
     });
   }
   async initiateJob(providerAddress, serviceRequirement, fareAmount, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
@@ -4967,257 +4799,137 @@ var AcpClient = class {
     return jobId;
   }
   async getActiveJobs(page = 1, pageSize = 10) {
-    const url = `${this.acpUrl}/api/jobs/active?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
-    const rawJobs = await this._fetchJobList(url);
-    return this._hydrateJobs(rawJobs, { logPrefix: "Active jobs" });
+    const rawJobs = await this._fetch("/jobs/active", "GET", {
+      pagination: {
+        page,
+        pageSize
+      }
+    });
+    return this._hydrateJobs(rawJobs ?? [], { logPrefix: "Active jobs" });
   }
   async getPendingMemoJobs(page = 1, pageSize = 10) {
-    const url = `${this.acpUrl}/api/jobs/pending-memos?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
-    const rawJobs = await this._fetchJobList(url);
-    return this._hydrateJobs(rawJobs, { logPrefix: "Pending memo jobs" });
+    const rawJobs = await this._fetch("/jobs/pending-memos", "GET", {
+      pagination: {
+        page,
+        pageSize
+      }
+    });
+    return this._hydrateJobs(rawJobs ?? [], { logPrefix: "Pending memo jobs" });
   }
   async getCompletedJobs(page = 1, pageSize = 10) {
-    const url = `${this.acpUrl}/api/jobs/completed?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
-    const rawJobs = await this._fetchJobList(url);
-    return this._hydrateJobs(rawJobs, { logPrefix: "Completed jobs" });
+    const rawJobs = await this._fetch("/jobs/completed", "GET", {
+      pagination: {
+        page,
+        pageSize
+      }
+    });
+    return this._hydrateJobs(rawJobs ?? [], { logPrefix: "Completed jobs" });
   }
   async getCancelledJobs(page = 1, pageSize = 10) {
-    const url = `${this.acpUrl}/api/jobs/cancelled?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
-    const rawJobs = await this._fetchJobList(url);
-    return this._hydrateJobs(rawJobs, { logPrefix: "Cancelled jobs" });
-  }
-  async _fetchJobList(url) {
-    let response;
-    try {
-      response = await fetch(url, {
-        headers: {
-          "wallet-address": this.walletAddress
-        }
-      });
-    } catch (err) {
-      throw new acpError_default("Failed to fetch ACP jobs (network error)", err);
-    }
-    let data;
-    try {
-      data = await response.json();
-    } catch (err) {
-      throw new acpError_default("Failed to parse ACP jobs response", err);
-    }
-    if (data.error) {
-      throw new acpError_default(data.error.message);
-    }
-    return data.data;
-  }
-  _hydrateJobs(rawJobs, options) {
-    const jobs = [];
-    const errors = [];
-    for (const job of rawJobs) {
-      try {
-        const memos = job.memos.map(
-          (memo) => new acpMemo_default(
-            this.contractClientByAddress(job.contractAddress),
-            memo.id,
-            memo.memoType,
-            memo.content,
-            memo.nextPhase,
-            memo.status,
-            memo.senderAddress,
-            memo.signedReason,
-            memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
-            memo.payableDetails,
-            memo.txHash,
-            memo.signedTxHash,
-            memo.state
-          )
-        );
-        jobs.push(
-          new acpJob_default(
-            this,
-            job.id,
-            job.clientAddress,
-            job.providerAddress,
-            job.evaluatorAddress,
-            job.price,
-            job.priceTokenAddress,
-            memos,
-            job.phase,
-            job.context,
-            job.contractAddress,
-            job.netPayableAmount
-          )
-        );
-      } catch (err) {
-        errors.push({ jobId: job.id, error: err });
-      }
-    }
-    if (errors.length > 0) {
-      console.warn(
-        `${options?.logPrefix ?? "Skipped"} ${errors.length} malformed job(s)
-` + JSON.stringify(
-          errors.map((e) => ({ jobId: e.jobId, message: e.error.message })),
-          null,
-          2
-        )
-      );
-    }
-    return jobs;
+    const rawJobs = await this._fetch("/jobs/cancelled", "GET", {
+      pagination: {
+        page,
+        pageSize
+      }
+    });
+    return this._hydrateJobs(rawJobs ?? [], { logPrefix: "Cancelled jobs" });
   }
   async getJobById(jobId) {
-    const url = `${this.acpUrl}/api/jobs/${jobId}`;
-    let response;
-    try {
-      response = await fetch(url, {
-        headers: {
-          "wallet-address": this.acpContractClient.walletAddress
-        }
-      });
-    } catch (err) {
-      throw new acpError_default("Failed to fetch job by id (network error)", err);
-    }
-    let data;
-    try {
-      data = await response.json();
-    } catch (err) {
-      throw new acpError_default("Failed to parse job by id response", err);
-    }
-    if (data.error) {
-      throw new acpError_default(data.error.message);
-    }
-    const job = data.data;
+    const job = await this._fetch(`/jobs/${jobId}`);
     if (!job) {
-      return void 0;
-    }
-    try {
-      const memos = job.memos.map(
-        (memo) => new acpMemo_default(
-          this.contractClientByAddress(job.contractAddress),
-          memo.id,
-          memo.memoType,
-          memo.content,
-          memo.nextPhase,
-          memo.status,
-          memo.senderAddress,
-          memo.signedReason,
-          memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
-          memo.payableDetails,
-          memo.txHash,
-          memo.signedTxHash,
-          memo.state
-        )
-      );
-      return new acpJob_default(
-        this,
-        job.id,
-        job.clientAddress,
-        job.providerAddress,
-        job.evaluatorAddress,
-        job.price,
-        job.priceTokenAddress,
-        memos,
-        job.phase,
-        job.context,
-        job.contractAddress,
-        job.netPayableAmount
-      );
-    } catch (err) {
-      throw new acpError_default(`Failed to hydrate job ${jobId}`, err);
+      return null;
     }
+    return this._hydrateJob(job);
   }
   async getMemoById(jobId, memoId) {
-    const url = `${this.acpUrl}/api/jobs/${jobId}/memos/${memoId}`;
-    let response;
-    try {
-      response = await fetch(url, {
-        headers: {
-          "wallet-address": this.walletAddress
-        }
-      });
-    } catch (err) {
-      throw new acpError_default("Failed to fetch memo by id (network error)", err);
-    }
-    let data;
-    try {
-      data = await response.json();
-    } catch (err) {
-      throw new acpError_default("Failed to parse memo by id response", err);
-    }
-    if (data.error) {
-      throw new acpError_default(data.error.message);
-    }
-    const memo = data.data;
+    const memo = await this._fetch(
+      `/jobs/${jobId}/memos/${memoId}`
+    );
     if (!memo) {
-      return void 0;
-    }
-    try {
-      return new acpMemo_default(
-        this.contractClientByAddress(memo.contractAddress),
-        memo.id,
-        memo.memoType,
-        memo.content,
-        memo.nextPhase,
-        memo.status,
-        memo.senderAddress,
-        memo.signedReason,
-        memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
-        memo.payableDetails,
-        memo.txHash,
-        memo.signedTxHash,
-        memo.state
-      );
-    } catch (err) {
-      throw new acpError_default(
-        `Failed to hydrate memo ${memoId} for job ${jobId}`,
-        err
-      );
+      return null;
     }
+    return this._hydrateMemo(
+      memo,
+      this.contractClientByAddress(memo.contractAddress)
+    );
   }
-  async getAgent(walletAddress) {
-    const url = `${this.acpUrl}/api/agents?filters[walletAddress]=${walletAddress}`;
-    const response = await fetch(url);
-    const data = await response.json();
-    const agents = data.data || [];
-    if (agents.length === 0) {
-      return;
+  async getAgent(walletAddress, options = {}) {
+    const params = {
+      "filters[walletAddress]": walletAddress
+    };
+    const { showHiddenOfferings } = options;
+    if (showHiddenOfferings) {
+      params.showHiddenOfferings = true;
+    }
+    const agentsResponse = await this.noAuthAcpClient.get("/agents", {
+      params
+    });
+    if (!agentsResponse.data) {
+      return null;
     }
-    return agents[0];
+    return this._hydrateAgent(agentsResponse.data.data[0]);
   }
   async getAccountByJobId(jobId, acpContractClient) {
-    try {
-      const url = `${this.acpUrl}/api/accounts/job/${jobId}`;
-      const response = await fetch(url);
-      const data = await response.json();
-      if (!data.data) {
-        return null;
-      }
-      return new AcpAccount(
-        acpContractClient || this.contractClients[0],
-        data.data.id,
-        data.data.clientAddress,
-        data.data.providerAddress,
-        data.data.metadata
-      );
-    } catch (error) {
-      throw new acpError_default("Failed to get account by job id", error);
+    const account = await this._fetch(`/accounts/job/${jobId}`);
+    if (!account) {
+      return null;
     }
+    return new AcpAccount(
+      acpContractClient || this.contractClients[0],
+      account.id,
+      account.clientAddress,
+      account.providerAddress,
+      account.metadata
+    );
   }
   async getByClientAndProvider(clientAddress, providerAddress, acpContractClient) {
-    try {
-      const url = `${this.acpUrl}/api/accounts/client/${clientAddress}/provider/${providerAddress}`;
-      const response = await fetch(url);
-      const data = await response.json();
-      if (!data.data) {
-        return null;
+    const response = await this._fetch(
+      `/accounts/client/${clientAddress}/provider/${providerAddress}`,
+      "GET",
+      {},
+      {},
+      (err) => {
+        if (err.response?.status === 404) {
+          console.warn("Account not found by client and provider");
+          return;
+        }
+        throw new acpError_default("Failed to get account by client and provider", err);
       }
-      return new AcpAccount(
-        acpContractClient || this.contractClients[0],
-        data.data.id,
-        data.data.clientAddress,
-        data.data.providerAddress,
-        data.data.metadata
-      );
-    } catch (error) {
-      throw new acpError_default("Failed to get account by client and provider", error);
+    );
+    if (!response) {
+      return null;
+    }
+    return new AcpAccount(
+      acpContractClient || this.contractClients[0],
+      response.id,
+      response.clientAddress,
+      response.providerAddress,
+      response.metadata
+    );
+  }
+  async createMemoContent(jobId, content) {
+    const response = await this._fetch(
+      `/memo-contents`,
+      "POST",
+      {},
+      {
+        data: {
+          onChainJobId: jobId,
+          content
+        }
+      }
+    );
+    if (!response) {
+      throw new acpError_default("Failed to create memo content");
     }
+    return response;
+  }
+  async getTokenBalances() {
+    const response = await this._fetch(
+      `/chains/token-balances`,
+      "GET"
+    );
+    return response;
   }
 };
 var acpClient_default = AcpClient;
@@ -5228,7 +4940,10 @@ import { alchemy } from "@account-kit/infra";
 import {
   createModularAccountV2Client
 } from "@account-kit/smart-contracts";
-import { decodeEventLog, encodeFunctionData as encodeFunctionData3 } from "viem";
+import {
+  decodeEventLog,
+  encodeFunctionData as encodeFunctionData3
+} from "viem";
 
 // src/acpX402.ts
 import {
@@ -5600,12 +5315,12 @@ 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";
   }
+  signTypedData(typedData) {
+    return this.sessionKeyClient.signTypedData({ typedData });
+  }
 };
 var acpContractClient_default = AcpContractClient;
 
@@ -5615,7 +5330,11 @@ import { alchemy as alchemy2 } from "@account-kit/infra";
 import {
   createModularAccountV2Client as createModularAccountV2Client2
 } from "@account-kit/smart-contracts";
-import { createPublicClient as createPublicClient4, decodeEventLog as decodeEventLog2, http as http3 } from "viem";
+import {
+  createPublicClient as createPublicClient4,
+  decodeEventLog as decodeEventLog2,
+  http as http3
+} from "viem";
 
 // src/abis/jobManagerAbi.ts
 var JOB_MANAGER_ABI = [
@@ -6319,1234 +6038,76 @@ var JOB_MANAGER_ABI = [
 var jobManagerAbi_default = JOB_MANAGER_ABI;
 
 // src/contractClients/acpContractClientV2.ts
-import { base as base4, baseSepolia as baseSepolia4 } from "viem/chains";
-
-// src/abis/memoManagerAbi.ts
-var MEMO_MANAGER_ABI = [
-  { inputs: [], stateMutability: "nonpayable", type: "constructor" },
-  { inputs: [], name: "AccessControlBadConfirmation", type: "error" },
-  {
-    inputs: [
-      { internalType: "address", name: "account", type: "address" },
-      { internalType: "bytes32", name: "neededRole", type: "bytes32" }
-    ],
-    name: "AccessControlUnauthorizedAccount",
-    type: "error"
-  },
-  {
-    inputs: [{ internalType: "address", name: "target", type: "address" }],
-    name: "AddressEmptyCode",
-    type: "error"
-  },
-  { inputs: [], name: "AlreadyVoted", type: "error" },
-  { inputs: [], name: "CannotApproveMemo", type: "error" },
-  { inputs: [], name: "CannotUpdateApprovedMemo", type: "error" },
-  { inputs: [], name: "CannotUpdateMemo", type: "error" },
-  { inputs: [], name: "CannotWithdrawYet", type: "error" },
-  { inputs: [], name: "DestinationChainNotConfigured", type: "error" },
-  {
-    inputs: [
-      { internalType: "address", name: "implementation", type: "address" }
-    ],
-    name: "ERC1967InvalidImplementation",
-    type: "error"
-  },
-  { inputs: [], name: "ERC1967NonPayable", type: "error" },
-  { inputs: [], name: "EmptyContent", type: "error" },
-  { inputs: [], name: "FailedInnerCall", type: "error" },
-  { inputs: [], name: "InvalidInitialization", type: "error" },
-  { inputs: [], name: "InvalidMemoState", type: "error" },
-  { inputs: [], name: "InvalidMemoStateTransition", type: "error" },
-  { inputs: [], name: "InvalidMemoType", type: "error" },
-  { inputs: [], name: "JobAlreadyCompleted", type: "error" },
-  { inputs: [], name: "JobDoesNotExist", type: "error" },
-  { inputs: [], name: "MemoAlreadyApproved", type: "error" },
-  { inputs: [], name: "MemoAlreadyExecuted", type: "error" },
-  { inputs: [], name: "MemoAlreadySigned", type: "error" },
-  { inputs: [], name: "MemoCannotBeSigned", type: "error" },
-  { inputs: [], name: "MemoDoesNotExist", type: "error" },
-  { inputs: [], name: "MemoDoesNotRequireApproval", type: "error" },
-  { inputs: [], name: "MemoExpired", type: "error" },
-  { inputs: [], name: "MemoNotApproved", type: "error" },
-  { inputs: [], name: "MemoNotReadyToBeSigned", type: "error" },
-  { inputs: [], name: "MemoStateUnchanged", type: "error" },
-  { inputs: [], name: "NoAmountToTransfer", type: "error" },
-  { inputs: [], name: "NoPaymentAmount", type: "error" },
-  { inputs: [], name: "NotEscrowTransferMemoType", type: "error" },
-  { inputs: [], name: "NotInitializing", type: "error" },
-  { inputs: [], name: "NotPayableMemoType", type: "error" },
-  { inputs: [], name: "OnlyACPContract", type: "error" },
-  { inputs: [], name: "OnlyAssetManager", type: "error" },
-  { inputs: [], name: "OnlyClientOrProvider", type: "error" },
-  { inputs: [], name: "OnlyCounterParty", type: "error" },
-  { inputs: [], name: "OnlyEvaluator", type: "error" },
-  { inputs: [], name: "OnlyMemoSender", type: "error" },
-  { inputs: [], name: "ReentrancyGuardReentrantCall", type: "error" },
-  { inputs: [], name: "UUPSUnauthorizedCallContext", type: "error" },
-  {
-    inputs: [{ internalType: "bytes32", name: "slot", type: "bytes32" }],
-    name: "UUPSUnsupportedProxiableUUID",
-    type: "error"
-  },
-  { inputs: [], name: "ZeroAcpContractAddress", type: "error" },
-  { inputs: [], name: "ZeroAddressRecipient", type: "error" },
-  { inputs: [], name: "ZeroAddressToken", type: "error" },
-  { inputs: [], name: "ZeroAssetManagerAddress", type: "error" },
-  { inputs: [], name: "ZeroJobManagerAddress", type: "error" },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint64",
-        name: "version",
-        type: "uint64"
-      }
-    ],
-    name: "Initialized",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "memoId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "approver",
-        type: "address"
-      },
-      { indexed: false, internalType: "bool", name: "approved", type: "bool" },
-      {
-        indexed: false,
-        internalType: "string",
-        name: "reason",
-        type: "string"
-      }
-    ],
-    name: "MemoSigned",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "memoId",
-        type: "uint256"
-      },
-      {
-        indexed: false,
-        internalType: "enum ACPTypes.MemoState",
-        name: "oldState",
-        type: "uint8"
-      },
-      {
-        indexed: false,
-        internalType: "enum ACPTypes.MemoState",
-        name: "newState",
-        type: "uint8"
-      }
-    ],
-    name: "MemoStateUpdated",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "memoId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "jobId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      {
-        indexed: false,
-        internalType: "enum ACPTypes.JobPhase",
-        name: "nextPhase",
-        type: "uint8"
-      },
-      {
-        indexed: false,
-        internalType: "string",
-        name: "content",
-        type: "string"
-      }
-    ],
-    name: "NewMemo",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "jobId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "memoId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "token",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "PayableFeeRefunded",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "jobId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "memoId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "token",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "PayableFundsRefunded",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "memoId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "uint256",
-        name: "jobId",
-        type: "uint256"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "executor",
-        type: "address"
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256"
-      }
-    ],
-    name: "PayableMemoExecuted",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, internalType: "bytes32", name: "role", type: "bytes32" },
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "previousAdminRole",
-        type: "bytes32"
-      },
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "newAdminRole",
-        type: "bytes32"
-      }
-    ],
-    name: "RoleAdminChanged",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, internalType: "bytes32", name: "role", type: "bytes32" },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "account",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      }
-    ],
-    name: "RoleGranted",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      { indexed: true, internalType: "bytes32", name: "role", type: "bytes32" },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "account",
-        type: "address"
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "sender",
-        type: "address"
-      }
-    ],
-    name: "RoleRevoked",
-    type: "event"
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "implementation",
-        type: "address"
-      }
-    ],
-    name: "Upgraded",
-    type: "event"
-  },
-  {
-    inputs: [],
-    name: "ACP_CONTRACT_ROLE",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "ADMIN_ROLE",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "DEFAULT_ADMIN_ROLE",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "UPGRADE_INTERFACE_VERSION",
-    outputs: [{ internalType: "string", name: "", type: "string" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "acpContract",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      { internalType: "address", name: "sender", type: "address" },
-      { internalType: "bool", name: "approved", type: "bool" },
-      { internalType: "string", name: "reason", type: "string" }
-    ],
-    name: "approveMemo",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "assetManager",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256[]", name: "memoIds", type: "uint256[]" },
-      { internalType: "bool", name: "approved", type: "bool" },
-      { internalType: "string", name: "reason", type: "string" }
-    ],
-    name: "bulkApproveMemos",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      { internalType: "address", name: "user", type: "address" }
-    ],
-    name: "canApproveMemo",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "address", name: "sender", type: "address" },
-      { internalType: "string", name: "content", type: "string" },
-      {
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      { internalType: "bool", name: "isSecured", type: "bool" },
-      {
-        internalType: "enum ACPTypes.JobPhase",
-        name: "nextPhase",
-        type: "uint8"
-      },
-      { internalType: "string", name: "metadata", type: "string" }
-    ],
-    name: "createMemo",
-    outputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "address", name: "sender", type: "address" },
-      { internalType: "string", name: "content", type: "string" },
-      {
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      { internalType: "bool", name: "isSecured", type: "bool" },
-      {
-        internalType: "enum ACPTypes.JobPhase",
-        name: "nextPhase",
-        type: "uint8"
-      },
-      {
-        components: [
-          { internalType: "address", name: "token", type: "address" },
-          { internalType: "uint256", name: "amount", type: "uint256" },
-          { internalType: "address", name: "recipient", type: "address" },
-          { internalType: "uint256", name: "feeAmount", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.FeeType",
-            name: "feeType",
-            type: "uint8"
-          },
-          { internalType: "bool", name: "isExecuted", type: "bool" },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          { internalType: "uint32", name: "lzSrcEid", type: "uint32" },
-          { internalType: "uint32", name: "lzDstEid", type: "uint32" }
-        ],
-        internalType: "struct ACPTypes.PayableDetails",
-        name: "payableDetails_",
-        type: "tuple"
-      },
-      { internalType: "uint256", name: "expiredAt", type: "uint256" }
-    ],
-    name: "createPayableMemo",
-    outputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "emergencyApproveMemo",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "executePayableMemo",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "getAssetManager",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "uint256", name: "offset", type: "uint256" },
-      { internalType: "uint256", name: "limit", type: "uint256" }
-    ],
-    name: "getJobMemos",
-    outputs: [
-      {
-        components: [
-          { internalType: "uint256", name: "id", type: "uint256" },
-          { internalType: "uint256", name: "jobId", type: "uint256" },
-          { internalType: "address", name: "sender", type: "address" },
-          { internalType: "string", name: "content", type: "string" },
-          {
-            internalType: "enum ACPTypes.MemoType",
-            name: "memoType",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "createdAt", type: "uint256" },
-          { internalType: "bool", name: "isApproved", type: "bool" },
-          { internalType: "address", name: "approvedBy", type: "address" },
-          { internalType: "uint256", name: "approvedAt", type: "uint256" },
-          { internalType: "bool", name: "requiresApproval", type: "bool" },
-          { internalType: "string", name: "metadata", type: "string" },
-          { internalType: "bool", name: "isSecured", type: "bool" },
-          {
-            internalType: "enum ACPTypes.JobPhase",
-            name: "nextPhase",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
-        ],
-        internalType: "struct ACPTypes.Memo[]",
-        name: "memoArray",
-        type: "tuple[]"
-      },
-      { internalType: "uint256", name: "total", type: "uint256" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "enum ACPTypes.JobPhase", name: "phase", type: "uint8" },
-      { internalType: "uint256", name: "offset", type: "uint256" },
-      { internalType: "uint256", name: "limit", type: "uint256" }
-    ],
-    name: "getJobMemosByPhase",
-    outputs: [
-      {
-        components: [
-          { internalType: "uint256", name: "id", type: "uint256" },
-          { internalType: "uint256", name: "jobId", type: "uint256" },
-          { internalType: "address", name: "sender", type: "address" },
-          { internalType: "string", name: "content", type: "string" },
-          {
-            internalType: "enum ACPTypes.MemoType",
-            name: "memoType",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "createdAt", type: "uint256" },
-          { internalType: "bool", name: "isApproved", type: "bool" },
-          { internalType: "address", name: "approvedBy", type: "address" },
-          { internalType: "uint256", name: "approvedAt", type: "uint256" },
-          { internalType: "bool", name: "requiresApproval", type: "bool" },
-          { internalType: "string", name: "metadata", type: "string" },
-          { internalType: "bool", name: "isSecured", type: "bool" },
-          {
-            internalType: "enum ACPTypes.JobPhase",
-            name: "nextPhase",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
-        ],
-        internalType: "struct ACPTypes.Memo[]",
-        name: "memoArray",
-        type: "tuple[]"
-      },
-      { internalType: "uint256", name: "total", type: "uint256" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      {
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      { internalType: "uint256", name: "offset", type: "uint256" },
-      { internalType: "uint256", name: "limit", type: "uint256" }
-    ],
-    name: "getJobMemosByType",
-    outputs: [
-      {
-        components: [
-          { internalType: "uint256", name: "id", type: "uint256" },
-          { internalType: "uint256", name: "jobId", type: "uint256" },
-          { internalType: "address", name: "sender", type: "address" },
-          { internalType: "string", name: "content", type: "string" },
-          {
-            internalType: "enum ACPTypes.MemoType",
-            name: "memoType",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "createdAt", type: "uint256" },
-          { internalType: "bool", name: "isApproved", type: "bool" },
-          { internalType: "address", name: "approvedBy", type: "address" },
-          { internalType: "uint256", name: "approvedAt", type: "uint256" },
-          { internalType: "bool", name: "requiresApproval", type: "bool" },
-          { internalType: "string", name: "metadata", type: "string" },
-          { internalType: "bool", name: "isSecured", type: "bool" },
-          {
-            internalType: "enum ACPTypes.JobPhase",
-            name: "nextPhase",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
-        ],
-        internalType: "struct ACPTypes.Memo[]",
-        name: "memoArray",
-        type: "tuple[]"
-      },
-      { internalType: "uint256", name: "total", type: "uint256" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "getLocalEid",
-    outputs: [{ internalType: "uint32", name: "", type: "uint32" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "getMemo",
-    outputs: [
-      {
-        components: [
-          { internalType: "uint256", name: "id", type: "uint256" },
-          { internalType: "uint256", name: "jobId", type: "uint256" },
-          { internalType: "address", name: "sender", type: "address" },
-          { internalType: "string", name: "content", type: "string" },
-          {
-            internalType: "enum ACPTypes.MemoType",
-            name: "memoType",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "createdAt", type: "uint256" },
-          { internalType: "bool", name: "isApproved", type: "bool" },
-          { internalType: "address", name: "approvedBy", type: "address" },
-          { internalType: "uint256", name: "approvedAt", type: "uint256" },
-          { internalType: "bool", name: "requiresApproval", type: "bool" },
-          { internalType: "string", name: "metadata", type: "string" },
-          { internalType: "bool", name: "isSecured", type: "bool" },
-          {
-            internalType: "enum ACPTypes.JobPhase",
-            name: "nextPhase",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
-        ],
-        internalType: "struct ACPTypes.Memo",
-        name: "",
-        type: "tuple"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "getMemoApprovalStatus",
-    outputs: [
-      { internalType: "bool", name: "isApproved", type: "bool" },
-      { internalType: "address", name: "approvedBy", type: "address" },
-      { internalType: "uint256", name: "approvedAt", type: "uint256" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "getMemoWithPayableDetails",
-    outputs: [
-      {
-        components: [
-          { internalType: "uint256", name: "id", type: "uint256" },
-          { internalType: "uint256", name: "jobId", type: "uint256" },
-          { internalType: "address", name: "sender", type: "address" },
-          { internalType: "string", name: "content", type: "string" },
-          {
-            internalType: "enum ACPTypes.MemoType",
-            name: "memoType",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "createdAt", type: "uint256" },
-          { internalType: "bool", name: "isApproved", type: "bool" },
-          { internalType: "address", name: "approvedBy", type: "address" },
-          { internalType: "uint256", name: "approvedAt", type: "uint256" },
-          { internalType: "bool", name: "requiresApproval", type: "bool" },
-          { internalType: "string", name: "metadata", type: "string" },
-          { internalType: "bool", name: "isSecured", type: "bool" },
-          {
-            internalType: "enum ACPTypes.JobPhase",
-            name: "nextPhase",
-            type: "uint8"
-          },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.MemoState",
-            name: "state",
-            type: "uint8"
-          }
-        ],
-        internalType: "struct ACPTypes.Memo",
-        name: "memo",
-        type: "tuple"
-      },
-      {
-        components: [
-          { internalType: "address", name: "token", type: "address" },
-          { internalType: "uint256", name: "amount", type: "uint256" },
-          { internalType: "address", name: "recipient", type: "address" },
-          { internalType: "uint256", name: "feeAmount", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.FeeType",
-            name: "feeType",
-            type: "uint8"
-          },
-          { internalType: "bool", name: "isExecuted", type: "bool" },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          { internalType: "uint32", name: "lzSrcEid", type: "uint32" },
-          { internalType: "uint32", name: "lzDstEid", type: "uint32" }
-        ],
-        internalType: "struct ACPTypes.PayableDetails",
-        name: "details",
-        type: "tuple"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "getPayableDetails",
-    outputs: [
-      {
-        components: [
-          { internalType: "address", name: "token", type: "address" },
-          { internalType: "uint256", name: "amount", type: "uint256" },
-          { internalType: "address", name: "recipient", type: "address" },
-          { internalType: "uint256", name: "feeAmount", type: "uint256" },
-          {
-            internalType: "enum ACPTypes.FeeType",
-            name: "feeType",
-            type: "uint8"
-          },
-          { internalType: "bool", name: "isExecuted", type: "bool" },
-          { internalType: "uint256", name: "expiredAt", type: "uint256" },
-          { internalType: "uint32", name: "lzSrcEid", type: "uint32" },
-          { internalType: "uint32", name: "lzDstEid", type: "uint32" }
-        ],
-        internalType: "struct ACPTypes.PayableDetails",
-        name: "",
-        type: "tuple"
-      }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "bytes32", name: "role", type: "bytes32" }],
-    name: "getRoleAdmin",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "bytes32", name: "role", type: "bytes32" },
-      { internalType: "address", name: "account", type: "address" }
-    ],
-    name: "grantRole",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "bytes32", name: "role", type: "bytes32" },
-      { internalType: "address", name: "account", type: "address" }
-    ],
-    name: "hasRole",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "acpContract_", type: "address" },
-      { internalType: "address", name: "jobManager_", type: "address" },
-      { internalType: "address", name: "paymentManager_", type: "address" }
-    ],
-    name: "initialize",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "address", name: "user", type: "address" }
-    ],
-    name: "isJobEvaluator",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      { internalType: "address", name: "user", type: "address" }
-    ],
-    name: "isMemoSigner",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "isPayable",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "jobManager",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "", type: "uint256" },
-      { internalType: "uint256", name: "", type: "uint256" }
-    ],
-    name: "jobMemos",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "", type: "uint256" },
-      { internalType: "enum ACPTypes.JobPhase", name: "", type: "uint8" },
-      { internalType: "uint256", name: "", type: "uint256" }
-    ],
-    name: "jobMemosByPhase",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "", type: "uint256" },
-      { internalType: "enum ACPTypes.MemoType", name: "", type: "uint8" },
-      { internalType: "uint256", name: "", type: "uint256" }
-    ],
-    name: "jobMemosByType",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "", type: "uint256" },
-      { internalType: "address", name: "", type: "address" }
-    ],
-    name: "memoApprovals",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "memoCounter",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    name: "memos",
-    outputs: [
-      { internalType: "uint256", name: "id", type: "uint256" },
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "address", name: "sender", type: "address" },
-      { internalType: "string", name: "content", type: "string" },
-      {
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      { internalType: "uint256", name: "createdAt", type: "uint256" },
-      { internalType: "bool", name: "isApproved", type: "bool" },
-      { internalType: "address", name: "approvedBy", type: "address" },
-      { internalType: "uint256", name: "approvedAt", type: "uint256" },
-      { internalType: "bool", name: "requiresApproval", type: "bool" },
-      { internalType: "string", name: "metadata", type: "string" },
-      { internalType: "bool", name: "isSecured", type: "bool" },
-      {
-        internalType: "enum ACPTypes.JobPhase",
-        name: "nextPhase",
-        type: "uint8"
-      },
-      { internalType: "uint256", name: "expiredAt", type: "uint256" },
-      { internalType: "enum ACPTypes.MemoState", name: "state", type: "uint8" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    name: "payableDetails",
-    outputs: [
-      { internalType: "address", name: "token", type: "address" },
-      { internalType: "uint256", name: "amount", type: "uint256" },
-      { internalType: "address", name: "recipient", type: "address" },
-      { internalType: "uint256", name: "feeAmount", type: "uint256" },
-      { internalType: "enum ACPTypes.FeeType", name: "feeType", type: "uint8" },
-      { internalType: "bool", name: "isExecuted", type: "bool" },
-      { internalType: "uint256", name: "expiredAt", type: "uint256" },
-      { internalType: "uint32", name: "lzSrcEid", type: "uint32" },
-      { internalType: "uint32", name: "lzDstEid", type: "uint32" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "paymentManager",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [],
-    name: "proxiableUUID",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "bytes32", name: "role", type: "bytes32" },
-      { internalType: "address", name: "callerConfirmation", type: "address" }
-    ],
-    name: "renounceRole",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    name: "requiredApprovals",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "requiresApproval",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "bytes32", name: "role", type: "bytes32" },
-      { internalType: "address", name: "account", type: "address" }
-    ],
-    name: "revokeRole",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      {
-        internalType: "enum ACPTypes.MemoType",
-        name: "memoType",
-        type: "uint8"
-      },
-      { internalType: "uint256", name: "requiredApprovals_", type: "uint256" }
-    ],
-    name: "setApprovalRequirements",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "assetManager_", type: "address" }
-    ],
-    name: "setAssetManager",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      { internalType: "address", name: "sender", type: "address" },
-      { internalType: "bool", name: "isApproved", type: "bool" },
-      { internalType: "string", name: "reason", type: "string" }
-    ],
-    name: "signMemo",
-    outputs: [{ internalType: "uint256", name: "jobId", type: "uint256" }],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "bytes4", name: "interfaceId", type: "bytes4" }],
-    name: "supportsInterface",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "acpContract_", type: "address" },
-      { internalType: "address", name: "jobManager_", type: "address" },
-      { internalType: "address", name: "paymentManager_", type: "address" },
-      { internalType: "address", name: "assetManager_", type: "address" }
-    ],
-    name: "updateContracts",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      { internalType: "string", name: "newContent", type: "string" }
-    ],
-    name: "updateMemoContent",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      {
-        internalType: "enum ACPTypes.MemoState",
-        name: "newMemoState",
-        type: "uint8"
-      }
-    ],
-    name: "updateMemoState",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "address", name: "newImplementation", type: "address" },
-      { internalType: "bytes", name: "data", type: "bytes" }
-    ],
-    name: "upgradeToAndCall",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "withdrawEscrowedFunds",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-var memoManagerAbi_default = MEMO_MANAGER_ABI;
-
-// src/contractClients/acpContractClientV2.ts
-var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClient_default {
-  constructor(jobManagerAddress, memoManagerAddress, accountManagerAddress, agentWalletAddress, config = baseAcpConfigV2) {
-    super(agentWalletAddress, config);
-    this.jobManagerAddress = jobManagerAddress;
-    this.memoManagerAddress = memoManagerAddress;
-    this.accountManagerAddress = accountManagerAddress;
-    this.PRIORITY_FEE_MULTIPLIER = 2;
-    this.MAX_FEE_PER_GAS = 2e7;
-    this.MAX_PRIORITY_FEE_PER_GAS = 21e6;
-    this.GAS_FEE_MULTIPLIER = 0.5;
-    this.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.chain.id] = createPublicClient4({
-        chain: chain.chain,
-        transport: http3(chain.rpcUrl)
-      });
-    }
-    const publicClient = createPublicClient4({
-      chain: config.chain,
-      transport: http3(config.rpcEndpoint)
-    });
-    const [jobManagerAddress, memoManagerAddress, accountManagerAddress] = await publicClient.multicall({
-      contracts: [
-        {
-          address: config.contractAddress,
-          abi: config.abi,
-          functionName: "jobManager"
-        },
-        {
-          address: config.contractAddress,
-          abi: config.abi,
-          functionName: "memoManager"
-        },
-        {
-          address: config.contractAddress,
-          abi: config.abi,
-          functionName: "accountManager"
-        }
-      ]
-    });
-    if (!jobManagerAddress || !memoManagerAddress || !accountManagerAddress) {
-      throw new acpError_default(
-        "Failed to get job manager, memo manager, or account manager address"
-      );
-    }
-    const acpContractClient = new _AcpContractClientV2(
-      jobManagerAddress.result,
-      memoManagerAddress.result,
-      accountManagerAddress.result,
-      agentWalletAddress,
-      config
-    );
-    acpContractClient.publicClients = publicClients;
-    await acpContractClient.init(walletPrivateKey, sessionEntityKeyId);
-    return acpContractClient;
-  }
-  async init(privateKey, sessionEntityKeyId) {
-    const sessionKeySigner = LocalAccountSigner2.privateKeyToAccountSigner(privateKey);
-    this._sessionKeyClient = await createModularAccountV2Client2({
-      chain: this.chain,
-      transport: alchemy2({
-        rpcUrl: this.config.alchemyRpcUrl
-      }),
-      signer: sessionKeySigner,
-      policyId: "186aaa4a-5f57-4156-83fb-e456365a8820",
-      accountAddress: this.agentWalletAddress,
-      signerEntity: {
-        entityId: sessionEntityKeyId,
-        isGlobalValidation: true
+var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClient_default {
+  constructor(jobManagerAddress, memoManagerAddress, accountManagerAddress, agentWalletAddress, config = baseAcpConfigV2) {
+    super(agentWalletAddress, config);
+    this.jobManagerAddress = jobManagerAddress;
+    this.memoManagerAddress = memoManagerAddress;
+    this.accountManagerAddress = accountManagerAddress;
+    this.PRIORITY_FEE_MULTIPLIER = 2;
+    this.MAX_FEE_PER_GAS = 2e7;
+    this.MAX_PRIORITY_FEE_PER_GAS = 21e6;
+    this.GAS_FEE_MULTIPLIER = 0.5;
+    this.RETRY_CONFIG = {
+      intervalMs: 200,
+      multiplier: 1.1,
+      maxRetries: 10
+    };
+  }
+  static async build(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfigV2) {
+    const publicClient = createPublicClient4({
+      chain: config.chain,
+      transport: http3(config.rpcEndpoint)
+    });
+    const [jobManagerAddress, memoManagerAddress, accountManagerAddress] = await publicClient.multicall({
+      contracts: [
+        {
+          address: config.contractAddress,
+          abi: config.abi,
+          functionName: "jobManager"
+        },
+        {
+          address: config.contractAddress,
+          abi: config.abi,
+          functionName: "memoManager"
+        },
+        {
+          address: config.contractAddress,
+          abi: config.abi,
+          functionName: "accountManager"
+        }
+      ]
+    });
+    if (!jobManagerAddress || !memoManagerAddress || !accountManagerAddress) {
+      throw new acpError_default(
+        "Failed to get job manager, memo manager, or account manager address"
+      );
+    }
+    const acpContractClient = new _AcpContractClientV2(
+      jobManagerAddress.result,
+      memoManagerAddress.result,
+      accountManagerAddress.result,
+      agentWalletAddress,
+      config
+    );
+    await acpContractClient.init(walletPrivateKey, sessionEntityKeyId);
+    return acpContractClient;
+  }
+  async init(privateKey, sessionEntityKeyId) {
+    const sessionKeySigner = LocalAccountSigner2.privateKeyToAccountSigner(privateKey);
+    this._sessionKeyClient = await createModularAccountV2Client2({
+      chain: this.chain,
+      transport: alchemy2({
+        rpcUrl: this.config.alchemyRpcUrl
+      }),
+      signer: sessionKeySigner,
+      policyId: "186aaa4a-5f57-4156-83fb-e456365a8820",
+      accountAddress: this.agentWalletAddress,
+      signerEntity: {
+        entityId: sessionEntityKeyId,
+        isGlobalValidation: true
       }
     });
-    for (const chain of this.config.chains) {
-      this._sessionKeyClients[chain.chain.id] = await createModularAccountV2Client2({
-        chain: chain.chain,
-        transport: alchemy2({
-          rpcUrl: `${this.config.alchemyRpcUrl}?chainId=${chain.chain.id}`
-        }),
-        signer: sessionKeySigner,
-        policyId: "186aaa4a-5f57-4156-83fb-e456365a8820",
-        accountAddress: this.agentWalletAddress,
-        signerEntity: {
-          entityId: sessionEntityKeyId,
-          isGlobalValidation: true
-        }
-      });
-    }
     this._acpX402 = new AcpX402(
       this.config,
       this.sessionKeyClient,
@@ -7591,20 +6152,11 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     }
     return this._acpX402;
   }
-  async calculateGasFees(chainId) {
-    if (chainId) {
-      const { maxFeePerGas } = await this.publicClients[chainId].estimateFeesPerGas();
-      const increasedMaxFeePerGas = BigInt(maxFeePerGas) + BigInt(maxFeePerGas) * BigInt(this.GAS_FEE_MULTIPLIER * 100) / BigInt(100);
-      return increasedMaxFeePerGas;
-    }
+  async calculateGasFees() {
     const finalMaxFeePerGas = BigInt(this.MAX_FEE_PER_GAS) + BigInt(this.MAX_PRIORITY_FEE_PER_GAS) * BigInt(Math.max(0, this.PRIORITY_FEE_MULTIPLIER - 1));
     return finalMaxFeePerGas;
   }
-  async handleOperation(operations, chainId) {
-    const sessionKeyClient = chainId ? this._sessionKeyClients[chainId] : this.sessionKeyClient;
-    if (!sessionKeyClient) {
-      throw new acpError_default("Session key client not initialized");
-    }
+  async handleOperation(operations) {
     const basePayload = {
       uo: operations.map((operation) => ({
         target: operation.contractAddress,
@@ -7629,17 +6181,12 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
             }
           }
         };
-        const { hash } = await sessionKeyClient.sendUserOperation(payload);
-        const checkTransactionConfig = {
+        const { hash } = await this.sessionKeyClient.sendUserOperation(payload);
+        const txnHash = await this.sessionKeyClient.waitForUserOperationTransaction({
           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++;
@@ -7702,16 +6249,12 @@ 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";
   }
+  async signTypedData(typedData) {
+    return await this.sessionKeyClient.signTypedData({ typedData });
+  }
 };
 var acpContractClientV2_default = AcpContractClientV2;
 
@@ -7719,6 +6262,7 @@ var acpContractClientV2_default = AcpContractClientV2;
 var index_default = acpClient_default;
 export {
   acpAbi_default as ACP_ABI,
+  acpAgent_default as AcpAgent,
   AcpAgentSort,
   acpContractClient_default as AcpContractClient,
   acpContractClientV2_default as AcpContractClientV2,
@@ -7728,7 +6272,6 @@ export {
   acpJob_default as AcpJob,
   AcpJobPhases,
   acpMemo_default as AcpMemo,
-  AcpMemoState,
   AcpMemoStatus,
   AcpOnlineStatus,
   baseAcpContractClient_default as BaseAcpContractClient,
@@ -7736,15 +6279,12 @@ export {
   FareAmount,
   FareBigInt,
   MemoType,
-  PayloadType,
-  PositionDirection,
   baseAcpConfig,
   baseAcpConfigV2,
   baseAcpX402Config,
   baseAcpX402ConfigV2,
   baseSepoliaAcpConfig,
   baseSepoliaAcpConfigV2,
-  baseSepoliaAcpX402ConfigV2,
   index_default as default,
   ethFare,
   preparePayload,