@actalink/commonlib 0.0.41 → 0.1.0-dev

package/dist/index.cjs

@@ -680,6 +680,7 @@ var import_account_abstraction = require("viem/account-abstraction");
 var import_sdk = require("@zerodev/sdk");
 var import_constants = require("@zerodev/sdk/constants");
 var import_ecdsa_validator = require("@zerodev/ecdsa-validator");
+var import_smart_account_validator = require("@zerodev/smart-account-validator");
 var import_permissionless = require("permissionless");
 var import_pimlico = require("permissionless/clients/pimlico");
 
@@ -789,8 +790,9 @@ var ActaAccount = class {
     this.signer = signer;
     this.publicClient = publicClient;
   }
-  createAccount() {
+  createAccountFromEOA() {
     return __async(this, null, function* () {
+      console.log("EOA connected");
       const kernelVersion = import_constants.KERNEL_V3_1;
       const entryPoint = (0, import_constants.getEntryPoint)("0.7");
       const ecdsaValidator = yield (0, import_ecdsa_validator.signerToEcdsaValidator)(this.publicClient, {
@@ -808,6 +810,45 @@ var ActaAccount = class {
       return account;
     });
   }
+  createAccountFromSmartWallet() {
+    return __async(this, null, function* () {
+      console.log("Smart account Connected");
+      const kernelVersion = import_constants.KERNEL_V3_1;
+      const entryPoint = (0, import_constants.getEntryPoint)("0.7");
+      const validator = yield (0, import_smart_account_validator.signerToSmartAccountValidator)(this.publicClient, {
+        entryPoint: (0, import_constants.getEntryPoint)("0.7"),
+        kernelVersion,
+        signer: this.signer,
+        smartAccountType: "SAFE"
+      });
+      const account = yield (0, import_sdk.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();
@@ -908,10 +949,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.");
@@ -983,10 +1022,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.");
@@ -1879,7 +1916,7 @@ var ActaFlexDeposit = class {
     this.serviceSessionParams = void 0;
     this.depositSessionId = "";
     this.status = "not_started";
-    this.serviceType = "bexo";
+    this.serviceType = "deposit";
     this.allowMaxTokenApproval = false;
     var _a, _b, _c;
     this.connectorType = parameters.connectorType;
@@ -2004,7 +2041,7 @@ var ActaFlexDeposit = class {
     return __async(this, null, function* () {
       try {
         if (this.paymentType === "single") {
-          const paymentParams = this.serviceType === "bexo" ? __spreadProps(__spreadValues({}, servicePaymentParams), {
+          const paymentParams = this.serviceType === "deposit" ? __spreadProps(__spreadValues({}, servicePaymentParams), {
             depositSessionId: this.depositSessionId
           }) : servicePaymentParams;
           const id = yield this.createSinglePayment(paymentParams);
@@ -2013,7 +2050,7 @@ var ActaFlexDeposit = class {
         if (this.paymentType === "choose") {
         }
         if (this.paymentType === "recurring") {
-          const paymentParams = this.serviceType === "bexo" ? __spreadProps(__spreadValues({}, servicePaymentParams), {
+          const paymentParams = this.serviceType === "deposit" ? __spreadProps(__spreadValues({}, servicePaymentParams), {
             depositSessionId: this.depositSessionId
           }) : servicePaymentParams;
           const id = yield this.createRecurringPayments(paymentParams);