@virtuals-protocol/acp-node 0.2.0-beta.1 → 0.2.0-beta.10

package/dist/index.mjs

@@ -1,4 +1,6 @@
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
@@ -15,6 +17,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
@@ -44,7 +47,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.2.0-beta.1",
+      version: "0.2.0-beta.10",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -76,32 +79,82 @@ var require_package = __commonJS({
 
 // src/acpAbi.ts
 var ACP_ABI = [
-  { inputs: [], stateMutability: "nonpayable", type: "constructor" },
-  { inputs: [], name: "AccessControlBadConfirmation", type: "error" },
+  {
+    inputs: [],
+    stateMutability: "nonpayable",
+    type: "constructor"
+  },
+  {
+    inputs: [],
+    name: "AccessControlBadConfirmation",
+    type: "error"
+  },
   {
     inputs: [
-      { internalType: "address", name: "account", type: "address" },
-      { internalType: "bytes32", name: "neededRole", type: "bytes32" }
+      {
+        internalType: "address",
+        name: "account",
+        type: "address"
+      },
+      {
+        internalType: "bytes32",
+        name: "neededRole",
+        type: "bytes32"
+      }
     ],
     name: "AccessControlUnauthorizedAccount",
     type: "error"
   },
   {
-    inputs: [{ internalType: "address", name: "target", type: "address" }],
+    inputs: [
+      {
+        internalType: "address",
+        name: "target",
+        type: "address"
+      }
+    ],
     name: "AddressEmptyCode",
     type: "error"
   },
   {
-    inputs: [{ internalType: "address", name: "account", type: "address" }],
+    inputs: [
+      {
+        internalType: "address",
+        name: "account",
+        type: "address"
+      }
+    ],
     name: "AddressInsufficientBalance",
     type: "error"
   },
-  { inputs: [], name: "FailedInnerCall", type: "error" },
-  { inputs: [], name: "InvalidInitialization", type: "error" },
-  { inputs: [], name: "NotInitializing", type: "error" },
-  { inputs: [], name: "ReentrancyGuardReentrantCall", type: "error" },
   {
-    inputs: [{ internalType: "address", name: "token", type: "address" }],
+    inputs: [],
+    name: "FailedInnerCall",
+    type: "error"
+  },
+  {
+    inputs: [],
+    name: "InvalidInitialization",
+    type: "error"
+  },
+  {
+    inputs: [],
+    name: "NotInitializing",
+    type: "error"
+  },
+  {
+    inputs: [],
+    name: "ReentrancyGuardReentrantCall",
+    type: "error"
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "token",
+        type: "address"
+      }
+    ],
     name: "SafeERC20FailedOperation",
     type: "error"
   },
@@ -218,6 +271,25 @@ var ACP_ABI = [
     name: "JobCreated",
     type: "event"
   },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "paymentToken",
+        type: "address"
+      }
+    ],
+    name: "JobPaymentTokenSet",
+    type: "event"
+  },
   {
     anonymous: false,
     inputs: [
@@ -233,7 +305,12 @@ var ACP_ABI = [
         name: "oldPhase",
         type: "uint8"
       },
-      { indexed: false, internalType: "uint8", name: "phase", type: "uint8" }
+      {
+        indexed: false,
+        internalType: "uint8",
+        name: "phase",
+        type: "uint8"
+      }
     ],
     name: "JobPhaseUpdated",
     type: "event"
@@ -377,8 +454,61 @@ var ACP_ABI = [
         name: "memoId",
         type: "uint256"
       },
-      { indexed: true, internalType: "address", name: "from", type: "address" },
-      { indexed: false, internalType: "address", name: "to", type: "address" },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "sender",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "address",
+        name: "token",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "feeAmount",
+        type: "uint256"
+      }
+    ],
+    name: "PayableFundsEscrowed",
+    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",
@@ -410,8 +540,18 @@ var ACP_ABI = [
         name: "memoId",
         type: "uint256"
       },
-      { indexed: true, internalType: "address", name: "from", type: "address" },
-      { indexed: false, internalType: "address", name: "to", type: "address" },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "from",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "address",
+        name: "to",
+        type: "address"
+      },
       {
         indexed: false,
         internalType: "address",
@@ -481,7 +621,12 @@ var ACP_ABI = [
   {
     anonymous: false,
     inputs: [
-      { indexed: true, internalType: "bytes32", name: "role", type: "bytes32" },
+      {
+        indexed: true,
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
       {
         indexed: true,
         internalType: "bytes32",
@@ -501,7 +646,12 @@ var ACP_ABI = [
   {
     anonymous: false,
     inputs: [
-      { indexed: true, internalType: "bytes32", name: "role", type: "bytes32" },
+      {
+        indexed: true,
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
       {
         indexed: true,
         internalType: "address",
@@ -521,7 +671,12 @@ var ACP_ABI = [
   {
     anonymous: false,
     inputs: [
-      { indexed: true, internalType: "bytes32", name: "role", type: "bytes32" },
+      {
+        indexed: true,
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
       {
         indexed: true,
         internalType: "address",
@@ -541,87 +696,192 @@ var ACP_ABI = [
   {
     inputs: [],
     name: "ADMIN_ROLE",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+    outputs: [
+      {
+        internalType: "bytes32",
+        name: "",
+        type: "bytes32"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [],
     name: "DEFAULT_ADMIN_ROLE",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+    outputs: [
+      {
+        internalType: "bytes32",
+        name: "",
+        type: "bytes32"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [],
     name: "PHASE_COMPLETED",
-    outputs: [{ internalType: "uint8", name: "", type: "uint8" }],
+    outputs: [
+      {
+        internalType: "uint8",
+        name: "",
+        type: "uint8"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [],
     name: "PHASE_EVALUATION",
-    outputs: [{ internalType: "uint8", name: "", type: "uint8" }],
+    outputs: [
+      {
+        internalType: "uint8",
+        name: "",
+        type: "uint8"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [],
     name: "PHASE_EXPIRED",
-    outputs: [{ internalType: "uint8", name: "", type: "uint8" }],
+    outputs: [
+      {
+        internalType: "uint8",
+        name: "",
+        type: "uint8"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [],
     name: "PHASE_NEGOTIATION",
-    outputs: [{ internalType: "uint8", name: "", type: "uint8" }],
+    outputs: [
+      {
+        internalType: "uint8",
+        name: "",
+        type: "uint8"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [],
     name: "PHASE_REJECTED",
-    outputs: [{ internalType: "uint8", name: "", type: "uint8" }],
+    outputs: [
+      {
+        internalType: "uint8",
+        name: "",
+        type: "uint8"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [],
     name: "PHASE_REQUEST",
-    outputs: [{ internalType: "uint8", name: "", type: "uint8" }],
+    outputs: [
+      {
+        internalType: "uint8",
+        name: "",
+        type: "uint8"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [],
     name: "PHASE_TRANSACTION",
-    outputs: [{ internalType: "uint8", name: "", type: "uint8" }],
+    outputs: [
+      {
+        internalType: "uint8",
+        name: "",
+        type: "uint8"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [],
     name: "TOTAL_PHASES",
-    outputs: [{ internalType: "uint8", name: "", type: "uint8" }],
+    outputs: [
+      {
+        internalType: "uint8",
+        name: "",
+        type: "uint8"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [
-      { internalType: "address", name: "account", type: "address" },
+      {
+        internalType: "address",
+        name: "account",
+        type: "address"
+      },
       {
         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: "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: "contract IERC20",
+            name: "jobPaymentToken",
+            type: "address"
+          }
         ],
         internalType: "struct ACPSimple.Job",
         name: "job",
@@ -629,12 +889,24 @@ var ACP_ABI = [
       }
     ],
     name: "canSign",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool"
+      }
+    ],
     stateMutability: "pure",
     type: "function"
   },
   {
-    inputs: [{ internalType: "uint256", name: "id", type: "uint256" }],
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "id",
+        type: "uint256"
+      }
+    ],
     name: "claimBudget",
     outputs: [],
     stateMutability: "nonpayable",
@@ -642,40 +914,104 @@ var ACP_ABI = [
   },
   {
     inputs: [
-      { internalType: "address", name: "provider", type: "address" },
-      { internalType: "address", name: "evaluator", type: "address" },
-      { internalType: "uint256", name: "expiredAt", type: "uint256" }
+      {
+        internalType: "address",
+        name: "provider",
+        type: "address"
+      },
+      {
+        internalType: "address",
+        name: "evaluator",
+        type: "address"
+      },
+      {
+        internalType: "uint256",
+        name: "expiredAt",
+        type: "uint256"
+      }
     ],
     name: "createJob",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
     stateMutability: "nonpayable",
     type: "function"
   },
   {
     inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "string", name: "content", type: "string" },
+      {
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        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: "bool",
+        name: "isSecured",
+        type: "bool"
+      },
+      {
+        internalType: "uint8",
+        name: "nextPhase",
+        type: "uint8"
+      }
     ],
     name: "createMemo",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
     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: "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",
@@ -686,88 +1022,198 @@ var ACP_ABI = [
         name: "memoType",
         type: "uint8"
       },
-      { internalType: "uint8", name: "nextPhase", type: "uint8" },
-      { internalType: "uint256", name: "expiredAt", type: "uint256" }
+      {
+        internalType: "uint8",
+        name: "nextPhase",
+        type: "uint8"
+      },
+      {
+        internalType: "uint256",
+        name: "expiredAt",
+        type: "uint256"
+      }
     ],
     name: "createPayableMemo",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
     stateMutability: "nonpayable",
     type: "function"
   },
   {
     inputs: [],
     name: "evaluatorFeeBP",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "uint256", name: "offset", type: "uint256" },
-      { internalType: "uint256", name: "limit", type: "uint256" }
+      {
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "offset",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "limit",
+        type: "uint256"
+      }
     ],
     name: "getAllMemos",
     outputs: [
       {
         components: [
-          { internalType: "string", name: "content", type: "string" },
+          {
+            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" }
+          {
+            internalType: "bool",
+            name: "isSecured",
+            type: "bool"
+          },
+          {
+            internalType: "uint8",
+            name: "nextPhase",
+            type: "uint8"
+          },
+          {
+            internalType: "uint256",
+            name: "jobId",
+            type: "uint256"
+          },
+          {
+            internalType: "address",
+            name: "sender",
+            type: "address"
+          }
         ],
         internalType: "struct InteractionLedger.Memo[]",
         name: "",
         type: "tuple[]"
       },
-      { internalType: "uint256", name: "total", type: "uint256" }
+      {
+        internalType: "uint256",
+        name: "total",
+        type: "uint256"
+      }
     ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "uint8", name: "phase", type: "uint8" }
+      {
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        internalType: "uint8",
+        name: "phase",
+        type: "uint8"
+      }
     ],
     name: "getJobPhaseMemoIds",
-    outputs: [{ internalType: "uint256[]", name: "", type: "uint256[]" }],
+    outputs: [
+      {
+        internalType: "uint256[]",
+        name: "",
+        type: "uint256[]"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "uint8", name: "phase", type: "uint8" },
-      { internalType: "uint256", name: "offset", type: "uint256" },
-      { internalType: "uint256", name: "limit", type: "uint256" }
+      {
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        internalType: "uint8",
+        name: "phase",
+        type: "uint8"
+      },
+      {
+        internalType: "uint256",
+        name: "offset",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "limit",
+        type: "uint256"
+      }
     ],
     name: "getMemosForPhase",
     outputs: [
       {
         components: [
-          { internalType: "string", name: "content", type: "string" },
+          {
+            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" }
+          {
+            internalType: "bool",
+            name: "isSecured",
+            type: "bool"
+          },
+          {
+            internalType: "uint8",
+            name: "nextPhase",
+            type: "uint8"
+          },
+          {
+            internalType: "uint256",
+            name: "jobId",
+            type: "uint256"
+          },
+          {
+            internalType: "address",
+            name: "sender",
+            type: "address"
+          }
         ],
         internalType: "struct InteractionLedger.Memo[]",
         name: "",
         type: "tuple[]"
       },
-      { internalType: "uint256", name: "total", type: "uint256" }
+      {
+        internalType: "uint256",
+        name: "total",
+        type: "uint256"
+      }
     ],
     stateMutability: "view",
     type: "function"
@@ -775,21 +1221,47 @@ var ACP_ABI = [
   {
     inputs: [],
     name: "getPhases",
-    outputs: [{ internalType: "string[7]", name: "", type: "string[7]" }],
+    outputs: [
+      {
+        internalType: "string[7]",
+        name: "",
+        type: "string[7]"
+      }
+    ],
     stateMutability: "pure",
     type: "function"
   },
   {
-    inputs: [{ internalType: "bytes32", name: "role", type: "bytes32" }],
+    inputs: [
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      }
+    ],
     name: "getRoleAdmin",
-    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+    outputs: [
+      {
+        internalType: "bytes32",
+        name: "",
+        type: "bytes32"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [
-      { internalType: "bytes32", name: "role", type: "bytes32" },
-      { internalType: "address", name: "account", type: "address" }
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
+      {
+        internalType: "address",
+        name: "account",
+        type: "address"
+      }
     ],
     name: "grantRole",
     outputs: [],
@@ -798,20 +1270,50 @@ var ACP_ABI = [
   },
   {
     inputs: [
-      { internalType: "bytes32", name: "role", type: "bytes32" },
-      { internalType: "address", name: "account", type: "address" }
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
+      {
+        internalType: "address",
+        name: "account",
+        type: "address"
+      }
     ],
     name: "hasRole",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [
-      { internalType: "address", name: "paymentTokenAddress", type: "address" },
-      { internalType: "uint256", name: "evaluatorFeeBP_", type: "uint256" },
-      { internalType: "uint256", name: "platformFeeBP_", type: "uint256" },
-      { internalType: "address", name: "platformTreasury_", type: "address" }
+      {
+        internalType: "address",
+        name: "paymentTokenAddress",
+        type: "address"
+      },
+      {
+        internalType: "uint256",
+        name: "evaluatorFeeBP_",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "platformFeeBP_",
+        type: "uint256"
+      },
+      {
+        internalType: "address",
+        name: "platformTreasury_",
+        type: "address"
+      }
     ],
     name: "initialize",
     outputs: [],
@@ -820,265 +1322,796 @@ var ACP_ABI = [
   },
   {
     inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "address", name: "account", type: "address" }
-    ],
-    name: "isJobEvaluator",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "isPayableMemo",
-    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+      {
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        internalType: "address",
+        name: "account",
+        type: "address"
+      }
+    ],
+    name: "isJobEvaluator",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool"
+      }
+    ],
+    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" }],
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      }
+    ],
     name: "jobAdditionalFees",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [],
     name: "jobCounter",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        internalType: "uint8",
+        name: "phase",
+        type: "uint8"
+      },
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
+    name: "jobMemoIds",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "memoIds",
+        type: "uint256"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
+    name: "jobs",
+    outputs: [
+      {
+        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: "contract IERC20",
+        name: "jobPaymentToken",
+        type: "address"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "memoCounter",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
+    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",
+    outputs: [
+      {
+        internalType: "uint8",
+        name: "",
+        type: "uint8"
+      }
+    ],
     stateMutability: "view",
     type: "function"
   },
   {
     inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "uint8", name: "phase", type: "uint8" },
-      { internalType: "uint256", name: "", type: "uint256" }
+      {
+        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",
+    outputs: [
+      {
+        internalType: "contract IERC20",
+        name: "",
+        type: "address"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "platformFeeBP",
+    outputs: [
+      {
+        internalType: "uint256",
+        name: "",
+        type: "uint256"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "platformTreasury",
+    outputs: [
+      {
+        internalType: "address",
+        name: "",
+        type: "address"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
+      {
+        internalType: "address",
+        name: "callerConfirmation",
+        type: "address"
+      }
+    ],
+    name: "renounceRole",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "bytes32",
+        name: "role",
+        type: "bytes32"
+      },
+      {
+        internalType: "address",
+        name: "account",
+        type: "address"
+      }
+    ],
+    name: "revokeRole",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      }
+    ],
+    name: "setBudget",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "jobId",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      },
+      {
+        internalType: "contract IERC20",
+        name: "jobPaymentToken_",
+        type: "address"
+      }
+    ],
+    name: "setBudgetWithPaymentToken",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "memoId",
+        type: "uint256"
+      },
+      {
+        internalType: "bool",
+        name: "isApproved",
+        type: "bool"
+      },
+      {
+        internalType: "string",
+        name: "reason",
+        type: "string"
+      }
+    ],
+    name: "signMemo",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "memoId",
+        type: "uint256"
+      },
+      {
+        internalType: "address",
+        name: "signer",
+        type: "address"
+      }
+    ],
+    name: "signatories",
+    outputs: [
+      {
+        internalType: "uint8",
+        name: "res",
+        type: "uint8"
+      }
+    ],
+    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: "uint256",
+        name: "evaluatorFeeBP_",
+        type: "uint256"
+      }
+    ],
+    name: "updateEvaluatorFee",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "platformFeeBP_",
+        type: "uint256"
+      },
+      {
+        internalType: "address",
+        name: "platformTreasury_",
+        type: "address"
+      }
+    ],
+    name: "updatePlatformFee",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    inputs: [
+      {
+        internalType: "uint256",
+        name: "memoId",
+        type: "uint256"
+      }
+    ],
+    name: "withdrawEscrowedFunds",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  }
+];
+var acpAbi_default = ACP_ABI;
+
+// src/acpClient.ts
+import { io } from "socket.io-client";
+
+// src/acpContractClient.ts
+import { LocalAccountSigner } from "@aa-sdk/core";
+import { alchemy } from "@account-kit/infra";
+import {
+  createModularAccountV2Client
+} from "@account-kit/smart-contracts";
+import { decodeEventLog, encodeFunctionData, erc20Abi, fromHex } from "viem";
+
+// src/acpConfigs.ts
+import { baseSepolia, base } from "@account-kit/infra";
+
+// src/acpFare.ts
+import { ethAddress, parseUnits } from "viem";
+
+// src/acpError.ts
+var AcpError = class _AcpError extends Error {
+  constructor(message, originalError) {
+    super();
+    this.message = message;
+    this.name = "AcpError";
+    if (originalError && typeof originalError === "object" && "stack" in originalError) {
+      this.stack += `
+Caused by: ${originalError.stack}`;
+    }
+    Object.setPrototypeOf(this, _AcpError.prototype);
+  }
+};
+var acpError_default = AcpError;
+
+// src/acpFare.ts
+var Fare = class {
+  constructor(contractAddress, decimals) {
+    this.contractAddress = contractAddress;
+    this.decimals = decimals;
+  }
+  formatAmount(amount) {
+    return parseUnits(amount.toString(), this.decimals);
+  }
+};
+var FareAmount = class _FareAmount {
+  constructor(fareAmount, fare) {
+    this.amount = fare.formatAmount(
+      this.truncateTo6Decimals(fareAmount.toString())
+    );
+    this.fare = fare;
+  }
+  truncateTo6Decimals(input) {
+    const [intPart, decPart = ""] = input.split(".");
+    if (decPart === "") {
+      return parseFloat(intPart);
+    }
+    const truncated = decPart.slice(0, 6).padEnd(6, "0");
+    return parseFloat(`${intPart}.${truncated}`);
+  }
+  add(other) {
+    if (this.fare.contractAddress !== other.fare.contractAddress) {
+      throw new acpError_default("Token addresses do not match");
+    }
+    return new _FareAmount(Number(this.amount + other.amount), this.fare);
+  }
+};
+var FareBigInt = class _FareBigInt {
+  constructor(amount, fare) {
+    this.amount = amount;
+    this.fare = fare;
+  }
+  add(other) {
+    if (this.fare.contractAddress !== other.fare.contractAddress) {
+      throw new acpError_default("Token addresses do not match");
+    }
+    return new _FareBigInt(this.amount + other.amount, this.fare);
+  }
+};
+var wethFare = new Fare("0x4200000000000000000000000000000000000006", 18);
+var ethFare = new Fare(ethAddress, 18);
+
+// src/acpConfigs.ts
+var AcpContractConfig = class {
+  constructor(chain, contractAddress, baseFare, alchemyRpcUrl, acpUrl, rpcEndpoint) {
+    this.chain = chain;
+    this.contractAddress = contractAddress;
+    this.baseFare = baseFare;
+    this.alchemyRpcUrl = alchemyRpcUrl;
+    this.acpUrl = acpUrl;
+    this.rpcEndpoint = rpcEndpoint;
+  }
+};
+var baseSepoliaAcpConfig = new AcpContractConfig(
+  baseSepolia,
+  "0x8Db6B1c839Fc8f6bd35777E194677B67b4D51928",
+  new Fare("0x036CbD53842c5426634e7929541eC2318f3dCF7e", 6),
+  "https://alchemy-proxy.virtuals.io/api/proxy/rpc",
+  "https://acpx.virtuals.gg"
+);
+var baseAcpConfig = new AcpContractConfig(
+  base,
+  "0x6a1FE26D54ab0d3E1e3168f2e0c0cDa5cC0A0A4A",
+  new Fare("0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913", 6),
+  "https://alchemy-proxy-prod.virtuals.io/api/proxy/rpc",
+  "https://acpx.virtuals.io"
+);
+
+// src/wethAbi.ts
+var WETH_ABI = [
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: "address", name: "src", type: "address" },
+      { indexed: true, internalType: "address", name: "guy", type: "address" },
+      { indexed: false, internalType: "uint256", name: "wad", type: "uint256" }
+    ],
+    name: "Approval",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: "address", name: "dst", type: "address" },
+      { indexed: false, internalType: "uint256", name: "wad", type: "uint256" }
     ],
-    name: "jobMemoIds",
-    outputs: [{ internalType: "uint256", name: "memoIds", type: "uint256" }],
-    stateMutability: "view",
-    type: "function"
+    name: "Deposit",
+    type: "event"
   },
   {
-    inputs: [{ internalType: "uint256", name: "", type: "uint256" }],
-    name: "jobs",
-    outputs: [
-      { 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" }
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: "address", name: "src", type: "address" },
+      { indexed: true, internalType: "address", name: "dst", type: "address" },
+      { indexed: false, internalType: "uint256", name: "wad", type: "uint256" }
     ],
-    stateMutability: "view",
-    type: "function"
+    name: "Transfer",
+    type: "event"
   },
   {
-    inputs: [],
-    name: "memoCounter",
+    anonymous: false,
+    inputs: [
+      { indexed: true, internalType: "address", name: "src", type: "address" },
+      { indexed: false, internalType: "uint256", name: "wad", type: "uint256" }
+    ],
+    name: "Withdrawal",
+    type: "event"
+  },
+  { payable: true, stateMutability: "payable", type: "fallback" },
+  {
+    constant: true,
+    inputs: [
+      { internalType: "address", name: "", type: "address" },
+      { internalType: "address", name: "", type: "address" }
+    ],
+    name: "allowance",
     outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    payable: false,
     stateMutability: "view",
     type: "function"
   },
   {
-    inputs: [{ internalType: "uint256", name: "memoId", type: "uint256" }],
-    name: "memoExpiredAt",
-    outputs: [{ internalType: "uint256", name: "expiredAt", type: "uint256" }],
-    stateMutability: "view",
+    constant: false,
+    inputs: [
+      { internalType: "address", name: "guy", type: "address" },
+      { internalType: "uint256", name: "wad", type: "uint256" }
+    ],
+    name: "approve",
+    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+    payable: false,
+    stateMutability: "nonpayable",
     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" }
-    ],
+    constant: true,
+    inputs: [{ internalType: "address", name: "", type: "address" }],
+    name: "balanceOf",
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    payable: false,
     stateMutability: "view",
     type: "function"
   },
   {
+    constant: true,
     inputs: [],
-    name: "numEvaluatorsPerJob",
+    name: "decimals",
     outputs: [{ internalType: "uint8", name: "", type: "uint8" }],
+    payable: false,
     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",
+    constant: false,
+    inputs: [],
+    name: "deposit",
+    outputs: [],
+    payable: true,
+    stateMutability: "payable",
     type: "function"
   },
   {
+    constant: true,
     inputs: [],
-    name: "paymentToken",
-    outputs: [{ internalType: "contract IERC20", name: "", type: "address" }],
+    name: "name",
+    outputs: [{ internalType: "string", name: "", type: "string" }],
+    payable: false,
     stateMutability: "view",
     type: "function"
   },
   {
+    constant: true,
     inputs: [],
-    name: "platformFeeBP",
-    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    name: "symbol",
+    outputs: [{ internalType: "string", name: "", type: "string" }],
+    payable: false,
     stateMutability: "view",
     type: "function"
   },
   {
+    constant: true,
     inputs: [],
-    name: "platformTreasury",
-    outputs: [{ internalType: "address", name: "", type: "address" }],
+    name: "totalSupply",
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    payable: false,
     stateMutability: "view",
     type: "function"
   },
   {
+    constant: false,
     inputs: [
-      { internalType: "bytes32", name: "role", type: "bytes32" },
-      { internalType: "address", name: "callerConfirmation", type: "address" }
-    ],
-    name: "renounceRole",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "bytes32", name: "role", type: "bytes32" },
-      { internalType: "address", name: "account", type: "address" }
-    ],
-    name: "revokeRole",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "jobId", type: "uint256" },
-      { internalType: "uint256", name: "amount", type: "uint256" }
-    ],
-    name: "setBudget",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      { internalType: "bool", name: "isApproved", type: "bool" },
-      { internalType: "string", name: "reason", type: "string" }
+      { internalType: "address", name: "dst", type: "address" },
+      { internalType: "uint256", name: "wad", type: "uint256" }
     ],
-    name: "signMemo",
-    outputs: [],
+    name: "transfer",
+    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+    payable: false,
     stateMutability: "nonpayable",
     type: "function"
   },
   {
+    constant: false,
     inputs: [
-      { internalType: "uint256", name: "memoId", type: "uint256" },
-      { internalType: "address", name: "signer", type: "address" }
+      { internalType: "address", name: "src", type: "address" },
+      { internalType: "address", name: "dst", type: "address" },
+      { internalType: "uint256", name: "wad", type: "uint256" }
     ],
-    name: "signatories",
-    outputs: [{ internalType: "uint8", name: "res", type: "uint8" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [{ internalType: "bytes4", name: "interfaceId", type: "bytes4" }],
-    name: "supportsInterface",
+    name: "transferFrom",
     outputs: [{ internalType: "bool", name: "", type: "bool" }],
-    stateMutability: "view",
-    type: "function"
-  },
-  {
-    inputs: [
-      { internalType: "uint256", name: "evaluatorFeeBP_", type: "uint256" }
-    ],
-    name: "updateEvaluatorFee",
-    outputs: [],
+    payable: false,
     stateMutability: "nonpayable",
     type: "function"
   },
   {
-    inputs: [
-      { internalType: "uint256", name: "platformFeeBP_", type: "uint256" },
-      { internalType: "address", name: "platformTreasury_", type: "address" }
-    ],
-    name: "updatePlatformFee",
+    constant: false,
+    inputs: [{ internalType: "uint256", name: "wad", type: "uint256" }],
+    name: "withdraw",
     outputs: [],
+    payable: false,
     stateMutability: "nonpayable",
     type: "function"
   }
 ];
-var acpAbi_default = ACP_ABI;
-
-// src/acpClient.ts
-import { parseEther } from "viem";
-import { io } from "socket.io-client";
-
-// src/acpContractClient.ts
-import { LocalAccountSigner } from "@aa-sdk/core";
-import { alchemy } from "@account-kit/infra";
-import {
-  createModularAccountV2Client
-} from "@account-kit/smart-contracts";
-
-// src/configs.ts
-import { baseSepolia, base } from "@account-kit/infra";
-var baseSepoliaAcpConfig = {
-  chain: baseSepolia,
-  contractAddress: "0x8Db6B1c839Fc8f6bd35777E194677B67b4D51928",
-  virtualsTokenAddress: "0xbfAB80ccc15DF6fb7185f9498d6039317331846a",
-  alchemyRpcUrl: "https://alchemy-proxy.virtuals.io/api/proxy/rpc",
-  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",
-  priorityFeeMultiplier: 2,
-  maxFeePerGas: 2e7,
-  maxPriorityFeePerGas: 21e6
-};
+var wethAbi_default = WETH_ABI;
 
 // src/acpContractClient.ts
-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";
@@ -1088,8 +2121,7 @@ var MemoType = /* @__PURE__ */ ((MemoType2) => {
   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";
+  MemoType2[MemoType2["PAYABLE_TRANSFER_ESCROW"] = 8] = "PAYABLE_TRANSFER_ESCROW";
   return MemoType2;
 })(MemoType || {});
 var AcpJobPhases = /* @__PURE__ */ ((AcpJobPhases2) => {
@@ -1103,30 +2135,26 @@ var AcpJobPhases = /* @__PURE__ */ ((AcpJobPhases2) => {
   return AcpJobPhases2;
 })(AcpJobPhases || {});
 var AcpContractClient = class _AcpContractClient {
-  constructor(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig, customRpcUrl) {
+  // private paymentTokenAddress: Address;
+  constructor(walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig) {
     this.walletPrivateKey = walletPrivateKey;
     this.sessionEntityKeyId = sessionEntityKeyId;
     this.agentWalletAddress = agentWalletAddress;
     this.config = config;
-    this.customRpcUrl = customRpcUrl;
     this.MAX_RETRIES = 3;
+    this.PRIORITY_FEE_MULTIPLIER = 2;
+    this.MAX_FEE_PER_GAS = 2e7;
+    this.MAX_PRIORITY_FEE_PER_GAS = 21e6;
     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, _3) {
-    return __async(this, arguments, function* (walletPrivateKey, sessionEntityKeyId, agentWalletAddress, customRpcUrl, config = baseAcpConfig) {
+  }
+  static build(_0, _1, _2) {
+    return __async(this, arguments, function* (walletPrivateKey, sessionEntityKeyId, agentWalletAddress, config = baseAcpConfig) {
       const acpContractClient = new _AcpContractClient(
         walletPrivateKey,
         sessionEntityKeyId,
         agentWalletAddress,
-        config,
-        customRpcUrl
+        config
       );
       yield acpContractClient.init();
       return acpContractClient;
@@ -1152,7 +2180,7 @@ var AcpContractClient = class _AcpContractClient {
   }
   get sessionKeyClient() {
     if (!this._sessionKeyClient) {
-      throw new Error("Session key client not initialized");
+      throw new acpError_default("Session key client not initialized");
     }
     return this._sessionKeyClient;
   }
@@ -1161,21 +2189,17 @@ var AcpContractClient = class _AcpContractClient {
   }
   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));
+      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;
     });
   }
   handleSendUserOperation(_0) {
-    return __async(this, arguments, function* (data, contractAddress = this.contractAddress) {
+    return __async(this, arguments, function* (data, contractAddress = this.contractAddress, value) {
       const payload = {
         uo: {
           target: contractAddress,
-          data
+          data,
+          value
         },
         overrides: {}
       };
@@ -1195,7 +2219,6 @@ var AcpContractClient = class _AcpContractClient {
           });
           return hash;
         } catch (error) {
-          console.debug("Failed to send user operation", error);
           retries -= 1;
           if (retries === 0) {
             finalError = error;
@@ -1204,20 +2227,20 @@ var AcpContractClient = class _AcpContractClient {
           yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
         }
       }
-      throw new Error(`Failed to send user operation ${finalError}`);
+      throw new acpError_default(`Failed to send user operation`, finalError);
     });
   }
   getJobId(hash) {
     return __async(this, null, function* () {
       const result = yield this.sessionKeyClient.getUserOperationReceipt(hash);
       if (!result) {
-        throw new Error("Failed to get user operation receipt");
+        throw new acpError_default("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");
+        throw new acpError_default("Failed to get contract logs");
       }
       return fromHex(contractLogs.data, "number");
     });
@@ -1238,100 +2261,47 @@ var AcpContractClient = class _AcpContractClient {
         const jobId = yield this.getJobId(hash);
         return { txHash: hash, jobId };
       } catch (error) {
-        console.error(`Failed to create job ${error}`);
-        throw new Error("Failed to create job");
+        throw new acpError_default("Failed to create job", error);
       }
     });
   }
-  approveAllowance(priceInWei) {
-    return __async(this, null, function* () {
+  approveAllowance(_0) {
+    return __async(this, arguments, function* (amountBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress) {
       try {
         const data = encodeFunctionData({
           abi: erc20Abi,
           functionName: "approve",
-          args: [this.contractAddress, priceInWei]
+          args: [this.contractAddress, amountBaseUnit]
         });
-        return yield this.handleSendUserOperation(
-          data,
-          this.virtualsTokenAddress
-        );
+        return yield this.handleSendUserOperation(data, paymentTokenAddress);
       } catch (error) {
-        console.error(`Failed to approve allowance ${error}`);
-        throw new Error("Failed to approve allowance");
-      }
-    });
-  }
-  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: "createPayableFeeMemo",
-            args: [jobId, content, amount, memoType, nextPhase]
-          });
-          const { hash } = yield this.sessionKeyClient.sendUserOperation({
-            uo: {
-              target: this.contractAddress,
-              data
-            }
-          });
-          yield this.sessionKeyClient.waitForUserOperationTransaction({
-            hash
-          });
-          return hash;
-        } catch (error) {
-          console.error(
-            `failed to create payable fee memo ${jobId} ${content} ${error}`
-          );
-          retries -= 1;
-          yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
-        }
+        throw new acpError_default("Failed to approve allowance", error);
       }
-      throw new Error("Failed to create payable fee memo");
     });
   }
   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: "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: {
-              target: this.contractAddress,
-              data
-            }
-          });
-          yield this.sessionKeyClient.waitForUserOperationTransaction({
-            hash
-          });
-          return hash;
-        } catch (error) {
-          console.error(
-            `failed to create payable memo ${jobId} ${content} ${error}`
-          );
-          retries -= 1;
-          yield new Promise((resolve) => setTimeout(resolve, 2e3 * retries));
-        }
+    return __async(this, arguments, function* (jobId, content, amountBaseUnit, recipient, feeAmountBaseUnit, feeType, nextPhase, type, expiredAt, token = this.config.baseFare.contractAddress) {
+      try {
+        const data = encodeFunctionData({
+          abi: acpAbi_default,
+          functionName: "createPayableMemo",
+          args: [
+            jobId,
+            content,
+            token,
+            amountBaseUnit,
+            recipient,
+            feeAmountBaseUnit,
+            feeType,
+            type,
+            nextPhase,
+            Math.floor(expiredAt.getTime() / 1e3)
+          ]
+        });
+        return yield this.handleSendUserOperation(data);
+      } catch (error) {
+        throw new acpError_default("Failed to create payable memo", error);
       }
-      throw new Error("Failed to create payable memo");
     });
   }
   createMemo(jobId, content, type, isSecured, nextPhase) {
@@ -1344,8 +2314,7 @@ var AcpContractClient = class _AcpContractClient {
         });
         return yield this.handleSendUserOperation(data);
       } catch (error) {
-        console.error(`Failed to create memo ${jobId} ${content} ${error}`);
-        throw new Error("Failed to create memo");
+        throw new acpError_default("Failed to create memo", error);
       }
     });
   }
@@ -1353,13 +2322,13 @@ var AcpContractClient = class _AcpContractClient {
     return __async(this, null, function* () {
       const result = yield this.sessionKeyClient.getUserOperationReceipt(hash);
       if (!result) {
-        throw new Error("Failed to get user operation receipt");
+        throw new acpError_default("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");
+        throw new acpError_default("Failed to get contract logs");
       }
       const decoded = decodeEventLog({
         abi: acpAbi_default,
@@ -1367,7 +2336,7 @@ var AcpContractClient = class _AcpContractClient {
         topics: contractLogs.topics
       });
       if (!decoded.args) {
-        throw new Error("Failed to decode event logs");
+        throw new acpError_default("Failed to decode event logs");
       }
       return parseInt(decoded.args.memoId);
     });
@@ -1382,23 +2351,52 @@ var AcpContractClient = class _AcpContractClient {
         });
         return yield this.handleSendUserOperation(data);
       } catch (error) {
-        console.error(`Failed to sign memo ${error}`);
-        throw new Error("Failed to sign memo");
+        throw new acpError_default("Failed to sign memo", error);
       }
     });
   }
-  setBudget(jobId, budget) {
+  setBudget(jobId, budgetBaseUnit) {
     return __async(this, null, function* () {
       try {
         const data = encodeFunctionData({
           abi: acpAbi_default,
           functionName: "setBudget",
-          args: [jobId, budget]
+          args: [jobId, budgetBaseUnit]
+        });
+        return yield this.handleSendUserOperation(data);
+      } catch (error) {
+        throw new acpError_default("Failed to set budget", error);
+      }
+    });
+  }
+  setBudgetWithPaymentToken(_0, _1) {
+    return __async(this, arguments, function* (jobId, budgetBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress) {
+      try {
+        const data = encodeFunctionData({
+          abi: acpAbi_default,
+          functionName: "setBudgetWithPaymentToken",
+          args: [jobId, budgetBaseUnit, paymentTokenAddress]
         });
         return yield this.handleSendUserOperation(data);
       } catch (error) {
-        console.error(`Failed to set budget ${error}`);
-        throw new Error("Failed to set budget");
+        throw new acpError_default("Failed to set budget", error);
+      }
+    });
+  }
+  wrapEth(amountBaseUnit) {
+    return __async(this, null, function* () {
+      try {
+        const data = encodeFunctionData({
+          abi: wethAbi_default,
+          functionName: "deposit"
+        });
+        return yield this.handleSendUserOperation(
+          data,
+          wethFare.contractAddress,
+          amountBaseUnit
+        );
+      } catch (error) {
+        throw new acpError_default("Failed to wrap eth", error);
       }
     });
   }
@@ -1406,6 +2404,12 @@ var AcpContractClient = class _AcpContractClient {
 var acpContractClient_default = AcpContractClient;
 
 // src/interfaces.ts
+var AcpMemoStatus = /* @__PURE__ */ ((AcpMemoStatus2) => {
+  AcpMemoStatus2["PENDING"] = "PENDING";
+  AcpMemoStatus2["APPROVED"] = "APPROVED";
+  AcpMemoStatus2["REJECTED"] = "REJECTED";
+  return AcpMemoStatus2;
+})(AcpMemoStatus || {});
 var AcpAgentSort = /* @__PURE__ */ ((AcpAgentSort2) => {
   AcpAgentSort2["SUCCESSFUL_JOB_COUNT"] = "successfulJobCount";
   AcpAgentSort2["SUCCESS_RATE"] = "successRate";
@@ -1428,6 +2432,8 @@ var AcpOnlineStatus = /* @__PURE__ */ ((AcpOnlineStatus2) => {
 var PayloadType = /* @__PURE__ */ ((PayloadType2) => {
   PayloadType2["FUND_RESPONSE"] = "fund_response";
   PayloadType2["OPEN_POSITION"] = "open_position";
+  PayloadType2["SWAP_TOKEN"] = "swap_token";
+  PayloadType2["RESPONSE_SWAP_TOKEN"] = "response_swap_token";
   PayloadType2["CLOSE_PARTIAL_POSITION"] = "close_partial_position";
   PayloadType2["CLOSE_POSITION"] = "close_position";
   PayloadType2["POSITION_FULFILLED"] = "position_fulfilled";
@@ -1435,6 +2441,11 @@ var PayloadType = /* @__PURE__ */ ((PayloadType2) => {
   PayloadType2["UNFULFILLED_POSITION"] = "unfulfilled_position";
   return PayloadType2;
 })(PayloadType || {});
+var PositionDirection = /* @__PURE__ */ ((PositionDirection2) => {
+  PositionDirection2["LONG"] = "long";
+  PositionDirection2["SHORT"] = "short";
+  return PositionDirection2;
+})(PositionDirection || {});
 
 // src/utils.ts
 function tryParseJson(content) {
@@ -1447,20 +2458,46 @@ function tryParseJson(content) {
 
 // src/acpJob.ts
 var AcpJob = class {
-  constructor(acpClient, id, clientAddress, providerAddress, evaluatorAddress, price, memos, phase, context) {
+  constructor(acpClient, id, clientAddress, providerAddress, evaluatorAddress, price, priceTokenAddress, memos, phase, context) {
     this.acpClient = acpClient;
     this.id = id;
     this.clientAddress = clientAddress;
     this.providerAddress = providerAddress;
     this.evaluatorAddress = evaluatorAddress;
     this.price = price;
+    this.priceTokenAddress = priceTokenAddress;
     this.memos = memos;
     this.phase = phase;
     this.context = context;
+    this.baseFare = acpClient.acpContractClient.config.baseFare;
   }
   get serviceRequirement() {
     var _a;
-    return (_a = this.memos.find((m) => m.nextPhase === 1 /* NEGOTIATION */)) == null ? void 0 : _a.content;
+    const content = (_a = this.memos.find(
+      (m) => m.nextPhase === 1 /* NEGOTIATION */
+    )) == null ? void 0 : _a.content;
+    if (!content) {
+      return void 0;
+    }
+    const contentObj = tryParseJson(content);
+    if (!contentObj) {
+      return content;
+    }
+    if (contentObj.serviceRequirement) {
+      return contentObj.serviceRequirement;
+    }
+    return contentObj;
+  }
+  get serviceName() {
+    var _a;
+    const content = (_a = this.memos.find(
+      (m) => m.nextPhase === 1 /* NEGOTIATION */
+    )) == null ? void 0 : _a.content;
+    if (!content) {
+      return void 0;
+    }
+    const contentObj = tryParseJson(content);
+    return contentObj == null ? void 0 : contentObj.serviceName;
   }
   get deliverable() {
     var _a;
@@ -1484,16 +2521,21 @@ var AcpJob = class {
         (m) => m.nextPhase === 2 /* TRANSACTION */
       );
       if (!memo) {
-        throw new Error("No transaction memo found");
+        throw new acpError_default("No transaction memo found");
       }
-      return yield this.acpClient.payJob(this.id, amount, memo.id, reason);
+      return yield this.acpClient.payJob(
+        this.id,
+        this.baseFare.formatAmount(amount),
+        memo.id,
+        reason
+      );
     });
   }
   respond(accept, payload, reason) {
     return __async(this, null, function* () {
       var _a;
       if (((_a = this.latestMemo) == null ? void 0 : _a.nextPhase) !== 1 /* NEGOTIATION */) {
-        throw new Error("No negotiation memo found");
+        throw new acpError_default("No negotiation memo found");
       }
       return yield this.acpClient.respondJob(
         this.id,
@@ -1508,7 +2550,7 @@ var AcpJob = class {
     return __async(this, null, function* () {
       var _a;
       if (((_a = this.latestMemo) == null ? void 0 : _a.nextPhase) !== 3 /* EVALUATION */) {
-        throw new Error("No transaction memo found");
+        throw new acpError_default("No transaction memo found");
       }
       return yield this.acpClient.deliverJob(this.id, deliverable);
     });
@@ -1517,7 +2559,7 @@ var AcpJob = class {
     return __async(this, null, function* () {
       var _a;
       if (((_a = this.latestMemo) == null ? void 0 : _a.nextPhase) !== 4 /* COMPLETED */) {
-        throw new Error("No evaluation memo found");
+        throw new acpError_default("No evaluation memo found");
       }
       return yield this.acpClient.acpContractClient.signMemo(
         this.latestMemo.id,
@@ -1526,16 +2568,17 @@ var AcpJob = class {
       );
     });
   }
-  openPosition(payload, feeAmount, expiredAt, walletAddress) {
-    return __async(this, null, function* () {
+  openPosition(_0, _1) {
+    return __async(this, arguments, function* (payload, feeAmount, expiredAt = new Date(Date.now() + 1e3 * 60 * 3), walletAddress) {
       if (payload.length === 0) {
-        throw new Error("No positions to open");
+        throw new acpError_default("No positions to open");
       }
+      const sumAmount = payload.reduce((acc, curr) => acc + curr.amount, 0);
       return yield this.acpClient.transferFunds(
         this.id,
-        payload.reduce((acc, curr) => acc + curr.amount, 0),
+        new FareAmount(sumAmount, this.baseFare),
         walletAddress || this.providerAddress,
-        feeAmount,
+        new FareAmount(feeAmount, this.baseFare),
         1 /* IMMEDIATE_FEE */,
         {
           type: "open_position" /* OPEN_POSITION */,
@@ -1546,34 +2589,84 @@ var AcpJob = class {
       );
     });
   }
+  swapToken(payload, decimals, feeAmount, walletAddress) {
+    return __async(this, null, function* () {
+      return yield this.acpClient.transferFunds(
+        this.id,
+        new FareAmount(
+          payload.amount,
+          new Fare(payload.fromContractAddress, decimals)
+        ),
+        walletAddress || this.providerAddress,
+        new FareAmount(feeAmount, this.baseFare),
+        1 /* IMMEDIATE_FEE */,
+        {
+          type: "swap_token" /* SWAP_TOKEN */,
+          data: payload
+        },
+        2 /* TRANSACTION */,
+        new Date(Date.now() + 1e3 * 60 * 30)
+      );
+    });
+  }
+  responseSwapToken(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) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
+        throw new acpError_default("No swap token memo found");
+      }
+      const payload = tryParseJson(
+        memo.content
+      );
+      if ((payload == null ? void 0 : payload.type) !== "swap_token" /* SWAP_TOKEN */) {
+        throw new acpError_default("Invalid swap token memo");
+      }
+      return yield memo.sign(accept, reason);
+    });
+  }
+  transferFunds(_0, _1, _2) {
+    return __async(this, arguments, function* (payload, fareAmount, walletAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 30)) {
+      return yield this.acpClient.transferFunds(
+        this.id,
+        fareAmount,
+        walletAddress || this.clientAddress,
+        new FareAmount(0, this.baseFare),
+        0 /* NO_FEE */,
+        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");
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
+        throw new acpError_default("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");
+        throw new acpError_default("Invalid open position memo");
       }
       return yield this.acpClient.responseFundsTransfer(memo.id, accept, reason);
     });
   }
-  closePartialPosition(payload) {
-    return __async(this, null, function* () {
+  closePartialPosition(_0) {
+    return __async(this, arguments, function* (payload, expireAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
       return yield this.acpClient.requestFunds(
         this.id,
-        payload.amount,
+        new FareAmount(payload.amount, this.baseFare),
         this.clientAddress,
-        0,
+        new FareAmount(0, this.baseFare),
         0 /* NO_FEE */,
         {
           type: "close_partial_position" /* CLOSE_PARTIAL_POSITION */,
           data: payload
         },
-        2 /* TRANSACTION */
+        2 /* TRANSACTION */,
+        expireAt
       );
     });
   }
@@ -1581,18 +2674,18 @@ var AcpJob = class {
     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");
+        throw new acpError_default("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");
+        throw new acpError_default("Invalid close position memo");
       }
       return yield this.acpClient.responseFundsRequest(
         memo.id,
         accept,
-        payload.data.amount,
+        this.baseFare.formatAmount(payload.data.amount),
         reason
       );
     });
@@ -1609,29 +2702,30 @@ var AcpJob = class {
       );
     });
   }
-  responseRequestClosePosition(memoId, accept, payload, reason) {
-    return __async(this, null, function* () {
+  responseRequestClosePosition(_0, _1, _2, _3) {
+    return __async(this, arguments, function* (memoId, accept, payload, reason, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
       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");
+        throw new acpError_default("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");
+        throw new acpError_default("Invalid close position memo");
       }
       yield memo.sign(accept, reason);
       if (accept) {
         return yield this.acpClient.transferFunds(
           this.id,
-          payload.amount,
+          new FareAmount(payload.amount, this.baseFare),
           this.clientAddress,
-          0,
+          new FareAmount(0, this.baseFare),
           0 /* NO_FEE */,
           {
             type: "close_position" /* CLOSE_POSITION */,
             data: payload
           },
-          2 /* TRANSACTION */
+          2 /* TRANSACTION */,
+          expiredAt
         );
       }
     });
@@ -1639,61 +2733,63 @@ var AcpJob = class {
   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");
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
+        throw new acpError_default("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");
+        throw new acpError_default("Invalid close position memo");
       }
       yield memo.sign(accept, reason);
     });
   }
-  positionFulfilled(payload) {
-    return __async(this, null, function* () {
+  positionFulfilled(_0) {
+    return __async(this, arguments, function* (payload, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
       return yield this.acpClient.transferFunds(
         this.id,
-        payload.amount,
+        new FareAmount(payload.amount, this.baseFare),
         this.clientAddress,
-        0,
+        new FareAmount(0, this.baseFare),
         0 /* NO_FEE */,
         {
           type: "position_fulfilled" /* POSITION_FULFILLED */,
           data: payload
         },
-        2 /* TRANSACTION */
+        2 /* TRANSACTION */,
+        expiredAt
       );
     });
   }
-  unfulfilledPosition(payload) {
-    return __async(this, null, function* () {
+  unfulfilledPosition(_0) {
+    return __async(this, arguments, function* (payload, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
       return yield this.acpClient.transferFunds(
         this.id,
-        payload.amount,
+        new FareAmount(payload.amount, this.baseFare),
         this.clientAddress,
-        0,
+        new FareAmount(0, this.baseFare),
         0 /* NO_FEE */,
         {
           type: "unfulfilled_position" /* UNFULFILLED_POSITION */,
           data: payload
         },
-        2 /* TRANSACTION */
+        2 /* TRANSACTION */,
+        expiredAt
       );
     });
   }
   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");
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
+        throw new acpError_default("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");
+        throw new acpError_default("Invalid unfulfilled position memo");
       }
       return yield this.acpClient.responseFundsTransfer(memo.id, accept, reason);
     });
@@ -1701,14 +2797,14 @@ var AcpJob = class {
   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");
+      if ((memo == null ? void 0 : memo.nextPhase) !== 2 /* TRANSACTION */ || (memo == null ? void 0 : memo.type) !== 8 /* PAYABLE_TRANSFER_ESCROW */) {
+        throw new acpError_default("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");
+        throw new acpError_default("Invalid position fulfilled memo");
       }
       return yield this.acpClient.responseFundsTransfer(memo.id, accept, reason);
     });
@@ -1727,17 +2823,17 @@ var AcpJob = class {
       );
     });
   }
-  responseCloseJob(memoId, accept, fulfilledPositions, reason) {
-    return __async(this, null, function* () {
+  responseCloseJob(_0, _1, _2, _3) {
+    return __async(this, arguments, function* (memoId, accept, fulfilledPositions, reason, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
       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");
+        throw new acpError_default("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");
+        throw new acpError_default("Invalid close job and withdraw memo");
       }
       yield memo.sign(accept, reason);
       if (!accept) {
@@ -1759,15 +2855,16 @@ var AcpJob = class {
       }
       return yield this.acpClient.transferFunds(
         this.id,
-        fulfilledPositions.reduce((acc, curr) => acc + curr.amount, 0),
+        new FareAmount(totalAmount, this.baseFare),
         this.clientAddress,
-        0,
+        new FareAmount(0, this.baseFare),
         0 /* NO_FEE */,
         {
           type: "close_job_and_withdraw" /* CLOSE_JOB_AND_WITHDRAW */,
           data: fulfilledPositions
         },
-        4 /* COMPLETED */
+        4 /* COMPLETED */,
+        expiredAt
       );
     });
   }
@@ -1775,13 +2872,13 @@ var AcpJob = class {
     return __async(this, null, function* () {
       const memo = this.memos.find((m) => m.id === memoId);
       if (!memo) {
-        throw new Error("Memo not found");
+        throw new acpError_default("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");
+        throw new acpError_default("Invalid close job and withdraw memo");
       }
       yield memo.sign(accept, reason);
     });
@@ -1791,13 +2888,20 @@ var acpJob_default = AcpJob;
 
 // src/acpMemo.ts
 var AcpMemo = class {
-  constructor(acpClient, id, type, content, nextPhase, expiry) {
+  constructor(acpClient, id, type, content, nextPhase, status, signedReason, expiry, payableDetails) {
     this.acpClient = acpClient;
     this.id = id;
     this.type = type;
     this.content = content;
     this.nextPhase = nextPhase;
+    this.status = status;
+    this.signedReason = signedReason;
     this.expiry = expiry;
+    this.payableDetails = payableDetails;
+    if (this.payableDetails) {
+      this.payableDetails.amount = BigInt(this.payableDetails.amount);
+      this.payableDetails.feeAmount = BigInt(this.payableDetails.feeAmount);
+    }
     this.structuredContent = tryParseJson(this.content) || void 0;
   }
   get payloadType() {
@@ -1833,10 +2937,10 @@ var acpMemo_default = AcpMemo;
 // src/acpJobOffering.ts
 import Ajv from "ajv";
 var AcpJobOffering = class {
-  constructor(acpClient, providerAddress, type, price, requirementSchema) {
+  constructor(acpClient, providerAddress, name, price, requirementSchema) {
     this.acpClient = acpClient;
     this.providerAddress = providerAddress;
-    this.type = type;
+    this.name = name;
     this.price = price;
     this.requirementSchema = requirementSchema;
     this.ajv = new Ajv({ allErrors: true });
@@ -1847,13 +2951,28 @@ var AcpJobOffering = class {
         const validator = this.ajv.compile(this.requirementSchema);
         const valid = validator(serviceRequirement);
         if (!valid) {
-          throw new Error(this.ajv.errorsText(validator.errors));
+          throw new acpError_default(this.ajv.errorsText(validator.errors));
         }
       }
+      let finalServiceRequirement = {
+        serviceName: this.name
+      };
+      if (typeof serviceRequirement === "string") {
+        finalServiceRequirement = __spreadProps(__spreadValues({}, finalServiceRequirement), {
+          message: serviceRequirement
+        });
+      } else {
+        finalServiceRequirement = __spreadProps(__spreadValues({}, finalServiceRequirement), {
+          serviceRequirement
+        });
+      }
       return yield this.acpClient.initiateJob(
         this.providerAddress,
-        serviceRequirement,
-        this.price,
+        finalServiceRequirement,
+        new FareAmount(
+          this.price,
+          this.acpClient.acpContractClient.config.baseFare
+        ),
         evaluatorAddress,
         expiredAt
       );
@@ -1907,6 +3026,7 @@ var AcpClient = class {
               data.providerAddress,
               data.evaluatorAddress,
               data.price,
+              data.priceTokenAddress,
               data.memos.map((memo) => {
                 return new acpMemo_default(
                   this,
@@ -1914,7 +3034,10 @@ var AcpClient = class {
                   memo.memoType,
                   memo.content,
                   memo.nextPhase,
-                  memo.expiry ? new Date(parseInt(memo.expiry)) : null
+                  memo.status,
+                  memo.signedReason,
+                  memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
+                  memo.payableDetails
                 );
               }),
               data.phase,
@@ -1936,6 +3059,7 @@ var AcpClient = class {
               data.providerAddress,
               data.evaluatorAddress,
               data.price,
+              data.priceTokenAddress,
               data.memos.map((memo) => {
                 return new acpMemo_default(
                   this,
@@ -1943,7 +3067,10 @@ var AcpClient = class {
                   memo.memoType,
                   memo.content,
                   memo.nextPhase,
-                  memo.expiry ? new Date(parseInt(memo.expiry)) : null
+                  memo.status,
+                  memo.signedReason,
+                  memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
+                  memo.payableDetails
                 );
               }),
               data.phase,
@@ -2001,7 +3128,7 @@ var AcpClient = class {
               this,
               agent.walletAddress,
               offering.name,
-              offering.price,
+              offering.priceUsd,
               offering.requirementSchema
             );
           }),
@@ -2013,18 +3140,22 @@ var AcpClient = class {
     });
   }
   initiateJob(_0, _1, _2, _3) {
-    return __async(this, arguments, function* (providerAddress, serviceRequirement, amount, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
+    return __async(this, arguments, function* (providerAddress, serviceRequirement, fareAmount, evaluatorAddress, expiredAt = new Date(Date.now() + 1e3 * 60 * 60 * 24)) {
+      if (providerAddress === this.acpContractClient.walletAddress) {
+        throw new acpError_default(
+          "Provider address cannot be the same as the client address"
+        );
+      }
       const { jobId } = yield this.acpContractClient.createJob(
         providerAddress,
         evaluatorAddress || this.acpContractClient.walletAddress,
         expiredAt
       );
-      if (amount > 0) {
-        yield this.acpContractClient.setBudget(
-          jobId,
-          parseEther(amount.toString())
-        );
-      }
+      yield this.acpContractClient.setBudgetWithPaymentToken(
+        jobId,
+        fareAmount.amount,
+        fareAmount.fare.contractAddress
+      );
       yield this.acpContractClient.createMemo(
         jobId,
         typeof serviceRequirement === "string" ? serviceRequirement : JSON.stringify(serviceRequirement),
@@ -2050,68 +3181,79 @@ var AcpClient = class {
       );
     });
   }
-  payJob(jobId, amount, memoId, reason) {
+  payJob(jobId, amountBaseUnit, memoId, reason) {
     return __async(this, null, function* () {
-      if (amount > 0) {
-        yield this.acpContractClient.approveAllowance(
-          parseEther(amount.toString())
-        );
+      if (amountBaseUnit > BigInt(0)) {
+        yield this.acpContractClient.approveAllowance(amountBaseUnit);
       }
       yield this.acpContractClient.signMemo(memoId, true, reason);
       return yield this.acpContractClient.createMemo(
         jobId,
-        `Payment of ${amount} made. ${reason != null ? reason : ""}`,
+        `Payment made. ${reason != null ? reason : ""}`,
         0 /* MESSAGE */,
         false,
         3 /* EVALUATION */
       );
     });
   }
-  requestFunds(jobId, amount, recipient, feeAmount, feeType, reason, nextPhase) {
+  requestFunds(jobId, transferFareAmount, recipient, feeFareAmount, feeType, reason, nextPhase, expiredAt) {
     return __async(this, null, function* () {
       return yield this.acpContractClient.createPayableMemo(
         jobId,
         JSON.stringify(reason),
-        parseEther(amount.toString()),
+        transferFareAmount.amount,
         recipient,
-        parseEther(feeAmount.toString()),
+        feeFareAmount.amount,
         feeType,
         nextPhase,
-        6 /* PAYABLE_REQUEST */
+        6 /* PAYABLE_REQUEST */,
+        expiredAt
       );
     });
   }
-  responseFundsRequest(memoId, accept, amount, reason) {
+  responseFundsRequest(memoId, accept, amountBaseUnit, 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())
-        );
+      if (amountBaseUnit > BigInt(0)) {
+        yield this.acpContractClient.approveAllowance(amountBaseUnit);
       }
       return yield this.acpContractClient.signMemo(memoId, true, reason);
     });
   }
-  transferFunds(jobId, amount, recipient, feeAmount, feeType, reason, nextPhase, expiredAt) {
+  transferFunds(jobId, transferFareAmount, recipient, feeFareAmount, feeType, reason, nextPhase, expiredAt) {
     return __async(this, null, function* () {
-      const totalAmount = amount + feeAmount;
-      if (totalAmount > 0) {
+      if (transferFareAmount.fare.contractAddress === ethFare.contractAddress) {
+        yield this.acpContractClient.wrapEth(transferFareAmount.amount);
+        transferFareAmount = new FareBigInt(transferFareAmount.amount, wethFare);
+      }
+      if (feeFareAmount.amount > 0 && feeFareAmount.fare.contractAddress !== this.acpContractClient.config.baseFare.contractAddress) {
+        throw new acpError_default("Fee token address is not the same as the base fare");
+      }
+      const isFeeTokenDifferent = feeFareAmount.fare.contractAddress !== transferFareAmount.fare.contractAddress;
+      if (isFeeTokenDifferent) {
         yield this.acpContractClient.approveAllowance(
-          parseEther(totalAmount.toString())
+          feeFareAmount.amount,
+          feeFareAmount.fare.contractAddress
         );
       }
+      const finalAmount = isFeeTokenDifferent ? transferFareAmount : transferFareAmount.add(feeFareAmount);
+      yield this.acpContractClient.approveAllowance(
+        finalAmount.amount,
+        transferFareAmount.fare.contractAddress
+      );
       return yield this.acpContractClient.createPayableMemo(
         jobId,
         JSON.stringify(reason),
-        parseEther(amount.toString()),
+        transferFareAmount.amount,
         recipient,
-        parseEther(feeAmount.toString()),
+        feeFareAmount.amount,
         feeType,
         nextPhase,
-        7 /* PAYABLE_TRANSFER */,
-        expiredAt
+        8 /* PAYABLE_TRANSFER_ESCROW */,
+        expiredAt,
+        transferFareAmount.fare.contractAddress
       );
     });
   }
@@ -2153,7 +3295,7 @@ var AcpClient = class {
         });
         const data = yield response.json();
         if (data.error) {
-          throw new Error(data.error.message);
+          throw new acpError_default(data.error.message);
         }
         return data.data.map((job) => {
           return new acpJob_default(
@@ -2163,6 +3305,7 @@ var AcpClient = class {
             job.providerAddress,
             job.evaluatorAddress,
             job.price,
+            job.priceTokenAddress,
             job.memos.map((memo) => {
               return new acpMemo_default(
                 this,
@@ -2170,7 +3313,10 @@ var AcpClient = class {
                 memo.memoType,
                 memo.content,
                 memo.nextPhase,
-                memo.expiry ? new Date(parseInt(memo.expiry)) : null
+                memo.status,
+                memo.signedReason,
+                memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
+                memo.payableDetails
               );
             }),
             job.phase,
@@ -2178,7 +3324,7 @@ var AcpClient = class {
           );
         });
       } catch (error) {
-        throw error;
+        throw new acpError_default("Failed to get active jobs", error);
       }
     });
   }
@@ -2193,7 +3339,7 @@ var AcpClient = class {
         });
         const data = yield response.json();
         if (data.error) {
-          throw new Error(data.error.message);
+          throw new acpError_default(data.error.message);
         }
         return data.data.map((job) => {
           return new acpJob_default(
@@ -2203,6 +3349,7 @@ var AcpClient = class {
             job.providerAddress,
             job.evaluatorAddress,
             job.price,
+            job.priceTokenAddress,
             job.memos.map((memo) => {
               return new acpMemo_default(
                 this,
@@ -2210,7 +3357,10 @@ var AcpClient = class {
                 memo.memoType,
                 memo.content,
                 memo.nextPhase,
-                memo.expiry ? new Date(parseInt(memo.expiry)) : null
+                memo.status,
+                memo.signedReason,
+                memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
+                memo.payableDetails
               );
             }),
             job.phase,
@@ -2218,7 +3368,7 @@ var AcpClient = class {
           );
         });
       } catch (error) {
-        throw error;
+        throw new acpError_default("Failed to get completed jobs", error);
       }
     });
   }
@@ -2233,7 +3383,7 @@ var AcpClient = class {
         });
         const data = yield response.json();
         if (data.error) {
-          throw new Error(data.error.message);
+          throw new acpError_default(data.error.message);
         }
         return data.data.map((job) => {
           return new acpJob_default(
@@ -2243,6 +3393,7 @@ var AcpClient = class {
             job.providerAddress,
             job.evaluatorAddress,
             job.price,
+            job.priceTokenAddress,
             job.memos.map((memo) => {
               return new acpMemo_default(
                 this,
@@ -2250,7 +3401,10 @@ var AcpClient = class {
                 memo.memoType,
                 memo.content,
                 memo.nextPhase,
-                memo.expiry ? new Date(parseInt(memo.expiry)) : null
+                memo.status,
+                memo.signedReason,
+                memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
+                memo.payableDetails
               );
             }),
             job.phase,
@@ -2258,7 +3412,7 @@ var AcpClient = class {
           );
         });
       } catch (error) {
-        throw error;
+        throw new acpError_default("Failed to get cancelled jobs", error);
       }
     });
   }
@@ -2273,7 +3427,7 @@ var AcpClient = class {
         });
         const data = yield response.json();
         if (data.error) {
-          throw new Error(data.error.message);
+          throw new acpError_default(data.error.message);
         }
         const job = data.data;
         if (!job) {
@@ -2286,6 +3440,7 @@ var AcpClient = class {
           job.providerAddress,
           job.evaluatorAddress,
           job.price,
+          job.priceTokenAddress,
           job.memos.map((memo) => {
             return new acpMemo_default(
               this,
@@ -2293,14 +3448,17 @@ var AcpClient = class {
               memo.memoType,
               memo.content,
               memo.nextPhase,
-              memo.expiry ? new Date(parseInt(memo.expiry)) : null
+              memo.status,
+              memo.signedReason,
+              memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
+              memo.payableDetails
             );
           }),
           job.phase,
           job.context
         );
       } catch (error) {
-        throw error;
+        throw new acpError_default("Failed to get job by id", error);
       }
     });
   }
@@ -2315,7 +3473,7 @@ var AcpClient = class {
         });
         const data = yield response.json();
         if (data.error) {
-          throw new Error(data.error.message);
+          throw new acpError_default(data.error.message);
         }
         const memo = data.data;
         if (!memo) {
@@ -2327,10 +3485,13 @@ var AcpClient = class {
           memo.memoType,
           memo.content,
           memo.nextPhase,
-          memo.expiry ? new Date(parseInt(memo.expiry)) : null
+          memo.status,
+          memo.signedReason,
+          memo.expiry ? new Date(parseInt(memo.expiry) * 1e3) : void 0,
+          memo.payableDetails
         );
       } catch (error) {
-        throw error;
+        throw new acpError_default("Failed to get memo by id", error);
       }
     });
   }
@@ -2355,14 +3516,23 @@ export {
   acpAbi_default as ACP_ABI,
   AcpAgentSort,
   acpContractClient_default as AcpContractClient,
+  AcpContractConfig,
+  acpError_default as AcpError,
   AcpGraduationStatus,
   acpJob_default as AcpJob,
   AcpJobPhases,
   acpMemo_default as AcpMemo,
+  AcpMemoStatus,
   AcpOnlineStatus,
+  Fare,
+  FareAmount,
+  FareBigInt,
   MemoType,
   PayloadType,
+  PositionDirection,
   baseAcpConfig,
   baseSepoliaAcpConfig,
-  index_default as default
+  index_default as default,
+  ethFare,
+  wethFare
 };