@actalink/commonlib 0.0.15 → 0.0.17

package/dist/index.js

@@ -593,7 +593,7 @@ import {
   VALIDATOR_TYPE
 } from "@zerodev/sdk/constants";
 import { signerToEcdsaValidator } from "@zerodev/ecdsa-validator";
-import { createSmartAccountClient } from "permissionless";
+import { createSmartAccountClient, getRequiredPrefund } from "permissionless";
 import { createPimlicoClient } from "permissionless/clients/pimlico";
 
 // src/rpc.ts
@@ -806,7 +806,8 @@ var ActaAccount = class {
         chainId,
         token: tokenSymbol,
         amount,
-        receiver
+        receiver,
+        feebps
       } = parameters;
       if (amount <= BigInt(0)) {
         throw new Error("Amount must be greater than 0.");
@@ -822,11 +823,6 @@ var ActaAccount = class {
       if (!token2) {
         throw new Error("Token not found.");
       }
-      const quotes = yield pimlicoClient.getTokenQuotes({
-        tokens: [token2.address],
-        chain: getChainById(chainId)
-      });
-      const { postOpGas, exchangeRate, paymaster } = quotes[0];
       const userOperation = yield accountClient.prepareUserOperation({
         calls: [
           {
@@ -847,22 +843,31 @@ var ActaAccount = class {
           }
         ]
       });
-      const userOperationMaxGas = userOperation.preVerificationGas + userOperation.callGasLimit + userOperation.verificationGasLimit + (userOperation.paymasterPostOpGasLimit || BigInt(0)) + (userOperation.paymasterVerificationGasLimit || BigInt(0));
-      const userOperationMaxCost = BigInt(
-        userOperationMaxGas * userOperation.maxFeePerGas
-      );
-      const estimatedGasCostInToken = (userOperationMaxCost + postOpGas * userOperation.maxFeePerGas) * exchangeRate / BigInt(1e18);
-      const ActalinkFeesInToken = amount * BigInt(20) / BigInt(1e4);
-      const estimatedTotalFeesInToken = estimatedGasCostInToken + ActalinkFeesInToken;
+      const quotes = yield pimlicoClient.getTokenQuotes({
+        tokens: [token2.address],
+        chain: getChainById(chainId)
+      });
+      const userOperationMaxCost = getRequiredPrefund({
+        userOperation,
+        entryPointVersion: "0.7"
+      });
+      const postOpGas = quotes[0].postOpGas;
+      const exchangeRate = quotes[0].exchangeRate;
+      const exchangeRateNativeToUsd = quotes[0].exchangeRateNativeToUsd;
+      const maxCostInWei = userOperationMaxCost + postOpGas * userOperation.maxFeePerGas;
+      const costInToken = maxCostInWei * exchangeRate / BigInt(1e18);
+      const costInUsd = maxCostInWei * exchangeRateNativeToUsd / BigInt(1e18);
+      const ActalinkFeesInToken = amount * BigInt(feebps) / BigInt(1e4);
+      const estimatedTotalFeesInToken = costInToken + ActalinkFeesInToken;
       const feeInclusiveAmountInToken = amount - estimatedTotalFeesInToken;
       const feeExclusiveAmountInToken = amount + estimatedTotalFeesInToken;
       return {
-        estimatedGasCostInToken,
+        estimatedGasCostInToken: costInToken,
         ActalinkFeesInToken,
         estimatedTotalFeesInToken,
         feeInclusiveAmountInToken,
         feeExclusiveAmountInToken,
-        paymaster,
+        paymaster: quotes[0].paymaster,
         userOperation
       };
     });
@@ -876,7 +881,8 @@ var ActaAccount = class {
         receivers,
         feeInclusive,
         walletClient,
-        totalAmount
+        totalAmount,
+        feebps
       } = parameters;
       if (totalAmount <= BigInt(0)) {
         throw new Error("Amount must be greater than 0.");
@@ -892,14 +898,6 @@ var ActaAccount = class {
       if (!token2) {
         throw new Error("Token not found.");
       }
-      console.log(`fromAddress: ${fromAddress}`);
-      const quotes = yield pimlicoClient.getTokenQuotes({
-        tokens: [token2.address],
-        chain: getChainById(chainId)
-      });
-      const { postOpGas, exchangeRate, paymaster } = quotes[0];
-      console.log("preparing");
-      console.log(token2.address);
       const receiversData = receivers.map((r) => {
         return {
           to: getAddress2(token2.address),
@@ -924,17 +922,27 @@ var ActaAccount = class {
           }
         ]
       });
-      const userOperationMaxGas = userOperation.preVerificationGas + userOperation.callGasLimit + userOperation.verificationGasLimit + (userOperation.paymasterPostOpGasLimit || BigInt(0)) + (userOperation.paymasterVerificationGasLimit || BigInt(0));
-      const userOperationMaxCost = BigInt(
-        userOperationMaxGas * userOperation.maxFeePerGas
-      );
-      const estimatedGasCostInToken = (userOperationMaxCost + postOpGas * userOperation.maxFeePerGas) * exchangeRate / BigInt(1e18);
-      const ActalinkFeesInToken = totalAmount * BigInt(20) / BigInt(1e4);
-      const estimatedTotalFeesInToken = estimatedGasCostInToken + ActalinkFeesInToken;
+      const quotes = yield pimlicoClient.getTokenQuotes({
+        tokens: [token2.address],
+        chain: getChainById(chainId)
+      });
+      const userOperationMaxCost = getRequiredPrefund({
+        userOperation,
+        entryPointVersion: "0.7"
+      });
+      const postOpGas = quotes[0].postOpGas;
+      const exchangeRate = quotes[0].exchangeRate;
+      const exchangeRateNativeToUsd = quotes[0].exchangeRateNativeToUsd;
+      const paymaster = quotes[0].paymaster;
+      const maxCostInWei = userOperationMaxCost + postOpGas * userOperation.maxFeePerGas;
+      const costInToken = maxCostInWei * exchangeRate / BigInt(1e18);
+      const costInUsd = maxCostInWei * exchangeRateNativeToUsd / BigInt(1e18);
+      const ActalinkFeesInToken = totalAmount * BigInt(feebps) / BigInt(1e4);
+      const estimatedTotalFeesInToken = costInToken + ActalinkFeesInToken;
       const feeInclusiveAmountInToken = totalAmount - estimatedTotalFeesInToken;
       const feeExclusiveAmountInToken = totalAmount + estimatedTotalFeesInToken;
       return {
-        estimatedGasCostInToken,
+        estimatedGasCostInToken: costInToken,
         ActalinkFeesInToken,
         estimatedTotalFeesInToken,
         feeInclusiveAmountInToken,
@@ -957,7 +965,8 @@ var ActaAccount = class {
           amount,
           receiver,
           feeInclusive,
-          allowMaxTokenApproval
+          allowMaxTokenApproval,
+          feebps
         } = singlePaymentParams;
         if (amount <= BigInt(0)) {
           throw new Error("Amount must be greater than 0.");
@@ -983,7 +992,8 @@ var ActaAccount = class {
           token: tokenSymbol,
           amount,
           receiver,
-          feeInclusive
+          feeInclusive,
+          feebps
         });
         const account = yield this.createAccount();
         const { accountClient } = yield this.createAccountHelpers();
@@ -1006,7 +1016,7 @@ var ActaAccount = class {
               args: [
                 fromAddress,
                 "0x26eeCa5956Bf8C01040BAC9e6D7982a0e87F31B4",
-                estimatedGasCostInToken
+                estimatedTotalFeesInToken
               ]
             },
             {
@@ -1046,7 +1056,8 @@ var ActaAccount = class {
           feeInclusive,
           allowMaxTokenApproval,
           totalAmount,
-          walletClient
+          walletClient,
+          feebps
         } = singlePaymentParams;
         if (totalAmount <= BigInt(0)) {
           throw new Error("Amount must be greater than 0.");
@@ -1074,7 +1085,8 @@ var ActaAccount = class {
           receivers,
           feeInclusive,
           totalAmount,
-          walletClient
+          walletClient,
+          feebps
         });
         const account = yield this.createAccount();
         const { accountClient } = yield this.createAccountHelpers();
@@ -1107,7 +1119,7 @@ var ActaAccount = class {
               args: [
                 fromAddress,
                 "0x26eeCa5956Bf8C01040BAC9e6D7982a0e87F31B4",
-                estimatedGasCostInToken
+                estimatedTotalFeesInToken
               ]
             }
           ]
@@ -1143,7 +1155,8 @@ var ActaAccount = class {
         intervalUnit,
         startDate,
         endDate,
-        allowMaxTokenApproval
+        allowMaxTokenApproval,
+        feebps
       } = recurringPaymentParams;
       if (amount <= BigInt(0)) {
         throw new Error("Amount must be greater than 0.");
@@ -1193,7 +1206,8 @@ var ActaAccount = class {
         token: tokenSymbol,
         amount,
         receiver,
-        feeInclusive
+        feeInclusive,
+        feebps
       });
       const amountToTransfer = feeInclusive ? amount : feeExclusiveAmountInToken;
       const receiverAmount = feeInclusive ? feeInclusiveAmountInToken : amount;
@@ -1272,7 +1286,8 @@ var ActaAccount = class {
         allowMaxTokenApproval,
         receivers,
         totalAmount,
-        walletClient
+        walletClient,
+        feebps
       } = paymentParams;
       if (signerAddress === void 0) {
         throw new Error("signer address is not provided.");
@@ -1319,7 +1334,8 @@ var ActaAccount = class {
         receivers,
         feeInclusive,
         totalAmount,
-        walletClient
+        walletClient,
+        feebps
       });
       const amountToTransfer = feeInclusive ? totalAmount : feeExclusiveAmountInToken;
       const receiverAmount = feeInclusive ? feeInclusiveAmountInToken : totalAmount;
@@ -1701,6 +1717,7 @@ var transactionServiceUrl = "https://api.acta.link/transaction/v1/";
 var depositServiceUrl = "https://api.acta.link/deposit/v1/";
 var ActaDeposit = class {
   constructor(parameters) {
+    this.feeInclusive = false;
     this.count = 0;
     this.intervalUnit = void 0;
     this.startDate = void 0;
@@ -1710,7 +1727,7 @@ var ActaDeposit = class {
     this.status = "not_started";
     this.serviceType = "deposit";
     this.allowMaxTokenApproval = false;
-    var _a, _b;
+    var _a, _b, _c;
     this.connectorType = parameters.connectorType;
     this.walletClient = parameters.walletClient;
     this.signerAddress = parameters.signerAddress;
@@ -1718,14 +1735,14 @@ var ActaDeposit = class {
     this.token = parameters.token;
     this.amount = parameters.amount;
     this.receiver = parameters.receiver;
-    this.feeInclusive = parameters.feeInclusive;
+    this.feeInclusive = (_a = parameters.feeInclusive) != null ? _a : false;
     this.paymentType = parameters.paymentType;
     this.count = parameters.count;
     this.intervalUnit = parameters.intervalUnit;
     this.startDate = parameters.startDate;
     this.endDate = parameters.endDate;
-    this.depositSessionId = (_a = parameters.depositSessionId) != null ? _a : "";
-    this.allowMaxTokenApproval = (_b = parameters.allowMaxTokenApproval) != null ? _b : false;
+    this.depositSessionId = (_b = parameters.depositSessionId) != null ? _b : "";
+    this.allowMaxTokenApproval = (_c = parameters.allowMaxTokenApproval) != null ? _c : false;
     this.viemClient = new ViemClient(this.chainId, this.walletClient);
     this.account = new ActaAccount(
       this.chainId,
@@ -1890,7 +1907,8 @@ var ActaDeposit = class {
           amount,
           receiver,
           feeInclusive,
-          allowMaxTokenApproval: this.allowMaxTokenApproval
+          allowMaxTokenApproval: this.allowMaxTokenApproval,
+          feebps: 10
         });
         const txn = yield executeSinglePaymentAPICall(
           `${transactionServiceUrl}execute/single`,
@@ -1983,7 +2001,8 @@ var ActaDeposit = class {
         startDate,
         endDate,
         receiver,
-        allowMaxTokenApproval: this.allowMaxTokenApproval
+        allowMaxTokenApproval: this.allowMaxTokenApproval,
+        feebps: 20
       });
       const txn = yield scheduleRecurringPaymentsAPICall(
         `${transactionServiceUrl}schedule/recurring`,
@@ -2026,7 +2045,8 @@ var ActaDeposit = class {
         feeInclusive,
         receiver,
         signerAddress,
-        token: tokenSymbol
+        token: tokenSymbol,
+        feebps: 10
       });
       const amountToTransfer = feeInclusive ? amount : feeExclusiveAmountInToken;
       let paymentAmount = (amountToTransfer + estimatedGasCostInToken * BigInt(2)) * BigInt(count != null ? count : 1);
@@ -2046,6 +2066,7 @@ import { toHex as toHex3 } from "viem";
 var transactionServiceUrl2 = "https://api.acta.link/transaction/v1/";
 var ActaBilling = class {
   constructor(parameters) {
+    this.feeInclusive = true;
     this.count = 0;
     this.intervalUnit = void 0;
     this.startDate = void 0;
@@ -2054,7 +2075,7 @@ var ActaBilling = class {
     this.status = "not_started";
     this.serviceType = "deposit";
     this.allowMaxTokenApproval = false;
-    var _a;
+    var _a, _b;
     this.connectorType = parameters.connectorType;
     this.walletClient = parameters.walletClient;
     this.signerAddress = parameters.signerAddress;
@@ -2062,13 +2083,13 @@ var ActaBilling = class {
     this.token = parameters.token;
     this.amount = parameters.amount;
     this.receiver = parameters.receiver;
-    this.feeInclusive = parameters.feeInclusive;
+    this.feeInclusive = (_a = parameters.feeInclusive) != null ? _a : true;
     this.paymentType = parameters.paymentType;
     this.count = parameters.count;
     this.intervalUnit = parameters.intervalUnit;
     this.startDate = parameters.startDate;
     this.endDate = parameters.endDate;
-    this.allowMaxTokenApproval = (_a = parameters.allowMaxTokenApproval) != null ? _a : false;
+    this.allowMaxTokenApproval = (_b = parameters.allowMaxTokenApproval) != null ? _b : false;
     this.serviceType = parameters.serviceType;
     this.viemClient = new ViemClient(this.chainId, this.walletClient);
     this.account = new ActaAccount(
@@ -2136,7 +2157,8 @@ var ActaBilling = class {
           amount,
           receiver,
           feeInclusive,
-          allowMaxTokenApproval: this.allowMaxTokenApproval
+          allowMaxTokenApproval: this.allowMaxTokenApproval,
+          feebps: 20
         });
         const txn = yield executeSinglePaymentAPICall(
           `${transactionServiceUrl2}execute/single`,
@@ -2201,7 +2223,8 @@ var ActaBilling = class {
         startDate,
         endDate,
         receiver,
-        allowMaxTokenApproval: this.allowMaxTokenApproval
+        allowMaxTokenApproval: this.allowMaxTokenApproval,
+        feebps: 20
       });
       const txn = yield scheduleRecurringPaymentsAPICall(
         `${transactionServiceUrl2}schedule/recurring`,
@@ -2244,7 +2267,8 @@ var ActaBilling = class {
         feeInclusive,
         receiver,
         signerAddress,
-        token: tokenSymbol
+        token: tokenSymbol,
+        feebps: 20
       });
       const amountToTransfer = feeInclusive ? amount : feeExclusiveAmountInToken;
       let paymentAmount = (amountToTransfer + estimatedGasCostInToken * BigInt(2)) * BigInt(count != null ? count : 1);
@@ -2342,6 +2366,10 @@ var ActaBatch = class {
           walletClient,
           instructionId
         } = parameters;
+        let isFeeInclusive = false;
+        if (feeInclusive) {
+          isFeeInclusive = true;
+        }
         const { envBatchServiceUrl } = returnEnvUrl(chainId);
         const instuctionData = yield fetchBatchInstructionDetails(
           `${envBatchServiceUrl}instruction/${instructionId}`,
@@ -2384,12 +2412,13 @@ var ActaBatch = class {
           userOperation
         } = yield account.estimateSingleBatchPaymentGas({
           chainId,
-          feeInclusive,
+          feeInclusive: isFeeInclusive,
           signerAddress,
           token: token2,
           walletClient,
           receivers,
-          totalAmount: totalAmountParsed
+          totalAmount: totalAmountParsed,
+          feebps: 20
         });
         return {
           estimatedGasCostInToken,
@@ -2420,6 +2449,10 @@ var ActaBatch = class {
           allowMaxTokenApproval,
           instructionId
         } = params;
+        let isFeeInclusive = false;
+        if (feeInclusive) {
+          isFeeInclusive = true;
+        }
         const { envBatchServiceUrl } = returnEnvUrl(chainId);
         const instuctionData = yield fetchBatchInstructionDetails(
           `${envBatchServiceUrl}instruction/${instructionId}`,
@@ -2458,11 +2491,12 @@ var ActaBatch = class {
           signerAddress,
           chainId,
           token: tokenSymbol,
-          feeInclusive,
+          feeInclusive: isFeeInclusive,
           receivers,
           totalAmount: totalAmountParsed,
           walletClient,
-          allowMaxTokenApproval
+          allowMaxTokenApproval,
+          feebps: 20
         });
         const txn = yield executeSingleBatchPaymentAPICall(
           `${envBatchServiceUrl}execute/single/batch`,
@@ -2473,7 +2507,7 @@ var ActaBatch = class {
             chainId,
             tokenAddress: tokenData.address,
             amount: toHex4(totalAmountParsed),
-            feeInclusive,
+            feeInclusive: isFeeInclusive,
             serviceType: "batch"
           },
           serviceParams
@@ -2501,6 +2535,10 @@ var ActaBatch = class {
           instructionId,
           executionTime
         } = params;
+        let isFeeInclusive = false;
+        if (feeInclusive) {
+          isFeeInclusive = true;
+        }
         const { envBatchServiceUrl } = returnEnvUrl(chainId);
         if (executionTime <= Date.now() + 1e3 * 60 * 2) {
           throw new Error(
@@ -2544,12 +2582,13 @@ var ActaBatch = class {
           signerAddress,
           chainId,
           token: tokenSymbol,
-          feeInclusive,
+          feeInclusive: isFeeInclusive,
           receivers,
           totalAmount: totalAmountParsed,
           walletClient,
           allowMaxTokenApproval,
-          count: 1
+          count: 1,
+          feebps: 20
         });
         const txn = yield executeScheduleBatchPaymentAPICall(
           `${envBatchServiceUrl}execute/schedule/batch`,
@@ -2559,7 +2598,7 @@ var ActaBatch = class {
             chainId,
             tokenAddress: tokenData.address,
             amount: toHex4(totalAmountParsed),
-            feeInclusive,
+            feeInclusive: isFeeInclusive,
             serviceType: "batch",
             amountExclusive: toHex4(amountExclusive),
             approval,
@@ -2580,6 +2619,125 @@ var ActaBatch = class {
       }
     });
   }
+  createSingleBatchPaymentWithoutKey(params, serviceParams) {
+    return __async(this, null, function* () {
+      try {
+        const {
+          chainId,
+          feeInclusive,
+          signerAddress,
+          token: tokenSymbol,
+          walletClient,
+          allowMaxTokenApproval,
+          receivers,
+          totalAmount
+        } = params;
+        let isFeeInclusive = false;
+        if (feeInclusive) {
+          isFeeInclusive = true;
+        }
+        const tokenData = getTokenByChainIdAndSymbol(chainId, tokenSymbol);
+        if (!tokenData) {
+          throw new Error("Token not supported");
+        }
+        const viemClient = new ViemClient(chainId, walletClient);
+        const account = new ActaAccount(
+          chainId,
+          viemClient.publicClient(),
+          walletClient
+        );
+        console.log("signing");
+        const rpcParameters = yield account.signSingleBatchOperation({
+          signerAddress,
+          chainId,
+          token: tokenSymbol,
+          feeInclusive: isFeeInclusive,
+          receivers,
+          totalAmount,
+          walletClient,
+          allowMaxTokenApproval,
+          feebps: 20
+        });
+        return {
+          senderAddress: signerAddress,
+          chainId,
+          tokenAddress: tokenData.address,
+          amount: toHex4(totalAmount),
+          feeInclusive: isFeeInclusive,
+          serviceType: "batch",
+          sessionId: serviceParams.sessionId,
+          rpcParameters
+        };
+      } catch (error) {
+        if (error instanceof Error) {
+          throw new Error(error.message);
+        }
+        throw new Error("Failed to create payment.");
+      }
+    });
+  }
+  createScheduleBatchPaymentWithoutKey(params, serviceParams) {
+    return __async(this, null, function* () {
+      try {
+        const {
+          chainId,
+          feeInclusive,
+          signerAddress,
+          token: tokenSymbol,
+          walletClient,
+          allowMaxTokenApproval,
+          executionTime,
+          receivers,
+          totalAmount
+        } = params;
+        let isFeeInclusive = false;
+        if (feeInclusive) {
+          isFeeInclusive = true;
+        }
+        const tokenData = getTokenByChainIdAndSymbol(chainId, tokenSymbol);
+        if (!tokenData) {
+          throw new Error("Token not supported");
+        }
+        const viemClient = new ViemClient(chainId, walletClient);
+        const account = new ActaAccount(
+          chainId,
+          viemClient.publicClient(),
+          walletClient
+        );
+        console.log("signing");
+        const { amountExclusive, approval } = yield account.signRecurringOrScheduleBatchPayments({
+          signerAddress,
+          chainId,
+          token: tokenSymbol,
+          feeInclusive: isFeeInclusive,
+          receivers,
+          totalAmount,
+          walletClient,
+          allowMaxTokenApproval,
+          count: 1,
+          feebps: 20
+        });
+        return {
+          senderAddress: signerAddress,
+          chainId,
+          tokenAddress: tokenData.address,
+          amount: toHex4(totalAmount),
+          feeInclusive: isFeeInclusive,
+          serviceType: "batch",
+          amountExclusive: toHex4(amountExclusive),
+          approval,
+          executionAt: executionTime,
+          sessionId: serviceParams.sessionId
+        };
+      } catch (error) {
+        console.log(error);
+        if (error instanceof Error) {
+          throw new Error(error.message);
+        }
+        throw new Error("Failed to create payment.");
+      }
+    });
+  }
 };
 
 // src/utils.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actalink/commonlib",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "author": "Actalink",
   "license": "MIT license",
   "publishConfig": {