@charterlabs/rhinestone-sdk 0.1.13 → 0.2.0

package/dist/src/accounts/index.js

@@ -10,16 +10,15 @@ exports.signEip7702InitData = signEip7702InitData;
 exports.getEip7702InitCall = getEip7702InitCall;
 exports.isDeployed = isDeployed;
 exports.deploy = deploy;
+exports.toErc6492Signature = toErc6492Signature;
 exports.getSmartAccount = getSmartAccount;
 exports.getSmartSessionSmartAccount = getSmartSessionSmartAccount;
 exports.getGuardianSmartAccount = getGuardianSmartAccount;
 exports.getPackedSignature = getPackedSignature;
-exports.deployStandaloneWithEoa = deployStandaloneWithEoa;
+exports.getTypedDataPackedSignature = getTypedDataPackedSignature;
 const viem_1 = require("viem");
-const p256_1 = require("@noble/curves/p256");
 const execution_1 = require("../execution");
 const smart_session_1 = require("../execution/smart-session");
-const modules_1 = require("../modules");
 const validators_1 = require("../modules/validators");
 const core_1 = require("../modules/validators/core");
 const error_1 = require("./error");
@@ -35,6 +34,9 @@ Object.defineProperty(exports, "SmartSessionsNotEnabledError", { enumerable: tru
 const kernel_1 = require("./kernel");
 const nexus_1 = require("./nexus");
 const safe_1 = require("./safe");
+const common_1 = require("./signing/common");
+const message_1 = require("./signing/message");
+const typedData_1 = require("./signing/typedData");
 const startale_1 = require("./startale");
 const utils_1 = require("./utils");
 function getDeployArgs(config) {
@@ -180,26 +182,56 @@ function getAddress(config) {
 }
 // Signs and packs a signature to be EIP-1271 compatible
 async function getPackedSignature(config, signers, chain, validator, hash, transformSignature = (signature) => signature) {
-    signers = signers ?? convertOwnerSetToSignerSet(config.owners);
-    const signFn = (hash) => sign(signers, chain, hash);
+    signers = signers ?? (0, common_1.convertOwnerSetToSignerSet)(config.owners);
+    const signFn = (hash) => (0, message_1.sign)(signers, chain, hash);
     const account = getAccountProvider(config);
     const address = getAddress(config);
     switch (account.type) {
         case 'safe': {
-            return (0, safe_1.getPackedSignature)(signFn, hash, validator, transformSignature);
+            const signature = await signFn(hash);
+            return (0, safe_1.packSignature)(signature, validator, transformSignature);
         }
         case 'nexus': {
-            return (0, nexus_1.getPackedSignature)(signFn, hash, validator, transformSignature);
+            const signature = await signFn(hash);
+            return (0, nexus_1.packSignature)(signature, validator, transformSignature);
         }
         case 'kernel': {
-            return (0, kernel_1.getPackedSignature)(signFn, hash, validator, address, transformSignature);
+            const signature = await signFn((0, kernel_1.wrapMessageHash)(hash, address));
+            return (0, kernel_1.packSignature)(signature, validator, transformSignature);
         }
         case 'startale': {
-            return (0, startale_1.getPackedSignature)(signFn, hash, validator, transformSignature);
+            const signature = await signFn(hash);
+            return (0, startale_1.packSignature)(signature, validator, transformSignature);
         }
     }
 }
-async function isDeployed(chain, config) {
+// Signs and packs a signature to be EIP-1271 compatible
+async function getTypedDataPackedSignature(config, signers, chain, validator, parameters, transformSignature = (signature) => signature) {
+    signers = signers ?? (0, common_1.convertOwnerSetToSignerSet)(config.owners);
+    const signFn = (parameters) => (0, typedData_1.sign)(signers, chain, parameters);
+    const account = getAccountProvider(config);
+    switch (account.type) {
+        case 'safe': {
+            const signature = await signFn(parameters);
+            return (0, safe_1.packSignature)(signature, validator, transformSignature);
+        }
+        case 'nexus': {
+            const signature = await signFn(parameters);
+            return (0, nexus_1.packSignature)(signature, validator, transformSignature);
+        }
+        case 'kernel': {
+            const address = getAddress(config);
+            const signMessageFn = (hash) => (0, message_1.sign)(signers, chain, hash);
+            const signature = await signMessageFn((0, kernel_1.wrapMessageHash)((0, viem_1.hashTypedData)(parameters), address));
+            return (0, kernel_1.packSignature)(signature, validator, transformSignature);
+        }
+        case 'startale': {
+            const signature = await signFn(parameters);
+            return (0, startale_1.packSignature)(signature, validator, transformSignature);
+        }
+    }
+}
+async function isDeployed(config, chain) {
     const publicClient = (0, viem_1.createPublicClient)({
         chain: chain,
         transport: (0, utils_1.createTransport)(chain, config.provider),
@@ -234,7 +266,7 @@ async function deployWithIntent(chain, config) {
         // Already deployed
         return;
     }
-    await (0, execution_1.sendTransaction)(config, {
+    const result = await (0, execution_1.sendTransaction)(config, {
         targetChain: chain,
         calls: [
             {
@@ -243,42 +275,35 @@ async function deployWithIntent(chain, config) {
             },
         ],
     });
+    await (0, execution_1.waitForExecution)(config, result, true);
 }
-async function deployStandaloneWithEoa(chain, config, deployer) {
-    if (is7702(config)) {
-        throw new Error('deployStandaloneWithEoa is only for factory-based accounts. Remove config.eoa to use this method.');
-    }
-    const address = getAddress(config);
-    const alreadyDeployed = await isDeployed(chain, config);
-    if (alreadyDeployed) {
-        return address;
+async function toErc6492Signature(config, signature, chain) {
+    const deployed = await isDeployed(config, chain);
+    if (deployed) {
+        return signature;
     }
-    const { factory, factoryData } = getDeployArgs(config);
-    if (!factory || !factoryData) {
+    // Account is not deployed, use ERC-6492
+    const initCode = getInitCode(config);
+    if (!initCode) {
         throw new error_1.FactoryArgsNotAvailableError();
     }
-    const publicClient = (0, viem_1.createPublicClient)({
-        chain,
-        transport: (0, utils_1.createTransport)(chain, config.provider),
-    });
-    const walletClient = (0, viem_1.createWalletClient)({
-        account: deployer,
-        chain,
-        transport: (0, utils_1.createTransport)(chain, config.provider),
-    });
-    const hash = await walletClient.sendTransaction({
-        to: factory,
-        data: factoryData,
-    });
-    await publicClient.waitForTransactionReceipt({ hash });
-    return address;
+    const { factory, factoryData } = initCode;
+    const magicBytes = '0x6492649264926492649264926492649264926492649264926492649264926492';
+    return (0, viem_1.concat)([
+        (0, viem_1.encodeAbiParameters)([
+            { name: 'create2Factory', type: 'address' },
+            { name: 'factoryCalldata', type: 'bytes' },
+            { name: 'originalERC1271Signature', type: 'bytes' },
+        ], [factory, factoryData, signature]),
+        magicBytes,
+    ]);
 }
 async function getSmartAccount(config, client, chain) {
     const account = getAccountProvider(config);
     const address = getAddress(config);
     const ownerValidator = (0, validators_1.getOwnerValidator)(config);
-    const signers = convertOwnerSetToSignerSet(config.owners);
-    const signFn = (hash) => sign(signers, chain, hash);
+    const signers = (0, common_1.convertOwnerSetToSignerSet)(config.owners);
+    const signFn = (hash) => (0, message_1.sign)(signers, chain, hash);
     switch (account.type) {
         case 'safe': {
             return (0, safe_1.getSmartAccount)(client, address, config.owners, ownerValidator.address, signFn);
@@ -305,7 +330,7 @@ async function getSmartSessionSmartAccount(config, client, chain, session, enabl
         session,
         enableData: enableData || undefined,
     };
-    const signFn = (hash) => sign(signers, chain, hash);
+    const signFn = (hash) => (0, message_1.sign)(signers, chain, hash);
     const account = getAccountProvider(config);
     switch (account.type) {
         case 'safe': {
@@ -333,7 +358,7 @@ async function getGuardianSmartAccount(config, client, chain, guardians) {
         type: 'guardians',
         guardians: accounts,
     };
-    const signFn = (hash) => sign(signers, chain, hash);
+    const signFn = (hash) => (0, message_1.sign)(signers, chain, hash);
     const account = getAccountProvider(config);
     switch (account.type) {
         case 'safe': {
@@ -350,139 +375,6 @@ async function getGuardianSmartAccount(config, client, chain, guardians) {
         }
     }
 }
-async function sign(signers, chain, hash) {
-    switch (signers.type) {
-        case 'owner': {
-            switch (signers.kind) {
-                case 'ecdsa': {
-                    const signatures = await Promise.all(signers.accounts.map((account) => signEcdsa(account, hash)));
-                    return (0, viem_1.concat)(signatures);
-                }
-                case 'passkey': {
-                    // Convert OwnerSignerSet to WebauthnValidatorConfig
-                    const webAuthnConfig = {
-                        type: 'passkey',
-                        account: signers.account,
-                        credentialIds: signers.credentialIds
-                    };
-                    return await signPasskey(webAuthnConfig, chain, hash);
-                }
-                case 'multi-factor': {
-                    const signatures = await Promise.all(signers.validators.map(async (validator) => {
-                        if (validator === null) {
-                            return '0x';
-                        }
-                        // Convert to proper validator format
-                        const validatorConfig = validator.type === 'ecdsa'
-                            ? { type: 'ecdsa', accounts: validator.accounts, threshold: 1 }
-                            : { type: 'passkey', account: validator.account, credentialIds: validator.credentialIds };
-                        const validatorSigners = convertOwnerSetToSignerSet(validatorConfig);
-                        return sign(validatorSigners, chain, hash);
-                    }));
-                    const data = (0, viem_1.encodeAbiParameters)([
-                        {
-                            components: [
-                                {
-                                    internalType: 'bytes32',
-                                    name: 'packedValidatorAndId',
-                                    type: 'bytes32',
-                                },
-                                { internalType: 'bytes', name: 'data', type: 'bytes' },
-                            ],
-                            name: 'validators',
-                            type: 'tuple[]',
-                        },
-                    ], [
-                        signers.validators.map((validator, index) => {
-                            // Convert to proper validator format for getValidator
-                            const validatorConfig = validator.type === 'ecdsa'
-                                ? { type: 'ecdsa', accounts: validator.accounts, threshold: 1 }
-                                : { type: 'passkey', account: validator.account, credentialIds: validator.credentialIds };
-                            const validatorModule = (0, core_1.getValidator)(validatorConfig);
-                            return {
-                                packedValidatorAndId: (0, viem_1.concat)([
-                                    (0, viem_1.pad)((0, viem_1.toHex)(validator.id), { size: 12 }),
-                                    validatorModule.address,
-                                ]),
-                                data: signatures[index],
-                            };
-                        }),
-                    ]);
-                    return data;
-                }
-                default: {
-                    throw new Error('Unsupported owner kind');
-                }
-            }
-        }
-        case 'session': {
-            const sessionSigners = convertOwnerSetToSignerSet(signers.session.owners);
-            return sign(sessionSigners, chain, hash);
-        }
-        case 'guardians': {
-            const signatures = await Promise.all(signers.guardians.map((account) => signEcdsa(account, hash)));
-            return (0, viem_1.concat)(signatures);
-        }
-    }
-}
-async function signEcdsa(account, hash) {
-    if (!account.signMessage) {
-        throw new error_1.SigningNotSupportedForAccountError();
-    }
-    return await account.signMessage({ message: { raw: hash } });
-}
-async function signPasskey(validators, chain, hash) {
-    const { account, credentialIds } = validators;
-    console.log('credentialIds in the signPasskey', credentialIds);
-    const { webauthn: rawWebauthn, signature } = await account.sign({ hash });
-    console.log('rawWebauthn in the signPasskey', rawWebauthn);
-    console.log('signature in the signPasskey', signature);
-    const { authenticatorData, clientDataJSON, challengeIndex, typeIndex } = rawWebauthn;
-    const usePrecompiled = (0, modules_1.isRip7212SupportedNetwork)(chain);
-    // Convert signature to object { r, s } in r||s format using noble p256
-    function lowSNormalize(r, s) {
-        const n = BigInt('0xFFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551');
-        if (s > n / 2n)
-            return { r, s: n - s };
-        return { r, s };
-    }
-    function toRS(sig) {
-        if (typeof sig === 'object' && 'r' in sig && 's' in sig) {
-            return lowSNormalize(sig.r, sig.s);
-        }
-        const bytes = typeof sig === 'string' ? (0, viem_1.hexToBytes)(sig) : sig;
-        let compact;
-        if (bytes.length > 0 && bytes[0] === 0x30) {
-            // DER
-            const derSig = p256_1.secp256r1.Signature.fromDER(bytes);
-            compact = derSig.toCompactRawBytes(); // 64 bytes r||s
-        }
-        else if (bytes.length === 64) {
-            compact = bytes;
-        }
-        else if (typeof sig === 'string' && sig.length === 2 + 64 * 2) {
-            // Hex r||s
-            compact = (0, viem_1.hexToBytes)(sig);
-        }
-        else {
-            // Fallback: treat as r||s if size permits
-            compact = bytes;
-        }
-        const rHex = (0, viem_1.bytesToHex)(compact.slice(0, 32));
-        const sHex = (0, viem_1.bytesToHex)(compact.slice(32, 64));
-        const r = BigInt(rHex);
-        const s = BigInt(sHex);
-        return lowSNormalize(r, s);
-    }
-    const processedSignature = toRS(signature);
-    console.log('processedSignature in the signPasskey', processedSignature);
-    return (0, modules_1.getWebauthnValidatorSignature)({
-        credentialIds,
-        usePrecompiled,
-        webauthn: { authenticatorData, clientDataJSON, challengeIndex, typeIndex },
-        signature: processedSignature,
-    });
-}
 function is7702(config) {
     return config.eoa !== undefined;
 }
@@ -494,40 +386,3 @@ function getAccountProvider(config) {
         type: 'nexus',
     };
 }
-function convertOwnerSetToSignerSet(owners) {
-    switch (owners.type) {
-        case 'ecdsa': {
-            return {
-                type: 'owner',
-                kind: 'ecdsa',
-                accounts: owners.accounts,
-            };
-        }
-        case 'passkey': {
-            const { account, credentialIds } = owners;
-            return {
-                type: 'owner',
-                kind: 'passkey',
-                account,
-                credentialIds,
-            };
-        }
-        case 'multi-factor': {
-            // Filter out null entries and propagate credentialIds
-            const mf = owners;
-            const validValidators = mf.validators.filter((v) => v !== null);
-            return {
-                type: 'owner',
-                kind: 'multi-factor',
-                validators: validValidators.map((validator, index) => {
-                    if (validator.type === 'ecdsa') {
-                        return { type: 'ecdsa', id: index, accounts: validator.accounts };
-                    }
-                    else {
-                        return { type: 'passkey', id: index, account: validator.account, credentialIds: validator.credentialIds };
-                    }
-                }),
-            };
-        }
-    }
-}

package/dist/src/accounts/index.test.js

@@ -14,18 +14,17 @@ const _1 = require(".");
                 },
                 rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(address).toEqual('0xa32fa78416f6c68ce4f75f702e07849a269feffb');
+            (0, vitest_1.expect)(address).toEqual('0x7fbe9b0796484c06c94968b910a4cf488fd1719b');
         });
         (0, vitest_1.test)('Safe, passkey owner with a session', () => {
             const address = (0, _1.getAddress)({
                 owners: {
                     type: 'passkey',
                     account: consts_1.passkeyAccount,
-                    credentialIds: ['0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef'],
                 },
                 rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(address).toEqual('0xfbda4e576b2a300cd1b7e8748c9a7577ab3a503e');
+            (0, vitest_1.expect)(address).toEqual('0x82a8a51443c2b8608001bdc4ff5bb31f69e8ed14');
         });
     });
     (0, vitest_1.describe)('Sign', () => {

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

@@ -13,9 +13,10 @@ declare function getDeployArgs(config: RhinestoneAccountConfig): {
 };
 declare function getAddress(config: RhinestoneAccountConfig): `0x${string}`;
 declare function getInstallData(module: Module): Hex[];
-declare function getPackedSignature(signFn: (message: Hex) => Promise<Hex>, hash: Hex, validator: ValidatorConfig, accountAddress: Address, transformSignature?: (signature: Hex) => Hex): Promise<`0x${string}`>;
+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 getSessionSmartAccount(client: PublicClient, address: Address, session: Session, validatorAddress: Address, enableData: EnableSessionData | null, 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 { getInstallData, getAddress, getDeployArgs, getSmartAccount, getSessionSmartAccount, getGuardianSmartAccount, getPackedSignature, };
+export { getInstallData, getAddress, getDeployArgs, getSmartAccount, getSessionSmartAccount, getGuardianSmartAccount, 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,EAQZ,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;AAQ1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAC1E,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAgBhF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;EA4CrD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBASlD;AAED,iBAAS,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE,CAsE7C;AAED,iBAAe,kBAAkB,CAC/B,MAAM,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EACtC,IAAI,EAAE,GAAG,EACT,SAAS,EAAE,eAAe,EAC1B,cAAc,EAAE,OAAO,EACvB,kBAAkB,GAAE,CAAC,SAAS,EAAE,GAAG,KAAK,GAA8B,0BAevE;AAwBD,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,sBAAsB,CACnC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,OAAO,EACzB,UAAU,EAAE,iBAAiB,GAAG,IAAI,EACpC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEA0ClC;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,cAAc,EACd,UAAU,EACV,aAAa,EACb,eAAe,EACf,sBAAsB,EACtB,uBAAuB,EACvB,kBAAkB,GACnB,CAAA"}
+{"version":3,"file":"kernel.d.ts","sourceRoot":"","sources":["../../../accounts/kernel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,GAAG,EACR,KAAK,OAAO,EAQZ,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;AAQ1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAC1E,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAgBhF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;EA4CrD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBASlD;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,sBAAsB,CACnC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,OAAO,EACzB,UAAU,EAAE,iBAAiB,GAAG,IAAI,EACpC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEA0ClC;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,cAAc,EACd,UAAU,EACV,aAAa,EACb,eAAe,EACf,sBAAsB,EACtB,uBAAuB,EACvB,aAAa,EACb,eAAe,GAChB,CAAA"}

package/dist/src/accounts/kernel.js

@@ -6,7 +6,8 @@ exports.getDeployArgs = getDeployArgs;
 exports.getSmartAccount = getSmartAccount;
 exports.getSessionSmartAccount = getSessionSmartAccount;
 exports.getGuardianSmartAccount = getGuardianSmartAccount;
-exports.getPackedSignature = getPackedSignature;
+exports.packSignature = packSignature;
+exports.wrapMessageHash = wrapMessageHash;
 const viem_1 = require("viem");
 const account_abstraction_1 = require("viem/account-abstraction");
 const modules_1 = require("../modules");
@@ -126,11 +127,8 @@ function getInstallData(module) {
         }
     }
 }
-async function getPackedSignature(signFn, hash, validator, accountAddress, transformSignature = (signature) => signature) {
+async function packSignature(signature, validator, transformSignature = (signature) => signature) {
     const vId = validator.isRoot ? '0x00' : (0, viem_1.concat)(['0x01', validator.address]);
-    const signature = validator.isRoot
-        ? await signFn(wrapMessageHash(hash, accountAddress))
-        : await signFn(hash);
     const magicValueSigReplayable = (0, viem_1.keccak256)((0, viem_1.toHex)('kernel.replayable.signature'));
     const packedSig = (0, viem_1.concat)([
         vId,

package/dist/src/accounts/kernel.test.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const viem_1 = require("viem");
 const vitest_1 = require("vitest");
 const consts_1 = require("../../test/consts");
 const common_1 = require("../modules/common");
@@ -17,17 +16,16 @@ const MOCK_MODULE_ADDRESS = '0x28de6501fa86f2e6cd0b33c3aabdaeb4a1b93f3f';
                 rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
             (0, vitest_1.expect)(factory).toEqual('0xd703aae79538628d27099b8c4f621be4ccd142d5');
-            (0, vitest_1.expect)(factoryData).toEqual('0xc5265d5d0000000000000000000000002577507b78c2008ff367261cb6285d44ba5ef2e90000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003243c3b752b010000000000E9E6E96Bcaa3c113187CdB7E38AED90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000f6c02c78ded62973b43bfa523b247da09948693600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001249517e29f000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000094000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
+            (0, vitest_1.expect)(factoryData).toEqual('0xc5265d5d0000000000000000000000002577507b78c2008ff367261cb6285d44ba5ef2e90000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003243c3b752b0120C008719Ba9D8aA14C7d07D122cd5E965aA8da50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000f6c02c78ded62973b43bfa523b247da09948693600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001249517e29f000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000094000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
             (0, vitest_1.expect)(salt).toEqual('0x0000000000000000000000000000000000000000000000000000000000000000');
             (0, vitest_1.expect)(implementation).toEqual('0xd6CEDDe84be40893d153Be9d467CD6aD37875b28');
-            (0, vitest_1.expect)(initializationCallData).toEqual('0x3c3b752b010000000000E9E6E96Bcaa3c113187CdB7E38AED90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000f6c02c78ded62973b43bfa523b247da09948693600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001249517e29f000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000940000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
+            (0, vitest_1.expect)(initializationCallData).toEqual('0x3c3b752b0120C008719Ba9D8aA14C7d07D122cd5E965aA8da50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000f6c02c78ded62973b43bfa523b247da09948693600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001249517e29f000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000940000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
         });
         (0, vitest_1.test)('Passkey owner', () => {
             const { factory, factoryData, salt, implementation, initializationCallData, } = (0, kernel_1.getDeployArgs)({
                 owners: {
                     type: 'passkey',
                     account: consts_1.passkeyAccount,
-                    credentialIds: ['0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef'],
                 },
                 rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
@@ -47,14 +45,13 @@ const MOCK_MODULE_ADDRESS = '0x28de6501fa86f2e6cd0b33c3aabdaeb4a1b93f3f';
                 },
                 rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(address).toEqual('0xe4090134D2FdC0fc13b43651B5b1c75BDf825c5f');
+            (0, vitest_1.expect)(address).toEqual('0x43bb2f5505a463c57C9688678cC9DB8d10729747');
         });
         (0, vitest_1.test)('Passkey owner', () => {
             const address = (0, kernel_1.getAddress)({
                 owners: {
                     type: 'passkey',
                     account: consts_1.passkeyAccount,
-                    credentialIds: ['0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef'],
                 },
                 rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
@@ -79,25 +76,21 @@ const MOCK_MODULE_ADDRESS = '0x28de6501fa86f2e6cd0b33c3aabdaeb4a1b93f3f';
     (0, vitest_1.describe)('Get Packed Signature', () => {
         (0, vitest_1.describe)('Mock signature', () => {
             (0, vitest_1.test)('Root validator', async () => {
-                const hash = (0, viem_1.keccak256)('0xabcd');
                 const mockSignature = '0x1234';
-                const accountAddress = '0xa80ed905adbd7cba128aaf64a1fa33a530b9b0aa';
                 const validator = {
                     address: '0xe35b75e5ec3c04e9cefa8e581fbee859f56edeb4',
                     isRoot: true,
                 };
-                const signature = await (0, kernel_1.getPackedSignature)(async (_) => mockSignature, hash, validator, accountAddress);
+                const signature = await (0, kernel_1.packSignature)(mockSignature, validator);
                 (0, vitest_1.expect)(signature).toEqual('0x000555ad2729e8da1777a4e5020806f8bf7601c3db6bfe402f410a34958363a95a1234');
             });
             (0, vitest_1.test)('Non-root validator', async () => {
-                const hash = (0, viem_1.keccak256)('0xabcd');
                 const mockSignature = '0x1234';
-                const accountAddress = '0xa80ed905adbd7cba128aaf64a1fa33a530b9b0aa';
                 const validator = {
                     address: '0xe35b75e5ec3c04e9cefa8e581fbee859f56edeb4',
                     isRoot: false,
                 };
-                const signature = await (0, kernel_1.getPackedSignature)(async (_) => mockSignature, hash, validator, accountAddress);
+                const signature = await (0, kernel_1.packSignature)(mockSignature, validator);
                 (0, vitest_1.expect)(signature).toEqual('0x01e35b75e5ec3c04e9cefa8e581fbee859f56edeb40555ad2729e8da1777a4e5020806f8bf7601c3db6bfe402f410a34958363a95a1234');
             });
         });

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

@@ -14,7 +14,7 @@ declare function getDeployArgs(config: RhinestoneAccountConfig): {
 };
 declare function getAddress(config: RhinestoneAccountConfig): `0x${string}`;
 declare function getInstallData(module: Module): `0x${string}`;
-declare function getPackedSignature(signFn: (message: Hex) => Promise<Hex>, hash: Hex, validator: ValidatorConfig, transformSignature?: (signature: Hex) => Hex, defaultValidatorAddress?: Address): Promise<`0x${string}`>;
+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 getSessionSmartAccount(client: PublicClient, address: Address, session: Session, validatorAddress: Address, enableData: EnableSessionData | null, 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">>>;
@@ -23,5 +23,5 @@ declare function getEip7702InitCall(config: RhinestoneAccountConfig, signature:
     initData: `0x${string}`;
     contract: `0x${string}`;
 }>;
-export { getInstallData, getAddress, getPackedSignature, getDeployArgs, getSmartAccount, getSessionSmartAccount, getGuardianSmartAccount, signEip7702InitData, getEip7702InitCall, };
+export { getInstallData, getAddress, packSignature, getDeployArgs, getSmartAccount, getSessionSmartAccount, getGuardianSmartAccount, 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,GAAG,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAYpE,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAEhC,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAS/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAE1E,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAehF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;;EA+DrD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBA4BlD;AAED,iBAAS,cAAc,CAAC,MAAM,EAAE,MAAM,iBA2BrC;AAED,iBAAe,kBAAkB,CAC/B,MAAM,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EACtC,IAAI,EAAE,GAAG,EACT,SAAS,EAAE,eAAe,EAC1B,kBAAkB,GAAE,CAAC,SAAS,EAAE,GAAG,KAAK,GAA8B,EACtE,uBAAuB,GAAE,OAAyC,0BAYnE;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,sBAAsB,CACnC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,OAAO,EACzB,UAAU,EAAE,iBAAiB,GAAG,IAAI,EACpC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EACjC,uBAAuB,GAAE,OAAyC,iEAwCnE;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,0BA0Bb;AAED,iBAAe,kBAAkB,CAC/B,MAAM,EAAE,uBAAuB,EAC/B,SAAS,EAAE,GAAG;;;GAuCf;AAED,OAAO,EACL,cAAc,EACd,UAAU,EACV,kBAAkB,EAClB,aAAa,EACb,eAAe,EACf,sBAAsB,EACtB,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,GAAG,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAYpE,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAEhC,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAS/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAE1E,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAchF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;;EAoErD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBA4BlD;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,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,sBAAsB,CACnC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,OAAO,EACzB,UAAU,EAAE,iBAAiB,GAAG,IAAI,EACpC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EACjC,uBAAuB,GAAE,OAAyC,iEAwCnE;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,0BA0Bb;AAED,iBAAe,kBAAkB,CAC/B,MAAM,EAAE,uBAAuB,EAC/B,SAAS,EAAE,GAAG;;;GAuCf;AAED,OAAO,EACL,cAAc,EACd,UAAU,EACV,aAAa,EACb,aAAa,EACb,eAAe,EACf,sBAAsB,EACtB,uBAAuB,EACvB,mBAAmB,EACnB,kBAAkB,GACnB,CAAA"}

package/dist/src/accounts/nexus.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInstallData = getInstallData;
 exports.getAddress = getAddress;
-exports.getPackedSignature = getPackedSignature;
+exports.packSignature = packSignature;
 exports.getDeployArgs = getDeployArgs;
 exports.getSmartAccount = getSmartAccount;
 exports.getSessionSmartAccount = getSessionSmartAccount;
@@ -16,27 +16,33 @@ const validators_1 = require("../modules/validators");
 const core_1 = require("../modules/validators/core");
 const error_1 = require("./error");
 const utils_1 = require("./utils");
-const NEXUS_DEFAULT_VALIDATOR_ADDRESS = core_1.OWNABLE_VALIDATOR_ADDRESS;
-const NEXUS_IMPLEMENTATION_ADDRESS = '0x0000000000Fb742636364B5ca9B6D2ebbC63FB5D';
-const NEXUS_FACTORY_ADDRESS = '0x0000000000751F0a4816c34fB95ccbD463878361';
-const NEXUS_BOOTSTRAP_ADDRESS = '0x00000000001Cf4667Bfd7be8f67D01d63938784b';
+const NEXUS_DEFAULT_VALIDATOR_ADDRESS = core_1.WEBAUTHN_VALIDATOR_ADDRESS;
+const NEXUS_IMPLEMENTATION_ADDRESS = '0x55cc6609fDb3620ABeABf4dB020abfc469494778';
+const NEXUS_FACTORY_ADDRESS = '0xFF4454d15707a6f6BF01540796040f9E1646322C';
+const NEXUS_BOOTSTRAP_ADDRESS = '0x40E89A87C56A340c9257350dEDf4B89a3FcCCcD3';
 const NEXUS_CREATION_CODE = '0x60806040526102aa803803806100148161018c565b92833981016040828203126101885781516001600160a01b03811692909190838303610188576020810151906001600160401b03821161018857019281601f8501121561018857835161006e610069826101c5565b61018c565b9481865260208601936020838301011161018857815f926020809301865e8601015260017f90b772c2cb8a51aa7a8a65fc23543c6d022d5b3f8e2b92eed79fba7eef8293005d823b15610176577f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b031916821790557fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b5f80a282511561015e575f8091610146945190845af43d15610156573d91610137610069846101c5565b9283523d5f602085013e6101e0565b505b604051606b908161023f8239f35b6060916101e0565b50505034156101485763b398979f60e01b5f5260045ffd5b634c9c8ce360e01b5f5260045260245ffd5b5f80fd5b6040519190601f01601f191682016001600160401b038111838210176101b157604052565b634e487b7160e01b5f52604160045260245ffd5b6001600160401b0381116101b157601f01601f191660200190565b9061020457508051156101f557805190602001fd5b63d6bda27560e01b5f5260045ffd5b81511580610235575b610215575090565b639996b31560e01b5f9081526001600160a01b0391909116600452602490fd5b50803b1561020d56fe60806040523615605c575f8073ffffffffffffffffffffffffffffffffffffffff7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5416368280378136915af43d5f803e156058573d5ff35b3d5ffd5b00fea164736f6c634300081b000a';
 function getDeployArgs(config) {
     const salt = (0, viem_1.keccak256)('0x');
     const moduleSetup = (0, modules_1.getSetup)(config);
-    console.log('moduleSetup from SDK', moduleSetup);
+    // Filter out the default validator
+    const defaultValidator = moduleSetup.validators.find((v) => v.address === NEXUS_DEFAULT_VALIDATOR_ADDRESS);
+    const defaultValidatorInitData = defaultValidator
+        ? defaultValidator.initData
+        : '0x';
+    console.log('[SDK] defaultValidatorInitData in the getDeployArgs', defaultValidatorInitData);
+    const validators = moduleSetup.validators.filter((v) => v.address !== NEXUS_DEFAULT_VALIDATOR_ADDRESS);
     const initData = (0, viem_1.encodeAbiParameters)([{ type: 'address' }, { type: 'bytes' }], [
         NEXUS_BOOTSTRAP_ADDRESS,
         (0, viem_1.encodeFunctionData)({
             abi: (0, viem_1.parseAbi)([
                 'struct BootstrapConfig {address module;bytes initData;}',
                 'struct BootstrapPreValidationHookConfig {uint256 hookType;address module;bytes data;}',
-                'struct RegistryConfig {address registry;address[] attesters;uint8 threshold;}',
-                'function initNexus(BootstrapConfig[] calldata validators,BootstrapConfig[] calldata executors,BootstrapConfig calldata hook,BootstrapConfig[] calldata fallbacks,BootstrapPreValidationHookConfig[] calldata preValidationHooks,RegistryConfig registryConfig) external',
+                'function initNexusWithDefaultValidatorAndOtherModulesNoRegistry(bytes calldata defaultValidatorInitData,BootstrapConfig[] calldata validators,BootstrapConfig[] calldata executors,BootstrapConfig calldata hook,BootstrapConfig[] calldata fallbacks,BootstrapPreValidationHookConfig[] calldata preValidationHooks) external',
             ]),
-            functionName: 'initNexus',
+            functionName: 'initNexusWithDefaultValidatorAndOtherModulesNoRegistry',
             args: [
-                moduleSetup.validators.map((v) => ({
+                defaultValidatorInitData,
+                validators.map((v) => ({
                     module: v.address,
                     initData: v.initData,
                 })),
@@ -53,11 +59,6 @@ function getDeployArgs(config) {
                     initData: f.initData,
                 })),
                 [],
-                {
-                    registry: moduleSetup.registry,
-                    attesters: moduleSetup.attesters,
-                    threshold: moduleSetup.threshold,
-                },
             ],
         }),
     ]);
@@ -125,8 +126,7 @@ function getInstallData(module) {
         args: [module.type, module.address, module.initData],
     });
 }
-async function getPackedSignature(signFn, hash, validator, transformSignature = (signature) => signature, defaultValidatorAddress = NEXUS_DEFAULT_VALIDATOR_ADDRESS) {
-    const signature = await signFn(hash);
+async function packSignature(signature, validator, transformSignature = (signature) => signature, defaultValidatorAddress = NEXUS_DEFAULT_VALIDATOR_ADDRESS) {
     const validatorAddress = validator.address === defaultValidatorAddress
         ? viem_1.zeroAddress
         : validator.address;