update: 7579 actions (#90)

Author: yoanslvy

packages/sdk/package.json

@@ -6,7 +6,7 @@
       "name": "yoanslvy"
     }
   ],
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "SDK Cometh Connect 4337",
   "repository": "https://github.com/cometh-hq/connect-sdk-4337.git",
   "keywords": [

packages/sdk/src/core/actions/accounts/7579/setFallbackTo7579.ts

@@ -11,6 +11,7 @@ import {
     getSmartSessionsValidator,
 } from "@rhinestone/module-sdk";
 import { isSmartAccountDeployed } from "permissionless";
+import { isModuleInstalled } from "permissionless/actions/erc7579";
 
 import { sendTransaction } from "permissionless/actions/smartAccount";
 import {
@@ -23,6 +24,7 @@ import {
     type Transport,
     createPublicClient,
 } from "viem";
+import type { SmartAccount } from "viem/account-abstraction";
 import { encodeFunctionData, getAction, parseAbi } from "viem/utils";
 
 export async function setFallbackTo7579<
@@ -70,6 +72,32 @@ export async function setFallbackTo7579<
 
     const smartSessions = getSmartSessionsValidator({});
 
+    let isSessionValidatorInstalled: boolean;
+
+    try {
+        isSessionValidatorInstalled = await getAction(
+            client,
+            isModuleInstalled,
+            "isModuleInstalled"
+        )({
+            type: smartSessions.type,
+            address: smartSessions.address,
+            context: smartSessions.initData,
+            account: client.account as SmartAccount,
+        });
+    } catch {
+        isSessionValidatorInstalled = false;
+    }
+
+    const validators = !isSessionValidatorInstalled
+        ? [
+              {
+                  module: smartSessions.address,
+                  initData: smartSessions.initData,
+              },
+          ]
+        : [];
+
     const txs = [
         {
             to: LAUNCHPAD_ADDRESS,
@@ -81,12 +109,7 @@ export async function setFallbackTo7579<
                 functionName: "addSafe7579",
                 args: [
                     SAFE_7579_ADDRESS,
-                    [
-                        {
-                            module: smartSessions.address,
-                            initData: smartSessions.initData,
-                        },
-                    ],
+                    validators,
                     [],
                     [],
                     [],

packages/sdk/src/core/modules/sessionKey/decorators/grantPermission.ts

@@ -11,8 +11,9 @@ import {
     RHINESTONE_ATTESTER_ADDRESS,
     getSmartSessionsValidator,
 } from "@rhinestone/module-sdk";
+import { isModuleInstalled } from "permissionless/actions/erc7579";
 import type { Chain, Client, Hex, PublicClient, Transport } from "viem";
-import { sendUserOperation } from "viem/account-abstraction";
+import { type SmartAccount, sendUserOperation } from "viem/account-abstraction";
 import { encodeFunctionData, getAction, parseAbi } from "viem/utils";
 import type { Call } from "../types";
 import { preparePermission } from "./preparePermission";
@@ -71,6 +72,32 @@ export async function grantPermission<
     if (!is7579FallbackSet) {
         const smartSessions = getSmartSessionsValidator({});
 
+        let isSessionValidatorInstalled: boolean;
+
+        try {
+            isSessionValidatorInstalled = await getAction(
+                client,
+                isModuleInstalled,
+                "isModuleInstalled"
+            )({
+                type: smartSessions.type,
+                address: smartSessions.address,
+                context: smartSessions.initData,
+                account: client.account as SmartAccount,
+            });
+        } catch {
+            isSessionValidatorInstalled = false;
+        }
+
+        const validators = !isSessionValidatorInstalled
+            ? [
+                  {
+                      module: smartSessions.address,
+                      initData: smartSessions.initData,
+                  },
+              ]
+            : [];
+
         calls.unshift({
             to: LAUNCHPAD_ADDRESS,
             data: encodeFunctionData({
@@ -81,12 +108,7 @@ export async function grantPermission<
                 functionName: "addSafe7579",
                 args: [
                     SAFE_7579_ADDRESS,
-                    [
-                        {
-                            module: smartSessions.address,
-                            initData: smartSessions.initData,
-                        },
-                    ],
+                    validators,
                     [],
                     [],
                     [],