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

package/dist/index.mjs

@@ -47,7 +47,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@virtuals-protocol/acp-node",
-      version: "0.2.0-beta.7",
+      version: "0.2.0-beta.9",
       main: "./dist/index.js",
       module: "./dist/index.mjs",
       types: "./dist/index.d.ts",
@@ -1859,43 +1859,242 @@ import { alchemy } from "@account-kit/infra";
 import {
   createModularAccountV2Client
 } from "@account-kit/smart-contracts";
+import { decodeEventLog, encodeFunctionData, erc20Abi, fromHex } from "viem";
 
-// src/configs.ts
+// src/acpConfigs.ts
 import { baseSepolia, base } from "@account-kit/infra";
-var baseSepoliaAcpConfig = {
-  chain: baseSepolia,
-  contractAddress: "0x8Db6B1c839Fc8f6bd35777E194677B67b4D51928",
-  paymentTokenAddress: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
-  paymentTokenDecimals: 6,
-  alchemyRpcUrl: "https://alchemy-proxy.virtuals.io/api/proxy/rpc",
-  acpUrl: "https://acpx.virtuals.gg",
-  priorityFeeMultiplier: 2,
-  maxFeePerGas: 2e7,
-  maxPriorityFeePerGas: 21e6
+
+// src/acpFare.ts
+import { ethAddress, parseUnits } from "viem";
+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 Error("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 Error("Token addresses do not match");
+    }
+    return new _FareBigInt(this.amount + other.amount, this.fare);
+  }
 };
-var baseAcpConfig = {
-  chain: base,
-  contractAddress: "0x6a1FE26D54ab0d3E1e3168f2e0c0cDa5cC0A0A4A",
-  paymentTokenAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-  paymentTokenDecimals: 6,
-  alchemyRpcUrl: "https://alchemy-proxy-prod.virtuals.io/api/proxy/rpc",
-  acpUrl: "https://acpx.virtuals.io",
-  priorityFeeMultiplier: 2,
-  maxFeePerGas: 2e7,
-  maxPriorityFeePerGas: 21e6
+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: "Deposit",
+    type: "event"
+  },
+  {
+    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" }
+    ],
+    name: "Transfer",
+    type: "event"
+  },
+  {
+    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"
+  },
+  {
+    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"
+  },
+  {
+    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: "decimals",
+    outputs: [{ internalType: "uint8", name: "", type: "uint8" }],
+    payable: false,
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    constant: false,
+    inputs: [],
+    name: "deposit",
+    outputs: [],
+    payable: true,
+    stateMutability: "payable",
+    type: "function"
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: "name",
+    outputs: [{ internalType: "string", name: "", type: "string" }],
+    payable: false,
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: "symbol",
+    outputs: [{ internalType: "string", name: "", type: "string" }],
+    payable: false,
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: "totalSupply",
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
+    payable: false,
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    constant: false,
+    inputs: [
+      { internalType: "address", name: "dst", type: "address" },
+      { internalType: "uint256", name: "wad", type: "uint256" }
+    ],
+    name: "transfer",
+    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+    payable: false,
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    constant: false,
+    inputs: [
+      { internalType: "address", name: "src", type: "address" },
+      { internalType: "address", name: "dst", type: "address" },
+      { internalType: "uint256", name: "wad", type: "uint256" }
+    ],
+    name: "transferFrom",
+    outputs: [{ internalType: "bool", name: "", type: "bool" }],
+    payable: false,
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  {
+    constant: false,
+    inputs: [{ internalType: "uint256", name: "wad", type: "uint256" }],
+    name: "withdraw",
+    outputs: [],
+    payable: false,
+    stateMutability: "nonpayable",
+    type: "function"
+  }
+];
+var wethAbi_default = WETH_ABI;
 
 // src/acpContractClient.ts
-import {
-  createPublicClient,
-  decodeEventLog,
-  encodeFunctionData,
-  erc20Abi,
-  fromHex,
-  http,
-  parseUnits
-} from "viem";
-import { publicActionsL2 } from "viem/op-stack";
 var MemoType = /* @__PURE__ */ ((MemoType2) => {
   MemoType2[MemoType2["MESSAGE"] = 0] = "MESSAGE";
   MemoType2[MemoType2["CONTEXT_URL"] = 1] = "CONTEXT_URL";
@@ -1919,30 +2118,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.paymentTokenAddress = config.paymentTokenAddress;
-    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;
@@ -1977,21 +2172,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: {}
       };
@@ -2038,9 +2229,6 @@ var AcpContractClient = class _AcpContractClient {
       return fromHex(contractLogs.data, "number");
     });
   }
-  formatAmount(amount) {
-    return parseUnits(amount.toString(), this.config.paymentTokenDecimals);
-  }
   createJob(providerAddress, evaluatorAddress, expireAt) {
     return __async(this, null, function* () {
       try {
@@ -2063,12 +2251,12 @@ var AcpContractClient = class _AcpContractClient {
     });
   }
   approveAllowance(_0) {
-    return __async(this, arguments, function* (amount, paymentTokenAddress = this.paymentTokenAddress) {
+    return __async(this, arguments, function* (amountBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress) {
       try {
         const data = encodeFunctionData({
           abi: erc20Abi,
           functionName: "approve",
-          args: [this.contractAddress, this.formatAmount(amount)]
+          args: [this.contractAddress, amountBaseUnit]
         });
         return yield this.handleSendUserOperation(data, paymentTokenAddress);
       } catch (error) {
@@ -2078,7 +2266,7 @@ var AcpContractClient = class _AcpContractClient {
     });
   }
   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.paymentTokenAddress) {
+    return __async(this, arguments, function* (jobId, content, amountBaseUnit, recipient, feeAmountBaseUnit, feeType, nextPhase, type, expiredAt, token = this.config.baseFare.contractAddress) {
       let retries = 3;
       while (retries > 0) {
         try {
@@ -2089,9 +2277,9 @@ var AcpContractClient = class _AcpContractClient {
               jobId,
               content,
               token,
-              this.formatAmount(amount),
+              amountBaseUnit,
               recipient,
-              this.formatAmount(feeAmount),
+              feeAmountBaseUnit,
               feeType,
               type,
               nextPhase,
@@ -2172,13 +2360,13 @@ var AcpContractClient = class _AcpContractClient {
       }
     });
   }
-  setBudget(jobId, budget) {
+  setBudget(jobId, budgetBaseUnit) {
     return __async(this, null, function* () {
       try {
         const data = encodeFunctionData({
           abi: acpAbi_default,
           functionName: "setBudget",
-          args: [jobId, this.formatAmount(budget)]
+          args: [jobId, budgetBaseUnit]
         });
         return yield this.handleSendUserOperation(data);
       } catch (error) {
@@ -2188,12 +2376,12 @@ var AcpContractClient = class _AcpContractClient {
     });
   }
   setBudgetWithPaymentToken(_0, _1) {
-    return __async(this, arguments, function* (jobId, budget, paymentTokenAddress = this.paymentTokenAddress) {
+    return __async(this, arguments, function* (jobId, budgetBaseUnit, paymentTokenAddress = this.config.baseFare.contractAddress) {
       try {
         const data = encodeFunctionData({
           abi: acpAbi_default,
           functionName: "setBudgetWithPaymentToken",
-          args: [jobId, this.formatAmount(budget), paymentTokenAddress]
+          args: [jobId, budgetBaseUnit, paymentTokenAddress]
         });
         return yield this.handleSendUserOperation(data);
       } catch (error) {
@@ -2202,6 +2390,24 @@ var AcpContractClient = class _AcpContractClient {
       }
     });
   }
+  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) {
+        console.error(`Failed to wrap eth ${error}`);
+        throw new Error("Failed to wrap eth");
+      }
+    });
+  }
 };
 var acpContractClient_default = AcpContractClient;
 
@@ -2234,6 +2440,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";
@@ -2241,6 +2449,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) {
@@ -2264,6 +2477,7 @@ var AcpJob = class {
     this.memos = memos;
     this.phase = phase;
     this.context = context;
+    this.baseFare = acpClient.acpContractClient.config.baseFare;
   }
   get serviceRequirement() {
     var _a;
@@ -2317,7 +2531,12 @@ var AcpJob = class {
       if (!memo) {
         throw new Error("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) {
@@ -2362,11 +2581,12 @@ var AcpJob = class {
       if (payload.length === 0) {
         throw new Error("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 */,
@@ -2377,6 +2597,55 @@ 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 Error("No swap token memo found");
+      }
+      const payload = tryParseJson(
+        memo.content
+      );
+      if ((payload == null ? void 0 : payload.type) !== "swap_token" /* SWAP_TOKEN */) {
+        throw new Error("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);
@@ -2396,9 +2665,9 @@ var AcpJob = class {
     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 */,
@@ -2424,7 +2693,7 @@ var AcpJob = class {
       return yield this.acpClient.responseFundsRequest(
         memo.id,
         accept,
-        payload.data.amount,
+        this.baseFare.formatAmount(payload.data.amount),
         reason
       );
     });
@@ -2455,9 +2724,9 @@ var AcpJob = class {
       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 */,
@@ -2488,9 +2757,9 @@ var AcpJob = class {
     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 */,
@@ -2505,9 +2774,9 @@ var AcpJob = class {
     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 */,
@@ -2594,9 +2863,9 @@ 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 */,
@@ -2637,6 +2906,10 @@ var AcpMemo = class {
     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() {
@@ -2704,7 +2977,10 @@ var AcpJobOffering = class {
       return yield this.acpClient.initiateJob(
         this.providerAddress,
         finalServiceRequirement,
-        this.price,
+        new FareAmount(
+          this.price,
+          this.acpClient.acpContractClient.config.baseFare
+        ),
         evaluatorAddress,
         expiredAt
       );
@@ -2872,13 +3148,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 Error(
+          "Provider address cannot be the same as the client address"
+        );
+      }
       const { jobId } = yield this.acpContractClient.createJob(
         providerAddress,
         evaluatorAddress || this.acpContractClient.walletAddress,
         expiredAt
       );
-      yield this.acpContractClient.setBudgetWithPaymentToken(jobId, amount);
+      yield this.acpContractClient.setBudgetWithPaymentToken(
+        jobId,
+        fareAmount.amount,
+        fareAmount.fare.contractAddress
+      );
       yield this.acpContractClient.createMemo(
         jobId,
         typeof serviceRequirement === "string" ? serviceRequirement : JSON.stringify(serviceRequirement),
@@ -2904,29 +3189,29 @@ 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(amount);
+      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, expiredAt) {
+  requestFunds(jobId, transferFareAmount, recipient, feeFareAmount, feeType, reason, nextPhase, expiredAt) {
     return __async(this, null, function* () {
       return yield this.acpContractClient.createPayableMemo(
         jobId,
         JSON.stringify(reason),
-        amount,
+        transferFareAmount.amount,
         recipient,
-        feeAmount,
+        feeFareAmount.amount,
         feeType,
         nextPhase,
         6 /* PAYABLE_REQUEST */,
@@ -2934,33 +3219,49 @@ var AcpClient = class {
       );
     });
   }
-  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(amount);
+      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) {
-        yield this.acpContractClient.approveAllowance(totalAmount);
+      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 Error("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(
+          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),
-        amount,
+        transferFareAmount.amount,
         recipient,
-        feeAmount,
+        feeFareAmount.amount,
         feeType,
         nextPhase,
         8 /* PAYABLE_TRANSFER_ESCROW */,
-        expiredAt
+        expiredAt,
+        transferFareAmount.fare.contractAddress
       );
     });
   }
@@ -3223,15 +3524,22 @@ export {
   acpAbi_default as ACP_ABI,
   AcpAgentSort,
   acpContractClient_default as AcpContractClient,
+  AcpContractConfig,
   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
 };