Merge pull request #63 from cometh-hq/develop

feat: add global policy

Author: yoanslvy

packages/sdk/package.json

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

packages/sdk/src/constants.ts

@@ -1,5 +1,5 @@
-import type { Address } from "viem";
-import { muster } from "./customChains";
+import type { Address, Hex } from "viem";
+import { muster, swisstronikTestnet } from "./customChains";
 
 const API_URL = "https://api.4337.cometh.io";
 
@@ -13,8 +13,12 @@ const LAUNCHPAD_ADDRESS: Address = "0x7579011aB74c46090561ea277Ba79D510c6C00ff";
 
 const add7579FunctionSelector = "0xd78343d9";
 const hardcodeVerificationGasLimit7579 = 1000000n;
+const FALLBACK_TARGET_FLAG =
+    "0x0000000000000000000000000000000000000001" as Address;
+const FALLBACK_TARGET_SELECTOR_FLAG_PERMITTED_TO_CALL_SMARTSESSION =
+    "0x00000001" as Hex;
 
-const customChains = [muster];
+const customChains = [muster, swisstronikTestnet];
 const defaultClientConfig = {
     cacheTime: 60_000,
     batch: {
@@ -28,6 +32,8 @@ export {
     SENTINEL_MODULES,
     SAFE_7579_ADDRESS,
     LAUNCHPAD_ADDRESS,
+    FALLBACK_TARGET_FLAG,
+    FALLBACK_TARGET_SELECTOR_FLAG_PERMITTED_TO_CALL_SMARTSESSION,
     customChains,
     add7579FunctionSelector,
     hardcodeVerificationGasLimit7579,

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

@@ -1,5 +1,9 @@
 import type { ComethSafeSmartAccount } from "@/core/accounts/safe/createSafeSmartAccount";
 
+import {
+    FALLBACK_TARGET_FLAG,
+    FALLBACK_TARGET_SELECTOR_FLAG_PERMITTED_TO_CALL_SMARTSESSION,
+} from "@/constants";
 import {
     type ActionData,
     type PolicyData,
@@ -84,7 +88,48 @@ export const getPermissionAction = async ({
     for (const sessionInfo of sessionRequestedInfo) {
         const actionPolicies: ActionData[] = [];
 
-        for (const actionPolicyInfo of sessionInfo.actionPoliciesInfo ?? []) {
+        if (
+            !sessionInfo.actionPoliciesInfo ||
+            sessionInfo.actionPoliciesInfo.length === 0
+        ) {
+            // If no action policies provided, use sudo action
+            const session = {
+                chainId: BigInt(client?.chain?.id as number),
+                sessionValidator: sessionInfo.sessionValidator as Address,
+                sessionValidatorInitData: encodeValidationData({
+                    threshold: 1,
+                    owners: [sessionInfo.sessionKeyData],
+                }),
+                salt: sessionInfo.salt ?? generateSalt(),
+                userOpPolicies: [getSudoPolicy()],
+                actions: [
+                    {
+                        actionTarget: FALLBACK_TARGET_FLAG,
+                        actionTargetSelector:
+                            FALLBACK_TARGET_SELECTOR_FLAG_PERMITTED_TO_CALL_SMARTSESSION,
+                        actionPolicies: [
+                            {
+                                policy: getSudoPolicy().policy,
+                                initData: "0x" as Hex,
+                            },
+                        ],
+                    },
+                ],
+                erc7739Policies: {
+                    allowedERC7739Content: [],
+                    erc1271Policies: [],
+                },
+                permitERC4337Paymaster: true,
+            };
+
+            const permissionId = await getPermissionId({ session });
+            permissionIds.push(permissionId);
+            sessions.push(session);
+            continue;
+        }
+
+        // Existing logic for when actionPoliciesInfo is not empty
+        for (const actionPolicyInfo of sessionInfo.actionPoliciesInfo) {
             if (actionPolicyInfo.abi) {
                 // Resolve the abi to multiple function selectors...
                 const resolvedPolicyInfos = abiToPoliciesInfo(actionPolicyInfo);
@@ -116,8 +161,6 @@ export const getPermissionAction = async ({
             permitERC4337Paymaster: true,
         };
 
-        console.log({ session });
-
         const permissionId = await getPermissionId({
             session,
         });

packages/sdk/src/customChains.ts

@@ -11,16 +11,34 @@ export const muster = defineChain({
     },
     rpcUrls: {
         default: {
-            http: [
-                process.env.RPC_URL_MUSTER_TESTNET ||
-                    "https://muster.alt.technology/",
-            ],
+            http: ["https://muster.alt.technology/"],
         },
         public: {
-            http: [
-                process.env.RPC_URL_MUSTER_TESTNET ||
-                    "https://muster.alt.technology/",
-            ],
+            http: ["https://muster.alt.technology/"],
+        },
+    },
+    contracts: {
+        multicall3: {
+            address: "0xcA11bde05977b3631167028862bE2a173976CA11",
+        },
+    },
+});
+
+export const swisstronikTestnet = defineChain({
+    id: 1291,
+    name: "Swisstronik testnet",
+    network: "swisstronik testnet",
+    nativeCurrency: {
+        decimals: 18,
+        name: "Ether",
+        symbol: "ETH",
+    },
+    rpcUrls: {
+        default: {
+            http: ["https://json-rpc.testnet.swisstronik.com/unencrypted/"],
+        },
+        public: {
+            http: ["https://json-rpc.testnet.swisstronik.com/unencrypted/"],
         },
     },
     contracts: {

packages/sdk/src/index.ts

@@ -43,12 +43,12 @@ import { retrieveLegacyWalletAddress } from "./migrationKit/retrieveLegacyWallet
 
 import type { GrantPermissionParameters } from "./core/modules/sessionKey/decorators/grantPermission";
 
+import { SmartSessionMode } from "@rhinestone/module-sdk";
 import type { UsePermissionParameters } from "./core/modules/sessionKey/decorators/usePermission";
 import type {
     CreateSessionDataParams,
     GrantPermissionResponse,
 } from "./core/modules/sessionKey/types";
-import { SmartSessionMode } from "@rhinestone/module-sdk";
 
 export {
     createSigner,
@@ -69,7 +69,7 @@ export {
     toSmartSessionsSigner,
     ENTRYPOINT_ADDRESS_V07,
     customChains,
-    SmartSessionMode
+    SmartSessionMode,
 };
 
 export type {