@actalink/commonlib 0.0.3 → 0.0.5

package/dist/index.cjs

@@ -612,14 +612,12 @@ var import_viem6 = require("viem");
 
 // src/account.ts
 var import_viem4 = require("viem");
-var import_accounts3 = require("viem/accounts");
 var import_account_abstraction2 = require("viem/account-abstraction");
 var import_sdk2 = require("@zerodev/sdk");
 var import_constants = require("@zerodev/sdk/constants");
 var import_ecdsa_validator = require("@zerodev/ecdsa-validator");
 var import_permissionless = require("permissionless");
 var import_pimlico = require("permissionless/clients/pimlico");
-var import_pimlico2 = require("permissionless/experimental/pimlico");
 
 // src/rpc.ts
 function getRpcByChainId(chainId) {
@@ -705,7 +703,7 @@ var ViemClient = class {
         signerAddress,
         spender
       );
-      if (allowance < amount || allowMaxTokenApproval) {
+      if (allowance < amount) {
         const txn = yield this.walletClient.sendTransaction({
           to: token2.address,
           account: signerAddress,
@@ -1147,8 +1145,7 @@ var ActaAccount = class {
         userOperation: {
           estimateFeesPerGas: () => __async(this, null, function* () {
             return (yield pimlicoClient.getUserOperationGasPrice()).fast;
-          }),
-          prepareUserOperation: (0, import_pimlico2.prepareUserOperationForErc20Paymaster)(pimlicoClient)
+          })
         }
       });
       return { paymasterClient, pimlicoClient, accountClient };
@@ -1188,28 +1185,17 @@ var ActaAccount = class {
             to: (0, import_viem4.getAddress)(token2.address),
             abi: (0, import_viem4.parseAbi)(["function transferFrom(address,address,uint)"]),
             functionName: "transferFrom",
-            args: [fromAddress, smartAccountAddress, BigInt(0)]
-          },
-          {
-            to: (0, import_viem4.getAddress)(token2.address),
-            abi: (0, import_viem4.parseAbi)(["function approve(address,uint)"]),
-            functionName: "approve",
-            args: [paymaster, BigInt(0)]
-          },
-          {
-            to: (0, import_viem4.getAddress)(token2.address),
-            abi: (0, import_viem4.parseAbi)(["function transfer(address,uint)"]),
-            functionName: "transfer",
             args: [
+              fromAddress,
               "0x061BA68bc8208F4AddBeE86F74F17D77129cCF70",
               BigInt(0)
             ]
           },
           {
             to: (0, import_viem4.getAddress)(token2.address),
-            abi: (0, import_viem4.parseAbi)(["function transfer(address,uint)"]),
-            functionName: "transfer",
-            args: [receiver, BigInt(0)]
+            abi: (0, import_viem4.parseAbi)(["function transferFrom(address,address,uint)"]),
+            functionName: "transferFrom",
+            args: [fromAddress, receiver, BigInt(0)]
           }
         ]
       });
@@ -1292,33 +1278,19 @@ var ActaAccount = class {
               to: (0, import_viem4.getAddress)(token2.address),
               abi: (0, import_viem4.parseAbi)(["function transferFrom(address,address,uint)"]),
               functionName: "transferFrom",
-              args: [fromAddress, smartAccountAddress, amountToTransfer]
-            },
-            {
-              to: (0, import_viem4.getAddress)(token2.address),
-              abi: (0, import_viem4.parseAbi)(["function approve(address,uint)"]),
-              functionName: "approve",
-              args: [paymaster, estimatedGasCostInToken]
-            },
-            {
-              to: (0, import_viem4.getAddress)(token2.address),
-              abi: (0, import_viem4.parseAbi)(["function transfer(address,uint)"]),
-              functionName: "transfer",
               args: [
-                "0x061BA68bc8208F4AddBeE86F74F17D77129cCF70",
-                ActalinkFeesInToken
+                fromAddress,
+                "0xC4910E5ec82Da0A41aF9C6360b7A1f531e1e37B0",
+                estimatedGasCostInToken
               ]
             },
             {
               to: (0, import_viem4.getAddress)(token2.address),
-              abi: (0, import_viem4.parseAbi)(["function transfer(address,uint)"]),
-              functionName: "transfer",
-              args: [receiver, receiverAmount]
+              abi: (0, import_viem4.parseAbi)(["function transferFrom(address,address,uint)"]),
+              functionName: "transferFrom",
+              args: [fromAddress, receiver, receiverAmount]
             }
-          ],
-          paymasterContext: {
-            token: token2.address
-          }
+          ]
         });
         const signature = yield account.signUserOperation(__spreadProps(__spreadValues({}, userOperation), {
           chainId: this.chainId
@@ -1373,11 +1345,6 @@ var ActaAccount = class {
       const smartAccountAddress = account.address;
       const viemClient = new ViemClient(this.chainId, this.signer);
       const { paymasterClient, pimlicoClient } = yield this.createAccountHelpers();
-      const sessionKeySigner = yield toECDSASigner(
-        (0, import_accounts3.privateKeyToAccount)(
-          "0x8519baaeb81ebbcf3597d93c2f9790d1eda37097121e844e1b88c1ab77b67ae2"
-        )
-      );
       const ecdsaValidator = yield (0, import_ecdsa_validator.signerToEcdsaValidator)(
         viemClient.publicClient(),
         {
@@ -1386,7 +1353,7 @@ var ActaAccount = class {
           signer: this.signer
         }
       );
-      const sessionKeyAddress = "0x0744F720fe178AC21F25a30263B6269a1C0bB106";
+      const sessionKeyAddress = "0xFDEed8e268D74DF71f3Db7409F8A8290FF1263ED";
       const emptyAccount = (0, import_sdk2.addressToEmptyAccount)(sessionKeyAddress);
       const emptySessionKeySigner = yield toECDSASigner(emptyAccount);
       const {
@@ -1426,45 +1393,13 @@ var ActaAccount = class {
                 condition: import_policies2.ParamCondition.EQUAL,
                 value: signerAddress
               },
-              {
-                condition: import_policies2.ParamCondition.EQUAL,
-                value: smartAccountAddress
-              },
-              {
-                condition: import_policies2.ParamCondition.GREATER_THAN_OR_EQUAL,
-                value: 0
-              }
-            ]
-          },
-          {
-            target: token2.address,
-            valueLimit: BigInt(0),
-            abi: (0, import_viem4.parseAbi)(["function approve(address,uint)"]),
-            functionName: "approve",
-            args: [
-              {
-                condition: import_policies2.ParamCondition.EQUAL,
-                value: paymaster
-              },
-              {
-                condition: import_policies2.ParamCondition.GREATER_THAN_OR_EQUAL,
-                value: 0
-              }
-            ]
-          },
-          {
-            target: token2.address,
-            valueLimit: BigInt(0),
-            abi: (0, import_viem4.parseAbi)(["function transfer(address,uint)"]),
-            functionName: "transfer",
-            args: [
               {
                 condition: import_policies2.ParamCondition.ONE_OF,
-                value: ["0xbDCBee616C26D5282227a672C3d0B87EA477A3fe", receiver]
+                value: ["0xC4910E5ec82Da0A41aF9C6360b7A1f531e1e37B0", receiver]
               },
               {
-                condition: import_policies2.ParamCondition.GREATER_THAN_OR_EQUAL,
-                value: 0
+                condition: import_policies2.ParamCondition.LESS_THAN_OR_EQUAL,
+                value: amountToTransfer + amountToTransfer / BigInt(2)
               }
             ]
           }
@@ -1921,6 +1856,38 @@ var ActaDeposit = 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
+      });
+      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"];
+    });
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.d.cts

@@ -241,6 +241,7 @@ declare class ActaDeposit {
     createPayment(servicePaymentParams?: any): Promise<any>;
     createSinglePayment(servicePaymentParams?: any): Promise<any>;
     createRecurringPayments(servicePaymentParams?: any): Promise<any>;
+    getPaymentSteps(): Promise<string[]>;
 }
 
 declare class ActaAccount {

package/dist/index.d.ts

@@ -241,6 +241,7 @@ declare class ActaDeposit {
     createPayment(servicePaymentParams?: any): Promise<any>;
     createSinglePayment(servicePaymentParams?: any): Promise<any>;
     createRecurringPayments(servicePaymentParams?: any): Promise<any>;
+    getPaymentSteps(): Promise<string[]>;
 }
 
 declare class ActaAccount {

package/dist/index.js

@@ -525,7 +525,6 @@ import {
   getAddress as getAddress2,
   parseAbi as parseAbi2
 } from "viem";
-import { privateKeyToAccount as privateKeyToAccount2 } from "viem/accounts";
 import {
   createPaymasterClient,
   formatUserOperationRequest
@@ -535,7 +534,6 @@ import { getEntryPoint, KERNEL_V3_1 } from "@zerodev/sdk/constants";
 import { signerToEcdsaValidator } from "@zerodev/ecdsa-validator";
 import { createSmartAccountClient } from "permissionless";
 import { createPimlicoClient } from "permissionless/clients/pimlico";
-import { prepareUserOperationForErc20Paymaster } from "permissionless/experimental/pimlico";
 
 // src/rpc.ts
 function getRpcByChainId(chainId) {
@@ -627,7 +625,7 @@ var ViemClient = class {
         signerAddress,
         spender
       );
-      if (allowance < amount || allowMaxTokenApproval) {
+      if (allowance < amount) {
         const txn = yield this.walletClient.sendTransaction({
           to: token2.address,
           account: signerAddress,
@@ -1103,8 +1101,7 @@ var ActaAccount = class {
         userOperation: {
           estimateFeesPerGas: () => __async(this, null, function* () {
             return (yield pimlicoClient.getUserOperationGasPrice()).fast;
-          }),
-          prepareUserOperation: prepareUserOperationForErc20Paymaster(pimlicoClient)
+          })
         }
       });
       return { paymasterClient, pimlicoClient, accountClient };
@@ -1144,28 +1141,17 @@ var ActaAccount = class {
             to: getAddress2(token2.address),
             abi: parseAbi2(["function transferFrom(address,address,uint)"]),
             functionName: "transferFrom",
-            args: [fromAddress, smartAccountAddress, BigInt(0)]
-          },
-          {
-            to: getAddress2(token2.address),
-            abi: parseAbi2(["function approve(address,uint)"]),
-            functionName: "approve",
-            args: [paymaster, BigInt(0)]
-          },
-          {
-            to: getAddress2(token2.address),
-            abi: parseAbi2(["function transfer(address,uint)"]),
-            functionName: "transfer",
             args: [
+              fromAddress,
               "0x061BA68bc8208F4AddBeE86F74F17D77129cCF70",
               BigInt(0)
             ]
           },
           {
             to: getAddress2(token2.address),
-            abi: parseAbi2(["function transfer(address,uint)"]),
-            functionName: "transfer",
-            args: [receiver, BigInt(0)]
+            abi: parseAbi2(["function transferFrom(address,address,uint)"]),
+            functionName: "transferFrom",
+            args: [fromAddress, receiver, BigInt(0)]
           }
         ]
       });
@@ -1248,33 +1234,19 @@ var ActaAccount = class {
               to: getAddress2(token2.address),
               abi: parseAbi2(["function transferFrom(address,address,uint)"]),
               functionName: "transferFrom",
-              args: [fromAddress, smartAccountAddress, amountToTransfer]
-            },
-            {
-              to: getAddress2(token2.address),
-              abi: parseAbi2(["function approve(address,uint)"]),
-              functionName: "approve",
-              args: [paymaster, estimatedGasCostInToken]
-            },
-            {
-              to: getAddress2(token2.address),
-              abi: parseAbi2(["function transfer(address,uint)"]),
-              functionName: "transfer",
               args: [
-                "0x061BA68bc8208F4AddBeE86F74F17D77129cCF70",
-                ActalinkFeesInToken
+                fromAddress,
+                "0xC4910E5ec82Da0A41aF9C6360b7A1f531e1e37B0",
+                estimatedGasCostInToken
               ]
             },
             {
               to: getAddress2(token2.address),
-              abi: parseAbi2(["function transfer(address,uint)"]),
-              functionName: "transfer",
-              args: [receiver, receiverAmount]
+              abi: parseAbi2(["function transferFrom(address,address,uint)"]),
+              functionName: "transferFrom",
+              args: [fromAddress, receiver, receiverAmount]
             }
-          ],
-          paymasterContext: {
-            token: token2.address
-          }
+          ]
         });
         const signature = yield account.signUserOperation(__spreadProps(__spreadValues({}, userOperation), {
           chainId: this.chainId
@@ -1329,11 +1301,6 @@ var ActaAccount = class {
       const smartAccountAddress = account.address;
       const viemClient = new ViemClient(this.chainId, this.signer);
       const { paymasterClient, pimlicoClient } = yield this.createAccountHelpers();
-      const sessionKeySigner = yield toECDSASigner(
-        privateKeyToAccount2(
-          "0x8519baaeb81ebbcf3597d93c2f9790d1eda37097121e844e1b88c1ab77b67ae2"
-        )
-      );
       const ecdsaValidator = yield signerToEcdsaValidator(
         viemClient.publicClient(),
         {
@@ -1342,7 +1309,7 @@ var ActaAccount = class {
           signer: this.signer
         }
       );
-      const sessionKeyAddress = "0x0744F720fe178AC21F25a30263B6269a1C0bB106";
+      const sessionKeyAddress = "0xFDEed8e268D74DF71f3Db7409F8A8290FF1263ED";
       const emptyAccount = addressToEmptyAccount(sessionKeyAddress);
       const emptySessionKeySigner = yield toECDSASigner(emptyAccount);
       const {
@@ -1382,45 +1349,13 @@ var ActaAccount = class {
                 condition: ParamCondition.EQUAL,
                 value: signerAddress
               },
-              {
-                condition: ParamCondition.EQUAL,
-                value: smartAccountAddress
-              },
-              {
-                condition: ParamCondition.GREATER_THAN_OR_EQUAL,
-                value: 0
-              }
-            ]
-          },
-          {
-            target: token2.address,
-            valueLimit: BigInt(0),
-            abi: parseAbi2(["function approve(address,uint)"]),
-            functionName: "approve",
-            args: [
-              {
-                condition: ParamCondition.EQUAL,
-                value: paymaster
-              },
-              {
-                condition: ParamCondition.GREATER_THAN_OR_EQUAL,
-                value: 0
-              }
-            ]
-          },
-          {
-            target: token2.address,
-            valueLimit: BigInt(0),
-            abi: parseAbi2(["function transfer(address,uint)"]),
-            functionName: "transfer",
-            args: [
               {
                 condition: ParamCondition.ONE_OF,
-                value: ["0xbDCBee616C26D5282227a672C3d0B87EA477A3fe", receiver]
+                value: ["0xC4910E5ec82Da0A41aF9C6360b7A1f531e1e37B0", receiver]
               },
               {
-                condition: ParamCondition.GREATER_THAN_OR_EQUAL,
-                value: 0
+                condition: ParamCondition.LESS_THAN_OR_EQUAL,
+                value: amountToTransfer + amountToTransfer / BigInt(2)
               }
             ]
           }
@@ -1877,6 +1812,38 @@ var ActaDeposit = 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
+      });
+      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"];
+    });
+  }
 };
 export {
   ActaAccount,

package/package.json

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