@rhinestone/sdk 2.0.0-beta.4 → 2.0.0-beta.41

package/dist/src/accounts/index.js

@@ -1,16 +1,18 @@
-import { concat, createPublicClient, encodeAbiParameters, encodeFunctionData, hashTypedData, size, zeroAddress, } from 'viem';
+import { concat, createPublicClient, encodeAbiParameters, encodeFunctionData, hashTypedData, isAddressEqual, size, zeroAddress, } from 'viem';
 import { sendTransactionInternal, sendUserOperationInternal, waitForExecution, } from '../execution/index.js';
 import { getIntentExecutor, getSetup } from '../modules/index.js';
+import { MODULE_TYPE_ID_VALIDATOR } from '../modules/common.js';
+import { getValidators as getValidatorsInternal, isValidatorInitialized, } from '../modules/read.js';
 import { getOwnerValidator } from '../modules/validators/index.js';
-import { getSocialRecoveryValidator } from '../modules/validators/core.js';
-import { AccountConfigurationNotSupportedError, AccountError, Eip712DomainNotAvailableError, Eip7702AccountMustHaveEoaError, Eip7702NotSupportedForAccountError, EoaAccountMustHaveAccountError, EoaSigningMethodNotConfiguredError, EoaSigningNotSupportedError, ExistingEip7702AccountsNotSupportedError, FactoryArgsNotAvailableError, isAccountError, ModuleInstallationNotSupportedError, OwnersFieldRequiredError, SigningNotSupportedForAccountError, SmartSessionsNotEnabledError, WalletClientNoConnectedAccountError, } from './error.js';
-import { getAddress as getKernelAddress, getDeployArgs as getKernelDeployArgs, getEip712Domain as getKernelEip712Domain, getGuardianSmartAccount as getKernelGuardianSmartAccount, getInstallData as getKernelInstallData, getSmartAccount as getKernelSmartAccount, packSignature as packKernelSignature, wrapMessageHash as wrapKernelMessageHash, } from './kernel.js';
-import { getAddress as getNexusAddress, getDefaultValidatorAddress as getNexusDefaultValidatorAddress, getDeployArgs as getNexusDeployArgs, getEip712Domain as getNexusEip712Domain, getEip7702InitCall as getNexusEip7702InitCall, getGuardianSmartAccount as getNexusGuardianSmartAccount, getInstallData as getNexusInstallData, getSmartAccount as getNexusSmartAccount, packSignature as packNexusSignature, signEip7702InitData as signNexusEip7702InitData, } from './nexus.js';
-import { getAddress as getSafeAddress, getDeployArgs as getSafeDeployArgs, getEip712Domain as getSafeEip712Domain, getGuardianSmartAccount as getSafeGuardianSmartAccount, getInstallData as getSafeInstallData, getSmartAccount as getSafeSmartAccount, getV0DeployArgs as getSafeV0DeployArgs, packSignature as packSafeSignature, } from './safe.js';
+import { AccountConfigurationNotSupportedError, AccountError, DefaultValidatorAlreadyInitializedError, Eip712DomainNotAvailableError, Eip7702AccountMustHaveEoaError, Eip7702NotSupportedForAccountError, EoaAccountMustHaveAccountError, EoaSigningMethodNotConfiguredError, EoaSigningNotSupportedError, FactoryArgsNotAvailableError, isAccountError, ModuleInstallationNotSupportedError, OwnersFieldRequiredError, SigningNotSupportedForAccountError, WalletClientNoConnectedAccountError, } from './error.js';
+import { getAddress as getHcaAddress, getDeployArgs as getHcaDeployArgs, getEip712Domain as getHcaEip712Domain, getSmartAccount as getHcaSmartAccount, packSignature as packHcaSignature, } from './hca.js';
+import { getAddress as getKernelAddress, getDeployArgs as getKernelDeployArgs, getEip712Domain as getKernelEip712Domain, getInstallData as getKernelInstallData, getSmartAccount as getKernelSmartAccount, packSignature as packKernelSignature, wrapMessageHash as wrapKernelMessageHash, } from './kernel.js';
+import { getAddress as getNexusAddress, getDefaultValidatorAddress as getNexusDefaultValidatorAddress, getDefaultValidatorInitData as getNexusDefaultValidatorInitData, getDeployArgs as getNexusDeployArgs, getEip712Domain as getNexusEip712Domain, getEip7702InitCall as getNexusEip7702InitCall, getInstallData as getNexusInstallData, getSmartAccount as getNexusSmartAccount, isDefaultValidatorConfigured as isNexusDefaultValidatorConfigured, packSignature as packNexusSignature, signEip7702InitData as signNexusEip7702InitData, } from './nexus.js';
+import { getAddress as getSafeAddress, getDeployArgs as getSafeDeployArgs, getEip712Domain as getSafeEip712Domain, getInstallData as getSafeInstallData, getSmartAccount as getSafeSmartAccount, getV0DeployArgs as getSafeV0DeployArgs, packSignature as packSafeSignature, } from './safe.js';
 import { convertOwnerSetToSignerSet } from './signing/common.js';
 import { sign as signMessage } from './signing/message.js';
 import { sign as signTypedData } from './signing/typedData.js';
-import { getAddress as getStartaleAddress, getDeployArgs as getStartaleDeployArgs, getEip712Domain as getStartaleEip712Domain, getGuardianSmartAccount as getStartaleGuardianSmartAccount, getInstallData as getStartaleInstallData, getSmartAccount as getStartaleSmartAccount, packSignature as packStartaleSignature, } from './startale.js';
+import { getAddress as getStartaleAddress, getDeployArgs as getStartaleDeployArgs, getEip712Domain as getStartaleEip712Domain, getInstallData as getStartaleInstallData, getSmartAccount as getStartaleSmartAccount, packSignature as packStartaleSignature, K1_DEFAULT_VALIDATOR_ADDRESS as STARTALE_K1_VALIDATOR_ADDRESS, } from './startale.js';
 import { createTransport, getBundlerClient, } from './utils.js';
 function getDeployArgs(config) {
     const account = getAccountProvider(config);
@@ -27,6 +29,9 @@ function getDeployArgs(config) {
         case 'startale': {
             return getStartaleDeployArgs(config);
         }
+        case 'hca': {
+            return getHcaDeployArgs(config);
+        }
         case 'eoa': {
             throw new Error('EOA accounts do not have deploy args');
         }
@@ -102,7 +107,8 @@ async function signEip7702InitData(config) {
         }
         case 'safe':
         case 'kernel':
-        case 'startale': {
+        case 'startale':
+        case 'hca': {
             throw new Eip7702NotSupportedForAccountError(account.type);
         }
         default: {
@@ -118,7 +124,8 @@ function getEip7702InitCall(config, signature) {
         }
         case 'safe':
         case 'kernel':
-        case 'startale': {
+        case 'startale':
+        case 'hca': {
             throw new Eip7702NotSupportedForAccountError(account.type);
         }
         default: {
@@ -141,6 +148,9 @@ function getEip712Domain(config, chain) {
         case 'startale': {
             return getStartaleEip712Domain(config, chain);
         }
+        case 'hca': {
+            return getHcaEip712Domain(config, chain);
+        }
         case 'eoa': {
             throw new Eip712DomainNotAvailableError('EOA accounts do not have an EIP-712 domain');
         }
@@ -166,6 +176,9 @@ function getModuleInstallationCalls(config, module) {
             case 'startale': {
                 return [getStartaleInstallData(module)];
             }
+            case 'hca': {
+                throw new ModuleInstallationNotSupportedError(account.type);
+            }
             case 'eoa': {
                 throw new ModuleInstallationNotSupportedError(account.type);
             }
@@ -178,8 +191,44 @@ function getModuleInstallationCalls(config, module) {
         data,
     }));
 }
-function getModuleUninstallationCalls(config, module) {
+// Like `getModuleInstallationCalls`, but aware of the Nexus default validator.
+// On Nexus the OwnableValidator is the hardwired default validator: it can't be
+// added via `installModule` (reverts `DefaultValidatorAlreadyInstalled`), and
+// passkey-bootstrapped accounts never initialize it, so `addOwner` reverts with
+// `NotInitialized`. For that case we initialize it directly via `onInstall`.
+async function getValidatorInstallationCalls(config, chain, module) {
+    const account = getAccountProvider(config);
+    if (account.type === 'nexus') {
+        const defaultValidatorAddress = getNexusDefaultValidatorAddress(account.version);
+        if (module.address.toLowerCase() === defaultValidatorAddress.toLowerCase()) {
+            // Treat the validator as initialized if the account's deployment will
+            // initialize it (config check, covers not-yet-deployed accounts) or if
+            // it is already initialized on-chain (covers accounts where ECDSA was
+            // enabled separately after deployment).
+            const initialized = isNexusDefaultValidatorConfigured(config) ||
+                (await isValidatorInitialized(getAddress(config), chain, defaultValidatorAddress, config.provider));
+            if (initialized) {
+                throw new DefaultValidatorAlreadyInitializedError();
+            }
+            return [
+                {
+                    to: defaultValidatorAddress,
+                    value: 0n,
+                    data: getNexusDefaultValidatorInitData(module),
+                },
+            ];
+        }
+    }
+    return getModuleInstallationCalls(config, module);
+}
+// SentinelList head pointer used by ERC-7579 module managers (Nexus, Safe7579,
+// Startale). Validator/executor uninstall on these accounts decodes the
+// `deInitData` slot as `(address prev, bytes moduleDeInit)`, where `prev`
+// identifies the preceding linked-list entry to repair on removal.
+const SENTINEL_LIST_HEAD = '0x0000000000000000000000000000000000000001';
+async function getModuleUninstallationCalls(config, chain, module) {
     const address = getAddress(config);
+    const onChainDeInitData = await resolveOnChainDeInitData(config, chain, address, module);
     const data = encodeFunctionData({
         abi: [
             {
@@ -204,10 +253,46 @@ function getModuleUninstallationCalls(config, module) {
             },
         ],
         functionName: 'uninstallModule',
-        args: [module.type, module.address, module.deInitData],
+        args: [module.type, module.address, onChainDeInitData],
     });
     return [{ to: address, data, value: 0n }];
 }
+/**
+ * Build the value the account expects in `uninstallModule`'s third argument.
+ *
+ * `Module.deInitData` carries module-level bytes (mirroring `Module.initData`,
+ * what the module's `onUninstall` sees). ERC-7579 accounts that store
+ * validators / executors in a SentinelList — Nexus, Safe7579, Startale —
+ * require an account-level wrapper `abi.encode(prev, moduleDeInit)` so they
+ * can pop the entry from the linked list. Kernel uses different storage and
+ * treats this slot as raw module bytes, so we pass `module.deInitData` through
+ * unchanged.
+ *
+ * Scope: validator type only — there are no public actions to disable
+ * executor modules today.
+ */
+async function resolveOnChainDeInitData(config, chain, account, module) {
+    if (module.type !== MODULE_TYPE_ID_VALIDATOR) {
+        return module.deInitData;
+    }
+    const accountType = getAccountProvider(config).type;
+    if (accountType !== 'nexus' &&
+        accountType !== 'safe' &&
+        accountType !== 'startale') {
+        return module.deInitData;
+    }
+    const validators = await getValidatorsInternal(accountType, account, chain, config.provider);
+    const targetLower = module.address.toLowerCase();
+    const index = validators.findIndex((v) => v.toLowerCase() === targetLower);
+    if (index === -1) {
+        // Not installed; pass through unchanged. The account's `uninstallModule`
+        // will surface a `ModuleNotInstalled` revert with the original module
+        // address, which is more useful than a silent abi.decode mismatch.
+        return module.deInitData;
+    }
+    const prev = index === 0 ? SENTINEL_LIST_HEAD : validators[index - 1];
+    return encodeAbiParameters([{ type: 'address' }, { type: 'bytes' }], [prev, module.deInitData]);
+}
 function getAddress(config) {
     if (is7702(config)) {
         if (!config.eoa) {
@@ -229,6 +314,9 @@ function getAddress(config) {
         case 'startale': {
             return getStartaleAddress(config);
         }
+        case 'hca': {
+            return getHcaAddress(config);
+        }
         case 'eoa': {
             if (!config.eoa) {
                 throw new AccountError({
@@ -249,38 +337,41 @@ function checkAddress(config) {
     }
     return initData.address.toLowerCase() === getAddress(config).toLowerCase();
 }
-// Signs and packs a signature to be EIP-1271 compatible
-async function getEip1271Signature(config, signers, chain, validator, hash, transformSignature = (signature) => signature) {
-    if (config.account?.type === 'eoa') {
-        throw new EoaSigningNotSupportedError('packed signatures');
-    }
-    signers = signers ?? convertOwnerSetToSignerSet(config.owners);
-    const signFn = (hash) => signMessage(signers, chain, address, hash, false);
+async function packAccountSignature(config, signature, validator, transformSignature = (signature) => signature) {
     const account = getAccountProvider(config);
-    const address = getAddress(config);
     switch (account.type) {
         case 'safe': {
-            const signature = await signFn(hash);
             return packSafeSignature(signature, validator, transformSignature);
         }
         case 'nexus': {
-            const signature = await signFn(hash);
             const defaultValidatorAddress = getNexusDefaultValidatorAddress(account.version);
             return packNexusSignature(signature, validator, transformSignature, defaultValidatorAddress);
         }
         case 'kernel': {
-            const signature = await signFn(wrapKernelMessageHash(hash, address));
             return packKernelSignature(signature, validator, transformSignature);
         }
         case 'startale': {
-            const signature = await signFn(hash);
             return packStartaleSignature(signature, validator, transformSignature);
         }
+        case 'hca': {
+            return packHcaSignature(signature, validator, transformSignature);
+        }
         default: {
             throw new Error(`Unsupported account type: ${account.type}`);
         }
     }
 }
+async function getEip1271Signature(config, signers, chain, validator, hash, transformSignature = (signature) => signature) {
+    if (config.account?.type === 'eoa') {
+        throw new EoaSigningNotSupportedError('packed signatures');
+    }
+    signers = signers ?? convertOwnerSetToSignerSet(config.owners);
+    const account = getAccountProvider(config);
+    const address = getAddress(config);
+    const signedHash = account.type === 'kernel' ? wrapKernelMessageHash(hash, address) : hash;
+    const signature = await signMessage(signers, chain, address, signedHash, false);
+    return packAccountSignature(config, signature, validator, transformSignature);
+}
 // Signs and packs a signature to be used by the emissary validator
 async function getEmissarySignature(config, signers, chain, hash, transformSignature = (signature) => signature) {
     if (config.account?.type === 'eoa') {
@@ -299,32 +390,52 @@ async function getTypedDataPackedSignature(config, signers, chain, validator, pa
     }
     const address = getAddress(config);
     signers = signers ?? convertOwnerSetToSignerSet(config.owners);
-    const signFn = (parameters) => signTypedData(signers, chain, address, parameters);
     const account = getAccountProvider(config);
-    switch (account.type) {
-        case 'safe': {
-            const signature = await signFn(parameters);
-            return packSafeSignature(signature, validator, transformSignature);
-        }
-        case 'nexus': {
-            const signature = await signFn(parameters);
-            const defaultValidatorAddress = getNexusDefaultValidatorAddress(account.version);
-            return packNexusSignature(signature, validator, transformSignature, defaultValidatorAddress);
-        }
-        case 'kernel': {
-            const address = getAddress(config);
-            const signMessageFn = (hash) => signMessage(signers, chain, address, hash, false);
-            const signature = await signMessageFn(wrapKernelMessageHash(hashTypedData(parameters), address));
-            return packKernelSignature(signature, validator, transformSignature);
-        }
-        case 'startale': {
-            const signature = await signFn(parameters);
-            return packStartaleSignature(signature, validator, transformSignature);
-        }
-        default: {
-            throw new Error(`Unsupported account type: ${account.type}`);
-        }
+    const signature = account.type === 'kernel'
+        ? await signMessage(signers, chain, address, wrapKernelMessageHash(hashTypedData(parameters), address), false)
+        : await signTypedData(signers, chain, address, parameters);
+    return packAccountSignature(config, signature, validator, transformSignature);
+}
+async function getOwnerEcdsaSignature(config, chain, parameters, owner, module, validatorSupportsEip712) {
+    if (config.account?.type === 'eoa') {
+        throw new EoaSigningNotSupportedError('packed signatures');
+    }
+    const address = getAddress(config);
+    const signers = {
+        type: 'owner',
+        kind: 'ecdsa',
+        accounts: [owner],
+        module,
+    };
+    const accountProvider = getAccountProvider(config);
+    if (accountProvider.type === 'kernel') {
+        return signMessage(signers, chain, address, wrapKernelMessageHash(hashTypedData(parameters), address), false);
+    }
+    if (!validatorSupportsEip712) {
+        return signMessage(signers, chain, address, hashTypedData(parameters), false);
+    }
+    return signTypedData(signers, chain, address, parameters);
+}
+async function getOwnerPasskeySignature(config, parameters, owner, validatorSupportsEip712) {
+    if (config.account?.type === 'eoa') {
+        throw new EoaSigningNotSupportedError('packed signatures');
+    }
+    const address = getAddress(config);
+    const accountProvider = getAccountProvider(config);
+    if (accountProvider.type === 'kernel') {
+        const { webauthn, signature } = await owner.sign({
+            hash: wrapKernelMessageHash(hashTypedData(parameters), address),
+        });
+        return { webauthn, signature };
+    }
+    if (!validatorSupportsEip712) {
+        const { webauthn, signature } = await owner.sign({
+            hash: hashTypedData(parameters),
+        });
+        return { webauthn, signature };
     }
+    const { webauthn, signature } = await owner.signTypedData(parameters);
+    return { webauthn, signature };
 }
 async function isDeployed(config, chain) {
     const account = getAccountProvider(config);
@@ -377,7 +488,8 @@ async function deploy(config, chain, params) {
 // Useful for existing (already deployed) accounts
 async function setup(config, chain) {
     const account = getAccountProvider(config);
-    if (account.type === 'eoa') {
+    // HCA accounts are locked and cannot install modules, so there is nothing to set up.
+    if (account.type === 'eoa' || account.type === 'hca') {
         return false;
     }
     const modules = getSetup(config);
@@ -391,7 +503,12 @@ async function setup(config, chain) {
         ...modules.executors,
         ...modules.fallbacks,
         ...modules.hooks,
-    ];
+    ].filter(
+    // Startale's K1 validator is the account's built-in default validator, set
+    // at deployment — it is never a regular 7579 module, so isModuleInstalled
+    // reports false and trying to install it reverts. Skip it.
+    (module) => !(account.type === 'startale' &&
+        isAddressEqual(module.address, STARTALE_K1_VALIDATOR_ADDRESS)));
     // Check if the modules are already installed
     const installedResults = await publicClient.multicall({
         contracts: allModules.map((module) => ({
@@ -541,34 +658,8 @@ async function getSmartAccount(config, client, chain) {
         case 'startale': {
             return getStartaleSmartAccount(client, address, config.owners, ownerValidator.address, signFn);
         }
-    }
-}
-async function getGuardianSmartAccount(config, client, chain, guardians) {
-    const address = getAddress(config);
-    const accounts = guardians.type === 'ecdsa' ? guardians.accounts : [];
-    const socialRecoveryValidator = getSocialRecoveryValidator(accounts);
-    if (!socialRecoveryValidator) {
-        throw new Error('Social recovery is not available');
-    }
-    const signers = {
-        type: 'guardians',
-        guardians: accounts,
-    };
-    const signFn = (hash) => signMessage(signers, chain, address, hash, true);
-    const account = getAccountProvider(config);
-    switch (account.type) {
-        case 'safe': {
-            return getSafeGuardianSmartAccount(client, address, guardians, socialRecoveryValidator.address, signFn);
-        }
-        case 'nexus': {
-            const defaultValidatorAddress = getNexusDefaultValidatorAddress(account.version);
-            return getNexusGuardianSmartAccount(client, address, guardians, socialRecoveryValidator.address, signFn, defaultValidatorAddress);
-        }
-        case 'kernel': {
-            return getKernelGuardianSmartAccount(client, address, guardians, socialRecoveryValidator.address, signFn);
-        }
-        case 'startale': {
-            return getStartaleGuardianSmartAccount(client, address, guardians, socialRecoveryValidator.address, signFn);
+        case 'hca': {
+            return getHcaSmartAccount(client, address, config.owners, ownerValidator.address, signFn);
         }
     }
 }
@@ -584,6 +675,6 @@ function getAccountProvider(config) {
         type: 'nexus',
     };
 }
-export { getEip712Domain, getModuleInstallationCalls, getModuleUninstallationCalls, getAddress, checkAddress, getAccountProvider, getInitCode, getV0InitCode, signEip7702InitData, getEip7702InitCall, is7702, isDeployed, deploy, setup, toErc6492Signature, getSmartAccount, getGuardianSmartAccount, getEip1271Signature, getEmissarySignature, getTypedDataPackedSignature, 
+export { getEip712Domain, getModuleInstallationCalls, getValidatorInstallationCalls, getModuleUninstallationCalls, getAddress, checkAddress, getAccountProvider, getInitCode, getV0InitCode, signEip7702InitData, getEip7702InitCall, is7702, isDeployed, deploy, setup, toErc6492Signature, getSmartAccount, getEip1271Signature, getEmissarySignature, getOwnerEcdsaSignature, getOwnerPasskeySignature, getTypedDataPackedSignature, packAccountSignature, 
 // Errors
-isAccountError, AccountError, AccountConfigurationNotSupportedError, Eip712DomainNotAvailableError, Eip7702AccountMustHaveEoaError, Eip7702NotSupportedForAccountError, EoaAccountMustHaveAccountError, EoaSigningMethodNotConfiguredError, EoaSigningNotSupportedError, ExistingEip7702AccountsNotSupportedError, FactoryArgsNotAvailableError, ModuleInstallationNotSupportedError, OwnersFieldRequiredError, SigningNotSupportedForAccountError, SmartSessionsNotEnabledError, WalletClientNoConnectedAccountError, };
+isAccountError, AccountError, AccountConfigurationNotSupportedError, DefaultValidatorAlreadyInitializedError, Eip712DomainNotAvailableError, Eip7702AccountMustHaveEoaError, Eip7702NotSupportedForAccountError, EoaAccountMustHaveAccountError, EoaSigningMethodNotConfiguredError, EoaSigningNotSupportedError, FactoryArgsNotAvailableError, ModuleInstallationNotSupportedError, OwnersFieldRequiredError, SigningNotSupportedForAccountError, WalletClientNoConnectedAccountError, };

package/dist/src/accounts/kernel.d.ts

@@ -22,6 +22,5 @@ declare function getInstallData(module: Module): Hex[];
 declare function packSignature(signature: Hex, validator: ValidatorConfig, transformSignature?: (signature: Hex) => Hex): Promise<`0x${string}`>;
 declare function wrapMessageHash(messageHash: Hex, accountAddress: Hex): Hex;
 declare function getSmartAccount(client: PublicClient, address: Address, owners: OwnerSet, validatorAddress: Address, sign: (hash: Hex) => Promise<Hex>): Promise<SmartAccount<SmartAccountImplementation<Abi, "0.7">>>;
-declare function getGuardianSmartAccount(client: PublicClient, address: Address, guardians: OwnerSet, validatorAddress: Address, sign: (hash: Hex) => Promise<Hex>): Promise<SmartAccount<SmartAccountImplementation<Abi, "0.7">>>;
-export { getEip712Domain, getInstallData, getAddress, getDeployArgs, getSmartAccount, getGuardianSmartAccount, packSignature, wrapMessageHash, };
+export { getEip712Domain, getInstallData, getAddress, getDeployArgs, getSmartAccount, packSignature, wrapMessageHash, };
 //# sourceMappingURL=kernel.d.ts.map

package/dist/src/accounts/kernel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kernel.d.ts","sourceRoot":"","sources":["../../../accounts/kernel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,GAAG,EACR,KAAK,OAAO,EACZ,KAAK,KAAK,EASV,KAAK,GAAG,EAER,KAAK,YAAY,EAMlB,MAAM,MAAM,CAAA;AACb,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAEhC,MAAM,0BAA0B,CAAA;AAGjC,OAAO,EAKL,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAA;AAE1B,OAAO,KAAK,EAAiB,QAAQ,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAKhF,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAgBhF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;SAmFrD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBAalD;AAED,iBAAS,eAAe,CAAC,MAAM,EAAE,uBAAuB,EAAE,KAAK,EAAE,KAAK;;;;;;EAarE;AAED,iBAAS,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE,CAsE7C;AAED,iBAAe,aAAa,CAC1B,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,eAAe,EAC1B,kBAAkB,GAAE,CAAC,SAAS,EAAE,GAAG,KAAK,GAA8B,0BAYvE;AAED,iBAAS,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,GAAG,GAAG,CAoBnE;AAED,iBAAe,eAAe,CAC5B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,QAAQ,EAChB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEAYlC;AAED,iBAAe,uBAAuB,CACpC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEAclC;AA+ED,OAAO,EACL,eAAe,EACf,cAAc,EACd,UAAU,EACV,aAAa,EACb,eAAe,EACf,uBAAuB,EACvB,aAAa,EACb,eAAe,GAChB,CAAA"}
+{"version":3,"file":"kernel.d.ts","sourceRoot":"","sources":["../../../accounts/kernel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,GAAG,EACR,KAAK,OAAO,EACZ,KAAK,KAAK,EASV,KAAK,GAAG,EAER,KAAK,YAAY,EAMlB,MAAM,MAAM,CAAA;AACb,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAEhC,MAAM,0BAA0B,CAAA;AAGjC,OAAO,EAKL,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAA;AAE1B,OAAO,KAAK,EAAiB,QAAQ,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAKhF,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAgBhF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;SAmFrD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBAalD;AAED,iBAAS,eAAe,CAAC,MAAM,EAAE,uBAAuB,EAAE,KAAK,EAAE,KAAK;;;;;;EAarE;AAED,iBAAS,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE,CAsE7C;AAED,iBAAe,aAAa,CAC1B,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,eAAe,EAC1B,kBAAkB,GAAE,CAAC,SAAS,EAAE,GAAG,KAAK,GAA8B,0BAYvE;AAED,iBAAS,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,GAAG,GAAG,CAoBnE;AAED,iBAAe,eAAe,CAC5B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,QAAQ,EAChB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEAYlC;AA+ED,OAAO,EACL,eAAe,EACf,cAAc,EACd,UAAU,EACV,aAAa,EACb,eAAe,EACf,aAAa,EACb,eAAe,GAChB,CAAA"}

package/dist/src/accounts/kernel.js

@@ -194,13 +194,6 @@ async function getSmartAccount(client, address, owners, validatorAddress, sign)
         return getMockSignature(owners);
     }, sign);
 }
-async function getGuardianSmartAccount(client, address, guardians, validatorAddress, sign) {
-    return await getBaseSmartAccount(address, client, validatorAddress, 'validator', async () => {
-        return getMockSignature(guardians);
-    }, async (hash) => {
-        return await sign(hash);
-    });
-}
 async function getBaseSmartAccount(address, client, validatorAddress, validatorType, getStubSignature, signUserOperation) {
     return await toSmartAccount({
         client,
@@ -269,4 +262,4 @@ async function getBaseSmartAccount(address, client, validatorAddress, validatorT
         },
     });
 }
-export { getEip712Domain, getInstallData, getAddress, getDeployArgs, getSmartAccount, getGuardianSmartAccount, packSignature, wrapMessageHash, };
+export { getEip712Domain, getInstallData, getAddress, getDeployArgs, getSmartAccount, packSignature, wrapMessageHash, };

package/dist/src/accounts/nexus.d.ts

@@ -20,14 +20,15 @@ declare function getEip712Domain(config: RhinestoneAccountConfig, chain: Chain):
     salt: "0x0000000000000000000000000000000000000000000000000000000000000000";
 };
 declare function getInstallData(module: Module): `0x${string}`;
+declare function getDefaultValidatorInitData(module: Module): Hex;
+declare function isDefaultValidatorConfigured(config: RhinestoneAccountConfig): boolean;
 declare function getDefaultValidatorAddress(version: '1.0.2' | '1.2.0' | 'rhinestone-1.0.0-beta' | 'rhinestone-1.0.0' | undefined): Address;
 declare function packSignature(signature: Hex, validator: ValidatorConfig, transformSignature?: (signature: Hex) => Hex, defaultValidatorAddress?: Address): Promise<`0x${string}`>;
 declare function getSmartAccount(client: PublicClient, address: Address, owners: OwnerSet, validatorAddress: Address, sign: (hash: Hex) => Promise<Hex>, defaultValidatorAddress?: Address): Promise<SmartAccount<SmartAccountImplementation<Abi, "0.7">>>;
-declare function getGuardianSmartAccount(client: PublicClient, address: Address, guardians: OwnerSet, validatorAddress: Address, sign: (hash: Hex) => Promise<Hex>, defaultValidatorAddress?: Address): Promise<SmartAccount<SmartAccountImplementation<Abi, "0.7">>>;
 declare function signEip7702InitData(config: RhinestoneAccountConfig, eoa: Account): Promise<`0x${string}`>;
 declare function getEip7702InitCall(config: RhinestoneAccountConfig, signature: Hex): {
     initData: `0x${string}`;
     contract: `0x${string}`;
 };
-export { getEip712Domain, getInstallData, getAddress, getDefaultValidatorAddress, packSignature, getDeployArgs, getSmartAccount, getGuardianSmartAccount, signEip7702InitData, getEip7702InitCall, };
+export { getEip712Domain, getInstallData, getDefaultValidatorInitData, isDefaultValidatorConfigured, getAddress, getDefaultValidatorAddress, packSignature, getDeployArgs, getSmartAccount, signEip7702InitData, getEip7702InitCall, };
 //# sourceMappingURL=nexus.d.ts.map

package/dist/src/accounts/nexus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nexus.d.ts","sourceRoot":"","sources":["../../../accounts/nexus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAe3E,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAEhC,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAG/C,OAAO,KAAK,EAAgB,QAAQ,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAM/E,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAqBhF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;;SAqHrD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBAsClD;AAED,iBAAS,eAAe,CAAC,MAAM,EAAE,uBAAuB,EAAE,KAAK,EAAE,KAAK;;;;;;EAarE;AAED,iBAAS,cAAc,CAAC,MAAM,EAAE,MAAM,iBA2BrC;AAED,iBAAS,0BAA0B,CACjC,OAAO,EACH,OAAO,GACP,OAAO,GACP,uBAAuB,GACvB,kBAAkB,GAClB,SAAS,GACZ,OAAO,CAcT;AAED,iBAAe,aAAa,CAC1B,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,eAAe,EAC1B,kBAAkB,GAAE,CAAC,SAAS,EAAE,GAAG,KAAK,GAA8B,EACtE,uBAAuB,GAAE,OAAyC,0BAWnE;AAED,iBAAe,eAAe,CAC5B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,QAAQ,EAChB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EACjC,uBAAuB,GAAE,OAAyC,iEAYnE;AAED,iBAAe,uBAAuB,CACpC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EACjC,uBAAuB,GAAE,OAAyC,iEAcnE;AAqFD,iBAAe,mBAAmB,CAChC,MAAM,EAAE,uBAAuB,EAC/B,GAAG,EAAE,OAAO,0BA8Bb;AAED,iBAAS,kBAAkB,CAAC,MAAM,EAAE,uBAAuB,EAAE,SAAS,EAAE,GAAG;;;EA0C1E;AA6FD,OAAO,EACL,eAAe,EACf,cAAc,EACd,UAAU,EACV,0BAA0B,EAC1B,aAAa,EACb,aAAa,EACb,eAAe,EACf,uBAAuB,EACvB,mBAAmB,EACnB,kBAAkB,GACnB,CAAA"}
+{"version":3,"file":"nexus.d.ts","sourceRoot":"","sources":["../../../accounts/nexus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAe3E,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAEhC,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAG/C,OAAO,KAAK,EAAgB,QAAQ,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAM/E,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAqBhF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;;SAqHrD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBAsClD;AAED,iBAAS,eAAe,CAAC,MAAM,EAAE,uBAAuB,EAAE,KAAK,EAAE,KAAK;;;;;;EAarE;AAED,iBAAS,cAAc,CAAC,MAAM,EAAE,MAAM,iBA2BrC;AAMD,iBAAS,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAcxD;AAOD,iBAAS,4BAA4B,CACnC,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAST;AAED,iBAAS,0BAA0B,CACjC,OAAO,EACH,OAAO,GACP,OAAO,GACP,uBAAuB,GACvB,kBAAkB,GAClB,SAAS,GACZ,OAAO,CAcT;AAED,iBAAe,aAAa,CAC1B,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,eAAe,EAC1B,kBAAkB,GAAE,CAAC,SAAS,EAAE,GAAG,KAAK,GAA8B,EACtE,uBAAuB,GAAE,OAAyC,0BAWnE;AAED,iBAAe,eAAe,CAC5B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,QAAQ,EAChB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EACjC,uBAAuB,GAAE,OAAyC,iEAYnE;AAqFD,iBAAe,mBAAmB,CAChC,MAAM,EAAE,uBAAuB,EAC/B,GAAG,EAAE,OAAO,0BA8Bb;AAED,iBAAS,kBAAkB,CAAC,MAAM,EAAE,uBAAuB,EAAE,SAAS,EAAE,GAAG;;;EA0C1E;AA6FD,OAAO,EACL,eAAe,EACf,cAAc,EACd,2BAA2B,EAC3B,4BAA4B,EAC5B,UAAU,EACV,0BAA0B,EAC1B,aAAa,EACb,aAAa,EACb,eAAe,EACf,mBAAmB,EACnB,kBAAkB,GACnB,CAAA"}

package/dist/src/accounts/nexus.js

@@ -188,6 +188,38 @@ function getInstallData(module) {
         args: [module.type, module.address, module.initData],
     });
 }
+// On Nexus the OwnableValidator is the hardwired default validator. It cannot
+// be added via `installModule` (reverts `DefaultValidatorAlreadyInstalled`), so
+// it is initialized out-of-band by calling its `onInstall` directly with the
+// same init data `installModule` would have passed (`abi.encode(threshold, owners)`).
+function getDefaultValidatorInitData(module) {
+    return encodeFunctionData({
+        abi: [
+            {
+                type: 'function',
+                name: 'onInstall',
+                inputs: [{ type: 'bytes', name: 'data' }],
+                outputs: [],
+                stateMutability: 'nonpayable',
+            },
+        ],
+        functionName: 'onInstall',
+        args: [module.initData],
+    });
+}
+// Whether the deploy bootstrap will initialize the default validator — i.e. the
+// account is configured with an Ownable/ECDSA owner set. Mirrors the
+// `defaultValidatorInitData` computation in `getDeployArgs`, so a counterfactual
+// (not-yet-deployed) account whose deployment initializes the default validator
+// is treated as already-initialized rather than emitting a second `onInstall`.
+function isDefaultValidatorConfigured(config) {
+    if (config.initData) {
+        return false;
+    }
+    const moduleSetup = getModuleSetup(config);
+    const defaultValidator = moduleSetup.validators.find((v) => v.address === NEXUS_DEFAULT_VALIDATOR_ADDRESS);
+    return defaultValidator ? size(defaultValidator.initData) > 0 : false;
+}
 function getDefaultValidatorAddress(version) {
     if (!version) {
         return NEXUS_DEFAULT_VALIDATOR_ADDRESS;
@@ -215,13 +247,6 @@ async function getSmartAccount(client, address, owners, validatorAddress, sign,
         return getMockSignature(owners);
     }, sign, defaultValidatorAddress);
 }
-async function getGuardianSmartAccount(client, address, guardians, validatorAddress, sign, defaultValidatorAddress = NEXUS_DEFAULT_VALIDATOR_ADDRESS) {
-    return await getBaseSmartAccount(address, client, validatorAddress, async () => {
-        return getMockSignature(guardians);
-    }, async (hash) => {
-        return await sign(hash);
-    }, defaultValidatorAddress);
-}
 async function getBaseSmartAccount(address, client, nonceValidatorAddress, getStubSignature, signUserOperation, defaultValidatorAddress) {
     return await toSmartAccount({
         client,
@@ -441,4 +466,4 @@ function tryDecodeV0FactoryData(factory, factoryData) {
 function isAbiDecodingError(error) {
     return (error instanceof Error && error.name === 'AbiFunctionSignatureNotFoundError');
 }
-export { getEip712Domain, getInstallData, getAddress, getDefaultValidatorAddress, packSignature, getDeployArgs, getSmartAccount, getGuardianSmartAccount, signEip7702InitData, getEip7702InitCall, };
+export { getEip712Domain, getInstallData, getDefaultValidatorInitData, isDefaultValidatorConfigured, getAddress, getDefaultValidatorAddress, packSignature, getDeployArgs, getSmartAccount, signEip7702InitData, getEip7702InitCall, };

package/dist/src/accounts/safe.d.ts

@@ -28,6 +28,5 @@ declare function getEip712Domain(config: RhinestoneAccountConfig, chain: Chain):
 declare function getInstallData(module: Module): `0x${string}`;
 declare function packSignature(signature: Hex, validator: ValidatorConfig, transformSignature?: (signature: Hex) => Hex): Promise<`0x${string}`>;
 declare function getSmartAccount(client: PublicClient, address: Address, owners: OwnerSet, validatorAddress: Address, sign: (hash: Hex) => Promise<Hex>): Promise<SmartAccount<SmartAccountImplementation<Abi, "0.7">>>;
-declare function getGuardianSmartAccount(client: PublicClient, address: Address, guardians: OwnerSet, validatorAddress: Address, sign: (hash: Hex) => Promise<Hex>): Promise<SmartAccount<SmartAccountImplementation<Abi, "0.7">>>;
-export { getEip712Domain, getInstallData, getAddress, packSignature, getDeployArgs, getV0DeployArgs, getSmartAccount, getGuardianSmartAccount, };
+export { getEip712Domain, getInstallData, getAddress, packSignature, getDeployArgs, getV0DeployArgs, getSmartAccount, };
 //# sourceMappingURL=safe.d.ts.map

package/dist/src/accounts/safe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"safe.d.ts","sourceRoot":"","sources":["../../../accounts/safe.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,GAAG,EACR,KAAK,OAAO,EACZ,KAAK,KAAK,EAOV,KAAK,GAAG,EAER,KAAK,YAAY,EAKlB,MAAM,MAAM,CAAA;AACb,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAEhC,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAM/C,OAAO,KAAK,EAAE,QAAQ,EAAE,uBAAuB,EAAe,MAAM,UAAU,CAAA;AAM9E,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAoBhF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;SAmGrD;AAED,iBAAS,eAAe,CAAC,MAAM,EAAE,uBAAuB;;;;;;EAgFvD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBAoBlD;AAED,iBAAS,eAAe,CAAC,MAAM,EAAE,uBAAuB,EAAE,KAAK,EAAE,KAAK;;;;;;EAarE;AAED,iBAAS,cAAc,CAAC,MAAM,EAAE,MAAM,iBA2BrC;AAED,iBAAe,aAAa,CAC1B,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,eAAe,EAC1B,kBAAkB,GAAE,CAAC,SAAS,EAAE,GAAG,KAAK,GAA8B,0BAMvE;AAED,iBAAe,eAAe,CAC5B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,QAAQ,EAChB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEAWlC;AAED,iBAAe,uBAAuB,CACpC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEAalC;AA0GD,OAAO,EACL,eAAe,EACf,cAAc,EACd,UAAU,EACV,aAAa,EACb,aAAa,EACb,eAAe,EACf,eAAe,EACf,uBAAuB,GACxB,CAAA"}
+{"version":3,"file":"safe.d.ts","sourceRoot":"","sources":["../../../accounts/safe.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,GAAG,EACR,KAAK,OAAO,EACZ,KAAK,KAAK,EAOV,KAAK,GAAG,EAER,KAAK,YAAY,EAKlB,MAAM,MAAM,CAAA;AACb,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAEhC,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAM/C,OAAO,KAAK,EAAE,QAAQ,EAAE,uBAAuB,EAAe,MAAM,UAAU,CAAA;AAM9E,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAoBhF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;SAmGrD;AAED,iBAAS,eAAe,CAAC,MAAM,EAAE,uBAAuB;;;;;;EAgFvD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBAoBlD;AAED,iBAAS,eAAe,CAAC,MAAM,EAAE,uBAAuB,EAAE,KAAK,EAAE,KAAK;;;;;;EAarE;AAED,iBAAS,cAAc,CAAC,MAAM,EAAE,MAAM,iBA2BrC;AAED,iBAAe,aAAa,CAC1B,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,eAAe,EAC1B,kBAAkB,GAAE,CAAC,SAAS,EAAE,GAAG,KAAK,GAA8B,0BAMvE;AAED,iBAAe,eAAe,CAC5B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,QAAQ,EAChB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEAWlC;AA2GD,OAAO,EACL,eAAe,EACf,cAAc,EACd,UAAU,EACV,aAAa,EACb,aAAa,EACb,eAAe,EACf,eAAe,GAChB,CAAA"}

package/dist/src/accounts/safe.js

@@ -239,13 +239,6 @@ async function getSmartAccount(client, address, owners, validatorAddress, sign)
         return getMockSignature(owners);
     }, sign);
 }
-async function getGuardianSmartAccount(client, address, guardians, validatorAddress, sign) {
-    return await getBaseSmartAccount(address, client, validatorAddress, async () => {
-        return getMockSignature(guardians);
-    }, async (hash) => {
-        return await sign(hash);
-    });
-}
 async function getBaseSmartAccount(address, client, validatorAddress, getStubSignature, signUserOperation) {
     return await toSmartAccount({
         client,
@@ -317,8 +310,9 @@ function getOwners(config) {
     const ownerSet = config.owners;
     switch (ownerSet.type) {
         case 'ecdsa':
-        case 'ens':
             return ownerSet.accounts.map((account) => account.address);
+        case 'ens':
+            return ownerSet.owners.map((o) => o.account.address);
         case 'passkey':
             return [NO_SAFE_OWNER_ADDRESS];
         case 'multi-factor':
@@ -340,4 +334,4 @@ function getThreshold(config) {
             return 1n;
     }
 }
-export { getEip712Domain, getInstallData, getAddress, packSignature, getDeployArgs, getV0DeployArgs, getSmartAccount, getGuardianSmartAccount, };
+export { getEip712Domain, getInstallData, getAddress, packSignature, getDeployArgs, getV0DeployArgs, getSmartAccount, };

package/dist/src/accounts/signing/common.d.ts

@@ -21,12 +21,18 @@ declare function signWithMultiFactorAuth<T>(signers: SignerSet & {
     type: 'owner';
     kind: 'multi-factor';
 }, chain: Chain, address: Address, params: T, isUserOpHash: boolean, signMain: (signers: SignerSet, chain: Chain, address: Address, params: T, isUserOpHash: boolean) => Promise<Hex>): Promise<Hex>;
+declare function packMultiFactorOwnerSignatures(entries: {
+    id: number | Hex;
+    validatorAddress: Address;
+    signature: Hex;
+}[]): Hex;
+declare function packPasskeyOwnerSignatures(chain: Chain, address: Address, publicKeys: Hex[], signatures: {
+    webauthn: WebAuthnSignMetadata;
+    signature: Hex;
+}[], module?: Address): Hex;
 declare function signWithSession(signers: ResolvedSessionSignerSet, chain: Chain, address: Address, hash: Hex, signMain: (signers: SignerSet, chain: Chain, address: Address, hash: Hex, isUserOpHash: boolean) => Promise<Hex>): Promise<Hex>;
-declare function signWithGuardians<T>(signers: SignerSet & {
-    type: 'guardians';
-}, params: T, signingFunctions: SigningFunctions<T>): Promise<Hex>;
 declare function signWithOwners<T>(signers: SignerSet & {
     type: 'owner';
 }, chain: Chain, address: Address, params: T, signingFunctions: SigningFunctions<T>, isUserOpHash: boolean, signMain: (signers: SignerSet, chain: Chain, address: Address, params: T, isUserOpHash: boolean) => Promise<Hex>): Promise<Hex>;
-export { convertOwnerSetToSignerSet, signWithMultiFactorAuth, signWithSession, signWithGuardians, signWithOwners, type SigningFunctions, };
+export { convertOwnerSetToSignerSet, packMultiFactorOwnerSignatures, packPasskeyOwnerSignatures, signWithMultiFactorAuth, signWithSession, signWithOwners, type SigningFunctions, };
 //# sourceMappingURL=common.d.ts.map

package/dist/src/accounts/signing/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../accounts/signing/common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../accounts/signing/common.ts"],"names":[],"mappings":"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"}