permissionless 0.3.3 → 0.3.5

package/accounts/safe/toSafeSmartAccount.ts

@@ -704,6 +704,7 @@ const getInitializerCode = async ({
     erc7579LaunchpadAddress,
     setupTransactions = [],
     safeModules = [],
+    useMultiSendForSetup = true,
     validators = [],
     executors = [],
     fallbacks = [],
@@ -729,6 +730,7 @@ const getInitializerCode = async ({
         value: bigint
     }[]
     safeModules?: Address[]
+    useMultiSendForSetup?: boolean
     validators?: { address: Address; context: Address }[]
     executors?: {
         address: Address
@@ -902,6 +904,23 @@ const getInitializerCode = async ({
         })
     }
 
+    if (!useMultiSendForSetup && multiCalls.length === 1) {
+        return encodeFunctionData({
+            abi: setupAbi,
+            functionName: "setup",
+            args: [
+                ownerAddresses,
+                threshold,
+                multiCalls[0].to,
+                multiCalls[0].data,
+                safe4337ModuleAddress,
+                paymentToken,
+                payment,
+                paymentReceiver
+            ]
+        })
+    }
+
     const multiSendCallData = encodeMultiSend(multiCalls)
 
     return encodeFunctionData({
@@ -962,6 +981,7 @@ const getAccountInitCode = async ({
     saltNonce = BigInt(0),
     setupTransactions = [],
     safeModules = [],
+    useMultiSendForSetup = true,
     validators = [],
     executors = [],
     fallbacks = [],
@@ -985,6 +1005,7 @@ const getAccountInitCode = async ({
         value: bigint
     }[]
     safeModules?: Address[]
+    useMultiSendForSetup?: boolean
     validators?: { address: Address; context: Address }[]
     executors?: {
         address: Address
@@ -1009,6 +1030,7 @@ const getAccountInitCode = async ({
         setupTransactions,
         safeSingletonAddress,
         safeModules,
+        useMultiSendForSetup,
         erc7579LaunchpadAddress,
         validators,
         executors,
@@ -1183,6 +1205,15 @@ export type ToSafeSmartAccountParameters<
     payment?: bigint
     paymentReceiver?: Address
     onchainIdentifier?: Hex
+    /**
+     * When true (default), the Safe setup always routes through MultiSend,
+     * even for a single setup transaction. When false, a single setup
+     * transaction (e.g. just enableModules) is called directly without
+     * MultiSend wrapping. This produces a different counterfactual address
+     * and is compatible with Safe Protocol Kit / relay-kit address derivation.
+     * @default true
+     */
+    useMultiSendForSetup?: boolean
 } & GetErc7579Params<TErc7579>
 
 function isErc7579Args<entryPointVersion extends "0.6" | "0.7" = "0.7">(
@@ -1224,6 +1255,7 @@ const getAccountAddress = async ({
     paymentReceiver,
     setupTransactions = [],
     safeModules = [],
+    useMultiSendForSetup = true,
     saltNonce = BigInt(0),
     validators = [],
     executors = [],
@@ -1251,6 +1283,7 @@ const getAccountAddress = async ({
     payment?: bigint
     paymentReceiver?: Address
     safeModules?: Address[]
+    useMultiSendForSetup?: boolean
     saltNonce?: bigint
     erc7579LaunchpadAddress?: Address
     validators?: { address: Address; context: Address }[]
@@ -1280,6 +1313,7 @@ const getAccountAddress = async ({
         setupTransactions,
         safeSingletonAddress,
         safeModules,
+        useMultiSendForSetup,
         erc7579LaunchpadAddress,
         validators,
         executors,
@@ -1364,7 +1398,8 @@ export async function toSafeSmartAccount<
         paymentToken,
         payment,
         paymentReceiver,
-        onchainIdentifier
+        onchainIdentifier,
+        useMultiSendForSetup = true
     } = parameters
 
     const owners = await Promise.all(
@@ -1511,6 +1546,7 @@ export async function toSafeSmartAccount<
                 saltNonce,
                 setupTransactions,
                 safeModules,
+                useMultiSendForSetup,
                 validators,
                 executors,
                 fallbacks,
@@ -1547,6 +1583,7 @@ export async function toSafeSmartAccount<
                 saltNonce,
                 setupTransactions,
                 safeModules,
+                useMultiSendForSetup,
                 validators,
                 executors,
                 fallbacks,

package/actions/passkeyServer/startRegistration.ts

@@ -78,7 +78,7 @@ export type StartRegistrationParameters = {
 }
 export type StartRegistrationReturnType = CreateWebAuthnCredentialParameters
 
-export const startRegistration = async (
+export const startRegistration: (
     client: Client<
         Transport,
         Chain | undefined,
@@ -86,7 +86,7 @@ export const startRegistration = async (
         PasskeyServerRpcSchema
     >,
     args?: StartRegistrationParameters
-): Promise<StartRegistrationReturnType> => {
+) => Promise<StartRegistrationReturnType> = async (client, args) => {
     const response = await client.request({
         method: "pks_startRegistration",
         params: [args?.context]

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "permissionless",
-    "version": "0.3.3",
+    "version": "0.3.5",
     "author": "Pimlico",
     "homepage": "https://docs.pimlico.io/permissionless",
     "repository": "github:pimlicolabs/permissionless.js",
@@ -97,8 +97,8 @@
         }
     },
     "peerDependencies": {
-        "viem": "^2.28.1",
-        "ox": "^0.8.0"
+        "viem": "^2.44.4",
+        "ox": "^0.11.3"
     },
     "peerDependenciesMeta": {
         "ox": {

package/_cjs/vitest.config.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const node_path_1 = require("node:path");
-const vite_1 = require("vite");
-const config_1 = require("vitest/config");
-exports.default = (0, config_1.defineConfig)({
-    test: {
-        coverage: {
-            all: true,
-            provider: "v8",
-            reporter: process.env.CI ? ["lcov"] : ["text", "json", "html"],
-            include: ["**/permissionless/**"],
-            exclude: [
-                "**/errors/utils.ts",
-                "**/*.test.ts",
-                "**/permissionless-test/**",
-                "**/_cjs/**",
-                "**/_esm/**",
-                "**/_types/**"
-            ]
-        },
-        sequence: {
-            concurrent: false
-        },
-        fileParallelism: true,
-        environment: "node",
-        testTimeout: 60_000,
-        hookTimeout: 45_000,
-        include: [(0, node_path_1.join)(__dirname, "./**/*.test.ts")],
-        env: (0, vite_1.loadEnv)("test", process.cwd())
-    }
-});
-//# sourceMappingURL=vitest.config.js.map

package/_cjs/vitest.config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"vitest.config.js","sourceRoot":"","sources":["../vitest.config.ts"],"names":[],"mappings":";;AAAA,yCAAgC;AAChC,+BAA8B;AAC9B,0CAA4C;AAE5C,kBAAe,IAAA,qBAAY,EAAC;IACxB,IAAI,EAAE;QACF,QAAQ,EAAE;YACN,GAAG,EAAE,IAAI;YACT,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YAC9D,OAAO,EAAE,CAAC,sBAAsB,CAAC;YACjC,OAAO,EAAE;gBACL,oBAAoB;gBACpB,cAAc;gBACd,2BAA2B;gBAC3B,YAAY;gBACZ,YAAY;gBACZ,cAAc;aACjB;SACJ;QACD,QAAQ,EAAE;YACN,UAAU,EAAE,KAAK;SACpB;QACD,eAAe,EAAE,IAAI;QACrB,WAAW,EAAE,MAAM;QACnB,WAAW,EAAE,MAAM;QACnB,WAAW,EAAE,MAAM;QACnB,OAAO,EAAE,CAAC,IAAA,gBAAI,EAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAC5C,GAAG,EAAE,IAAA,cAAO,EAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;KACtC;CACJ,CAAC,CAAA"}

package/_esm/vitest.config.js

@@ -1,31 +0,0 @@
-import { join } from "node:path";
-import { loadEnv } from "vite";
-import { defineConfig } from "vitest/config";
-export default defineConfig({
-    test: {
-        coverage: {
-            all: true,
-            provider: "v8",
-            reporter: process.env.CI ? ["lcov"] : ["text", "json", "html"],
-            include: ["**/permissionless/**"],
-            exclude: [
-                "**/errors/utils.ts",
-                "**/*.test.ts",
-                "**/permissionless-test/**",
-                "**/_cjs/**",
-                "**/_esm/**",
-                "**/_types/**"
-            ]
-        },
-        sequence: {
-            concurrent: false
-        },
-        fileParallelism: true,
-        environment: "node",
-        testTimeout: 60_000,
-        hookTimeout: 45_000,
-        include: [join(__dirname, "./**/*.test.ts")],
-        env: loadEnv("test", process.cwd())
-    }
-});
-//# sourceMappingURL=vitest.config.js.map

package/_esm/vitest.config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"vitest.config.js","sourceRoot":"","sources":["../vitest.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE5C,eAAe,YAAY,CAAC;IACxB,IAAI,EAAE;QACF,QAAQ,EAAE;YACN,GAAG,EAAE,IAAI;YACT,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YAC9D,OAAO,EAAE,CAAC,sBAAsB,CAAC;YACjC,OAAO,EAAE;gBACL,oBAAoB;gBACpB,cAAc;gBACd,2BAA2B;gBAC3B,YAAY;gBACZ,YAAY;gBACZ,cAAc;aACjB;SACJ;QACD,QAAQ,EAAE;YACN,UAAU,EAAE,KAAK;SACpB;QACD,eAAe,EAAE,IAAI;QACrB,WAAW,EAAE,MAAM;QACnB,WAAW,EAAE,MAAM;QACnB,WAAW,EAAE,MAAM;QACnB,OAAO,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;QAC5C,GAAG,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;KACtC;CACJ,CAAC,CAAA"}

package/_types/vitest.config.d.ts

@@ -1,3 +0,0 @@
-declare const _default: import("vite").UserConfig;
-export default _default;
-//# sourceMappingURL=vitest.config.d.ts.map

package/_types/vitest.config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"vitest.config.d.ts","sourceRoot":"","sources":["../vitest.config.ts"],"names":[],"mappings":";AAIA,wBA0BE"}