@actalink/commonlib 0.0.39-dev → 0.0.39

package/dist/index.js

@@ -565,7 +565,7 @@ function getTokenByChainIdAndAddress(chainId, address) {
 }
 
 // src/deposit.ts
-import { toHex as toHex2, zeroAddress as zeroAddress3 } from "viem";
+import { toHex as toHex3, zeroAddress as zeroAddress3 } from "viem";
 
 // src/account.ts
 import {
@@ -573,13 +573,16 @@ import {
   getAddress as getAddress2,
   parseAbi as parseAbi2,
   encodeFunctionData as encodeFunctionData2,
+  hexToBigInt,
   concatHex,
-  pad
+  pad,
+  toHex
 } from "viem";
 import { parseAccount } from "viem/utils";
 import {
   createPaymasterClient,
-  formatUserOperationRequest
+  formatUserOperationRequest,
+  entryPoint07Address
 } from "viem/account-abstraction";
 import {
   addressToEmptyAccount,
@@ -776,6 +779,48 @@ var ActaAccount = class {
       };
     });
   }
+  createAccountHelperBatch() {
+    return __async(this, null, function* () {
+      const account = yield this.createAccount();
+      const entryPoint = getEntryPoint("0.7");
+      const paymasterClient = createPaymasterClient({
+        transport: http2(`https://api.acta.link/paymaster/v1/rpc`)
+      });
+      const pimlicoClient = createPimlicoClient({
+        chain: getChainById(this.chainId),
+        transport: http2(`${proxyUrl}/rpc?chainId=${this.chainId}`),
+        entryPoint
+      });
+      const accountClient = createSmartAccountClient({
+        account,
+        chain: getChainById(this.chainId),
+        paymaster: paymasterClient,
+        bundlerTransport: http2(`${proxyUrl}/rpc?chainId=${this.chainId}`),
+        userOperation: {
+          estimateFeesPerGas: () => __async(this, null, function* () {
+            return (yield pimlicoClient.getUserOperationGasPrice()).fast;
+          })
+        }
+      });
+      const kernelAccountClient = createKernelAccountClient({
+        account,
+        chain: getChainById(this.chainId),
+        paymaster: paymasterClient,
+        bundlerTransport: http2(`${proxyUrl}/rpc?chainId=${this.chainId}`),
+        userOperation: {
+          estimateFeesPerGas: () => __async(this, null, function* () {
+            return (yield pimlicoClient.getUserOperationGasPrice()).fast;
+          })
+        }
+      });
+      return {
+        paymasterClient,
+        pimlicoClient,
+        accountClient,
+        kernelAccountClient
+      };
+    });
+  }
   estimateSinglePaymentGas(parameters) {
     return __async(this, null, function* () {
       const {
@@ -868,7 +913,7 @@ var ActaAccount = class {
         throw new Error("Receivers not found for batch payment");
       }
       const account = yield this.createAccount();
-      const { accountClient, pimlicoClient } = yield this.createAccountHelpers();
+      const { accountClient, pimlicoClient } = yield this.createAccountHelperBatch();
       const fromAddress = signerAddress;
       const smartAccountAddress = account.address;
       const token2 = getTokenByChainIdAndSymbol(chainId, tokenSymbol);
@@ -899,18 +944,42 @@ var ActaAccount = class {
           }
         ]
       });
-      const quotes = yield pimlicoClient.getTokenQuotes({
-        tokens: [token2.address],
-        chain: getChainById(chainId)
+      const data = {
+        jsonrpc: "2.0",
+        id: 1,
+        method: "pm_getTokenQuotes",
+        params: [
+          {
+            tokens: [token2.address]
+          },
+          entryPoint07Address,
+          toHex(chainId)
+        ]
+      };
+      const res = yield fetch("https://api.acta.link/paymaster/v1/rpc", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify(data)
+      }).then((response) => {
+        if (!response.ok) {
+          throw new Error("HTTP error " + response.status);
+        }
+        return response.json();
       });
       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 quotes = res.result;
+      if (!quotes.paymaster) {
+        throw new Error("Error fetching quotes");
+      }
+      const postOpGas = hexToBigInt(quotes.postOpGas);
+      const exchangeRate = hexToBigInt(quotes.exchangeRate);
+      const exchangeRateNativeToUsd = hexToBigInt(quotes.exchangeRateNativeToUsd);
+      const paymaster = quotes.paymaster;
       const maxCostInWei = userOperationMaxCost + postOpGas * userOperation.maxFeePerGas;
       const costInToken = maxCostInWei * exchangeRate / BigInt(1e18);
       const costInUsd = maxCostInWei * exchangeRateNativeToUsd / BigInt(1e18);
@@ -1066,7 +1135,7 @@ var ActaAccount = class {
           feebps
         });
         const account = yield this.createAccount();
-        const { accountClient } = yield this.createAccountHelpers();
+        const { accountClient } = yield this.createAccountHelperBatch();
         const fromAddress = signerAddress;
         const smartAccountAddress = account.address;
         const amountToTransfer = feeInclusive ? totalAmount : feeExclusiveAmountInToken;
@@ -1166,7 +1235,7 @@ var ActaAccount = class {
           signer: this.signer
         }
       );
-      const sessionKeyAddress = "0x182f375CD15102B22A55702a516d36f8a6443E40";
+      const sessionKeyAddress = "0xFDEed8e268D74DF71f3Db7409F8A8290FF1263ED";
       const emptyAccount = addressToEmptyAccount(sessionKeyAddress);
       const emptySessionKeySigner = yield toECDSASigner({ signer: emptyAccount });
       const {
@@ -1294,7 +1363,7 @@ var ActaAccount = class {
           signer: this.signer
         }
       );
-      const sessionKeyAddress = "0x182f375CD15102B22A55702a516d36f8a6443E40";
+      const sessionKeyAddress = "0xFDEed8e268D74DF71f3Db7409F8A8290FF1263ED";
       const emptyAccount = addressToEmptyAccount(sessionKeyAddress);
       const emptySessionKeySigner = yield toECDSASigner({ signer: emptyAccount });
       const {
@@ -1400,7 +1469,7 @@ var ActaAccount = class {
       const viemClient = new ViemClient(this.chainId, this.signer);
       const account = yield this.createAccount();
       const { kernelAccountClient, accountClient } = yield this.createAccountHelpers();
-      const sessionKeyAddress = "0x182f375CD15102B22A55702a516d36f8a6443E40";
+      const sessionKeyAddress = "0xFDEed8e268D74DF71f3Db7409F8A8290FF1263ED";
       const emptyAccount = addressToEmptyAccount(sessionKeyAddress);
       const emptySessionKeySigner = yield toECDSASigner({ signer: emptyAccount });
       const callPolicy = toCallPolicy({
@@ -1476,7 +1545,7 @@ var ActaAccount = class {
 };
 
 // src/api.ts
-import { toHex } from "viem";
+import { toHex as toHex2 } from "viem";
 var HttpMethod = /* @__PURE__ */ ((HttpMethod2) => {
   HttpMethod2["Get"] = "get";
   HttpMethod2["Post"] = "post";
@@ -1562,8 +1631,8 @@ function verifySessionAPICall(url, sessionId) {
 function scheduleRecurringPaymentsAPICall(url, params) {
   return __async(this, null, function* () {
     const parsedParams = __spreadProps(__spreadValues({}, params), {
-      amount: toHex(params.amount),
-      amountExclusive: toHex(params.amountExclusive)
+      amount: toHex2(params.amount),
+      amountExclusive: toHex2(params.amountExclusive)
     });
     const response = yield sendRequest({
       url,
@@ -1577,8 +1646,8 @@ function scheduleSubscriptionPaymentsAPICall(url, paymentParams, serviceParams)
   return __async(this, null, function* () {
     const parsedParams = {
       paymentParams: __spreadProps(__spreadValues({}, paymentParams), {
-        amount: toHex(paymentParams.amount),
-        amountExclusive: toHex(paymentParams.amountExclusive)
+        amount: toHex2(paymentParams.amount),
+        amountExclusive: toHex2(paymentParams.amountExclusive)
       }),
       serviceParams
     };
@@ -1802,7 +1871,7 @@ var ActaDeposit = class {
               signerAddress: this.signerAddress,
               chainId: this.chainId,
               token: token2.address,
-              amount: toHex2(this.amount),
+              amount: toHex3(this.amount),
               receiver: this.receiver,
               feeInclusive: this.feeInclusive,
               serviceType: "deposit",
@@ -1934,7 +2003,7 @@ var ActaDeposit = class {
             receiverAddress: receiver,
             chainId,
             tokenAddress: token2.address,
-            amount: toHex2(amount),
+            amount: toHex3(amount),
             feeInclusive,
             serviceType
           },
@@ -2079,9 +2148,9 @@ var ActaDeposit = class {
 };
 
 // src/billing.ts
-import { toHex as toHex3 } from "viem";
-var billingServiceUrl = "https://api.fhoton.xyz/pay/api/v1/";
-var billingServiceTestUrl = "https://api.fhoton.xyz/pay/test/api/v1/";
+import { toHex as toHex4 } from "viem";
+var billingServiceUrl = "https://api.acta.link/pay/api/v1/";
+var billingServiceTestUrl = "https://api.acta.link/pay/test/api/v1/";
 var returnEnvUrl2 = (chainId) => {
   const mainnetChain = mainnetChains.find((c) => c.id === chainId);
   const testnetChain = testnetChains.find((c) => c.id === chainId);
@@ -2203,7 +2272,7 @@ var ActaBilling = class {
             receiverAddress: receiver,
             chainId,
             tokenAddress: token2.address,
-            amount: toHex3(amount),
+            amount: toHex4(amount),
             feeInclusive,
             serviceType
           },
@@ -2323,11 +2392,11 @@ var ActaBilling = class {
 import {
   getAddress as getAddress3,
   parseUnits,
-  toHex as toHex4,
+  toHex as toHex5,
   zeroAddress as zeroAddress4
 } from "viem";
-var batchServiceUrl = "https://api.fhoton.xyz/bexo/api/v1/";
-var batchServiceTestUrl = "https://api.fhoton.xyz/bexo/test/api/v1/";
+var batchServiceUrl = "https://api.acta.link/bexo/api/v1/";
+var batchServiceTestUrl = "https://api.acta.link/bexo/test/api/v1/";
 var returnEnvUrl3 = (chainId) => {
   const mainnetChain = mainnetChains.find((c) => c.id === chainId);
   const testnetChain = testnetChains.find((c) => c.id === chainId);
@@ -2548,7 +2617,7 @@ var ActaBatch = class {
             senderAddress: signerAddress,
             chainId,
             tokenAddress: tokenData.address,
-            amount: toHex4(totalAmountParsed),
+            amount: toHex5(totalAmountParsed),
             feeInclusive: isFeeInclusive,
             serviceType: "batch"
           },
@@ -2641,10 +2710,10 @@ var ActaBatch = class {
             senderAddress: signerAddress,
             chainId,
             tokenAddress: tokenData.address,
-            amount: toHex4(totalAmountParsed),
+            amount: toHex5(totalAmountParsed),
             feeInclusive: isFeeInclusive,
             serviceType: "batch",
-            amountExclusive: toHex4(amountExclusive),
+            amountExclusive: toHex5(amountExclusive),
             approval,
             executionAt: executionTime
           },
@@ -2706,7 +2775,7 @@ var ActaBatch = class {
           senderAddress: signerAddress,
           chainId,
           tokenAddress: tokenData.address,
-          amount: toHex4(totalAmount),
+          amount: toHex5(totalAmount),
           feeInclusive: isFeeInclusive,
           serviceType: "batch",
           sessionId: serviceParams.sessionId,
@@ -2765,10 +2834,10 @@ var ActaBatch = class {
           senderAddress: signerAddress,
           chainId,
           tokenAddress: tokenData.address,
-          amount: toHex4(totalAmount),
+          amount: toHex5(totalAmount),
           feeInclusive: isFeeInclusive,
           serviceType: "batch",
-          amountExclusive: toHex4(amountExclusive),
+          amountExclusive: toHex5(amountExclusive),
           approval,
           executionAt: executionTime,
           sessionId: serviceParams.sessionId
@@ -2826,10 +2895,10 @@ import {
 } from "@zerodev/permissions/policies";
 import { coerce, gt } from "semver";
 var ECDSA_SIGNER_CONTRACT = "0x6A6F069E2a08c2468e7724Ab3250CdBFBA14D4FF";
-var billingServiceUrl2 = "https://api.fhoton.xyz/pay/v1/";
+var billingServiceUrl2 = "https://api.acta.link/pay/v1/";
 var depositServiceUrl2 = "https://api.acta.link/bexo/v1/";
-var transactionServiceUrl2 = "https://api.fhoton.xyz/transaction/v1/";
-var billingServiceTestUrl2 = "https://api.fhoton.xyz/pay/test/v1/";
+var transactionServiceUrl2 = "https://api.acta.link/transaction/v1/";
+var billingServiceTestUrl2 = "https://api.acta.link/pay/test/v1/";
 var toSignerId = (signer) => {
   return encodeAbiParameters(
     [{ name: "signerData", type: "bytes" }],
@@ -3149,21 +3218,36 @@ var decodeParamsFromInitCode = (initCode, kernelVersion) => {
     throw new Error("Invalid initCode");
   return { index, validatorInitData, useMetaFactory };
 };
-var getPeriodInterval = (periodUnit) => {
+var getPeriodInterval = (periodUnit, currentDate = /* @__PURE__ */ new Date(), count = 1) => {
+  const nextDate = new Date(currentDate);
+  const c = count;
   switch (periodUnit) {
     case "5mins":
-      return 5 * 60;
+      nextDate.setMinutes(nextDate.getMinutes() + 5 * c);
+      break;
     case "day":
-      return 24 * 60 * 60;
+      nextDate.setDate(nextDate.getDate() + 1 * c);
+      break;
     case "week":
-      return 7 * 24 * 60 * 60;
+      nextDate.setDate(nextDate.getDate() + 7 * c);
+      break;
     case "month":
-      return 28 * 24 * 60 * 60;
+      nextDate.setMonth(nextDate.getMonth() + 1 * c);
+      break;
+    case "quarter":
+      nextDate.setMonth(nextDate.getMonth() + 3 * c);
+      break;
+    case "halfyear":
+      nextDate.setMonth(nextDate.getMonth() + 6 * c);
+      break;
     case "year":
-      return 365 * 24 * 60 * 60;
+      nextDate.setFullYear(nextDate.getFullYear() + 1 * c);
+      break;
     default:
       throw new Error("Invalid period unit");
   }
+  const milliSeconds = nextDate.getTime();
+  return { milliSeconds, nextDate };
 };
 var createBillingCheckoutSession = (serviceSessionparams) => __async(null, null, function* () {
   var _a, _b, _c, _d;

package/package.json

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