@actalink/commonlib 0.0.42 → 0.1.0

package/dist/index.js

@@ -565,7 +565,7 @@ function getTokenByChainIdAndAddress(chainId, address) {
 }
 
 // src/flexdeposit.ts
-import { toHex as toHex3, zeroAddress as zeroAddress3 } from "viem";
+import { toHex as toHex3, zeroAddress as zeroAddress2 } from "viem";
 
 // src/account.ts
 import {
@@ -596,6 +596,7 @@ import {
   VALIDATOR_TYPE
 } from "@zerodev/sdk/constants";
 import { signerToEcdsaValidator } from "@zerodev/ecdsa-validator";
+import { signerToSmartAccountValidator } from "@zerodev/smart-account-validator";
 import { createSmartAccountClient, getRequiredPrefund } from "permissionless";
 import { createPimlicoClient } from "permissionless/clients/pimlico";
 
@@ -718,8 +719,9 @@ var ActaAccount = class {
     this.signer = signer;
     this.publicClient = publicClient;
   }
-  createAccount() {
+  createAccountFromEOA() {
     return __async(this, null, function* () {
+      console.log("EOA connected");
       const kernelVersion = KERNEL_V3_1;
       const entryPoint = getEntryPoint("0.7");
       const ecdsaValidator = yield signerToEcdsaValidator(this.publicClient, {
@@ -737,12 +739,51 @@ var ActaAccount = class {
       return account;
     });
   }
+  createAccountFromSmartWallet() {
+    return __async(this, null, function* () {
+      console.log("Smart account Connected");
+      const kernelVersion = KERNEL_V3_1;
+      const entryPoint = getEntryPoint("0.7");
+      const validator = yield signerToSmartAccountValidator(this.publicClient, {
+        entryPoint: getEntryPoint("0.7"),
+        kernelVersion,
+        signer: this.signer,
+        smartAccountType: "SAFE"
+      });
+      const account = yield createKernelAccount(this.publicClient, {
+        plugins: {
+          sudo: validator
+        },
+        entryPoint,
+        kernelVersion
+      });
+      return account;
+    });
+  }
+  createAccount() {
+    return __async(this, null, function* () {
+      const signerAccount = this.signer.account;
+      if (!signerAccount) {
+        throw new Error("Signer account not provided");
+      }
+      const code = yield this.publicClient.getCode({
+        address: signerAccount.address
+      });
+      let account;
+      if (code && code.length > 0) {
+        account = yield this.createAccountFromSmartWallet();
+      } else {
+        account = yield this.createAccountFromEOA();
+      }
+      return account;
+    });
+  }
   createAccountHelpers() {
     return __async(this, null, function* () {
       const account = yield this.createAccount();
       const entryPoint = getEntryPoint("0.7");
       const paymasterClient = createPaymasterClient({
-        transport: http2(`${proxyUrl}/rpc?chainId=${this.chainId}`)
+        transport: http2(`https://api.acta.link/paymaster/v1/rpc`)
       });
       const pimlicoClient = createPimlicoClient({
         chain: getChainById(this.chainId),
@@ -837,10 +878,8 @@ var ActaAccount = class {
       if (receiver === signerAddress) {
         throw new Error("Receiver cannot be the same as the signer.");
       }
-      const account = yield this.createAccount();
       const { accountClient, pimlicoClient } = yield this.createAccountHelpers();
       const fromAddress = signerAddress;
-      const smartAccountAddress = account.address;
       const token2 = getTokenByChainIdAndSymbol(chainId, tokenSymbol);
       if (!token2) {
         throw new Error("Token not found.");
@@ -865,17 +904,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 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);
@@ -889,7 +953,7 @@ var ActaAccount = class {
         estimatedTotalFeesInToken,
         feeInclusiveAmountInToken,
         feeExclusiveAmountInToken,
-        paymaster: quotes[0].paymaster,
+        paymaster,
         userOperation
       };
     });
@@ -912,10 +976,8 @@ var ActaAccount = class {
       if (receivers.length === 0) {
         throw new Error("Receivers not found for batch payment");
       }
-      const account = yield this.createAccount();
       const { accountClient, pimlicoClient } = yield this.createAccountHelperBatch();
       const fromAddress = signerAddress;
-      const smartAccountAddress = account.address;
       const token2 = getTokenByChainIdAndSymbol(chainId, tokenSymbol);
       if (!token2) {
         throw new Error("Token not found.");
@@ -1836,13 +1898,13 @@ var ActaFlexDeposit = class {
   createSession(serviceSessionparams) {
     return __async(this, null, function* () {
       try {
-        if (!this.signerAddress || this.signerAddress === zeroAddress3) {
+        if (!this.signerAddress || this.signerAddress === zeroAddress2) {
           throw new Error("Signer address is required.");
         }
         if (this.paymentType !== "single" && this.paymentType !== "choose" && this.paymentType !== "recurring") {
           throw new Error("Invalid payment type.");
         }
-        if (!this.receiver || this.receiver === zeroAddress3) {
+        if (!this.receiver || this.receiver === zeroAddress2) {
           throw new Error("Receiver is required.");
         }
         if (this.paymentType === "recurring" && (this.count === void 0 || this.count === 0)) {
@@ -2152,7 +2214,7 @@ import {
   getAddress as getAddress3,
   parseUnits,
   toHex as toHex4,
-  zeroAddress as zeroAddress4
+  zeroAddress as zeroAddress3
 } from "viem";
 var batchServiceUrl = "https://flex-api.acta.link/flex/batch/api/v1/";
 var batchServiceTestUrl = "https://flex-api.acta.link/flex/batch/test/api/v1/";
@@ -2184,7 +2246,7 @@ var ActaFlexBatch = class {
         if (!this.APIkey) {
           throw new Error("No API key provided.");
         }
-        if (!signerAddress || signerAddress === zeroAddress4) {
+        if (!signerAddress || signerAddress === zeroAddress3) {
           throw new Error("Signer address is required.");
         }
         if (!name || name === "") {
@@ -2858,7 +2920,7 @@ import {
   getAddress as getAddress4,
   parseUnits as parseUnits2,
   toHex as toHex6,
-  zeroAddress as zeroAddress5
+  zeroAddress as zeroAddress4
 } from "viem";
 var batchServiceUrl2 = "https://api.acta.link/bexo/api/v1/";
 var batchServiceTestUrl2 = "https://api.acta.link/bexo/test/api/v1/";
@@ -2890,7 +2952,7 @@ var ActaBatch = class {
         if (!this.APIkey) {
           throw new Error("No API key provided.");
         }
-        if (!signerAddress || signerAddress === zeroAddress5) {
+        if (!signerAddress || signerAddress === zeroAddress4) {
           throw new Error("Signer address is required.");
         }
         if (!name || name === "") {
@@ -3337,7 +3399,7 @@ import {
   encodeAbiParameters,
   keccak256,
   slice,
-  zeroAddress as zeroAddress6,
+  zeroAddress as zeroAddress5,
   decodeFunctionData,
   hexToBigInt as hexToBigInt2
 } from "viem";
@@ -3449,7 +3511,7 @@ function toPermissionValidator2(_0, _1) {
     return __spreadProps(__spreadValues({}, signer.account), {
       supportedKernelVersions: ">=0.3.0",
       validatorType: "PERMISSION",
-      address: zeroAddress6,
+      address: zeroAddress5,
       source: "PermissionValidator",
       getEnableData,
       getIdentifier: getPermissionId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actalink/commonlib",
-  "version": "0.0.42",
+  "version": "0.1.0",
   "author": "Actalink",
   "license": "MIT license",
   "publishConfig": {
@@ -33,12 +33,13 @@
     "@zerodev/ecdsa-validator": "^5.4.8",
     "@zerodev/permissions": "5.5.12",
     "@zerodev/sdk": "5.4.41",
+    "@zerodev/smart-account-validator": "^5.4.1",
     "@zerodev/webauthn-key": "^5.4.4",
     "permissionless": "^0.2.47",
     "semver": "^7.7.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3",
-    "viem": "2.30.0"
+    "viem": "2.43.2"
   },
   "devDependencies": {
     "@types/semver": "^7.7.0",