@actalink/commonlib 0.1.0 → 0.1.2-dev

package/dist/index.cjs

@@ -777,6 +777,43 @@ var ViemClient = class {
       return allowance;
     });
   }
+  approveToken(token2, spender, amount, allowMaxTokenApproval) {
+    return __async(this, null, function* () {
+      var _a;
+      if (this.walletClient === void 0) {
+        throw new Error("Wallet client is required");
+      }
+      const signerAddress = (_a = this.walletClient.account) == null ? void 0 : _a.address;
+      console.log("signerAddress", signerAddress);
+      if (signerAddress === void 0) {
+        throw new Error("Signer address is required");
+      }
+      const txn = yield this.walletClient.sendTransaction({
+        to: token2.address,
+        account: signerAddress,
+        chain: getChainById(token2.chainId),
+        value: BigInt(0),
+        data: (0, import_viem2.encodeFunctionData)({
+          abi: (0, import_viem2.parseAbi)(["function approve(address,uint)"]),
+          functionName: "approve",
+          args: [spender, allowMaxTokenApproval ? import_viem2.maxUint256 : amount]
+        })
+      });
+      return txn;
+    });
+  }
+  waitForTransactionReceipt(hash, blocks = 1) {
+    return __async(this, null, function* () {
+      if (this.walletClient === void 0) {
+        throw new Error("Wallet client is required");
+      }
+      const receipt = yield this.publicClient().waitForTransactionReceipt({
+        hash,
+        confirmations: blocks
+      });
+      return receipt;
+    });
+  }
 };
 
 // src/account.ts
@@ -1131,7 +1168,7 @@ var ActaAccount = class {
       };
     });
   }
-  signSinglePaymentOperation(singlePaymentParams) {
+  estimatePaymentAmount(singlePaymentParams) {
     return __async(this, null, function* () {
       try {
         if (!this.signer) {
@@ -1144,7 +1181,6 @@ var ActaAccount = class {
           amount,
           receiver,
           feeInclusive,
-          allowMaxTokenApproval,
           feebps
         } = singlePaymentParams;
         if (amount <= BigInt(0)) {
@@ -1157,14 +1193,10 @@ var ActaAccount = class {
         if (!token2) {
           throw new Error("Token not found.");
         }
-        const viemClient = new ViemClient(this.chainId, this.signer);
         const {
-          estimatedGasCostInToken,
-          ActalinkFeesInToken,
           feeInclusiveAmountInToken,
           feeExclusiveAmountInToken,
-          estimatedTotalFeesInToken,
-          paymaster
+          estimatedTotalFeesInToken
         } = yield this.estimateSinglePaymentGas({
           signerAddress,
           chainId,
@@ -1174,18 +1206,141 @@ var ActaAccount = class {
           feeInclusive,
           feebps
         });
-        const account = yield this.createAccount();
-        const { accountClient } = yield this.createAccountHelpers();
-        const fromAddress = signerAddress;
-        const smartAccountAddress = account.address;
-        const amountToTransfer = feeInclusive ? amount : feeExclusiveAmountInToken;
+        const totalAmount = feeInclusive ? amount : feeExclusiveAmountInToken;
+        const actalinkFees = estimatedTotalFeesInToken;
         const receiverAmount = feeInclusive ? feeInclusiveAmountInToken : amount;
-        yield viemClient.checkAndApproveToken(
+        return {
+          totalAmount,
+          actalinkFees,
+          receiverAmount
+        };
+      } catch (error) {
+        if (error instanceof Error) {
+          throw new Error(error.message);
+        }
+        throw new Error("Failed to estimate payment amount.");
+      }
+    });
+  }
+  checkAllowance(params) {
+    return __async(this, null, function* () {
+      var _a;
+      try {
+        if (!this.signer) {
+          throw new Error("Signer is required for self custody payments.");
+        }
+        const { chainId, token: tokenSymbol } = params;
+        const account = yield this.createAccount();
+        const smartAccountAddress = yield account.getAddress();
+        const owner = (_a = this.signer.account) == null ? void 0 : _a.address;
+        console.log("signerAddress", owner);
+        if (owner === void 0) {
+          throw new Error("Signer address is required");
+        }
+        const token2 = getTokenByChainIdAndSymbol(chainId, tokenSymbol);
+        if (!token2) {
+          throw new Error("Token not found.");
+        }
+        const viemClient = new ViemClient(this.chainId, this.signer);
+        const allowance = yield viemClient.checkTokenAllowance(
+          token2,
+          owner,
+          smartAccountAddress
+        );
+        return allowance;
+      } catch (error) {
+        if (error instanceof Error) {
+          throw new Error(error.message);
+        }
+        throw new Error("Failed to check token allownace.");
+      }
+    });
+  }
+  approveToken(params) {
+    return __async(this, null, function* () {
+      try {
+        if (!this.signer) {
+          throw new Error("Signer is required for self custody payments.");
+        }
+        const {
+          chainId,
+          token: tokenSymbol,
+          amount,
+          allowMaxTokenApproval
+        } = params;
+        const account = yield this.createAccount();
+        const smartAccountAddress = yield account.getAddress();
+        const token2 = getTokenByChainIdAndSymbol(chainId, tokenSymbol);
+        if (!token2) {
+          throw new Error("Token not found.");
+        }
+        const viemClient = new ViemClient(this.chainId, this.signer);
+        const allowance = yield viemClient.approveToken(
           token2,
           smartAccountAddress,
-          amountToTransfer,
-          allowMaxTokenApproval != null ? allowMaxTokenApproval : false
+          amount,
+          allowMaxTokenApproval
         );
+        return allowance;
+      } catch (error) {
+        if (error instanceof Error) {
+          throw new Error(error.message);
+        }
+        throw new Error("Failed to approve token.");
+      }
+    });
+  }
+  waitForTransactionReceipt(params) {
+    return __async(this, null, function* () {
+      try {
+        if (!this.signer) {
+          throw new Error("Signer is required for self custody payments.");
+        }
+        const { chainId, hash } = params;
+        if (!hash) {
+          throw new Error("Hash is not provided.");
+        }
+        const viemClient = new ViemClient(this.chainId, this.signer);
+        const receipt = yield viemClient.waitForTransactionReceipt(hash);
+        return receipt;
+      } catch (error) {
+        if (error instanceof Error) {
+          throw new Error(error.message);
+        }
+        throw new Error("Failed to check token allownace.");
+      }
+    });
+  }
+  signSinglePaymentOperation(singlePaymentParams) {
+    return __async(this, null, function* () {
+      try {
+        if (!this.signer) {
+          throw new Error("Signer is required for self custody payments.");
+        }
+        const {
+          signerAddress,
+          chainId,
+          token: tokenSymbol,
+          actalinkFees,
+          receiverAmount,
+          receiver
+        } = singlePaymentParams;
+        if (receiverAmount <= BigInt(0)) {
+          throw new Error("Amount must be greater than 0.");
+        }
+        if (actalinkFees <= BigInt(0)) {
+          throw new Error("Fees must be greater than 0.");
+        }
+        if (receiver === signerAddress) {
+          throw new Error("Receiver cannot be the same as the signer.");
+        }
+        const token2 = getTokenByChainIdAndSymbol(chainId, tokenSymbol);
+        if (!token2) {
+          throw new Error("Token not found.");
+        }
+        const account = yield this.createAccount();
+        const { accountClient } = yield this.createAccountHelpers();
+        const fromAddress = signerAddress;
         const userOperation = yield accountClient.prepareUserOperation({
           calls: [
             {
@@ -1195,7 +1350,7 @@ var ActaAccount = class {
               args: [
                 fromAddress,
                 "0x26eeCa5956Bf8C01040BAC9e6D7982a0e87F31B4",
-                estimatedTotalFeesInToken
+                actalinkFees
               ]
             },
             {
@@ -1328,14 +1483,7 @@ var ActaAccount = class {
         chainId,
         token: tokenSymbol,
         amount,
-        receiver,
-        feeInclusive,
-        count,
-        intervalUnit,
-        startDate,
-        endDate,
-        allowMaxTokenApproval,
-        feebps
+        receiver
       } = recurringPaymentParams;
       if (amount <= BigInt(0)) {
         throw new Error("Amount must be greater than 0.");
@@ -1346,20 +1494,14 @@ var ActaAccount = class {
       if (receiver === signerAddress) {
         throw new Error("Receiver cannot be the same as the signer.");
       }
-      if (!intervalUnit) {
-        throw new Error("Interval unit is required.");
-      }
       const token2 = getTokenByChainIdAndSymbol(chainId, tokenSymbol);
       if (!token2) {
         throw new Error("Token not found.");
       }
       const kernelVersion = import_constants.KERNEL_V3_1;
       const entryPoint = (0, import_constants.getEntryPoint)("0.7");
-      const paymentCount = count != null ? count : 24;
       const account = yield this.createAccount();
-      const smartAccountAddress = account.address;
       const viemClient = new ViemClient(this.chainId, this.signer);
-      const { paymasterClient, pimlicoClient } = yield this.createAccountHelpers();
       const ecdsaValidator = yield (0, import_ecdsa_validator.signerToEcdsaValidator)(
         viemClient.publicClient(),
         {
@@ -1371,32 +1513,7 @@ var ActaAccount = class {
       const sessionKeyAddress = "0xFDEed8e268D74DF71f3Db7409F8A8290FF1263ED";
       const emptyAccount = (0, import_sdk.addressToEmptyAccount)(sessionKeyAddress);
       const emptySessionKeySigner = yield (0, import_signers.toECDSASigner)({ signer: emptyAccount });
-      const {
-        paymaster,
-        ActalinkFeesInToken,
-        feeInclusiveAmountInToken,
-        feeExclusiveAmountInToken,
-        estimatedTotalFeesInToken,
-        userOperation,
-        estimatedGasCostInToken
-      } = yield this.estimateSinglePaymentGas({
-        signerAddress,
-        chainId,
-        token: tokenSymbol,
-        amount,
-        receiver,
-        feeInclusive,
-        feebps
-      });
-      const amountToTransfer = feeInclusive ? amount : feeExclusiveAmountInToken;
-      const receiverAmount = feeInclusive ? feeInclusiveAmountInToken : amount;
-      yield viemClient.checkAndApproveToken(
-        token2,
-        smartAccountAddress,
-        amountToTransfer * BigInt(paymentCount) + estimatedGasCostInToken * BigInt(2) * BigInt(paymentCount),
-        allowMaxTokenApproval != null ? allowMaxTokenApproval : false
-      );
-      const amountExclusive = amountToTransfer + amountToTransfer / BigInt(2);
+      const amountExclusive = amount + amount / BigInt(2);
       const callPolicy = (0, import_policies.toCallPolicy)({
         policyVersion: import_policies.CallPolicyVersion.V0_0_4,
         permissions: [
@@ -1943,6 +2060,7 @@ var ActaFlexDeposit = class {
     this.status = "not_started";
     this.serviceType = "deposit";
     this.allowMaxTokenApproval = false;
+    this.feebps = 10;
     var _a, _b, _c;
     this.connectorType = parameters.connectorType;
     this.walletClient = parameters.walletClient;
@@ -2062,35 +2180,95 @@ var ActaFlexDeposit = class {
       }
     });
   }
-  createPayment(servicePaymentParams) {
+  estimatePaymentAmount() {
+    return __async(this, null, function* () {
+      try {
+        const signerAddress = this.signerAddress;
+        const chainId = this.chainId;
+        const tokenSymbol = this.token;
+        const amount = this.amount;
+        const receiver = this.receiver;
+        const feeInclusive = this.feeInclusive;
+        const feebps = this.feebps;
+        const { totalAmount, actalinkFees, receiverAmount } = yield this.account.estimatePaymentAmount({
+          signerAddress,
+          chainId,
+          token: tokenSymbol,
+          amount,
+          receiver,
+          feeInclusive,
+          feebps
+        });
+        return {
+          totalAmount,
+          actalinkFees,
+          receiverAmount
+        };
+      } catch (error) {
+        if (error instanceof Error) {
+          throw new Error(error.message);
+        }
+        throw new Error("Failed to estimate payment amount.");
+      }
+    });
+  }
+  checkAllowance() {
     return __async(this, null, function* () {
       try {
-        if (this.paymentType === "single") {
-          const paymentParams = this.serviceType === "deposit" ? __spreadProps(__spreadValues({}, servicePaymentParams), {
-            depositSessionId: this.depositSessionId
-          }) : servicePaymentParams;
-          const id = yield this.createSinglePayment(paymentParams);
-          return id;
-        }
-        if (this.paymentType === "choose") {
-        }
-        if (this.paymentType === "recurring") {
-          const paymentParams = this.serviceType === "deposit" ? __spreadProps(__spreadValues({}, servicePaymentParams), {
-            depositSessionId: this.depositSessionId
-          }) : servicePaymentParams;
-          const id = yield this.createRecurringPayments(paymentParams);
-          return id;
+        const chainId = this.chainId;
+        const tokenSymbol = this.token;
+        const allowance = yield this.account.checkAllowance({
+          chainId,
+          token: tokenSymbol
+        });
+        return allowance;
+      } catch (error) {
+        if (error instanceof Error) {
+          throw new Error(error.message);
         }
+        throw new Error("Failed to check token allowance.");
+      }
+    });
+  }
+  approveToken(parameters) {
+    return __async(this, null, function* () {
+      try {
+        const chainId = this.chainId;
+        const tokenSymbol = this.token;
+        const { totalAmount, allowMaxTokenApproval } = parameters;
+        const hash = yield this.account.approveToken({
+          chainId,
+          token: tokenSymbol,
+          amount: totalAmount,
+          allowMaxTokenApproval
+        });
+        return hash;
       } catch (error) {
-        this.status = "payment_failed";
         if (error instanceof Error) {
           throw new Error(error.message);
         }
-        throw new Error("Failed to create payment.");
+        throw new Error("Failed to approve token.");
       }
     });
   }
-  createSinglePayment(servicePaymentParams) {
+  waitForTransactionReceipt(hash) {
+    return __async(this, null, function* () {
+      try {
+        const chainId = this.chainId;
+        const receipt = yield this.account.waitForTransactionReceipt({
+          chainId,
+          hash
+        });
+        return receipt;
+      } catch (error) {
+        if (error instanceof Error) {
+          throw new Error(error.message);
+        }
+        throw new Error("Failed to fetch transaction receipt.");
+      }
+    });
+  }
+  createSinglePayment(parameters, servicePaymentParams) {
     return __async(this, null, function* () {
       try {
         if (this.connectorType !== "Self-Custody" /* SELF_CUSTODY */) {
@@ -2102,18 +2280,12 @@ var ActaFlexDeposit = class {
         const signerAddress = this.signerAddress;
         const chainId = this.chainId;
         const tokenSymbol = this.token;
-        const amount = this.amount;
         const receiver = this.receiver;
+        const amount = this.amount;
         const feeInclusive = this.feeInclusive;
         const serviceType = this.serviceType;
+        const { actalinkFees, receiverAmount } = parameters;
         const { envTransactionServiceUrl, envDepositServiceUrl } = returnEnvUrl(chainId);
-        if (this.depositSessionId !== "") {
-          const session = yield verifySessionAPICall(
-            `${envDepositServiceUrl}verify-session?sessionId=${this.depositSessionId}`,
-            this.depositSessionId
-          );
-          this.depositSessionId = session.sessionId;
-        }
         const token2 = getTokenByChainIdAndSymbol(chainId, tokenSymbol);
         if (!token2) {
           throw new Error("Token not supported.");
@@ -2122,11 +2294,9 @@ var ActaFlexDeposit = class {
           signerAddress,
           chainId,
           token: tokenSymbol,
-          amount,
-          receiver,
-          feeInclusive,
-          allowMaxTokenApproval: this.allowMaxTokenApproval,
-          feebps: 10
+          actalinkFees,
+          receiverAmount,
+          receiver
         });
         const txn = yield executeSinglePaymentAPICall(
           `${envTransactionServiceUrl}execute/single`,
@@ -2214,14 +2384,7 @@ var ActaFlexDeposit = class {
         chainId,
         token: tokenSymbol,
         amount,
-        feeInclusive,
-        count,
-        intervalUnit,
-        startDate,
-        endDate,
-        receiver,
-        allowMaxTokenApproval: this.allowMaxTokenApproval,
-        feebps: 20
+        receiver
       });
       const txn = yield scheduleRecurringPaymentsAPICall(
         `${envTransactionServiceUrl}schedule/recurring`,
@@ -2245,39 +2408,6 @@ var ActaFlexDeposit = class {
       return txn.recurringTransaction.id;
     });
   }
-  getPaymentSteps() {
-    return __async(this, null, function* () {
-      const signerAddress = this.signerAddress;
-      const chainId = this.chainId;
-      const tokenSymbol = this.token;
-      const amount = this.amount;
-      const receiver = this.receiver;
-      const feeInclusive = this.feeInclusive;
-      const count = this.count;
-      if (!signerAddress) return ["allowance", "confirm"];
-      const token2 = getTokenByChainIdAndSymbol(chainId, tokenSymbol);
-      if (!token2) return ["allowance", "confirm"];
-      const smartAccount = yield this.account.createAccount();
-      const { estimatedGasCostInToken, feeExclusiveAmountInToken } = yield this.account.estimateSinglePaymentGas({
-        chainId,
-        amount,
-        feeInclusive,
-        receiver,
-        signerAddress,
-        token: tokenSymbol,
-        feebps: 10
-      });
-      const amountToTransfer = feeInclusive ? amount : feeExclusiveAmountInToken;
-      let paymentAmount = (amountToTransfer + estimatedGasCostInToken * BigInt(2)) * BigInt(count != null ? count : 1);
-      const allowance = yield this.viemClient.checkTokenAllowance(
-        token2,
-        signerAddress,
-        smartAccount.address
-      );
-      if (paymentAmount <= allowance) return ["confirm"];
-      return ["allowance", "confirm"];
-    });
-  }
 };
 
 // src/flexbatch.ts
@@ -2742,8 +2872,8 @@ var ActaFlexBatch = class {
 
 // src/billing.ts
 var import_viem7 = require("viem");
-var billingServiceUrl = "https://api.acta.link/pay/api/v1/";
-var billingServiceTestUrl = "https://api.acta.link/pay/test/api/v1/";
+var billingServiceUrl = "https://pay-api.fhoton.xyz/pay/api/v1/";
+var billingServiceTestUrl = "https://pay-api.fhoton.xyz/pay/test/api/v1/";
 var returnEnvUrl3 = (chainId) => {
   const mainnetChain = mainnetChains.find((c) => c.id === chainId);
   const testnetChain = testnetChains.find((c) => c.id === chainId);
@@ -2771,6 +2901,7 @@ var ActaBilling = class {
     this.status = "not_started";
     this.serviceType = "deposit";
     this.allowMaxTokenApproval = false;
+    this.feebps = 20;
     var _a, _b;
     this.connectorType = parameters.connectorType;
     this.walletClient = parameters.walletClient;
@@ -2826,7 +2957,95 @@ var ActaBilling = class {
       }
     });
   }
-  createSinglePayment(servicePaymentParams) {
+  estimatePaymentAmount() {
+    return __async(this, null, function* () {
+      try {
+        const signerAddress = this.signerAddress;
+        const chainId = this.chainId;
+        const tokenSymbol = this.token;
+        const amount = this.amount;
+        const receiver = this.receiver;
+        const feeInclusive = this.feeInclusive;
+        const feebps = this.feebps;
+        const { totalAmount, actalinkFees, receiverAmount } = yield this.account.estimatePaymentAmount({
+          signerAddress,
+          chainId,
+          token: tokenSymbol,
+          amount,
+          receiver,
+          feeInclusive,
+          feebps
+        });
+        return {
+          totalAmount,
+          actalinkFees,
+          receiverAmount
+        };
+      } catch (error) {
+        if (error instanceof Error) {
+          throw new Error(error.message);
+        }
+        throw new Error("Failed to estimate payment amount.");
+      }
+    });
+  }
+  checkAllowance() {
+    return __async(this, null, function* () {
+      try {
+        const chainId = this.chainId;
+        const tokenSymbol = this.token;
+        const allowance = yield this.account.checkAllowance({
+          chainId,
+          token: tokenSymbol
+        });
+        return allowance;
+      } catch (error) {
+        if (error instanceof Error) {
+          throw new Error(error.message);
+        }
+        throw new Error("Failed to check token allowance.");
+      }
+    });
+  }
+  approveToken(parameters) {
+    return __async(this, null, function* () {
+      try {
+        const chainId = this.chainId;
+        const tokenSymbol = this.token;
+        const { totalAmount, allowMaxTokenApproval } = parameters;
+        const hash = yield this.account.approveToken({
+          chainId,
+          token: tokenSymbol,
+          amount: totalAmount,
+          allowMaxTokenApproval
+        });
+        return hash;
+      } catch (error) {
+        if (error instanceof Error) {
+          throw new Error(error.message);
+        }
+        throw new Error("Failed to approve token.");
+      }
+    });
+  }
+  waitForTransactionReceipt(hash) {
+    return __async(this, null, function* () {
+      try {
+        const chainId = this.chainId;
+        const receipt = yield this.account.waitForTransactionReceipt({
+          chainId,
+          hash
+        });
+        return receipt;
+      } catch (error) {
+        if (error instanceof Error) {
+          throw new Error(error.message);
+        }
+        throw new Error("Failed to fetch transaction receipt.");
+      }
+    });
+  }
+  createSinglePayment(parameters, servicePaymentParams) {
     return __async(this, null, function* () {
       try {
         if (this.connectorType !== "Self-Custody" /* SELF_CUSTODY */) {
@@ -2835,6 +3054,7 @@ var ActaBilling = class {
         if (!servicePaymentParams.checkoutSessionId || servicePaymentParams.checkoutSessionId === "") {
           throw new Error("checkout session ID is required.");
         }
+        const { actalinkFees, receiverAmount } = parameters;
         const signerAddress = this.signerAddress;
         const chainId = this.chainId;
         const tokenSymbol = this.token;
@@ -2851,11 +3071,9 @@ var ActaBilling = class {
           signerAddress,
           chainId,
           token: tokenSymbol,
-          amount,
-          receiver,
-          feeInclusive,
-          allowMaxTokenApproval: this.allowMaxTokenApproval,
-          feebps: 20
+          actalinkFees,
+          receiverAmount,
+          receiver
         });
         const txn = yield executeSinglePaymentAPICall(
           `${envBillingServiceUrl}execute/single`,
@@ -2915,14 +3133,7 @@ var ActaBilling = class {
         chainId,
         token: tokenSymbol,
         amount,
-        feeInclusive,
-        count,
-        intervalUnit,
-        startDate,
-        endDate,
-        receiver,
-        allowMaxTokenApproval: this.allowMaxTokenApproval,
-        feebps: 20
+        receiver
       });
       const txn = yield scheduleSubscriptionPaymentsAPICall(
         `${envBillingServiceUrl}schedule/subscription`,
@@ -3452,10 +3663,10 @@ var import_account_abstraction2 = require("viem/account-abstraction");
 var import_policies2 = require("@zerodev/permissions/policies");
 var import_semver = require("semver");
 var ECDSA_SIGNER_CONTRACT = "0x6A6F069E2a08c2468e7724Ab3250CdBFBA14D4FF";
-var billingServiceUrl2 = "https://api.acta.link/pay/v1/";
 var depositServiceUrl2 = "https://api.acta.link/bexo/v1/";
 var transactionServiceUrl2 = "https://api.acta.link/transaction/v1/";
-var billingServiceTestUrl2 = "https://api.acta.link/pay/test/v1/";
+var billingServiceUrl2 = "https://pay-api.fhoton.xyz/pay/api/v1/";
+var billingServiceTestUrl2 = "https://pay-api.fhoton.xyz/pay/test/api/v1/";
 var toSignerId = (signer) => {
   return (0, import_viem9.encodeAbiParameters)(
     [{ name: "signerData", type: "bytes" }],