@virtuals-protocol/acp-node 0.1.0-beta.9 → 0.2.0-beta.2

package/dist/index.mjs

@@ -1,4 +1,5 @@
 var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -14,6 +15,9 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+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) => {
@@ -35,6 +39,41 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 
+// package.json
+var require_package = __commonJS({
+  "package.json"(exports, module) {
+    module.exports = {
+      name: "@virtuals-protocol/acp-node",
+      version: "0.2.0-beta.2",
+      main: "./dist/index.js",
+      module: "./dist/index.mjs",
+      types: "./dist/index.d.ts",
+      scripts: {
+        test: 'echo "Error: no test specified" && exit 1',
+        tsup: "tsup src/index.ts --dts --format cjs,esm --out-dir dist"
+      },
+      author: "",
+      license: "ISC",
+      description: "",
+      devDependencies: {
+        typescript: "^5.8.3"
+      },
+      dependencies: {
+        "@aa-sdk/core": "^4.30.0",
+        "@account-kit/infra": "^4.30.0",
+        "@account-kit/smart-contracts": "^4.30.0",
+        ajv: "^8.17.1",
+        "socket.io-client": "^4.8.1",
+        tsup: "^8.5.0",
+        viem: "^2.28.2"
+      },
+      files: [
+        "dist"
+      ]
+    };
+  }
+});
+
 // src/acpAbi.ts
 var ACP_ABI = [
   { inputs: [], stateMutability: "nonpayable", type: "constructor" },
@@ -244,11 +283,176 @@ var ACP_ABI = [
         internalType: "uint256",
         name: "memoId",
         type: "uint256"
+      },
+      {
+        indexed: false,
+        internalType: "string",
+        name: "content",
+        type: "string"
       }
     ],
     name: "NewMemo",
     type: "event"
   },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "memoId",
+        type: "uint256"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "payer",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      }
+    ],
+    name: "PayableFeeCollected",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "memoId",
+        type: "uint256"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "payer",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "address",
+        name: "recipient",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "netAmount",
+        type: "uint256"
+      }
+    ],
+    name: "PayableFeeRequestExecuted",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "memoId",
+        type: "uint256"
+      },
+      { indexed: true, internalType: "address", name: "from", type: "address" },
+      { indexed: false, internalType: "address", name: "to", type: "address" },
+      {
+        indexed: false,
+        internalType: "address",
+        name: "token",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      }
+    ],
+    name: "PayableRequestExecuted",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "memoId",
+        type: "uint256"
+      },
+      { indexed: true, internalType: "address", name: "from", type: "address" },
+      { indexed: false, internalType: "address", name: "to", type: "address" },
+      {
+        indexed: false,
+        internalType: "address",
+        name: "token",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      }
+    ],
+    name: "PayableTransferExecuted",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "client",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      }
+    ],
+    name: "RefundedAdditionalFees",
+    type: "event"
+  },
   {
     anonymous: false,
     inputs: [
@@ -362,6 +566,13 @@ var ACP_ABI = [
     stateMutability: "view",
     type: "function"
   },
+  {
+    inputs: [],
+    name: "PHASE_EXPIRED",
+    outputs: [{ internalType: "uint8", name: "", type: "uint8" }],
+    stateMutability: "view",
+    type: "function"
+  },
   {
     inputs: [],
     name: "PHASE_NEGOTIATION",
@@ -400,11 +611,26 @@ var ACP_ABI = [
   {
     inputs: [
       { internalType: "address", name: "account", type: "address" },
-      { internalType: "uint256", name: "jobId", type: "uint256" }
+      {
+        components: [
+          { internalType: "uint256", name: "id", type: "uint256" },
+          { internalType: "address", name: "client", type: "address" },
+          { internalType: "address", name: "provider", type: "address" },
+          { internalType: "uint256", name: "budget", type: "uint256" },
+          { internalType: "uint256", name: "amountClaimed", type: "uint256" },
+          { internalType: "uint8", name: "phase", type: "uint8" },
+          { internalType: "uint256", name: "memoCount", type: "uint256" },
+          { internalType: "uint256", name: "expiredAt", type: "uint256" },
+          { internalType: "address", name: "evaluator", type: "address" }
+        ],
+        internalType: "struct ACPSimple.Job",
+        name: "job",
+        type: "tuple"
+      }
     ],
     name: "canSign",
     outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
+    stateMutability: "pure",
     type: "function"
   },
   {
@@ -442,6 +668,32 @@ var ACP_ABI = [
     stateMutability: "nonpayable",
     type: "function"
   },
+  {
+    inputs: [
+      { internalType: "uint256", name: "jobId", type: "uint256" },
+      { internalType: "string", name: "content", type: "string" },
+      { internalType: "address", name: "token", type: "address" },
+      { internalType: "uint256", name: "amount", type: "uint256" },
+      { internalType: "address", name: "recipient", type: "address" },
+      { internalType: "uint256", name: "feeAmount", type: "uint256" },
+      {
+        internalType: "enum ACPSimple.FeeType",
+        name: "feeType",
+        type: "uint8"
+      },
+      {
+        internalType: "enum InteractionLedger.MemoType",
+        name: "memoType",
+        type: "uint8"
+      },
+      { internalType: "uint8", name: "nextPhase", type: "uint8" },
+      { internalType: "uint256", name: "expiredAt", type: "uint256" }
+    ],
+    name: "createPayableMemo",
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
   {
     inputs: [],
     name: "evaluatorFeeBP",
@@ -479,6 +731,16 @@ var ACP_ABI = [
     stateMutability: "view",
     type: "function"
   },
+  {
+    inputs: [
+      { internalType: "uint256", name: "jobId", type: "uint256" },
+      { internalType: "uint8", name: "phase", type: "uint8" }
+    ],
+    name: "getJobPhaseMemoIds",
+    outputs: [{ internalType: "uint256[]", name: "", type: "uint256[]" }],
+    stateMutability: "view",
+    type: "function"
+  },
   {
     inputs: [
       { internalType: "uint256", name: "jobId", type: "uint256" },
@@ -513,7 +775,7 @@ var ACP_ABI = [
   {
     inputs: [],
     name: "getPhases",
-    outputs: [{ internalType: "string[6]", name: "", type: "string[6]" }],
+    outputs: [{ internalType: "string[7]", name: "", type: "string[7]" }],
     stateMutability: "pure",
     type: "function"
   },
@@ -566,6 +828,20 @@ var ACP_ABI = [
     stateMutability: "view",
     type: "function"
   },
+  {
+    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
+    name: "isPayableMemo",
+    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [{ internalType: "uint256", name: "jobId", type: "uint256" }],
+    name: "jobAdditionalFees",
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    stateMutability: "view",
+    type: "function"
+  },
   {
     inputs: [],
     name: "jobCounter",
@@ -608,6 +884,31 @@ var ACP_ABI = [
     stateMutability: "view",
     type: "function"
   },
+  {
+    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
+    name: "memoExpiredAt",
+    outputs: [{ internalType: "uint256", name: "expiredAt", type: "uint256" }],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    name: "memos",
+    outputs: [
+      { internalType: "string", name: "content", type: "string" },
+      {
+        internalType: "enum InteractionLedger.MemoType",
+        name: "memoType",
+        type: "uint8"
+      },
+      { internalType: "bool", name: "isSecured", type: "bool" },
+      { internalType: "uint8", name: "nextPhase", type: "uint8" },
+      { internalType: "uint256", name: "jobId", type: "uint256" },
+      { internalType: "address", name: "sender", type: "address" }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
   {
     inputs: [],
     name: "numEvaluatorsPerJob",
@@ -615,6 +916,24 @@ var ACP_ABI = [
     stateMutability: "view",
     type: "function"
   },
+  {
+    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
+    name: "payableDetails",
+    outputs: [
+      { internalType: "address", name: "token", type: "address" },
+      { internalType: "uint256", name: "amount", type: "uint256" },
+      { internalType: "address", name: "recipient", type: "address" },
+      { internalType: "uint256", name: "feeAmount", type: "uint256" },
+      {
+        internalType: "enum ACPSimple.FeeType",
+        name: "feeType",
+        type: "uint8"
+      },
+      { internalType: "bool", name: "isExecuted", type: "bool" }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
   {
     inputs: [],
     name: "paymentToken",
@@ -731,21 +1050,35 @@ import {
 import { baseSepolia, base } from "@account-kit/infra";
 var baseSepoliaAcpConfig = {
   chain: baseSepolia,
-  contractAddress: "0x2422c1c43451Eb69Ff49dfD39c4Dc8C5230fA1e6",
+  contractAddress: "0x8Db6B1c839Fc8f6bd35777E194677B67b4D51928",
   virtualsTokenAddress: "0xbfAB80ccc15DF6fb7185f9498d6039317331846a",
   alchemyRpcUrl: "https://alchemy-proxy.virtuals.io/api/proxy/rpc",
-  acpUrl: "https://acpx-staging.virtuals.io"
+  acpUrl: "https://acpx.virtuals.gg",
+  priorityFeeMultiplier: 2,
+  maxFeePerGas: 2e7,
+  maxPriorityFeePerGas: 21e6
 };
 var baseAcpConfig = {
   chain: base,
   contractAddress: "0x6a1FE26D54ab0d3E1e3168f2e0c0cDa5cC0A0A4A",
   virtualsTokenAddress: "0x0b3e328455c4059EEb9e3f84b5543F74E24e7E1b",
   alchemyRpcUrl: "https://alchemy-proxy-prod.virtuals.io/api/proxy/rpc",
-  acpUrl: "https://acpx.virtuals.io"
+  acpUrl: "https://acpx.virtuals.io",
+  priorityFeeMultiplier: 2,
+  maxFeePerGas: 2e7,
+  maxPriorityFeePerGas: 21e6
 };
 
 // src/acpContractClient.ts
-import { encodeFunctionData, erc20Abi, fromHex } from "viem";
+import {
+  createPublicClient,
+  decodeEventLog,
+  encodeFunctionData,
+  erc20Abi,
+  fromHex,
+  http
+} from "viem";
+import { publicActionsL2 } from "viem/op-stack";
 var MemoType = /* @__PURE__ */ ((MemoType2) => {
   MemoType2[MemoType2["MESSAGE"] = 0] = "MESSAGE";
   MemoType2[MemoType2["CONTEXT_URL"] = 1] = "CONTEXT_URL";
@@ -753,6 +1086,10 @@ var MemoType = /* @__PURE__ */ ((MemoType2) => {
   MemoType2[MemoType2["VOICE_URL"] = 3] = "VOICE_URL";
   MemoType2[MemoType2["OBJECT_URL"] = 4] = "OBJECT_URL";
   MemoType2[MemoType2["TXHASH"] = 5] = "TXHASH";
+  MemoType2[MemoType2["PAYABLE_REQUEST"] = 6] = "PAYABLE_REQUEST";
+  MemoType2[MemoType2["PAYABLE_TRANSFER"] = 7] = "PAYABLE_TRANSFER";
+  MemoType2[MemoType2["PAYABLE_FEE"] = 8] = "PAYABLE_FEE";
+  MemoType2[MemoType2["PAYABLE_FEE_REQUEST"] = 9] = "PAYABLE_FEE_REQUEST";
   return MemoType2;
 })(MemoType || {});
 var AcpJobPhases = /* @__PURE__ */ ((AcpJobPhases2) => {
@@ -762,25 +1099,34 @@ var AcpJobPhases = /* @__PURE__ */ ((AcpJobPhases2) => {
   AcpJobPhases2[AcpJobPhases2["EVALUATION"] = 3] = "EVALUATION";
   AcpJobPhases2[AcpJobPhases2["COMPLETED"] = 4] = "COMPLETED";
   AcpJobPhases2[AcpJobPhases2["REJECTED"] = 5] = "REJECTED";
+  AcpJobPhases2[AcpJobPhases2["EXPIRED"] = 6] = "EXPIRED";
   return AcpJobPhases2;
 })(AcpJobPhases || {});
 var AcpContractClient = class _AcpContractClient {
-  constructor(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig) {
+  constructor(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig, customRpcUrl) {
     this.walletPrivateKey = walletPrivateKey;
     this.sessionEntityKeyId = sessionEntityKeyId;
     this.agentWalletAddress = agentWalletAddress;
     this.config = config;
+    this.customRpcUrl = customRpcUrl;
+    this.MAX_RETRIES = 3;
     this.chain = config.chain;
     this.contractAddress = config.contractAddress;
     this.virtualsTokenAddress = config.virtualsTokenAddress;
+    this.customRpcUrl = customRpcUrl;
+    this.customRpcClient = createPublicClient({
+      chain: this.chain,
+      transport: this.customRpcUrl ? http(this.customRpcUrl) : http()
+    }).extend(publicActionsL2());
   }
-  static build(_0, _1, _2) {
-    return __async(this, arguments, function* (walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig) {
+  static build(_0, _1, _2, _3) {
+    return __async(this, arguments, function* (walletPrivateKey, sessionEntityKeyId, agentWalletAddress, customRpcUrl, config = baseAcpConfig) {
       const acpContractClient = new _AcpContractClient(
         walletPrivateKey,
         sessionEntityKeyId,
         agentWalletAddress,
-        config
+        config,
+        customRpcUrl
       );
       yield acpContractClient.init();
       return acpContractClient;
@@ -813,6 +1159,54 @@ var AcpContractClient = class _AcpContractClient {
   get walletAddress() {
     return this.sessionKeyClient.account.address;
   }
+  calculateGasFees() {
+    return __async(this, null, function* () {
+      const { maxFeePerGas, maxPriorityFeePerGas } = yield this.customRpcClient.estimateFeesPerGas();
+      let finalMaxFeePerGas = maxFeePerGas;
+      let priorityFeeMultiplier = Number(this.config.priorityFeeMultiplier) || 2;
+      const overrideMaxFeePerGas = this.config.maxFeePerGas || maxFeePerGas;
+      const overrideMaxPriorityFeePerGas = this.config.maxPriorityFeePerGas || maxPriorityFeePerGas;
+      finalMaxFeePerGas = BigInt(overrideMaxFeePerGas) + BigInt(overrideMaxPriorityFeePerGas) * BigInt(Math.max(0, priorityFeeMultiplier - 1));
+      return finalMaxFeePerGas;
+    });
+  }
+  handleSendUserOperation(_0) {
+    return __async(this, arguments, function* (data, contractAddress = this.contractAddress) {
+      const payload = {
+        uo: {
+          target: contractAddress,
+          data
+        },
+        overrides: {}
+      };
+      let retries = this.MAX_RETRIES;
+      let finalError;
+      while (retries > 0) {
+        try {
+          if (this.MAX_RETRIES > retries) {
+            const gasFees = yield this.calculateGasFees();
+            payload["overrides"] = {
+              maxFeePerGas: `0x${gasFees.toString(16)}`
+            };
+          }
+          const { hash } = yield this.sessionKeyClient.sendUserOperation(payload);
+          yield this.sessionKeyClient.waitForUserOperationTransaction({
+            hash
+          });
+          return hash;
+        } catch (error) {
+          console.debug("Failed to send user operation", error);
+          retries -= 1;
+          if (retries === 0) {
+            finalError = error;
+            break;
+          }
+          yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
+        }
+      }
+      throw new Error(`Failed to send user operation ${finalError}`);
+    });
+  }
   getJobId(hash) {
     return __async(this, null, function* () {
       const result = yield this.sessionKeyClient.getUserOperationReceipt(hash);
@@ -840,51 +1234,42 @@ var AcpContractClient = class _AcpContractClient {
             Math.floor(expireAt.getTime() / 1e3)
           ]
         });
-        const { hash } = yield this.sessionKeyClient.sendUserOperation({
-          uo: {
-            target: this.contractAddress,
-            data
-          }
-        });
-        yield this.sessionKeyClient.waitForUserOperationTransaction({
-          hash
-        });
+        const hash = yield this.handleSendUserOperation(data);
         const jobId = yield this.getJobId(hash);
         return { txHash: hash, jobId };
       } catch (error) {
-        console.error(error);
+        console.error(`Failed to create job ${error}`);
         throw new Error("Failed to create job");
       }
     });
   }
   approveAllowance(priceInWei) {
     return __async(this, null, function* () {
-      const data = encodeFunctionData({
-        abi: erc20Abi,
-        functionName: "approve",
-        args: [this.contractAddress, priceInWei]
-      });
-      const { hash } = yield this.sessionKeyClient.sendUserOperation({
-        uo: {
-          target: this.virtualsTokenAddress,
-          data
-        }
-      });
-      yield this.sessionKeyClient.waitForUserOperationTransaction({
-        hash
-      });
-      return hash;
+      try {
+        const data = encodeFunctionData({
+          abi: erc20Abi,
+          functionName: "approve",
+          args: [this.contractAddress, priceInWei]
+        });
+        return yield this.handleSendUserOperation(
+          data,
+          this.virtualsTokenAddress
+        );
+      } catch (error) {
+        console.error(`Failed to approve allowance ${error}`);
+        throw new Error("Failed to approve allowance");
+      }
     });
   }
-  createMemo(jobId, content, type, isSecured, nextPhase) {
+  createPayableFeeMemo(jobId, content, amount, memoType, nextPhase) {
     return __async(this, null, function* () {
       let retries = 3;
       while (retries > 0) {
         try {
           const data = encodeFunctionData({
             abi: acpAbi_default,
-            functionName: "createMemo",
-            args: [jobId, content, type, isSecured, nextPhase]
+            functionName: "createPayableFeeMemo",
+            args: [jobId, content, amount, memoType, nextPhase]
           });
           const { hash } = yield this.sessionKeyClient.sendUserOperation({
             uo: {
@@ -897,23 +1282,36 @@ var AcpContractClient = class _AcpContractClient {
           });
           return hash;
         } catch (error) {
-          console.error(`failed to create memo ${jobId} ${content} ${error}`);
+          console.error(
+            `failed to create payable fee memo ${jobId} ${content} ${error}`
+          );
           retries -= 1;
           yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
         }
       }
-      throw new Error("Failed to create memo");
+      throw new Error("Failed to create payable fee memo");
     });
   }
-  signMemo(memoId, isApproved, reason) {
-    return __async(this, null, function* () {
+  createPayableMemo(_0, _1, _2, _3, _4, _5, _6, _7, _8) {
+    return __async(this, arguments, function* (jobId, content, amount, recipient, feeAmount, feeType, nextPhase, type, expiredAt, token = this.config.virtualsTokenAddress) {
       let retries = 3;
       while (retries > 0) {
         try {
           const data = encodeFunctionData({
             abi: acpAbi_default,
-            functionName: "signMemo",
-            args: [memoId, isApproved, reason]
+            functionName: "createPayableMemo",
+            args: [
+              jobId,
+              content,
+              token,
+              amount,
+              recipient,
+              feeAmount,
+              feeType,
+              type,
+              nextPhase,
+              expiredAt ? Math.floor(expiredAt.getTime() / 1e3) : 0
+            ]
           });
           const { hash } = yield this.sessionKeyClient.sendUserOperation({
             uo: {
@@ -926,12 +1324,67 @@ var AcpContractClient = class _AcpContractClient {
           });
           return hash;
         } catch (error) {
-          console.error(`failed to sign memo ${error}`);
+          console.error(
+            `failed to create payable memo ${jobId} ${content} ${error}`
+          );
           retries -= 1;
           yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
         }
       }
-      throw new Error("Failed to sign memo");
+      throw new Error("Failed to create payable memo");
+    });
+  }
+  createMemo(jobId, content, type, isSecured, nextPhase) {
+    return __async(this, null, function* () {
+      try {
+        const data = encodeFunctionData({
+          abi: acpAbi_default,
+          functionName: "createMemo",
+          args: [jobId, content, type, isSecured, nextPhase]
+        });
+        return yield this.handleSendUserOperation(data);
+      } catch (error) {
+        console.error(`Failed to create memo ${jobId} ${content} ${error}`);
+        throw new Error("Failed to create memo");
+      }
+    });
+  }
+  getMemoId(hash) {
+    return __async(this, null, function* () {
+      const result = yield this.sessionKeyClient.getUserOperationReceipt(hash);
+      if (!result) {
+        throw new Error("Failed to get user operation receipt");
+      }
+      const contractLogs = result.logs.find(
+        (log) => log.address.toLowerCase() === this.contractAddress.toLowerCase()
+      );
+      if (!contractLogs) {
+        throw new Error("Failed to get contract logs");
+      }
+      const decoded = decodeEventLog({
+        abi: acpAbi_default,
+        data: contractLogs.data,
+        topics: contractLogs.topics
+      });
+      if (!decoded.args) {
+        throw new Error("Failed to decode event logs");
+      }
+      return parseInt(decoded.args.memoId);
+    });
+  }
+  signMemo(memoId, isApproved, reason) {
+    return __async(this, null, function* () {
+      try {
+        const data = encodeFunctionData({
+          abi: acpAbi_default,
+          functionName: "signMemo",
+          args: [memoId, isApproved, reason]
+        });
+        return yield this.handleSendUserOperation(data);
+      } catch (error) {
+        console.error(`Failed to sign memo ${error}`);
+        throw new Error("Failed to sign memo");
+      }
     });
   }
   setBudget(jobId, budget) {
@@ -942,18 +1395,9 @@ var AcpContractClient = class _AcpContractClient {
           functionName: "setBudget",
           args: [jobId, budget]
         });
-        const { hash } = yield this.sessionKeyClient.sendUserOperation({
-          uo: {
-            target: this.contractAddress,
-            data
-          }
-        });
-        yield this.sessionKeyClient.waitForUserOperationTransaction({
-          hash
-        });
-        return hash;
+        return yield this.handleSendUserOperation(data);
       } catch (error) {
-        console.error(error);
+        console.error(`Failed to set budget ${error}`);
         throw new Error("Failed to set budget");
       }
     });
@@ -961,6 +1405,46 @@ var AcpContractClient = class _AcpContractClient {
 };
 var acpContractClient_default = AcpContractClient;
 
+// src/interfaces.ts
+var AcpAgentSort = /* @__PURE__ */ ((AcpAgentSort2) => {
+  AcpAgentSort2["SUCCESSFUL_JOB_COUNT"] = "successfulJobCount";
+  AcpAgentSort2["SUCCESS_RATE"] = "successRate";
+  AcpAgentSort2["UNIQUE_BUYER_COUNT"] = "uniqueBuyerCount";
+  AcpAgentSort2["MINS_FROM_LAST_ONLINE"] = "minsFromLastOnlineTime";
+  return AcpAgentSort2;
+})(AcpAgentSort || {});
+var AcpGraduationStatus = /* @__PURE__ */ ((AcpGraduationStatus2) => {
+  AcpGraduationStatus2["ALL"] = "all";
+  AcpGraduationStatus2["GRADUATED"] = "graduated";
+  AcpGraduationStatus2["NOT_GRADUATED"] = "not_graduated";
+  return AcpGraduationStatus2;
+})(AcpGraduationStatus || {});
+var AcpOnlineStatus = /* @__PURE__ */ ((AcpOnlineStatus2) => {
+  AcpOnlineStatus2["ALL"] = "all";
+  AcpOnlineStatus2["ONLINE"] = "online";
+  AcpOnlineStatus2["OFFLINE"] = "offline";
+  return AcpOnlineStatus2;
+})(AcpOnlineStatus || {});
+var PayloadType = /* @__PURE__ */ ((PayloadType2) => {
+  PayloadType2["FUND_RESPONSE"] = "fund_response";
+  PayloadType2["OPEN_POSITION"] = "open_position";
+  PayloadType2["CLOSE_PARTIAL_POSITION"] = "close_partial_position";
+  PayloadType2["CLOSE_POSITION"] = "close_position";
+  PayloadType2["POSITION_FULFILLED"] = "position_fulfilled";
+  PayloadType2["CLOSE_JOB_AND_WITHDRAW"] = "close_job_and_withdraw";
+  PayloadType2["UNFULFILLED_POSITION"] = "unfulfilled_position";
+  return PayloadType2;
+})(PayloadType || {});
+
+// src/utils.ts
+function tryParseJson(content) {
+  try {
+    return JSON.parse(content);
+  } catch (error) {
+    return null;
+  }
+}
+
 // src/acpJob.ts
 var AcpJob = class {
   constructor(acpClient, id, clientAddress, providerAddress, evaluatorAddress, price, memos, phase, context) {
@@ -991,6 +1475,9 @@ var AcpJob = class {
   get evaluatorAgent() {
     return this.acpClient.getAgent(this.evaluatorAddress);
   }
+  get latestMemo() {
+    return this.memos[this.memos.length - 1];
+  }
   pay(amount, reason) {
     return __async(this, null, function* () {
       const memo = this.memos.find(
@@ -1002,23 +1489,25 @@ var AcpJob = class {
       return yield this.acpClient.payJob(this.id, amount, memo.id, reason);
     });
   }
-  respond(accept, reason) {
+  respond(accept, payload, reason) {
     return __async(this, null, function* () {
-      const memo = this.memos.find(
-        (m) => m.nextPhase === 1 /* NEGOTIATION */
-      );
-      if (!memo) {
+      var _a;
+      if (((_a = this.latestMemo) == null ? void 0 : _a.nextPhase) !== 1 /* NEGOTIATION */) {
         throw new Error("No negotiation memo found");
       }
-      return yield this.acpClient.respondJob(this.id, memo.id, accept, reason);
+      return yield this.acpClient.respondJob(
+        this.id,
+        this.latestMemo.id,
+        accept,
+        payload ? JSON.stringify(payload) : void 0,
+        reason
+      );
     });
   }
   deliver(deliverable) {
     return __async(this, null, function* () {
-      const memo = this.memos.find(
-        (m) => m.nextPhase === 3 /* EVALUATION */
-      );
-      if (!memo) {
+      var _a;
+      if (((_a = this.latestMemo) == null ? void 0 : _a.nextPhase) !== 3 /* EVALUATION */) {
         throw new Error("No transaction memo found");
       }
       return yield this.acpClient.deliverJob(this.id, deliverable);
@@ -1026,28 +1515,297 @@ var AcpJob = class {
   }
   evaluate(accept, reason) {
     return __async(this, null, function* () {
-      const memo = this.memos.find((m) => m.nextPhase === 4 /* COMPLETED */);
-      if (!memo) {
+      var _a;
+      if (((_a = this.latestMemo) == null ? void 0 : _a.nextPhase) !== 4 /* COMPLETED */) {
         throw new Error("No evaluation memo found");
       }
       return yield this.acpClient.acpContractClient.signMemo(
+        this.latestMemo.id,
+        accept,
+        reason
+      );
+    });
+  }
+  openPosition(payload, feeAmount, expiredAt, walletAddress) {
+    return __async(this, null, function* () {
+      if (payload.length === 0) {
+        throw new Error("No positions to open");
+      }
+      return yield this.acpClient.transferFunds(
+        this.id,
+        payload.reduce((acc, curr) => acc + curr.amount, 0),
+        walletAddress || this.providerAddress,
+        feeAmount,
+        1 /* IMMEDIATE_FEE */,
+        {
+          type: "open_position" /* OPEN_POSITION */,
+          data: payload
+        },
+        2 /* TRANSACTION */,
+        expiredAt
+      );
+    });
+  }
+  responseOpenPosition(memoId, accept, reason) {
+    return __async(this, null, function* () {
+      const memo = this.memos.find((m) => m.id === memoId);
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 7 /* PAYABLE_TRANSFER */) {
+        throw new Error("No open position memo found");
+      }
+      const payload = tryParseJson(
+        memo.content
+      );
+      if ((payload == null ? void 0 : payload.type) !== "open_position" /* OPEN_POSITION */) {
+        throw new Error("Invalid open position memo");
+      }
+      return yield this.acpClient.responseFundsTransfer(memo.id, accept, reason);
+    });
+  }
+  closePartialPosition(payload) {
+    return __async(this, null, function* () {
+      return yield this.acpClient.requestFunds(
+        this.id,
+        payload.amount,
+        this.clientAddress,
+        0,
+        0 /* NO_FEE */,
+        {
+          type: "close_partial_position" /* CLOSE_PARTIAL_POSITION */,
+          data: payload
+        },
+        2 /* TRANSACTION */
+      );
+    });
+  }
+  responseClosePartialPosition(memoId, accept, reason) {
+    return __async(this, null, function* () {
+      const memo = this.memos.find((m) => m.id === memoId);
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 6 /* PAYABLE_REQUEST */) {
+        throw new Error("No close position memo found");
+      }
+      const payload = tryParseJson(
+        memo.content
+      );
+      if ((payload == null ? void 0 : payload.type) !== "close_partial_position" /* CLOSE_PARTIAL_POSITION */) {
+        throw new Error("Invalid close position memo");
+      }
+      return yield this.acpClient.responseFundsRequest(
         memo.id,
         accept,
+        payload.data.amount,
         reason
       );
     });
   }
+  requestClosePosition(payload) {
+    return __async(this, null, function* () {
+      return yield this.acpClient.sendMessage(
+        this.id,
+        {
+          type: "close_position" /* CLOSE_POSITION */,
+          data: payload
+        },
+        2 /* TRANSACTION */
+      );
+    });
+  }
+  responseRequestClosePosition(memoId, accept, payload, reason) {
+    return __async(this, null, function* () {
+      const memo = this.memos.find((m) => m.id === memoId);
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 0 /* MESSAGE */) {
+        throw new Error("No message memo found");
+      }
+      const messagePayload = tryParseJson(memo.content);
+      if ((messagePayload == null ? void 0 : messagePayload.type) !== "close_position" /* CLOSE_POSITION */) {
+        throw new Error("Invalid close position memo");
+      }
+      yield memo.sign(accept, reason);
+      if (accept) {
+        return yield this.acpClient.transferFunds(
+          this.id,
+          payload.amount,
+          this.clientAddress,
+          0,
+          0 /* NO_FEE */,
+          {
+            type: "close_position" /* CLOSE_POSITION */,
+            data: payload
+          },
+          2 /* TRANSACTION */
+        );
+      }
+    });
+  }
+  confirmClosePosition(memoId, accept, reason) {
+    return __async(this, null, function* () {
+      const memo = this.memos.find((m) => m.id === memoId);
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 7 /* PAYABLE_TRANSFER */) {
+        throw new Error("No payable transfer memo found");
+      }
+      const payload = tryParseJson(
+        memo.content
+      );
+      if ((payload == null ? void 0 : payload.type) !== "close_position" /* CLOSE_POSITION */) {
+        throw new Error("Invalid close position memo");
+      }
+      yield memo.sign(accept, reason);
+    });
+  }
+  positionFulfilled(payload) {
+    return __async(this, null, function* () {
+      return yield this.acpClient.transferFunds(
+        this.id,
+        payload.amount,
+        this.clientAddress,
+        0,
+        0 /* NO_FEE */,
+        {
+          type: "position_fulfilled" /* POSITION_FULFILLED */,
+          data: payload
+        },
+        2 /* TRANSACTION */
+      );
+    });
+  }
+  unfulfilledPosition(payload) {
+    return __async(this, null, function* () {
+      return yield this.acpClient.transferFunds(
+        this.id,
+        payload.amount,
+        this.clientAddress,
+        0,
+        0 /* NO_FEE */,
+        {
+          type: "unfulfilled_position" /* UNFULFILLED_POSITION */,
+          data: payload
+        },
+        2 /* TRANSACTION */
+      );
+    });
+  }
+  responseUnfulfilledPosition(memoId, accept, reason) {
+    return __async(this, null, function* () {
+      const memo = this.memos.find((m) => m.id === memoId);
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 7 /* PAYABLE_TRANSFER */) {
+        throw new Error("No unfulfilled position memo found");
+      }
+      const payload = tryParseJson(
+        memo.content
+      );
+      if ((payload == null ? void 0 : payload.type) !== "unfulfilled_position" /* UNFULFILLED_POSITION */) {
+        throw new Error("Invalid unfulfilled position memo");
+      }
+      return yield this.acpClient.responseFundsTransfer(memo.id, accept, reason);
+    });
+  }
+  responsePositionFulfilled(memoId, accept, reason) {
+    return __async(this, null, function* () {
+      const memo = this.memos.find((m) => m.id === memoId);
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 7 /* PAYABLE_TRANSFER */) {
+        throw new Error("No position fulfilled memo found");
+      }
+      const payload = tryParseJson(
+        memo.content
+      );
+      if ((payload == null ? void 0 : payload.type) !== "position_fulfilled" /* POSITION_FULFILLED */) {
+        throw new Error("Invalid position fulfilled memo");
+      }
+      return yield this.acpClient.responseFundsTransfer(memo.id, accept, reason);
+    });
+  }
+  closeJob(message = "Close job and withdraw all") {
+    return __async(this, null, function* () {
+      return yield this.acpClient.sendMessage(
+        this.id,
+        {
+          type: "close_job_and_withdraw" /* CLOSE_JOB_AND_WITHDRAW */,
+          data: {
+            message
+          }
+        },
+        2 /* TRANSACTION */
+      );
+    });
+  }
+  responseCloseJob(memoId, accept, fulfilledPositions, reason) {
+    return __async(this, null, function* () {
+      const memo = this.memos.find((m) => m.id === memoId);
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 0 /* MESSAGE */) {
+        throw new Error("No message memo found");
+      }
+      const payload = tryParseJson(
+        memo.content
+      );
+      if ((payload == null ? void 0 : payload.type) !== "close_job_and_withdraw" /* CLOSE_JOB_AND_WITHDRAW */) {
+        throw new Error("Invalid close job and withdraw memo");
+      }
+      yield memo.sign(accept, reason);
+      if (!accept) {
+        return;
+      }
+      const totalAmount = fulfilledPositions.reduce(
+        (acc, curr) => acc + curr.amount,
+        0
+      );
+      if (totalAmount === 0) {
+        return yield this.acpClient.sendMessage(
+          this.id,
+          {
+            type: "close_job_and_withdraw" /* CLOSE_JOB_AND_WITHDRAW */,
+            data: fulfilledPositions
+          },
+          4 /* COMPLETED */
+        );
+      }
+      return yield this.acpClient.transferFunds(
+        this.id,
+        fulfilledPositions.reduce((acc, curr) => acc + curr.amount, 0),
+        this.clientAddress,
+        0,
+        0 /* NO_FEE */,
+        {
+          type: "close_job_and_withdraw" /* CLOSE_JOB_AND_WITHDRAW */,
+          data: fulfilledPositions
+        },
+        4 /* COMPLETED */
+      );
+    });
+  }
+  confirmJobClosure(memoId, accept, reason) {
+    return __async(this, null, function* () {
+      const memo = this.memos.find((m) => m.id === memoId);
+      if (!memo) {
+        throw new Error("Memo not found");
+      }
+      const payload = tryParseJson(
+        memo.content
+      );
+      if ((payload == null ? void 0 : payload.type) !== "close_job_and_withdraw" /* CLOSE_JOB_AND_WITHDRAW */) {
+        throw new Error("Invalid close job and withdraw memo");
+      }
+      yield memo.sign(accept, reason);
+    });
+  }
 };
 var acpJob_default = AcpJob;
 
 // src/acpMemo.ts
 var AcpMemo = class {
-  constructor(acpClient, id, type, content, nextPhase) {
+  constructor(acpClient, id, type, content, nextPhase, expiry) {
     this.acpClient = acpClient;
     this.id = id;
     this.type = type;
     this.content = content;
     this.nextPhase = nextPhase;
+    this.expiry = expiry;
+    this.structuredContent = tryParseJson(this.content) || void 0;
+  }
+  get payloadType() {
+    var _a;
+    return (_a = this.structuredContent) == null ? void 0 : _a.type;
+  }
+  getStructuredContent() {
+    return this.structuredContent;
   }
   create(jobId, isSecured = true) {
     return __async(this, null, function* () {
@@ -1105,6 +1863,7 @@ var AcpJobOffering = class {
 var acpJobOffering_default = AcpJobOffering;
 
 // src/acpClient.ts
+var { version } = require_package();
 var AcpClient = class {
   constructor(options) {
     this.acpContractClient = options.acpContractClient;
@@ -1121,11 +1880,16 @@ var AcpClient = class {
   init() {
     return __async(this, null, function* () {
       const socket = io(this.acpUrl, {
-        auth: __spreadValues(__spreadValues({}, this.onNewTask && {
+        auth: __spreadValues({
           walletAddress: this.acpContractClient.walletAddress
-        }), this.onEvaluate !== this.defaultOnEvaluate && {
+        }, this.onEvaluate !== this.defaultOnEvaluate && {
           evaluatorAddress: this.acpContractClient.walletAddress
-        })
+        }),
+        extraHeaders: {
+          "x-sdk-version": version,
+          "x-sdk-language": "node"
+        },
+        transports: ["websocket"]
       });
       socket.on("roomJoined" /* ROOM_JOINED */, (_, callback) => {
         console.log("Joined ACP Room");
@@ -1149,7 +1913,8 @@ var AcpClient = class {
                   memo.id,
                   memo.memoType,
                   memo.content,
-                  memo.nextPhase
+                  memo.nextPhase,
+                  memo.expiry ? new Date(parseInt(memo.expiry)) : null
                 );
               }),
               data.phase,
@@ -1177,13 +1942,17 @@ var AcpClient = class {
                   memo.id,
                   memo.memoType,
                   memo.content,
-                  memo.nextPhase
+                  memo.nextPhase,
+                  memo.expiry ? new Date(parseInt(memo.expiry)) : null
                 );
               }),
               data.phase,
               data.context
             );
-            this.onNewTask(job);
+            this.onNewTask(
+              job,
+              job.memos.find((m) => m.id == data.memoToSign)
+            );
           }
         })
       );
@@ -1199,28 +1968,26 @@ var AcpClient = class {
   }
   browseAgents(keyword, options) {
     return __async(this, null, function* () {
-      let { cluster, sort_by, rerank, top_k, graduated } = options;
-      rerank = rerank != null ? rerank : true;
+      let { cluster, sort_by, top_k, graduationStatus, onlineStatus } = options;
       top_k = top_k != null ? top_k : 5;
-      graduated = graduated != null ? graduated : true;
-      let url = `${this.acpUrl}/api/agents?search=${keyword}`;
+      let url = `${this.acpUrl}/api/agents/v2/search?search=${keyword}`;
       if (sort_by && sort_by.length > 0) {
-        url += `&sort=${sort_by.map((s) => s).join(",")}`;
+        url += `&sortBy=${sort_by.map((s) => s).join(",")}`;
       }
       if (top_k) {
         url += `&top_k=${top_k}`;
       }
-      if (rerank) {
-        url += `&rerank=true`;
-      }
       if (this.acpContractClient.walletAddress) {
-        url += `&filters[walletAddress][$notIn]=${this.acpContractClient.walletAddress}`;
+        url += `&walletAddressesToExclude=${this.acpContractClient.walletAddress}`;
       }
       if (cluster) {
-        url += `&filters[cluster]=${cluster}`;
+        url += `&cluster=${cluster}`;
+      }
+      if (graduationStatus) {
+        url += `&graduationStatus=${graduationStatus}`;
       }
-      if (graduated === false) {
-        url += `&filters[hasGraduated]=false`;
+      if (onlineStatus) {
+        url += `&onlineStatus=${onlineStatus}`;
       }
       const response = yield fetch(url);
       const data = yield response.json();
@@ -1252,10 +2019,12 @@ var AcpClient = class {
         evaluatorAddress || this.acpContractClient.walletAddress,
         expiredAt
       );
-      yield this.acpContractClient.setBudget(
-        jobId,
-        parseEther(amount.toString())
-      );
+      if (amount > 0) {
+        yield this.acpContractClient.setBudget(
+          jobId,
+          parseEther(amount.toString())
+        );
+      }
       yield this.acpContractClient.createMemo(
         jobId,
         typeof serviceRequirement === "string" ? serviceRequirement : JSON.stringify(serviceRequirement),
@@ -1266,7 +2035,7 @@ var AcpClient = class {
       return jobId;
     });
   }
-  respondJob(jobId, memoId, accept, reason) {
+  respondJob(jobId, memoId, accept, content, reason) {
     return __async(this, null, function* () {
       yield this.acpContractClient.signMemo(memoId, accept, reason);
       if (!accept) {
@@ -1274,7 +2043,7 @@ var AcpClient = class {
       }
       return yield this.acpContractClient.createMemo(
         jobId,
-        `Job ${jobId} accepted. ${reason != null ? reason : ""}`,
+        content != null ? content : `Job ${jobId} accepted. ${reason != null ? reason : ""}`,
         0 /* MESSAGE */,
         false,
         2 /* TRANSACTION */
@@ -1283,9 +2052,11 @@ var AcpClient = class {
   }
   payJob(jobId, amount, memoId, reason) {
     return __async(this, null, function* () {
-      yield this.acpContractClient.approveAllowance(
-        parseEther(amount.toString())
-      );
+      if (amount > 0) {
+        yield this.acpContractClient.approveAllowance(
+          parseEther(amount.toString())
+        );
+      }
       yield this.acpContractClient.signMemo(memoId, true, reason);
       return yield this.acpContractClient.createMemo(
         jobId,
@@ -1296,11 +2067,75 @@ var AcpClient = class {
       );
     });
   }
+  requestFunds(jobId, amount, recipient, feeAmount, feeType, reason, nextPhase) {
+    return __async(this, null, function* () {
+      return yield this.acpContractClient.createPayableMemo(
+        jobId,
+        JSON.stringify(reason),
+        parseEther(amount.toString()),
+        recipient,
+        parseEther(feeAmount.toString()),
+        feeType,
+        nextPhase,
+        6 /* PAYABLE_REQUEST */
+      );
+    });
+  }
+  responseFundsRequest(memoId, accept, amount, reason) {
+    return __async(this, null, function* () {
+      if (!accept) {
+        return yield this.acpContractClient.signMemo(memoId, accept, reason);
+      }
+      if (amount > 0) {
+        yield this.acpContractClient.approveAllowance(
+          parseEther(amount.toString())
+        );
+      }
+      return yield this.acpContractClient.signMemo(memoId, true, reason);
+    });
+  }
+  transferFunds(jobId, amount, recipient, feeAmount, feeType, reason, nextPhase, expiredAt) {
+    return __async(this, null, function* () {
+      const totalAmount = amount + feeAmount;
+      if (totalAmount > 0) {
+        yield this.acpContractClient.approveAllowance(
+          parseEther(totalAmount.toString())
+        );
+      }
+      return yield this.acpContractClient.createPayableMemo(
+        jobId,
+        JSON.stringify(reason),
+        parseEther(amount.toString()),
+        recipient,
+        parseEther(feeAmount.toString()),
+        feeType,
+        nextPhase,
+        7 /* PAYABLE_TRANSFER */,
+        expiredAt
+      );
+    });
+  }
+  sendMessage(jobId, message, nextPhase) {
+    return __async(this, null, function* () {
+      return yield this.acpContractClient.createMemo(
+        jobId,
+        JSON.stringify(message),
+        0 /* MESSAGE */,
+        false,
+        nextPhase
+      );
+    });
+  }
+  responseFundsTransfer(memoId, accept, reason) {
+    return __async(this, null, function* () {
+      return yield this.acpContractClient.signMemo(memoId, accept, reason);
+    });
+  }
   deliverJob(jobId, deliverable) {
     return __async(this, null, function* () {
       return yield this.acpContractClient.createMemo(
         jobId,
-        deliverable,
+        JSON.stringify(deliverable),
         4 /* OBJECT_URL */,
         true,
         4 /* COMPLETED */
@@ -1334,7 +2169,8 @@ var AcpClient = class {
                 memo.id,
                 memo.memoType,
                 memo.content,
-                memo.nextPhase
+                memo.nextPhase,
+                memo.expiry ? new Date(parseInt(memo.expiry)) : null
               );
             }),
             job.phase,
@@ -1373,7 +2209,8 @@ var AcpClient = class {
                 memo.id,
                 memo.memoType,
                 memo.content,
-                memo.nextPhase
+                memo.nextPhase,
+                memo.expiry ? new Date(parseInt(memo.expiry)) : null
               );
             }),
             job.phase,
@@ -1412,7 +2249,8 @@ var AcpClient = class {
                 memo.id,
                 memo.memoType,
                 memo.content,
-                memo.nextPhase
+                memo.nextPhase,
+                memo.expiry ? new Date(parseInt(memo.expiry)) : null
               );
             }),
             job.phase,
@@ -1454,7 +2292,8 @@ var AcpClient = class {
               memo.id,
               memo.memoType,
               memo.content,
-              memo.nextPhase
+              memo.nextPhase,
+              memo.expiry ? new Date(parseInt(memo.expiry)) : null
             );
           }),
           job.phase,
@@ -1487,7 +2326,8 @@ var AcpClient = class {
           memo.id,
           memo.memoType,
           memo.content,
-          memo.nextPhase
+          memo.nextPhase,
+          memo.expiry ? new Date(parseInt(memo.expiry)) : null
         );
       } catch (error) {
         throw error;
@@ -1509,26 +2349,19 @@ var AcpClient = class {
 };
 var acpClient_default = AcpClient;
 
-// src/interfaces.ts
-var AcpAgentSort = /* @__PURE__ */ ((AcpAgentSort2) => {
-  AcpAgentSort2["SUCCESSFUL_JOB_COUNT"] = "successfulJobCount";
-  AcpAgentSort2["SUCCESS_RATE"] = "successRate";
-  AcpAgentSort2["UNIQUE_BUYER_COUNT"] = "uniqueBuyerCount";
-  AcpAgentSort2["MINS_FROM_LAST_ONLINE"] = "minsFromLastOnlineTime";
-  AcpAgentSort2["IS_ONLINE"] = "isOnline";
-  return AcpAgentSort2;
-})(AcpAgentSort || {});
-
 // src/index.ts
 var index_default = acpClient_default;
 export {
   acpAbi_default as ACP_ABI,
   AcpAgentSort,
   acpContractClient_default as AcpContractClient,
+  AcpGraduationStatus,
   acpJob_default as AcpJob,
   AcpJobPhases,
   acpMemo_default as AcpMemo,
+  AcpOnlineStatus,
   MemoType,
+  PayloadType,
   baseAcpConfig,
   baseSepoliaAcpConfig,
   index_default as default