@virtuals-protocol/acp-node 0.3.0-beta.13 → 0.3.0-beta.15

package/dist/index.mjs

@@ -2,51 +2,41 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 
 // package.json
 var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.3.0-beta.13",
+      version: "0.3.0-beta.15",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
       scripts: {
-        test: 'echo "Error: no test specified" && exit 1',
+        test: "jest",
+        "test:watch": "jest --watch",
+        "test:coverage": "jest --coverage",
         tsup: "tsup src/index.ts --dts --format cjs,esm --out-dir dist"
       },
       author: "",
       license: "ISC",
       description: "",
       devDependencies: {
+        "@babel/core": "^7.28.5",
+        "@babel/preset-env": "^7.28.5",
+        "@babel/preset-typescript": "^7.28.5",
+        "@types/jest": "^30.0.0",
+        "babel-jest": "^30.2.0",
+        dotenv: "^17.2.3",
+        jest: "^30.2.0",
+        "ts-jest": "^29.4.5",
         typescript: "^5.8.3"
       },
       dependencies: {
         "@aa-sdk/core": "^4.73.0",
         "@account-kit/infra": "^4.73.0",
         "@account-kit/smart-contracts": "^4.73.0",
-        "@virtuals-protocol/acp-node": "^0.3.0-beta.9",
+        "@virtuals-protocol/acp-node": "^0.3.0-beta.10",
         ajv: "^8.17.1",
         "socket.io-client": "^4.8.1",
         tsup: "^8.5.0",
@@ -1230,7 +1220,7 @@ var ACP_ABI = [
 var acpAbi_default = ACP_ABI;
 
 // src/acpClient.ts
-import { zeroAddress as zeroAddress2 } from "viem";
+import { zeroAddress as zeroAddress3 } from "viem";
 import { io } from "socket.io-client";
 
 // src/contractClients/baseAcpContractClient.ts
@@ -1241,7 +1231,8 @@ import {
   http as http2,
   keccak256,
   toEventSignature,
-  toHex
+  toHex,
+  zeroAddress
 } from "viem";
 
 // src/configs/acpConfigs.ts
@@ -1280,22 +1271,20 @@ var Fare = class _Fare {
   formatAmount(amount) {
     return parseUnits(amount.toString(), this.decimals);
   }
-  static fromContractAddress(_0) {
-    return __async(this, arguments, function* (contractAddress, config = baseAcpConfig) {
-      if (contractAddress === config.baseFare.contractAddress) {
-        return config.baseFare;
-      }
-      const publicClient = createPublicClient({
-        chain: config.chain,
-        transport: http(config.rpcEndpoint)
-      });
-      const decimals = yield publicClient.readContract({
-        address: contractAddress,
-        abi: erc20Abi,
-        functionName: "decimals"
-      });
-      return new _Fare(contractAddress, decimals);
+  static async fromContractAddress(contractAddress, config = baseAcpConfig) {
+    if (contractAddress === config.baseFare.contractAddress) {
+      return config.baseFare;
+    }
+    const publicClient = createPublicClient({
+      chain: config.chain,
+      transport: http(config.rpcEndpoint)
     });
+    const decimals = await publicClient.readContract({
+      address: contractAddress,
+      abi: erc20Abi,
+      functionName: "decimals"
+    });
+    return new _Fare(contractAddress, decimals);
   }
 };
 var FareAmountBase = class {
@@ -1303,14 +1292,12 @@ var FareAmountBase = class {
     this.amount = amount;
     this.fare = fare;
   }
-  static fromContractAddress(_0, _1) {
-    return __async(this, arguments, function* (amount, contractAddress, config = baseAcpConfig) {
-      const fare = yield Fare.fromContractAddress(contractAddress, config);
-      if (typeof amount === "number") {
-        return new FareAmount(amount, fare);
-      }
-      return new FareBigInt(amount, fare);
-    });
+  static async fromContractAddress(amount, contractAddress, config = baseAcpConfig) {
+    const fare = await Fare.fromContractAddress(contractAddress, config);
+    if (typeof amount === "number") {
+      return new FareAmount(amount, fare);
+    }
+    return new FareBigInt(amount, fare);
   }
 };
 var FareAmount = class extends FareAmountBase {
@@ -3267,6 +3254,241 @@ var FIAT_TOKEN_V2_ABI = [
 ];
 var fiatTokenV2Abi_default = FIAT_TOKEN_V2_ABI;
 
+// src/abis/singleSignerValidationModuleAbi.ts
+var SINGLE_SIGNER_VALIDATION_MODULE_ABI = [
+  { inputs: [], name: "InvalidSignatureType", type: "error" },
+  {
+    inputs: [],
+    name: "NotAuthorized",
+    type: "error"
+  },
+  { inputs: [], name: "NotImplemented", type: "error" },
+  {
+    inputs: [],
+    name: "UnexpectedDataPassed",
+    type: "error"
+  },
+  {
+    anonymous: true,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "address",
+        name: "account",
+        type: "address"
+      },
+      {
+        indexed: true,
+        internalType: "uint32",
+        name: "entityId",
+        type: "uint32"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "newSigner",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "address",
+        name: "previousSigner",
+        type: "address"
+      }
+    ],
+    name: "SignerTransferred",
+    type: "event"
+  },
+  {
+    inputs: [],
+    name: "moduleId",
+    outputs: [{ internalType: "string", name: "", type: "string" }],
+    stateMutability: "pure",
+    type: "function"
+  },
+  {
+    inputs: [{ internalType: "bytes", name: "data", type: "bytes" }],
+    name: "onInstall",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [{ internalType: "bytes", name: "data", type: "bytes" }],
+    name: "onUninstall",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "address", name: "account", type: "address" },
+      {
+        internalType: "bytes32",
+        name: "hash",
+        type: "bytes32"
+      }
+    ],
+    name: "replaySafeHash",
+    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "uint32", name: "entityId", type: "uint32" },
+      {
+        internalType: "address",
+        name: "account",
+        type: "address"
+      }
+    ],
+    name: "signers",
+    outputs: [{ internalType: "address", name: "", type: "address" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [{ internalType: "bytes4", name: "interfaceId", type: "bytes4" }],
+    name: "supportsInterface",
+    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "uint32", name: "entityId", type: "uint32" },
+      {
+        internalType: "address",
+        name: "newSigner",
+        type: "address"
+      }
+    ],
+    name: "transferSigner",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "address", name: "account", type: "address" },
+      {
+        internalType: "uint32",
+        name: "entityId",
+        type: "uint32"
+      },
+      { internalType: "address", name: "sender", type: "address" },
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      },
+      { internalType: "bytes", name: "", type: "bytes" },
+      {
+        internalType: "bytes",
+        name: "",
+        type: "bytes"
+      }
+    ],
+    name: "validateRuntime",
+    outputs: [],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      { internalType: "address", name: "account", type: "address" },
+      {
+        internalType: "uint32",
+        name: "entityId",
+        type: "uint32"
+      },
+      { internalType: "address", name: "", type: "address" },
+      {
+        internalType: "bytes32",
+        name: "digest",
+        type: "bytes32"
+      },
+      { internalType: "bytes", name: "signature", type: "bytes" }
+    ],
+    name: "validateSignature",
+    outputs: [{ internalType: "bytes4", name: "", type: "bytes4" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "uint32",
+        name: "entityId",
+        type: "uint32"
+      },
+      {
+        components: [
+          { internalType: "address", name: "sender", type: "address" },
+          {
+            internalType: "uint256",
+            name: "nonce",
+            type: "uint256"
+          },
+          { internalType: "bytes", name: "initCode", type: "bytes" },
+          {
+            internalType: "bytes",
+            name: "callData",
+            type: "bytes"
+          },
+          {
+            internalType: "bytes32",
+            name: "accountGasLimits",
+            type: "bytes32"
+          },
+          {
+            internalType: "uint256",
+            name: "preVerificationGas",
+            type: "uint256"
+          },
+          { internalType: "bytes32", name: "gasFees", type: "bytes32" },
+          {
+            internalType: "bytes",
+            name: "paymasterAndData",
+            type: "bytes"
+          },
+          { internalType: "bytes", name: "signature", type: "bytes" }
+        ],
+        internalType: "struct PackedUserOperation",
+        name: "userOp",
+        type: "tuple"
+      },
+      { internalType: "bytes32", name: "userOpHash", type: "bytes32" }
+    ],
+    name: "validateUserOp",
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    stateMutability: "view",
+    type: "function"
+  }
+];
+var singleSignerValidationModuleAbi_default = SINGLE_SIGNER_VALIDATION_MODULE_ABI;
+
+// src/constants.ts
+import { base as base2, baseSepolia as baseSepolia2 } from "viem/chains";
+var USDC_TOKEN_ADDRESS = {
+  [baseSepolia2.id]: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+  [base2.id]: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
+};
+var X402AuthorizationTypes = [
+  { name: "from", type: "address" },
+  { name: "to", type: "address" },
+  { name: "value", type: "uint256" },
+  { name: "validAfter", type: "uint256" },
+  { name: "validBefore", type: "uint256" },
+  { name: "nonce", type: "bytes32" }
+];
+var HTTP_STATUS_CODES = {
+  OK: 200,
+  PAYMENT_REQUIRED: 402
+};
+var SINGLE_SIGNER_VALIDATION_MODULE_ADDRESS = "0x00000000000099DE0BF6fA90dEB851E2A2df7d83";
+
 // src/contractClients/baseAcpContractClient.ts
 var MemoType = /* @__PURE__ */ ((MemoType3) => {
   MemoType3[MemoType3["MESSAGE"] = 0] = "MESSAGE";
@@ -3309,6 +3531,44 @@ var BaseAcpContractClient = class {
       transport: http2(this.config.rpcEndpoint)
     });
   }
+  async validateSessionKeyOnChain(sessionSignerAddress, sessionEntityKeyId) {
+    const onChainSignerAddress = (await this.publicClient.readContract({
+      address: SINGLE_SIGNER_VALIDATION_MODULE_ADDRESS,
+      abi: singleSignerValidationModuleAbi_default,
+      functionName: "signers",
+      args: [sessionEntityKeyId, this.agentWalletAddress]
+    })).toLowerCase();
+    if (onChainSignerAddress === zeroAddress.toLowerCase()) {
+      throw new acpError_default(
+        `ACP Contract Client validation failed:
+${JSON.stringify(
+          {
+            reason: "no whitelisted wallet registered on-chain for entity id",
+            entityId: sessionEntityKeyId,
+            agentWalletAddress: this.agentWalletAddress
+          },
+          null,
+          2
+        )}`
+      );
+    }
+    if (onChainSignerAddress !== sessionSignerAddress.toLowerCase()) {
+      throw new acpError_default(
+        `ACP Contract Client validation failed:
+${JSON.stringify(
+          {
+            agentWalletAddress: this.agentWalletAddress,
+            entityId: sessionEntityKeyId,
+            givenWhitelistedWalletAddress: sessionSignerAddress,
+            expectedWhitelistedWalletAddress: onChainSignerAddress,
+            reason: "session signer address mismatch"
+          },
+          null,
+          2
+        )}`
+      );
+    }
+  }
   get walletAddress() {
     return this.agentWalletAddress;
   }
@@ -3468,43 +3728,39 @@ var BaseAcpContractClient = class {
       throw new acpError_default("Failed to wrap eth", error);
     }
   }
-  getX402PaymentDetails(jobId) {
-    return __async(this, null, function* () {
-      try {
-        const result = yield this.publicClient.readContract({
-          address: this.contractAddress,
-          abi: this.abi,
-          functionName: "x402PaymentDetails",
-          args: [BigInt(jobId)]
-        });
-        return {
-          isX402: result[0],
-          isBudgetReceived: result[1]
-        };
-      } catch (error) {
-        throw new acpError_default("Failed to get X402 payment details", error);
-      }
-    });
+  async getX402PaymentDetails(jobId) {
+    try {
+      const result = await this.publicClient.readContract({
+        address: this.contractAddress,
+        abi: this.abi,
+        functionName: "x402PaymentDetails",
+        args: [BigInt(jobId)]
+      });
+      return {
+        isX402: result[0],
+        isBudgetReceived: result[1]
+      };
+    } catch (error) {
+      throw new acpError_default("Failed to get X402 payment details", error);
+    }
   }
-  submitTransferWithAuthorization(from, to, value, validAfter, validBefore, nonce, signature) {
-    return __async(this, null, function* () {
-      try {
-        const operations = [];
-        const data = encodeFunctionData({
-          abi: fiatTokenV2Abi_default,
-          functionName: "transferWithAuthorization",
-          args: [from, to, value, validAfter, validBefore, nonce, signature]
-        });
-        const payload = {
-          data,
-          contractAddress: this.config.baseFare.contractAddress
-        };
-        operations.push(payload);
-        return operations;
-      } catch (error) {
-        throw new acpError_default("Failed to submit TransferWithAuthorization", error);
-      }
-    });
+  async submitTransferWithAuthorization(from, to, value, validAfter, validBefore, nonce, signature) {
+    try {
+      const operations = [];
+      const data = encodeFunctionData({
+        abi: fiatTokenV2Abi_default,
+        functionName: "transferWithAuthorization",
+        args: [from, to, value, validAfter, validBefore, nonce, signature]
+      });
+      const payload = {
+        data,
+        contractAddress: this.config.baseFare.contractAddress
+      };
+      operations.push(payload);
+      return operations;
+    } catch (error) {
+      throw new acpError_default("Failed to submit TransferWithAuthorization", error);
+    }
   }
 };
 var baseAcpContractClient_default = BaseAcpContractClient;
@@ -3572,29 +3828,8 @@ function safeBase64Encode(data) {
 }
 
 // src/acpJobOffering.ts
-import { zeroAddress } from "viem";
+import { zeroAddress as zeroAddress2 } from "viem";
 import Ajv from "ajv";
-
-// src/constants.ts
-import { base as base2, baseSepolia as baseSepolia2 } from "viem/chains";
-var USDC_TOKEN_ADDRESS = {
-  [baseSepolia2.id]: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
-  [base2.id]: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
-};
-var X402AuthorizationTypes = [
-  { name: "from", type: "address" },
-  { name: "to", type: "address" },
-  { name: "value", type: "uint256" },
-  { name: "validAfter", type: "uint256" },
-  { name: "validBefore", type: "uint256" },
-  { name: "nonce", type: "bytes32" }
-];
-var HTTP_STATUS_CODES = {
-  OK: 200,
-  PAYMENT_REQUIRED: 402
-};
-
-// src/acpJobOffering.ts
 var AcpJobOffering = class {
   constructor(acpClient, acpContractClient, providerAddress, name, price, priceType = "fixed" /* FIXED */, requirement) {
     this.acpClient = acpClient;
@@ -3606,89 +3841,87 @@ var AcpJobOffering = class {
     this.requirement = requirement;
     this.ajv = new Ajv({ allErrors: true });
   }
-  initiateJob(_0, _1) {
-    return __async(this, arguments, function* (serviceRequirement, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
-      if (this.requirement && typeof this.requirement === "object") {
-        const validator = this.ajv.compile(this.requirement);
-        const valid = validator(serviceRequirement);
-        if (!valid) {
-          throw new acpError_default(this.ajv.errorsText(validator.errors));
-        }
+  async initiateJob(serviceRequirement, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
+    if (this.requirement && typeof this.requirement === "object") {
+      const validator = this.ajv.compile(this.requirement);
+      const valid = validator(serviceRequirement);
+      if (!valid) {
+        throw new acpError_default(this.ajv.errorsText(validator.errors));
       }
-      const finalServiceRequirement = {
-        name: this.name,
-        requirement: serviceRequirement,
-        priceValue: this.price,
-        priceType: this.priceType
-      };
-      const fareAmount = new FareAmount(
-        this.priceType === "fixed" /* FIXED */ ? this.price : 0,
-        this.acpContractClient.config.baseFare
-      );
-      const account = yield this.acpClient.getByClientAndProvider(
-        this.acpContractClient.walletAddress,
+    }
+    const finalServiceRequirement = {
+      name: this.name,
+      requirement: serviceRequirement,
+      priceValue: this.price,
+      priceType: this.priceType
+    };
+    const fareAmount = new FareAmount(
+      this.priceType === "fixed" /* FIXED */ ? this.price : 0,
+      this.acpContractClient.config.baseFare
+    );
+    const account = await this.acpClient.getByClientAndProvider(
+      this.acpContractClient.walletAddress,
+      this.providerAddress,
+      this.acpContractClient
+    );
+    const isV1 = [
+      baseSepoliaAcpConfig.contractAddress,
+      baseSepoliaAcpX402Config.contractAddress,
+      baseAcpConfig.contractAddress,
+      baseAcpX402Config.contractAddress
+    ].includes(this.acpContractClient.config.contractAddress);
+    let createJobPayload;
+    const chainId = this.acpContractClient.config.chain.id;
+    const isUsdcPaymentToken = USDC_TOKEN_ADDRESS[chainId].toLowerCase() === fareAmount.fare.contractAddress.toLowerCase();
+    const isX402Job = this.acpContractClient.config.x402Config && isUsdcPaymentToken;
+    if (isV1 || !account) {
+      createJobPayload = this.acpContractClient.createJob(
         this.providerAddress,
-        this.acpContractClient
-      );
-      const isV1 = [
-        baseSepoliaAcpConfig.contractAddress,
-        baseSepoliaAcpX402Config.contractAddress,
-        baseAcpConfig.contractAddress,
-        baseAcpX402Config.contractAddress
-      ].includes(this.acpContractClient.config.contractAddress);
-      let createJobPayload;
-      const chainId = this.acpContractClient.config.chain.id;
-      const isUsdcPaymentToken = USDC_TOKEN_ADDRESS[chainId].toLowerCase() === fareAmount.fare.contractAddress.toLowerCase();
-      const isX402Job = this.acpContractClient.config.x402Config && isUsdcPaymentToken;
-      if (isV1 || !account) {
-        createJobPayload = this.acpContractClient.createJob(
-          this.providerAddress,
-          evaluatorAddress || this.acpContractClient.walletAddress,
-          expiredAt,
-          fareAmount.fare.contractAddress,
-          fareAmount.amount,
-          "",
-          isX402Job
-        );
-      } else {
-        createJobPayload = this.acpContractClient.createJobWithAccount(
-          account.id,
-          evaluatorAddress || zeroAddress,
-          fareAmount.amount,
-          fareAmount.fare.contractAddress,
-          expiredAt,
-          isX402Job
-        );
-      }
-      const { userOpHash } = yield this.acpContractClient.handleOperation([
-        createJobPayload
-      ]);
-      const jobId = yield this.acpContractClient.getJobId(
-        userOpHash,
-        this.acpContractClient.walletAddress,
-        this.providerAddress
-      );
-      const payloads = [];
-      const setBudgetWithPaymentTokenPayload = this.acpContractClient.setBudgetWithPaymentToken(
-        jobId,
+        evaluatorAddress || this.acpContractClient.walletAddress,
+        expiredAt,
+        fareAmount.fare.contractAddress,
         fareAmount.amount,
-        fareAmount.fare.contractAddress
+        "",
+        isX402Job
       );
-      if (setBudgetWithPaymentTokenPayload) {
-        payloads.push(setBudgetWithPaymentTokenPayload);
-      }
-      payloads.push(
-        this.acpContractClient.createMemo(
-          jobId,
-          JSON.stringify(finalServiceRequirement),
-          0 /* MESSAGE */,
-          true,
-          1 /* NEGOTIATION */
-        )
+    } else {
+      createJobPayload = this.acpContractClient.createJobWithAccount(
+        account.id,
+        evaluatorAddress || zeroAddress2,
+        fareAmount.amount,
+        fareAmount.fare.contractAddress,
+        expiredAt,
+        isX402Job
       );
-      yield this.acpContractClient.handleOperation(payloads);
-      return jobId;
-    });
+    }
+    const { userOpHash } = await this.acpContractClient.handleOperation([
+      createJobPayload
+    ]);
+    const jobId = await this.acpContractClient.getJobId(
+      userOpHash,
+      this.acpContractClient.walletAddress,
+      this.providerAddress
+    );
+    const payloads = [];
+    const setBudgetWithPaymentTokenPayload = this.acpContractClient.setBudgetWithPaymentToken(
+      jobId,
+      fareAmount.amount,
+      fareAmount.fare.contractAddress
+    );
+    if (setBudgetWithPaymentTokenPayload) {
+      payloads.push(setBudgetWithPaymentTokenPayload);
+    }
+    payloads.push(
+      this.acpContractClient.createMemo(
+        jobId,
+        JSON.stringify(finalServiceRequirement),
+        0 /* MESSAGE */,
+        true,
+        1 /* NEGOTIATION */
+      )
+    );
+    await this.acpContractClient.handleOperation(payloads);
+    return jobId;
   }
 };
 var acpJobOffering_default = AcpJobOffering;
@@ -3710,10 +3943,9 @@ var AcpJob = class {
     this.netPayableAmount = netPayableAmount;
     this.priceType = "fixed" /* FIXED */;
     this.priceValue = 0;
-    var _a;
-    const content = (_a = this.memos.find(
+    const content = this.memos.find(
       (m) => m.nextPhase === 1 /* NEGOTIATION */
-    )) == null ? void 0 : _a.content;
+    )?.content;
     if (!content) {
       return;
     }
@@ -3744,18 +3976,16 @@ var AcpJob = class {
     return this.acpContractClient.config.baseFare;
   }
   get deliverable() {
-    var _a;
-    return (_a = this.memos.find((m) => m.nextPhase === 4 /* COMPLETED */)) == null ? void 0 : _a.content;
+    return this.memos.find((m) => m.nextPhase === 4 /* COMPLETED */)?.content;
   }
   get rejectionReason() {
-    var _a;
     const requestMemo = this.memos.find(
       (m) => m.nextPhase === 1 /* NEGOTIATION */ && m.status === "REJECTED" /* REJECTED */
     );
     if (requestMemo) {
       return requestMemo.signedReason;
     }
-    return (_a = this.memos.find((m) => m.nextPhase === 5 /* REJECTED */)) == null ? void 0 : _a.content;
+    return this.memos.find((m) => m.nextPhase === 5 /* REJECTED */)?.content;
   }
   get providerAgent() {
     return this.acpClient.getAgent(this.providerAddress);
@@ -3772,330 +4002,304 @@ var AcpJob = class {
   get latestMemo() {
     return this.memos[this.memos.length - 1];
   }
-  createRequirement(content) {
-    return __async(this, null, function* () {
-      const operations = [];
-      operations.push(
-        this.acpContractClient.createMemo(
-          this.id,
-          content,
-          0 /* MESSAGE */,
-          true,
-          2 /* TRANSACTION */
-        )
-      );
-      return yield this.acpContractClient.handleOperation(operations);
-    });
+  async createRequirement(content) {
+    const operations = [];
+    operations.push(
+      this.acpContractClient.createMemo(
+        this.id,
+        content,
+        0 /* MESSAGE */,
+        true,
+        2 /* TRANSACTION */
+      )
+    );
+    return await this.acpContractClient.handleOperation(operations);
   }
-  createPayableRequirement(_0, _1, _2, _3) {
-    return __async(this, arguments, function* (content, type, amount, recipient, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
-      const operations = [];
-      if (type === 8 /* PAYABLE_TRANSFER_ESCROW */) {
-        operations.push(
-          this.acpContractClient.approveAllowance(
-            amount.amount,
-            amount.fare.contractAddress
-          )
-        );
-      }
-      const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
+  async createPayableRequirement(content, type, amount, recipient, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
+    const operations = [];
+    if (type === 8 /* PAYABLE_TRANSFER_ESCROW */) {
       operations.push(
-        this.acpContractClient.createPayableMemo(
-          this.id,
-          content,
+        this.acpContractClient.approveAllowance(
           amount.amount,
-          recipient,
-          this.priceType === "percentage" /* PERCENTAGE */ ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
-          this.priceType === "percentage" /* PERCENTAGE */ ? 3 /* PERCENTAGE_FEE */ : 0 /* NO_FEE */,
-          2 /* TRANSACTION */,
-          type,
-          expiredAt,
           amount.fare.contractAddress
         )
       );
-      return yield this.acpContractClient.handleOperation(operations);
-    });
+    }
+    const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
+    const isPercentagePricing = this.priceType === "percentage" /* PERCENTAGE */;
+    operations.push(
+      this.acpContractClient.createPayableMemo(
+        this.id,
+        content,
+        amount.amount,
+        recipient,
+        isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
+        isPercentagePricing ? 3 /* PERCENTAGE_FEE */ : 0 /* NO_FEE */,
+        2 /* TRANSACTION */,
+        type,
+        expiredAt,
+        amount.fare.contractAddress
+      )
+    );
+    return await this.acpContractClient.handleOperation(operations);
   }
-  payAndAcceptRequirement(reason) {
-    return __async(this, null, function* () {
-      const memo = this.memos.find(
-        (m) => m.nextPhase === 2 /* TRANSACTION */
-      );
-      if (!memo) {
-        throw new acpError_default("No notification memo found");
-      }
-      const operations = [];
-      const baseFareAmount = new FareAmount(this.price, this.baseFare);
-      const transferAmount = memo.payableDetails ? yield FareAmountBase.fromContractAddress(
-        memo.payableDetails.amount,
-        memo.payableDetails.token,
-        this.config
-      ) : new FareAmount(0, this.baseFare);
-      const totalAmount = baseFareAmount.fare.contractAddress === transferAmount.fare.contractAddress ? baseFareAmount.add(transferAmount) : baseFareAmount;
+  async payAndAcceptRequirement(reason) {
+    const memo = this.memos.find(
+      (m) => m.nextPhase === 2 /* TRANSACTION */
+    );
+    if (!memo) {
+      throw new acpError_default("No notification memo found");
+    }
+    const operations = [];
+    const baseFareAmount = new FareAmount(this.price, this.baseFare);
+    const transferAmount = memo.payableDetails ? await FareAmountBase.fromContractAddress(
+      memo.payableDetails.amount,
+      memo.payableDetails.token,
+      this.config
+    ) : new FareAmount(0, this.baseFare);
+    const totalAmount = baseFareAmount.fare.contractAddress === transferAmount.fare.contractAddress ? baseFareAmount.add(transferAmount) : baseFareAmount;
+    operations.push(
+      this.acpContractClient.approveAllowance(
+        totalAmount.amount,
+        this.baseFare.contractAddress
+      )
+    );
+    if (baseFareAmount.fare.contractAddress !== transferAmount.fare.contractAddress) {
       operations.push(
         this.acpContractClient.approveAllowance(
-          totalAmount.amount,
-          this.baseFare.contractAddress
+          transferAmount.amount,
+          transferAmount.fare.contractAddress
         )
       );
-      if (baseFareAmount.fare.contractAddress !== transferAmount.fare.contractAddress) {
-        operations.push(
-          this.acpContractClient.approveAllowance(
-            transferAmount.amount,
-            transferAmount.fare.contractAddress
-          )
-        );
-      }
-      operations.push(this.acpContractClient.signMemo(memo.id, true, reason));
-      operations.push(
-        this.acpContractClient.createMemo(
-          this.id,
-          `Payment made. ${reason != null ? reason : ""}`.trim(),
-          0 /* MESSAGE */,
-          true,
-          3 /* EVALUATION */
-        )
-      );
-      const x402PaymentDetails = yield this.acpContractClient.getX402PaymentDetails(this.id);
-      if (x402PaymentDetails.isX402) {
-        yield this.performX402Payment(this.price);
-      }
-      return yield this.acpContractClient.handleOperation(operations);
-    });
+    }
+    operations.push(this.acpContractClient.signMemo(memo.id, true, reason));
+    operations.push(
+      this.acpContractClient.createMemo(
+        this.id,
+        `Payment made. ${reason ?? ""}`.trim(),
+        0 /* MESSAGE */,
+        true,
+        3 /* EVALUATION */
+      )
+    );
+    const x402PaymentDetails = await this.acpContractClient.getX402PaymentDetails(this.id);
+    if (x402PaymentDetails.isX402) {
+      await this.performX402Payment(this.price);
+    }
+    return await this.acpContractClient.handleOperation(operations);
   }
-  respond(accept, reason) {
-    return __async(this, null, function* () {
-      const memoContent = `${reason || `Job ${this.id} ${accept ? "accepted" : "rejected"}.`}`;
-      if (accept) {
-        yield this.accept(memoContent);
-        return this.createRequirement(memoContent);
-      }
-      return yield this.reject(memoContent);
-    });
+  async respond(accept, reason) {
+    const memoContent = `${reason || `Job ${this.id} ${accept ? "accepted" : "rejected"}.`}`;
+    if (accept) {
+      await this.accept(memoContent);
+      return this.createRequirement(memoContent);
+    }
+    return await this.reject(memoContent);
+  }
+  async accept(reason) {
+    const memoContent = `Job ${this.id} accepted. ${reason || ""}`;
+    const latestMemo = this.latestMemo;
+    if (latestMemo?.nextPhase !== 1 /* NEGOTIATION */) {
+      throw new acpError_default("No request memo found");
+    }
+    return await latestMemo.sign(true, memoContent);
   }
-  accept(reason) {
-    return __async(this, null, function* () {
-      const memoContent = `Job ${this.id} accepted. ${reason || ""}`;
+  async reject(reason) {
+    const memoContent = `Job ${this.id} rejected. ${reason || ""}`;
+    if (this.phase === 0 /* REQUEST */) {
       const latestMemo = this.latestMemo;
-      if ((latestMemo == null ? void 0 : latestMemo.nextPhase) !== 1 /* NEGOTIATION */) {
+      if (latestMemo?.nextPhase !== 1 /* NEGOTIATION */) {
         throw new acpError_default("No request memo found");
       }
-      return yield latestMemo.sign(true, memoContent);
-    });
-  }
-  reject(reason) {
-    return __async(this, null, function* () {
-      const memoContent = `Job ${this.id} rejected. ${reason || ""}`;
-      if (this.phase === 0 /* REQUEST */) {
-        const latestMemo = this.latestMemo;
-        if ((latestMemo == null ? void 0 : latestMemo.nextPhase) !== 1 /* NEGOTIATION */) {
-          throw new acpError_default("No request memo found");
-        }
-        return yield latestMemo.sign(false, memoContent);
-      }
-      const operations = [];
-      operations.push(
-        this.acpContractClient.createMemo(
-          this.id,
-          memoContent,
-          0 /* MESSAGE */,
-          true,
-          5 /* REJECTED */
-        )
-      );
-      return yield this.acpContractClient.handleOperation(operations);
-    });
+      return await latestMemo.sign(false, memoContent);
+    }
+    const operations = [];
+    operations.push(
+      this.acpContractClient.createMemo(
+        this.id,
+        memoContent,
+        0 /* MESSAGE */,
+        true,
+        5 /* REJECTED */
+      )
+    );
+    return await this.acpContractClient.handleOperation(operations);
   }
-  rejectPayable() {
-    return __async(this, arguments, function* (reason = "", amount, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
-      const memoContent = `Job ${this.id} rejected. ${reason}`;
-      const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
-      const operations = [];
-      operations.push(
-        this.acpContractClient.approveAllowance(
-          amount.amount,
-          amount.fare.contractAddress
-        )
-      );
-      operations.push(
-        this.acpContractClient.createPayableMemo(
-          this.id,
-          memoContent,
-          amount.amount,
-          this.clientAddress,
-          feeAmount.amount,
-          0 /* NO_FEE */,
-          5 /* REJECTED */,
-          7 /* PAYABLE_TRANSFER */,
-          expiredAt,
-          amount.fare.contractAddress
-        )
-      );
-      return yield this.acpContractClient.handleOperation(operations);
-    });
+  async rejectPayable(reason = "", amount, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
+    const memoContent = `Job ${this.id} rejected. ${reason}`;
+    const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
+    const operations = [];
+    operations.push(
+      this.acpContractClient.approveAllowance(
+        amount.amount,
+        amount.fare.contractAddress
+      )
+    );
+    operations.push(
+      this.acpContractClient.createPayableMemo(
+        this.id,
+        memoContent,
+        amount.amount,
+        this.clientAddress,
+        feeAmount.amount,
+        0 /* NO_FEE */,
+        5 /* REJECTED */,
+        7 /* PAYABLE_TRANSFER */,
+        expiredAt,
+        amount.fare.contractAddress
+      )
+    );
+    return await this.acpContractClient.handleOperation(operations);
   }
-  deliver(deliverable) {
-    return __async(this, null, function* () {
-      var _a;
-      if (((_a = this.latestMemo) == null ? void 0 : _a.nextPhase) !== 3 /* EVALUATION */) {
-        throw new acpError_default("No transaction memo found");
-      }
-      const operations = [];
-      operations.push(
-        this.acpContractClient.createMemo(
-          this.id,
-          preparePayload(deliverable),
-          0 /* MESSAGE */,
-          true,
-          4 /* COMPLETED */
-        )
-      );
-      return yield this.acpContractClient.handleOperation(operations);
-    });
+  async deliver(deliverable) {
+    if (this.latestMemo?.nextPhase !== 3 /* EVALUATION */) {
+      throw new acpError_default("No transaction memo found");
+    }
+    const operations = [];
+    operations.push(
+      this.acpContractClient.createMemo(
+        this.id,
+        preparePayload(deliverable),
+        0 /* MESSAGE */,
+        true,
+        4 /* COMPLETED */
+      )
+    );
+    return await this.acpContractClient.handleOperation(operations);
   }
-  deliverPayable(_0, _1) {
-    return __async(this, arguments, function* (deliverable, amount, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
-      var _a;
-      if (((_a = this.latestMemo) == null ? void 0 : _a.nextPhase) !== 3 /* EVALUATION */) {
-        throw new acpError_default("No transaction memo found");
-      }
-      const operations = [];
-      operations.push(
-        this.acpContractClient.approveAllowance(
-          amount.amount,
-          amount.fare.contractAddress
-        )
-      );
-      const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
-      operations.push(
-        this.acpContractClient.createPayableMemo(
-          this.id,
-          preparePayload(deliverable),
-          amount.amount,
-          this.clientAddress,
-          feeAmount.amount,
-          0 /* NO_FEE */,
-          4 /* COMPLETED */,
-          7 /* PAYABLE_TRANSFER */,
-          expiredAt,
-          amount.fare.contractAddress
-        )
-      );
-      return yield this.acpContractClient.handleOperation(operations);
-    });
+  async deliverPayable(deliverable, amount, skipFee = false, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
+    if (this.latestMemo?.nextPhase !== 3 /* EVALUATION */) {
+      throw new acpError_default("No transaction memo found");
+    }
+    const operations = [];
+    operations.push(
+      this.acpContractClient.approveAllowance(
+        amount.amount,
+        amount.fare.contractAddress
+      )
+    );
+    const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
+    const isPercentagePricing = this.priceType === "percentage" /* PERCENTAGE */ && !skipFee;
+    operations.push(
+      this.acpContractClient.createPayableMemo(
+        this.id,
+        preparePayload(deliverable),
+        amount.amount,
+        this.clientAddress,
+        isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
+        isPercentagePricing ? 3 /* PERCENTAGE_FEE */ : 0 /* NO_FEE */,
+        4 /* COMPLETED */,
+        7 /* PAYABLE_TRANSFER */,
+        expiredAt,
+        amount.fare.contractAddress
+      )
+    );
+    return await this.acpContractClient.handleOperation(operations);
   }
-  evaluate(accept, reason) {
-    return __async(this, null, function* () {
-      var _a;
-      if (((_a = this.latestMemo) == null ? void 0 : _a.nextPhase) !== 4 /* COMPLETED */) {
-        throw new acpError_default("No evaluation memo found");
-      }
-      const memo = this.latestMemo;
-      yield memo.sign(accept, reason);
-    });
+  async evaluate(accept, reason) {
+    if (this.latestMemo?.nextPhase !== 4 /* COMPLETED */) {
+      throw new acpError_default("No evaluation memo found");
+    }
+    const memo = this.latestMemo;
+    await memo.sign(accept, reason);
   }
-  createNotification(content) {
-    return __async(this, null, function* () {
-      const operations = [];
-      operations.push(
-        this.acpContractClient.createMemo(
-          this.id,
-          content,
-          9 /* NOTIFICATION */,
-          true,
-          4 /* COMPLETED */
-        )
-      );
-      return yield this.acpContractClient.handleOperation(operations);
-    });
+  async createNotification(content) {
+    const operations = [];
+    operations.push(
+      this.acpContractClient.createMemo(
+        this.id,
+        content,
+        9 /* NOTIFICATION */,
+        true,
+        4 /* COMPLETED */
+      )
+    );
+    return await this.acpContractClient.handleOperation(operations);
   }
-  createPayableNotification(_0, _1) {
-    return __async(this, arguments, function* (content, amount, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
-      const operations = [];
-      operations.push(
-        this.acpContractClient.approveAllowance(
-          amount.amount,
-          amount.fare.contractAddress
-        )
-      );
-      const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
-      operations.push(
-        this.acpContractClient.createPayableMemo(
-          this.id,
-          content,
-          amount.amount,
-          this.clientAddress,
-          feeAmount.amount,
-          0 /* NO_FEE */,
-          4 /* COMPLETED */,
-          10 /* PAYABLE_NOTIFICATION */,
-          expiredAt,
-          amount.fare.contractAddress
-        )
-      );
-      return yield this.acpContractClient.handleOperation(operations);
-    });
+  async createPayableNotification(content, amount, skipFee = false, expiredAt = new Date(Date.now() + 1e3 * 60 * 5)) {
+    const operations = [];
+    operations.push(
+      this.acpContractClient.approveAllowance(
+        amount.amount,
+        amount.fare.contractAddress
+      )
+    );
+    const feeAmount = new FareAmount(0, this.acpContractClient.config.baseFare);
+    const isPercentagePricing = this.priceType === "percentage" /* PERCENTAGE */ && !skipFee;
+    operations.push(
+      this.acpContractClient.createPayableMemo(
+        this.id,
+        content,
+        amount.amount,
+        this.clientAddress,
+        isPercentagePricing ? BigInt(Math.round(this.priceValue * 1e4)) : feeAmount.amount,
+        isPercentagePricing ? 3 /* PERCENTAGE_FEE */ : 0 /* NO_FEE */,
+        4 /* COMPLETED */,
+        10 /* PAYABLE_NOTIFICATION */,
+        expiredAt,
+        amount.fare.contractAddress
+      )
+    );
+    return await this.acpContractClient.handleOperation(operations);
   }
-  performX402Payment(budget) {
-    return __async(this, null, function* () {
-      const paymentUrl = "/acp-budget";
-      const x402PayableREquirements = yield this.acpContractClient.performX402Request(
-        paymentUrl,
-        this.acpContractClient.getAcpVersion(),
-        budget.toString()
-      );
-      if (!x402PayableREquirements.isPaymentRequired) {
-        return;
-      }
-      if (!x402PayableREquirements.data.accepts.length) {
-        throw new acpError_default("No X402 payment requirements found");
-      }
-      const requirement = x402PayableREquirements.data.accepts[0];
-      const { encodedPayment, signature, message } = yield this.acpContractClient.generateX402Payment(
-        {
-          to: requirement.payTo,
-          value: Number(requirement.maxAmountRequired),
-          maxTimeoutSeconds: requirement.maxTimeoutSeconds,
-          asset: requirement.asset
-        },
-        x402PayableREquirements.data
-      );
-      yield this.acpContractClient.updateJobX402Nonce(this.id, message.nonce);
-      const x402Response = yield this.acpContractClient.performX402Request(
-        paymentUrl,
-        this.acpContractClient.getAcpVersion(),
-        budget.toString(),
-        encodedPayment
+  async performX402Payment(budget) {
+    const paymentUrl = "/acp-budget";
+    const x402PayableREquirements = await this.acpContractClient.performX402Request(
+      paymentUrl,
+      this.acpContractClient.getAcpVersion(),
+      budget.toString()
+    );
+    if (!x402PayableREquirements.isPaymentRequired) {
+      return;
+    }
+    if (!x402PayableREquirements.data.accepts.length) {
+      throw new acpError_default("No X402 payment requirements found");
+    }
+    const requirement = x402PayableREquirements.data.accepts[0];
+    const { encodedPayment, signature, message } = await this.acpContractClient.generateX402Payment(
+      {
+        to: requirement.payTo,
+        value: Number(requirement.maxAmountRequired),
+        maxTimeoutSeconds: requirement.maxTimeoutSeconds,
+        asset: requirement.asset
+      },
+      x402PayableREquirements.data
+    );
+    await this.acpContractClient.updateJobX402Nonce(this.id, message.nonce);
+    const x402Response = await this.acpContractClient.performX402Request(
+      paymentUrl,
+      this.acpContractClient.getAcpVersion(),
+      budget.toString(),
+      encodedPayment
+    );
+    if (x402Response.isPaymentRequired) {
+      const operations = await this.acpContractClient.submitTransferWithAuthorization(
+        message.from,
+        message.to,
+        BigInt(message.value),
+        BigInt(message.validAfter),
+        BigInt(message.validBefore),
+        message.nonce,
+        signature
       );
-      if (x402Response.isPaymentRequired) {
-        const operations = yield this.acpContractClient.submitTransferWithAuthorization(
-          message.from,
-          message.to,
-          BigInt(message.value),
-          BigInt(message.validAfter),
-          BigInt(message.validBefore),
-          message.nonce,
-          signature
-        );
-        yield this.acpContractClient.handleOperation(operations);
+      await this.acpContractClient.handleOperation(operations);
+    }
+    let waitMs = 2e3;
+    const maxWaitMs = 3e4;
+    let iterationCount = 0;
+    const maxIterations = 10;
+    while (true) {
+      const x402PaymentDetails = await this.acpContractClient.getX402PaymentDetails(this.id);
+      if (x402PaymentDetails.isBudgetReceived) {
+        break;
       }
-      let waitMs = 2e3;
-      const maxWaitMs = 3e4;
-      let iterationCount = 0;
-      const maxIterations = 10;
-      while (true) {
-        const x402PaymentDetails = yield this.acpContractClient.getX402PaymentDetails(this.id);
-        if (x402PaymentDetails.isBudgetReceived) {
-          break;
-        }
-        iterationCount++;
-        if (iterationCount >= maxIterations) {
-          throw new acpError_default("X402 payment timed out");
-        }
-        yield new Promise((resolve) => setTimeout(resolve, waitMs));
-        waitMs = Math.min(waitMs * 2, maxWaitMs);
+      iterationCount++;
+      if (iterationCount >= maxIterations) {
+        throw new acpError_default("X402 payment timed out");
       }
-    });
+      await new Promise((resolve) => setTimeout(resolve, waitMs));
+      waitMs = Math.min(waitMs * 2, maxWaitMs);
+    }
   }
 };
 var acpJob_default = AcpJob;
@@ -4122,28 +4326,23 @@ var AcpMemo = class {
     this.structuredContent = tryParseJson(this.content) || void 0;
   }
   get payloadType() {
-    var _a;
-    return (_a = this.structuredContent) == null ? void 0 : _a.type;
+    return this.structuredContent?.type;
   }
   getStructuredContent() {
     return this.structuredContent;
   }
-  create(jobId, isSecured = true) {
-    return __async(this, null, function* () {
-      return yield this.contractClient.createMemo(
-        jobId,
-        this.content,
-        this.type,
-        isSecured,
-        this.nextPhase
-      );
-    });
+  async create(jobId, isSecured = true) {
+    return await this.contractClient.createMemo(
+      jobId,
+      this.content,
+      this.type,
+      isSecured,
+      this.nextPhase
+    );
   }
-  sign(approved, reason) {
-    return __async(this, null, function* () {
-      const payload = this.contractClient.signMemo(this.id, approved, reason);
-      return yield this.contractClient.handleOperation([payload]);
-    });
+  async sign(approved, reason) {
+    const payload = this.contractClient.signMemo(this.id, approved, reason);
+    return await this.contractClient.handleOperation([payload]);
   }
 };
 var acpMemo_default = AcpMemo;
@@ -4157,14 +4356,12 @@ var AcpAccount = class {
     this.providerAddress = providerAddress;
     this.metadata = metadata;
   }
-  updateMetadata(metadata) {
-    return __async(this, null, function* () {
-      const hash = yield this.contractClient.updateAccountMetadata(
-        this.id,
-        JSON.stringify(metadata)
-      );
-      return hash;
-    });
+  async updateMetadata(metadata) {
+    const hash = await this.contractClient.updateAccountMetadata(
+      this.id,
+      JSON.stringify(metadata)
+    );
+    return hash;
   }
 };
 
@@ -4176,8 +4373,8 @@ var AcpClient = class {
     if (this.contractClients.length === 0) {
       throw new acpError_default("ACP contract client is required");
     }
-    this.contractClients.every((client) => {
-      if (client.contractAddress !== this.contractClients[0].contractAddress) {
+    this.contractClients.forEach((client) => {
+      if (client.walletAddress !== this.contractClients[0].walletAddress) {
         throw new acpError_default(
           "All contract clients must have the same agent wallet address"
         );
@@ -4185,7 +4382,7 @@ var AcpClient = class {
     });
     this.onNewTask = options.onNewTask;
     this.onEvaluate = options.onEvaluate || this.defaultOnEvaluate;
-    this.init();
+    this.init(options.skipSocketConnection);
   }
   contractClientByAddress(address) {
     if (!address) {
@@ -4205,282 +4402,48 @@ var AcpClient = class {
   get acpUrl() {
     return this.acpContractClient.config.acpUrl;
   }
-  defaultOnEvaluate(job) {
-    return __async(this, null, function* () {
-      yield job.evaluate(true, "Evaluated by default");
-    });
+  async defaultOnEvaluate(job) {
+    await job.evaluate(true, "Evaluated by default");
   }
   get walletAddress() {
-    if (Array.isArray(this.acpContractClient)) {
-      return this.acpContractClient[0].walletAddress;
-    }
     return this.acpContractClient.walletAddress;
   }
-  init() {
-    return __async(this, null, function* () {
-      const socket = io(this.acpUrl, {
-        auth: {
-          walletAddress: this.walletAddress
-        },
-        extraHeaders: {
-          "x-sdk-version": version,
-          "x-sdk-language": "node",
-          "x-contract-address": this.contractClients[0].contractAddress
-          // always prioritize the first client
-        },
-        transports: ["websocket"]
-      });
-      socket.on("roomJoined" /* ROOM_JOINED */, (_, callback) => {
-        console.log("Joined ACP Room");
-        callback(true);
-      });
-      socket.on(
-        "onEvaluate" /* ON_EVALUATE */,
-        (data, callback) => __async(this, null, function* () {
-          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
-                );
-              }),
-              data.phase,
-              data.context,
-              data.contractAddress,
-              data.netPayableAmount
-            );
-            this.onEvaluate(job);
-          }
-        })
-      );
-      socket.on(
-        "onNewTask" /* ON_NEW_TASK */,
-        (data, callback) => __async(this, null, function* () {
-          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
-                );
-              }),
-              data.phase,
-              data.context,
-              data.contractAddress,
-              data.netPayableAmount
-            );
-            this.onNewTask(
-              job,
-              job.memos.find((m) => m.id == data.memoToSign)
-            );
-          }
-        })
-      );
-      const cleanup = () => __async(this, null, function* () {
-        if (socket) {
-          socket.disconnect();
-        }
-        process.exit(0);
-      });
-      process.on("SIGINT", cleanup);
-      process.on("SIGTERM", cleanup);
-    });
-  }
-  browseAgents(keyword, options) {
-    return __async(this, null, function* () {
-      let { cluster, sort_by, top_k, graduationStatus, onlineStatus } = options;
-      top_k = top_k != null ? 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}`;
-      }
-      if (cluster) {
-        url += `&cluster=${cluster}`;
-      }
-      if (graduationStatus) {
-        url += `&graduationStatus=${graduationStatus}`;
-      }
-      if (onlineStatus) {
-        url += `&onlineStatus=${onlineStatus}`;
-      }
-      const response = yield fetch(url);
-      const data = yield response.json();
-      const availableContractClientAddresses = this.contractClients.map(
-        (client) => client.contractAddress.toLowerCase()
-      );
-      return data.data.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,
-          resource: agent.resources
-        };
-      });
+  async init(skipSocketConnection = false) {
+    if (skipSocketConnection) {
+      return;
+    }
+    const socket = io(this.acpUrl, {
+      auth: {
+        walletAddress: this.walletAddress
+      },
+      extraHeaders: {
+        "x-sdk-version": version,
+        "x-sdk-language": "node",
+        "x-contract-address": this.contractClients[0].contractAddress
+        // always prioritize the first client
+      },
+      transports: ["websocket"]
     });
-  }
-  initiateJob(_0, _1, _2, _3) {
-    return __async(this, arguments, function* (providerAddress, serviceRequirement, fareAmount, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
-      if (providerAddress === this.walletAddress) {
-        throw new acpError_default(
-          "Provider address cannot be the same as the client address"
-        );
-      }
-      const account = yield this.getByClientAndProvider(
-        this.walletAddress,
-        providerAddress,
-        this.acpContractClient
-      );
-      const isV1 = [
-        baseSepoliaAcpConfig.contractAddress,
-        baseSepoliaAcpX402Config.contractAddress,
-        baseAcpConfig.contractAddress,
-        baseAcpX402Config.contractAddress
-      ].includes(this.acpContractClient.config.contractAddress);
-      const defaultEvaluatorAddress = isV1 && !evaluatorAddress ? this.walletAddress : zeroAddress2;
-      const chainId = this.acpContractClient.config.chain.id;
-      const isUsdcPaymentToken = USDC_TOKEN_ADDRESS[chainId].toLowerCase() === fareAmount.fare.contractAddress.toLowerCase();
-      const isX402Job = this.acpContractClient.config.x402Config && isUsdcPaymentToken;
-      const createJobPayload = isV1 || !account ? this.acpContractClient.createJob(
-        providerAddress,
-        evaluatorAddress || defaultEvaluatorAddress,
-        expiredAt,
-        fareAmount.fare.contractAddress,
-        fareAmount.amount,
-        "",
-        isX402Job
-      ) : this.acpContractClient.createJobWithAccount(
-        account.id,
-        evaluatorAddress || defaultEvaluatorAddress,
-        fareAmount.amount,
-        fareAmount.fare.contractAddress,
-        expiredAt,
-        isX402Job
-      );
-      const { userOpHash } = yield this.acpContractClient.handleOperation([
-        createJobPayload
-      ]);
-      const jobId = yield this.acpContractClient.getJobId(
-        userOpHash,
-        this.walletAddress,
-        providerAddress
-      );
-      const payloads = [];
-      const setBudgetWithPaymentTokenPayload = this.acpContractClient.setBudgetWithPaymentToken(
-        jobId,
-        fareAmount.amount,
-        fareAmount.fare.contractAddress
-      );
-      if (setBudgetWithPaymentTokenPayload) {
-        payloads.push(setBudgetWithPaymentTokenPayload);
-      }
-      payloads.push(
-        this.acpContractClient.createMemo(
-          jobId,
-          preparePayload(serviceRequirement),
-          0 /* MESSAGE */,
-          true,
-          1 /* NEGOTIATION */
-        )
-      );
-      yield this.acpContractClient.handleOperation(payloads);
-      return jobId;
+    socket.on("roomJoined" /* ROOM_JOINED */, (_, callback) => {
+      console.log("Joined ACP Room");
+      callback(true);
     });
-  }
-  getActiveJobs(page = 1, pageSize = 10) {
-    return __async(this, null, function* () {
-      let url = `${this.acpUrl}/api/jobs/active?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
-      try {
-        const response = yield fetch(url, {
-          headers: {
-            "wallet-address": this.walletAddress
-          }
-        });
-        const data = yield response.json();
-        if (data.error) {
-          throw new acpError_default(data.error.message);
-        }
-        return data.data.map((job) => {
-          return new acpJob_default(
+    socket.on(
+      "onEvaluate" /* ON_EVALUATE */,
+      async (data, callback) => {
+        callback(true);
+        if (this.onEvaluate) {
+          const job = new acpJob_default(
             this,
-            job.id,
-            job.clientAddress,
-            job.providerAddress,
-            job.evaluatorAddress,
-            job.price,
-            job.priceTokenAddress,
-            job.memos.map((memo) => {
+            data.id,
+            data.clientAddress,
+            data.providerAddress,
+            data.evaluatorAddress,
+            data.price,
+            data.priceTokenAddress,
+            data.memos.map((memo) => {
               return new acpMemo_default(
-                this.contractClientByAddress(job.contractAddress),
+                this.contractClientByAddress(data.contractAddress),
                 memo.id,
                 memo.memoType,
                 memo.content,
@@ -4494,42 +4457,31 @@ var AcpClient = class {
                 memo.signedTxHash
               );
             }),
-            job.phase,
-            job.context,
-            job.contractAddress,
-            job.netPayableAmount
+            data.phase,
+            data.context,
+            data.contractAddress,
+            data.netPayableAmount
           );
-        });
-      } catch (error) {
-        throw new acpError_default("Failed to get active jobs", error);
-      }
-    });
-  }
-  getPendingMemoJobs(page = 1, pageSize = 10) {
-    return __async(this, null, function* () {
-      let url = `${this.acpUrl}/api/jobs/pending-memos?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
-      try {
-        const response = yield fetch(url, {
-          headers: {
-            "wallet-address": this.acpContractClient.walletAddress
-          }
-        });
-        const data = yield response.json();
-        if (data.error) {
-          throw new acpError_default(data.error.message);
+          this.onEvaluate(job);
         }
-        return data.data.map((job) => {
-          return new acpJob_default(
+      }
+    );
+    socket.on(
+      "onNewTask" /* ON_NEW_TASK */,
+      async (data, callback) => {
+        callback(true);
+        if (this.onNewTask) {
+          const job = new acpJob_default(
             this,
-            job.id,
-            job.clientAddress,
-            job.providerAddress,
-            job.evaluatorAddress,
-            job.price,
-            job.priceTokenAddress,
-            job.memos.map((memo) => {
+            data.id,
+            data.clientAddress,
+            data.providerAddress,
+            data.evaluatorAddress,
+            data.price,
+            data.priceTokenAddress,
+            data.memos.map((memo) => {
               return new acpMemo_default(
-                this.contractClientByAddress(job.contractAddress),
+                this.contractClientByAddress(data.contractAddress),
                 memo.id,
                 memo.memoType,
                 memo.content,
@@ -4538,137 +4490,274 @@ var AcpClient = class {
                 memo.senderAddress,
                 memo.signedReason,
                 memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
-                typeof memo.payableDetails === "string" ? tryParseJson(memo.payableDetails) || void 0 : memo.payableDetails,
+                memo.payableDetails,
                 memo.txHash,
                 memo.signedTxHash
               );
             }),
-            job.phase,
-            job.context,
-            job.contractAddress,
-            job.netPayableAmount
+            data.phase,
+            data.context,
+            data.contractAddress,
+            data.netPayableAmount
           );
-        });
-      } catch (error) {
-        throw new acpError_default("Failed to get pending memo jobs", error);
+          this.onNewTask(
+            job,
+            job.memos.find((m) => m.id == data.memoToSign)
+          );
+        }
       }
-    });
+    );
+    const cleanup = async () => {
+      if (socket) {
+        socket.disconnect();
+      }
+      process.exit(0);
+    };
+    process.on("SIGINT", cleanup);
+    process.on("SIGTERM", cleanup);
   }
-  getCompletedJobs(page = 1, pageSize = 10) {
-    return __async(this, null, function* () {
-      let url = `${this.acpUrl}/api/jobs/completed?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
-      try {
-        const response = yield fetch(url, {
-          headers: {
-            "wallet-address": this.acpContractClient.walletAddress
-          }
-        });
-        const data = yield response.json();
-        if (data.error) {
-          throw new acpError_default(data.error.message);
-        }
-        return data.data.map((job) => {
-          return new acpJob_default(
+  async browseAgents(keyword, options) {
+    let { cluster, sort_by, top_k, graduationStatus, onlineStatus } = 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}`;
+    }
+    if (cluster) {
+      url += `&cluster=${cluster}`;
+    }
+    if (graduationStatus) {
+      url += `&graduationStatus=${graduationStatus}`;
+    }
+    if (onlineStatus) {
+      url += `&onlineStatus=${onlineStatus}`;
+    }
+    const response = await fetch(url);
+    const data = await response.json();
+    const availableContractClientAddresses = this.contractClients.map(
+      (client) => client.contractAddress.toLowerCase()
+    );
+    return data.data.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,
-            job.id,
-            job.clientAddress,
-            job.providerAddress,
-            job.evaluatorAddress,
-            job.price,
-            job.priceTokenAddress,
-            job.memos.map((memo) => {
-              return 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
-              );
-            }),
-            job.phase,
-            job.context,
-            job.contractAddress,
-            job.netPayableAmount
+            acpContractClient,
+            agent.walletAddress,
+            jobs.name,
+            jobs.priceV2.value,
+            jobs.priceV2.type,
+            jobs.requirement
           );
-        });
-      } catch (error) {
-        throw new acpError_default("Failed to get completed jobs", error);
-      }
+        }),
+        contractAddress: agent.contractAddress,
+        twitterHandle: agent.twitterHandle,
+        walletAddress: agent.walletAddress,
+        metrics: agent.metrics,
+        resource: agent.resources
+      };
     });
   }
-  getCancelledJobs(page = 1, pageSize = 10) {
-    return __async(this, null, function* () {
-      let url = `${this.acpUrl}/api/jobs/cancelled?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
-      try {
-        const response = yield fetch(url, {
-          headers: {
-            "wallet-address": this.walletAddress
-          }
-        });
-        const data = yield response.json();
-        if (data.error) {
-          throw new acpError_default(data.error.message);
+  async initiateJob(providerAddress, serviceRequirement, fareAmount, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
+    if (providerAddress === this.walletAddress) {
+      throw new acpError_default(
+        "Provider address cannot be the same as the client address"
+      );
+    }
+    const account = await this.getByClientAndProvider(
+      this.walletAddress,
+      providerAddress,
+      this.acpContractClient
+    );
+    const isV1 = [
+      baseSepoliaAcpConfig.contractAddress,
+      baseSepoliaAcpX402Config.contractAddress,
+      baseAcpConfig.contractAddress,
+      baseAcpX402Config.contractAddress
+    ].includes(this.acpContractClient.config.contractAddress);
+    const defaultEvaluatorAddress = isV1 && !evaluatorAddress ? this.walletAddress : zeroAddress3;
+    const chainId = this.acpContractClient.config.chain.id;
+    const isUsdcPaymentToken = USDC_TOKEN_ADDRESS[chainId].toLowerCase() === fareAmount.fare.contractAddress.toLowerCase();
+    const isX402Job = this.acpContractClient.config.x402Config && isUsdcPaymentToken;
+    const createJobPayload = isV1 || !account ? this.acpContractClient.createJob(
+      providerAddress,
+      evaluatorAddress || defaultEvaluatorAddress,
+      expiredAt,
+      fareAmount.fare.contractAddress,
+      fareAmount.amount,
+      "",
+      isX402Job
+    ) : this.acpContractClient.createJobWithAccount(
+      account.id,
+      evaluatorAddress || defaultEvaluatorAddress,
+      fareAmount.amount,
+      fareAmount.fare.contractAddress,
+      expiredAt,
+      isX402Job
+    );
+    const { userOpHash } = await this.acpContractClient.handleOperation([
+      createJobPayload
+    ]);
+    const jobId = await this.acpContractClient.getJobId(
+      userOpHash,
+      this.walletAddress,
+      providerAddress
+    );
+    const payloads = [];
+    const setBudgetWithPaymentTokenPayload = this.acpContractClient.setBudgetWithPaymentToken(
+      jobId,
+      fareAmount.amount,
+      fareAmount.fare.contractAddress
+    );
+    if (setBudgetWithPaymentTokenPayload) {
+      payloads.push(setBudgetWithPaymentTokenPayload);
+    }
+    payloads.push(
+      this.acpContractClient.createMemo(
+        jobId,
+        preparePayload(serviceRequirement),
+        0 /* MESSAGE */,
+        true,
+        1 /* NEGOTIATION */
+      )
+    );
+    await this.acpContractClient.handleOperation(payloads);
+    return jobId;
+  }
+  async getActiveJobs(page = 1, pageSize = 10) {
+    let url = `${this.acpUrl}/api/jobs/active?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
+    try {
+      const response = await fetch(url, {
+        headers: {
+          "wallet-address": this.walletAddress
         }
-        return data.data.map((job) => {
-          return new acpJob_default(
-            this,
-            job.id,
-            job.clientAddress,
-            job.providerAddress,
-            job.evaluatorAddress,
-            job.price,
-            job.priceTokenAddress,
-            job.memos.map((memo) => {
-              return 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
-              );
-            }),
-            job.phase,
-            job.context,
-            job.contractAddress,
-            job.netPayableAmount
-          );
-        });
-      } catch (error) {
-        throw new acpError_default("Failed to get cancelled jobs", error);
+      });
+      const data = await response.json();
+      if (data.error) {
+        throw new acpError_default(data.error.message);
       }
-    });
+      return data.data.map((job) => {
+        return new acpJob_default(
+          this,
+          job.id,
+          job.clientAddress,
+          job.providerAddress,
+          job.evaluatorAddress,
+          job.price,
+          job.priceTokenAddress,
+          job.memos.map((memo) => {
+            return 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
+            );
+          }),
+          job.phase,
+          job.context,
+          job.contractAddress,
+          job.netPayableAmount
+        );
+      });
+    } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
+      throw new acpError_default("Failed to get active jobs", error);
+    }
+  }
+  async getPendingMemoJobs(page = 1, pageSize = 10) {
+    let url = `${this.acpUrl}/api/jobs/pending-memos?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
+    try {
+      const response = await fetch(url, {
+        headers: {
+          "wallet-address": this.acpContractClient.walletAddress
+        }
+      });
+      const data = await response.json();
+      if (data.error) {
+        throw new acpError_default(data.error.message);
+      }
+      return data.data.map((job) => {
+        return new acpJob_default(
+          this,
+          job.id,
+          job.clientAddress,
+          job.providerAddress,
+          job.evaluatorAddress,
+          job.price,
+          job.priceTokenAddress,
+          job.memos.map((memo) => {
+            return 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,
+              typeof memo.payableDetails === "string" ? tryParseJson(memo.payableDetails) || void 0 : memo.payableDetails,
+              memo.txHash,
+              memo.signedTxHash
+            );
+          }),
+          job.phase,
+          job.context,
+          job.contractAddress,
+          job.netPayableAmount
+        );
+      });
+    } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
+      throw new acpError_default("Failed to get pending memo jobs", error);
+    }
   }
-  getJobById(jobId) {
-    return __async(this, null, function* () {
-      let url = `${this.acpUrl}/api/jobs/${jobId}`;
-      try {
-        const response = yield fetch(url, {
-          headers: {
-            "wallet-address": this.acpContractClient.walletAddress
-          }
-        });
-        const data = yield response.json();
-        if (data.error) {
-          throw new acpError_default(data.error.message);
-        }
-        const job = data.data;
-        if (!job) {
-          return;
+  async getCompletedJobs(page = 1, pageSize = 10) {
+    let url = `${this.acpUrl}/api/jobs/completed?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
+    try {
+      const response = await fetch(url, {
+        headers: {
+          "wallet-address": this.acpContractClient.walletAddress
         }
+      });
+      const data = await response.json();
+      if (data.error) {
+        throw new acpError_default(data.error.message);
+      }
+      return data.data.map((job) => {
         return new acpJob_default(
           this,
           job.id,
@@ -4698,100 +4787,200 @@ var AcpClient = class {
           job.contractAddress,
           job.netPayableAmount
         );
-      } catch (error) {
-        throw new acpError_default("Failed to get job by id", error);
+      });
+    } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
       }
-    });
+      throw new acpError_default("Failed to get completed jobs", error);
+    }
   }
-  getMemoById(jobId, memoId) {
-    return __async(this, null, function* () {
-      let url = `${this.acpUrl}/api/jobs/${jobId}/memos/${memoId}`;
-      try {
-        const response = yield fetch(url, {
-          headers: {
-            "wallet-address": this.walletAddress
-          }
-        });
-        const data = yield response.json();
-        if (data.error) {
-          throw new acpError_default(data.error.message);
-        }
-        const memo = data.data;
-        if (!memo) {
-          return;
+  async getCancelledJobs(page = 1, pageSize = 10) {
+    let url = `${this.acpUrl}/api/jobs/cancelled?pagination[page]=${page}&pagination[pageSize]=${pageSize}`;
+    try {
+      const response = await fetch(url, {
+        headers: {
+          "wallet-address": this.walletAddress
         }
-        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
+      });
+      const data = await response.json();
+      if (data.error) {
+        throw new acpError_default(data.error.message);
+      }
+      return data.data.map((job) => {
+        return new acpJob_default(
+          this,
+          job.id,
+          job.clientAddress,
+          job.providerAddress,
+          job.evaluatorAddress,
+          job.price,
+          job.priceTokenAddress,
+          job.memos.map((memo) => {
+            return 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
+            );
+          }),
+          job.phase,
+          job.context,
+          job.contractAddress,
+          job.netPayableAmount
         );
-      } catch (error) {
-        throw new acpError_default("Failed to get memo by id", error);
+      });
+    } catch (error) {
+      if (error instanceof Error) {
+        return error;
       }
-    });
+      throw new acpError_default("Failed to get cancelled jobs", error);
+    }
   }
-  getAgent(walletAddress) {
-    return __async(this, null, function* () {
-      const url = `${this.acpUrl}/api/agents?filters[walletAddress]=${walletAddress}`;
-      const response = yield fetch(url);
-      const data = yield response.json();
-      const agents = data.data || [];
-      if (agents.length === 0) {
+  async getJobById(jobId) {
+    let url = `${this.acpUrl}/api/jobs/${jobId}`;
+    try {
+      const response = await fetch(url, {
+        headers: {
+          "wallet-address": this.acpContractClient.walletAddress
+        }
+      });
+      const data = await response.json();
+      if (data.error) {
+        throw new acpError_default(data.error.message);
+      }
+      const job = data.data;
+      if (!job) {
         return;
       }
-      return agents[0];
-    });
+      return new acpJob_default(
+        this,
+        job.id,
+        job.clientAddress,
+        job.providerAddress,
+        job.evaluatorAddress,
+        job.price,
+        job.priceTokenAddress,
+        job.memos.map((memo) => {
+          return 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
+          );
+        }),
+        job.phase,
+        job.context,
+        job.contractAddress,
+        job.netPayableAmount
+      );
+    } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
+      throw new acpError_default("Failed to get job by id", error);
+    }
   }
-  getAccountByJobId(jobId, acpContractClient) {
-    return __async(this, null, function* () {
-      try {
-        const url = `${this.acpUrl}/api/accounts/job/${jobId}`;
-        const response = yield fetch(url);
-        const data = yield response.json();
-        if (!data.data) {
-          return null;
+  async getMemoById(jobId, memoId) {
+    let url = `${this.acpUrl}/api/jobs/${jobId}/memos/${memoId}`;
+    try {
+      const response = await fetch(url, {
+        headers: {
+          "wallet-address": this.walletAddress
         }
-        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 data = await response.json();
+      if (data.error) {
+        throw new acpError_default(data.error.message);
       }
-    });
+      const memo = data.data;
+      if (!memo) {
+        return;
+      }
+      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
+      );
+    } catch (error) {
+      if (error instanceof acpError_default) {
+        return error;
+      }
+      throw new acpError_default("Failed to get memo by id", error);
+    }
   }
-  getByClientAndProvider(clientAddress, providerAddress, acpContractClient) {
-    return __async(this, null, function* () {
-      try {
-        const url = `${this.acpUrl}/api/accounts/client/${clientAddress}/provider/${providerAddress}`;
-        const response = yield fetch(url);
-        const data = yield 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 client and provider", error);
+  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;
+    }
+    return agents[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);
+    }
+  }
+  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;
+      }
+      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);
+    }
   }
 };
 var acpClient_default = AcpClient;
@@ -4818,136 +5007,127 @@ var AcpX402 = class {
     this.sessionKeyClient = sessionKeyClient;
     this.publicClient = publicClient;
   }
-  signUpdateJobNonceMessage(jobId, nonce) {
-    return __async(this, null, function* () {
-      const message = `${jobId}-${nonce}`;
-      const signature = yield this.sessionKeyClient.account.getSigner().signMessage(message);
-      return signature;
-    });
+  async signUpdateJobNonceMessage(jobId, nonce) {
+    const message = `${jobId}-${nonce}`;
+    const signature = await this.sessionKeyClient.account.getSigner().signMessage(message);
+    return signature;
   }
-  updateJobNonce(jobId, nonce) {
-    return __async(this, null, function* () {
-      try {
-        const apiUrl = `${this.config.acpUrl}/api/jobs/${jobId}/x402-nonce`;
-        const signature = yield this.signUpdateJobNonceMessage(jobId, nonce);
-        const response = yield fetch(apiUrl, {
-          method: "POST",
-          headers: {
-            "x-signature": signature,
-            "x-nonce": nonce,
-            "Content-Type": "application/json"
-          },
-          body: JSON.stringify({
-            data: {
-              nonce
-            }
-          })
-        });
-        if (!response.ok) {
-          throw new acpError_default(
-            "Failed to update job X402 nonce",
-            response.statusText
-          );
-        }
-        const acpJob = yield response.json();
-        return acpJob;
-      } catch (error) {
-        throw new acpError_default("Failed to update job X402 nonce", error);
+  async updateJobNonce(jobId, nonce) {
+    try {
+      const apiUrl = `${this.config.acpUrl}/api/jobs/${jobId}/x402-nonce`;
+      const signature = await this.signUpdateJobNonceMessage(jobId, nonce);
+      const response = await fetch(apiUrl, {
+        method: "POST",
+        headers: {
+          "x-signature": signature,
+          "x-nonce": nonce,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          data: {
+            nonce
+          }
+        })
+      });
+      if (!response.ok) {
+        throw new acpError_default(
+          "Failed to update job X402 nonce",
+          response.statusText
+        );
       }
-    });
+      const acpJob = await response.json();
+      return acpJob;
+    } catch (error) {
+      throw new acpError_default("Failed to update job X402 nonce", error);
+    }
   }
-  generatePayment(payableRequest, requirements) {
-    return __async(this, null, function* () {
-      try {
-        const USDC_CONTRACT = this.config.baseFare.contractAddress;
-        const timeNow = Math.floor(Date.now() / 1e3);
-        const validAfter = timeNow.toString();
-        const validBefore = (timeNow + requirements.accepts[0].maxTimeoutSeconds).toString();
-        const [tokenName, tokenVersion] = yield this.publicClient.multicall({
-          contracts: [
-            {
-              address: USDC_CONTRACT,
-              abi: erc20Abi3,
-              functionName: "name"
-            },
-            {
-              address: USDC_CONTRACT,
-              abi: fiatTokenV2Abi_default,
-              functionName: "version"
-            }
-          ]
-        });
-        const nonce = `0x${randomBytes(32).toString("hex")}`;
-        const message = {
-          from: this.sessionKeyClient.account.address,
-          to: payableRequest.to,
-          value: payableRequest.value.toString(),
-          validAfter: validAfter.toString(),
-          validBefore: validBefore.toString(),
-          nonce
-        };
-        const typedData = {
-          types: {
-            TransferWithAuthorization: X402AuthorizationTypes
-          },
-          domain: {
-            name: tokenName.result,
-            version: tokenVersion.result,
-            chainId: this.config.chain.id,
-            verifyingContract: USDC_CONTRACT
+  async generatePayment(payableRequest, requirements) {
+    try {
+      const USDC_CONTRACT = this.config.baseFare.contractAddress;
+      const timeNow = Math.floor(Date.now() / 1e3);
+      const validAfter = timeNow.toString();
+      const validBefore = (timeNow + requirements.accepts[0].maxTimeoutSeconds).toString();
+      const [tokenName, tokenVersion] = await this.publicClient.multicall({
+        contracts: [
+          {
+            address: USDC_CONTRACT,
+            abi: erc20Abi3,
+            functionName: "name"
           },
-          primaryType: "TransferWithAuthorization",
-          message
-        };
-        const signature = yield this.sessionKeyClient.signTypedData({
-          typedData
-        });
-        const payload = {
-          x402Version: requirements.x402Version,
-          scheme: requirements.accepts[0].scheme,
-          network: requirements.accepts[0].network,
-          payload: {
-            signature,
-            authorization: message
+          {
+            address: USDC_CONTRACT,
+            abi: fiatTokenV2Abi_default,
+            functionName: "version"
           }
-        };
-        const encodedPayment = safeBase64Encode(JSON.stringify(payload));
-        return {
-          encodedPayment,
+        ]
+      });
+      const nonce = `0x${randomBytes(32).toString("hex")}`;
+      const message = {
+        from: this.sessionKeyClient.account.address,
+        to: payableRequest.to,
+        value: payableRequest.value.toString(),
+        validAfter: validAfter.toString(),
+        validBefore: validBefore.toString(),
+        nonce
+      };
+      const typedData = {
+        types: {
+          TransferWithAuthorization: X402AuthorizationTypes
+        },
+        domain: {
+          name: tokenName.result,
+          version: tokenVersion.result,
+          chainId: this.config.chain.id,
+          verifyingContract: USDC_CONTRACT
+        },
+        primaryType: "TransferWithAuthorization",
+        message
+      };
+      const signature = await this.sessionKeyClient.signTypedData({
+        typedData
+      });
+      const payload = {
+        x402Version: requirements.x402Version,
+        scheme: requirements.accepts[0].scheme,
+        network: requirements.accepts[0].network,
+        payload: {
           signature,
-          message
-        };
-      } catch (error) {
-        throw new acpError_default("Failed to generate X402 payment", error);
-      }
-    });
-  }
-  performRequest(url, version2, budget, signature) {
-    return __async(this, null, function* () {
-      var _a;
-      const baseUrl = (_a = this.config.x402Config) == null ? void 0 : _a.url;
-      if (!baseUrl) throw new acpError_default("X402 URL not configured");
-      try {
-        const headers = {};
-        if (signature) headers["x-payment"] = signature;
-        if (budget) headers["x-budget"] = budget.toString();
-        headers["x-acp-version"] = version2;
-        const res = yield fetch(`${baseUrl}${url}`, { method: "GET", headers });
-        const data = yield res.json();
-        if (!res.ok && res.status !== HTTP_STATUS_CODES.PAYMENT_REQUIRED) {
-          throw new acpError_default(
-            "Invalid response status code for X402 request",
-            data
-          );
+          authorization: message
         }
-        return {
-          isPaymentRequired: res.status === HTTP_STATUS_CODES.PAYMENT_REQUIRED,
+      };
+      const encodedPayment = safeBase64Encode(JSON.stringify(payload));
+      return {
+        encodedPayment,
+        signature,
+        message
+      };
+    } catch (error) {
+      throw new acpError_default("Failed to generate X402 payment", error);
+    }
+  }
+  async performRequest(url, version2, budget, signature) {
+    const baseUrl = this.config.x402Config?.url;
+    if (!baseUrl) throw new acpError_default("X402 URL not configured");
+    try {
+      const headers = {};
+      if (signature) headers["x-payment"] = signature;
+      if (budget) headers["x-budget"] = budget.toString();
+      headers["x-acp-version"] = version2;
+      const res = await fetch(`${baseUrl}${url}`, { method: "GET", headers });
+      const data = await res.json();
+      if (!res.ok && res.status !== HTTP_STATUS_CODES.PAYMENT_REQUIRED) {
+        throw new acpError_default(
+          "Invalid response status code for X402 request",
           data
-        };
-      } catch (error) {
-        throw new acpError_default("Failed to perform X402 request", error);
+        );
       }
-    });
+      return {
+        isPaymentRequired: res.status === HTTP_STATUS_CODES.PAYMENT_REQUIRED,
+        data
+      };
+    } catch (error) {
+      throw new acpError_default("Failed to perform X402 request", error);
+    }
   }
 };
 
@@ -4959,37 +5139,46 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
     this.MAX_FEE_PER_GAS = 2e7;
     this.MAX_PRIORITY_FEE_PER_GAS = 21e6;
   }
-  static build(_0, _1, _2) {
-    return __async(this, arguments, function* (walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig) {
-      const acpContractClient = new _AcpContractClient(
-        agentWalletAddress,
-        config
-      );
-      yield acpContractClient.init(walletPrivateKey, sessionEntityKeyId);
-      return acpContractClient;
-    });
+  static async build(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig) {
+    const acpContractClient = new _AcpContractClient(
+      agentWalletAddress,
+      config
+    );
+    await acpContractClient.init(walletPrivateKey, sessionEntityKeyId);
+    return acpContractClient;
   }
-  init(privateKey, sessionEntityKeyId) {
-    return __async(this, null, function* () {
-      const sessionKeySigner = LocalAccountSigner.privateKeyToAccountSigner(privateKey);
-      this._sessionKeyClient = yield createModularAccountV2Client({
-        chain: this.chain,
-        transport: alchemy({
-          rpcUrl: this.config.alchemyRpcUrl
-        }),
-        signer: sessionKeySigner,
-        policyId: "186aaa4a-5f57-4156-83fb-e456365a8820",
-        accountAddress: this.agentWalletAddress,
-        signerEntity: {
-          entityId: sessionEntityKeyId,
-          isGlobalValidation: true
-        }
-      });
-      this._acpX402 = new AcpX402(
-        this.config,
-        this.sessionKeyClient,
-        this.publicClient
+  async init(privateKey, sessionEntityKeyId) {
+    const sessionKeySigner = LocalAccountSigner.privateKeyToAccountSigner(privateKey);
+    this._sessionKeyClient = await createModularAccountV2Client({
+      chain: this.chain,
+      transport: alchemy({
+        rpcUrl: this.config.alchemyRpcUrl
+      }),
+      signer: sessionKeySigner,
+      policyId: "186aaa4a-5f57-4156-83fb-e456365a8820",
+      accountAddress: this.agentWalletAddress,
+      signerEntity: {
+        entityId: sessionEntityKeyId,
+        isGlobalValidation: true
+      }
+    });
+    this._acpX402 = new AcpX402(
+      this.config,
+      this.sessionKeyClient,
+      this.publicClient
+    );
+    const account = this.sessionKeyClient.account;
+    const sessionSignerAddress = await account.getSigner().getAddress();
+    if (!await account.isAccountDeployed()) {
+      throw new acpError_default(
+        `ACP Contract Client validation failed: agent account ${this.agentWalletAddress} is not deployed on-chain`
       );
+    }
+    await this.validateSessionKeyOnChain(sessionSignerAddress, sessionEntityKeyId);
+    console.log("Connected to ACP:", {
+      agentWalletAddress: this.agentWalletAddress,
+      whitelistedWalletAddress: sessionSignerAddress,
+      entityId: sessionEntityKeyId
     });
   }
   getRandomNonce(bits = 152) {
@@ -5013,74 +5202,68 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
     }
     return this._acpX402;
   }
-  calculateGasFees() {
-    return __async(this, null, function* () {
-      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 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;
   }
-  handleOperation(operations) {
-    return __async(this, null, function* () {
-      const payload = {
-        uo: operations.map((op) => ({
-          target: op.contractAddress,
-          data: op.data,
-          value: op.value
-        })),
-        overrides: {
-          nonceKey: this.getRandomNonce()
+  async handleOperation(operations) {
+    const payload = {
+      uo: operations.map((op) => ({
+        target: op.contractAddress,
+        data: op.data,
+        value: op.value
+      })),
+      overrides: {
+        nonceKey: this.getRandomNonce()
+      }
+    };
+    let retries = this.config.maxRetries;
+    let finalError;
+    while (retries > 0) {
+      try {
+        if (this.config.maxRetries > retries) {
+          const gasFees = await this.calculateGasFees();
+          payload["overrides"] = {
+            maxFeePerGas: `0x${gasFees.toString(16)}`
+          };
         }
-      };
-      let retries = this.config.maxRetries;
-      let finalError;
-      while (retries > 0) {
-        try {
-          if (this.config.maxRetries > retries) {
-            const gasFees = yield this.calculateGasFees();
-            payload["overrides"] = {
-              maxFeePerGas: `0x${gasFees.toString(16)}`
-            };
-          }
-          const { hash } = yield this.sessionKeyClient.sendUserOperation(payload);
-          const txnHash = yield this.sessionKeyClient.waitForUserOperationTransaction({
-            hash
-          });
-          return { userOpHash: hash, txnHash };
-        } catch (error) {
-          retries -= 1;
-          if (retries === 0) {
-            finalError = error;
-            break;
-          }
-          yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
+        const { hash } = await this.sessionKeyClient.sendUserOperation(payload);
+        const txnHash = await this.sessionKeyClient.waitForUserOperationTransaction({
+          hash
+        });
+        return { userOpHash: hash, txnHash };
+      } catch (error) {
+        retries -= 1;
+        if (retries === 0) {
+          finalError = error;
+          break;
         }
+        await new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
       }
-      throw new acpError_default(`Failed to send user operation`, finalError);
-    });
+    }
+    throw new acpError_default(`Failed to send user operation`, finalError);
   }
-  getJobId(createJobUserOpHash, clientAddress, providerAddress) {
-    return __async(this, null, function* () {
-      const result = yield this.sessionKeyClient.getUserOperationReceipt(createJobUserOpHash);
-      if (!result) {
-        throw new acpError_default("Failed to get user operation receipt");
-      }
-      const contractLogs = result.logs.filter((log) => {
-        return log.address.toLowerCase() === this.contractAddress.toLowerCase();
-      }).map(
-        (log) => decodeEventLog({
-          abi: this.abi,
-          data: log.data,
-          topics: log.topics
-        })
-      );
-      const createdJobEvent = contractLogs.find(
-        (log) => log.eventName === "JobCreated" && log.args.client.toLowerCase() === clientAddress.toLowerCase() && log.args.provider.toLowerCase() === providerAddress.toLowerCase()
-      );
-      if (!createdJobEvent) {
-        throw new acpError_default("Failed to find created job event");
-      }
-      return Number(createdJobEvent.args.jobId);
-    });
+  async getJobId(createJobUserOpHash, clientAddress, providerAddress) {
+    const result = await this.sessionKeyClient.getUserOperationReceipt(createJobUserOpHash);
+    if (!result) {
+      throw new acpError_default("Failed to get user operation receipt");
+    }
+    const contractLogs = result.logs.filter((log) => {
+      return log.address.toLowerCase() === this.contractAddress.toLowerCase();
+    }).map(
+      (log) => decodeEventLog({
+        abi: this.abi,
+        data: log.data,
+        topics: log.topics
+      })
+    );
+    const createdJobEvent = contractLogs.find(
+      (log) => log.eventName === "JobCreated" && log.args.client.toLowerCase() === clientAddress.toLowerCase() && log.args.provider.toLowerCase() === providerAddress.toLowerCase()
+    );
+    if (!createdJobEvent) {
+      throw new acpError_default("Failed to find created job event");
+    }
+    return Number(createdJobEvent.args.jobId);
   }
   createJob(providerAddress, evaluatorAddress, expireAt, paymentTokenAddress, budgetBaseUnit, metadata, isX402Job) {
     try {
@@ -5151,20 +5334,14 @@ var AcpContractClient = class _AcpContractClient extends baseAcpContractClient_d
   updateAccountMetadata(accountId, metadata) {
     throw new acpError_default("Not Supported");
   }
-  updateJobX402Nonce(jobId, nonce) {
-    return __async(this, null, function* () {
-      return yield this.acpX402.updateJobNonce(jobId, nonce);
-    });
+  async updateJobX402Nonce(jobId, nonce) {
+    return await this.acpX402.updateJobNonce(jobId, nonce);
   }
-  generateX402Payment(payableRequest, requirements) {
-    return __async(this, null, function* () {
-      return yield this.acpX402.generatePayment(payableRequest, requirements);
-    });
+  async generateX402Payment(payableRequest, requirements) {
+    return await this.acpX402.generatePayment(payableRequest, requirements);
   }
-  performX402Request(url, version2, budget, signature) {
-    return __async(this, null, function* () {
-      return yield this.acpX402.performRequest(url, version2, budget, signature);
-    });
+  async performX402Request(url, version2, budget, signature) {
+    return await this.acpX402.performRequest(url, version2, budget, signature);
   }
   getAcpVersion() {
     return "1";
@@ -5892,68 +6069,77 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     this.MAX_FEE_PER_GAS = 2e7;
     this.MAX_PRIORITY_FEE_PER_GAS = 21e6;
   }
-  static build(_0, _1, _2) {
-    return __async(this, arguments, function* (walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfigV2) {
-      const publicClient = createPublicClient4({
-        chain: config.chain,
-        transport: http3(config.rpcEndpoint)
-      });
-      const [jobManagerAddress, memoManagerAddress, accountManagerAddress] = yield 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
-      );
-      yield acpContractClient.init(walletPrivateKey, sessionEntityKeyId);
-      return acpContractClient;
+  static async build(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfigV2) {
+    const publicClient = createPublicClient4({
+      chain: config.chain,
+      transport: http3(config.rpcEndpoint)
     });
-  }
-  init(privateKey, sessionEntityKeyId) {
-    return __async(this, null, function* () {
-      const sessionKeySigner = LocalAccountSigner2.privateKeyToAccountSigner(privateKey);
-      this._sessionKeyClient = yield 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
+    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"
         }
-      });
-      this._acpX402 = new AcpX402(
-        this.config,
-        this.sessionKeyClient,
-        this.publicClient
+      ]
+    });
+    if (!jobManagerAddress || !memoManagerAddress || !accountManagerAddress) {
+      throw new acpError_default(
+        "Failed to get job manager, memo manager, or account manager address"
+      );
+    }
+    const acpContractClient = new _AcpContractClientV2(
+      jobManagerAddress.result,
+      memoManagerAddress.result,
+      accountManagerAddress.result,
+      agentWalletAddress,
+      config
+    );
+    await acpContractClient.init(walletPrivateKey, sessionEntityKeyId);
+    return acpContractClient;
+  }
+  async init(privateKey, sessionEntityKeyId) {
+    const sessionKeySigner = LocalAccountSigner2.privateKeyToAccountSigner(privateKey);
+    this._sessionKeyClient = await createModularAccountV2Client2({
+      chain: this.chain,
+      transport: alchemy2({
+        rpcUrl: this.config.alchemyRpcUrl
+      }),
+      signer: sessionKeySigner,
+      policyId: "186aaa4a-5f57-4156-83fb-e456365a8820",
+      accountAddress: this.agentWalletAddress,
+      signerEntity: {
+        entityId: sessionEntityKeyId,
+        isGlobalValidation: true
+      }
+    });
+    this._acpX402 = new AcpX402(
+      this.config,
+      this.sessionKeyClient,
+      this.publicClient
+    );
+    const account = this.sessionKeyClient.account;
+    const sessionSignerAddress = await account.getSigner().getAddress();
+    if (!await account.isAccountDeployed()) {
+      throw new acpError_default(
+        `ACP Contract Client validation failed: agent account ${this.agentWalletAddress} is not deployed on-chain`
       );
+    }
+    await this.validateSessionKeyOnChain(sessionSignerAddress, sessionEntityKeyId);
+    console.log("Connected to ACP:", {
+      agentWalletAddress: this.agentWalletAddress,
+      whitelistedWalletAddress: sessionSignerAddress,
+      entityId: sessionEntityKeyId
     });
   }
   getRandomNonce(bits = 152) {
@@ -5977,116 +6163,102 @@ var AcpContractClientV2 = class _AcpContractClientV2 extends baseAcpContractClie
     }
     return this._acpX402;
   }
-  calculateGasFees() {
-    return __async(this, null, function* () {
-      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 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;
   }
-  handleOperation(operations) {
-    return __async(this, null, function* () {
-      const payload = {
-        uo: operations.map((operation) => ({
-          target: operation.contractAddress,
-          data: operation.data,
-          value: operation.value
-        })),
-        overrides: {
-          nonceKey: this.getRandomNonce()
+  async handleOperation(operations) {
+    const payload = {
+      uo: operations.map((operation) => ({
+        target: operation.contractAddress,
+        data: operation.data,
+        value: operation.value
+      })),
+      overrides: {
+        nonceKey: this.getRandomNonce()
+      }
+    };
+    let retries = this.config.maxRetries;
+    let finalError;
+    while (retries > 0) {
+      try {
+        if (this.config.maxRetries > retries) {
+          const gasFees = await this.calculateGasFees();
+          payload["overrides"] = {
+            maxFeePerGas: `0x${gasFees.toString(16)}`
+          };
         }
-      };
-      let retries = this.config.maxRetries;
-      let finalError;
-      while (retries > 0) {
-        try {
-          if (this.config.maxRetries > retries) {
-            const gasFees = yield this.calculateGasFees();
-            payload["overrides"] = {
-              maxFeePerGas: `0x${gasFees.toString(16)}`
-            };
+        const { hash } = await this.sessionKeyClient.sendUserOperation(payload);
+        const txnHash = await this.sessionKeyClient.waitForUserOperationTransaction({
+          hash,
+          tag: "pending",
+          retries: {
+            intervalMs: 200,
+            multiplier: 1.1,
+            maxRetries: 10
           }
-          const { hash } = yield this.sessionKeyClient.sendUserOperation(payload);
-          const txnHash = yield this.sessionKeyClient.waitForUserOperationTransaction({
-            hash,
-            tag: "pending",
-            retries: {
-              intervalMs: 200,
-              multiplier: 1.1,
-              maxRetries: 10
-            }
-          });
-          return { userOpHash: hash, txnHash };
-        } catch (error) {
-          retries -= 1;
-          if (retries === 0) {
-            finalError = error;
-            break;
-          }
-          yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
+        });
+        return { userOpHash: hash, txnHash };
+      } catch (error) {
+        retries -= 1;
+        if (retries === 0) {
+          finalError = error;
+          break;
         }
+        await new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
       }
-      throw new acpError_default(`Failed to send user operation`, finalError);
-    });
+    }
+    throw new acpError_default(`Failed to send user operation`, finalError);
   }
-  getJobId(createJobUserOpHash, clientAddress, providerAddress) {
-    return __async(this, null, function* () {
-      const result = yield this.sessionKeyClient.getUserOperationReceipt(
-        createJobUserOpHash,
-        "pending"
-      );
-      if (!result) {
-        throw new acpError_default("Failed to get user operation receipt");
-      }
-      const contractLogs = result.logs.filter((log) => {
-        return log.address.toLowerCase() === this.jobManagerAddress.toLowerCase();
-      }).map(
-        (log) => decodeEventLog2({
-          abi: jobManagerAbi_default,
-          data: log.data,
-          topics: log.topics
-        })
-      );
-      const createdJobEvent = contractLogs.find(
-        (log) => log.eventName === "JobCreated" && log.args.client.toLowerCase() === clientAddress.toLowerCase() && log.args.provider.toLowerCase() === providerAddress.toLowerCase()
-      );
-      if (!createdJobEvent) {
-        throw new acpError_default("Failed to find created job event");
-      }
-      return Number(createdJobEvent.args.jobId);
-    });
+  async getJobId(createJobUserOpHash, clientAddress, providerAddress) {
+    const result = await this.sessionKeyClient.getUserOperationReceipt(
+      createJobUserOpHash,
+      "pending"
+    );
+    if (!result) {
+      throw new acpError_default("Failed to get user operation receipt");
+    }
+    const contractLogs = result.logs.filter((log) => {
+      return log.address.toLowerCase() === this.jobManagerAddress.toLowerCase();
+    }).map(
+      (log) => decodeEventLog2({
+        abi: jobManagerAbi_default,
+        data: log.data,
+        topics: log.topics
+      })
+    );
+    const createdJobEvent = contractLogs.find(
+      (log) => log.eventName === "JobCreated" && log.args.client.toLowerCase() === clientAddress.toLowerCase() && log.args.provider.toLowerCase() === providerAddress.toLowerCase()
+    );
+    if (!createdJobEvent) {
+      throw new acpError_default("Failed to find created job event");
+    }
+    return Number(createdJobEvent.args.jobId);
   }
-  updateJobX402Nonce(jobId, nonce) {
-    return __async(this, null, function* () {
-      return yield this.acpX402.updateJobNonce(jobId, nonce);
-    });
+  async updateJobX402Nonce(jobId, nonce) {
+    return await this.acpX402.updateJobNonce(jobId, nonce);
   }
-  generateX402Payment(payableRequest, requirements) {
-    return __async(this, null, function* () {
-      return yield this.acpX402.generatePayment(payableRequest, requirements);
-    });
+  async generateX402Payment(payableRequest, requirements) {
+    return await this.acpX402.generatePayment(payableRequest, requirements);
   }
-  performX402Request(url, version2, budget, signature) {
-    return __async(this, null, function* () {
-      return yield this.acpX402.performRequest(url, version2, budget, signature);
-    });
+  async performX402Request(url, version2, budget, signature) {
+    return await this.acpX402.performRequest(url, version2, budget, signature);
   }
-  getX402PaymentDetails(jobId) {
-    return __async(this, null, function* () {
-      try {
-        const result = yield this.publicClient.readContract({
-          address: this.jobManagerAddress,
-          abi: jobManagerAbi_default,
-          functionName: "x402PaymentDetails",
-          args: [BigInt(jobId)]
-        });
-        return {
-          isX402: result[0],
-          isBudgetReceived: result[1]
-        };
-      } catch (error) {
-        throw new acpError_default("Failed to get X402 payment details", error);
-      }
-    });
+  async getX402PaymentDetails(jobId) {
+    try {
+      const result = await this.publicClient.readContract({
+        address: this.jobManagerAddress,
+        abi: jobManagerAbi_default,
+        functionName: "x402PaymentDetails",
+        args: [BigInt(jobId)]
+      });
+      return {
+        isX402: result[0],
+        isBudgetReceived: result[1]
+      };
+    } catch (error) {
+      throw new acpError_default("Failed to get X402 payment details", error);
+    }
   }
   getAcpVersion() {
     return "2";