@rhinestone/sdk 1.0.0-alpha.8 → 1.0.0-beta.38

package/dist/src/accounts/nexus.js

@@ -2,23 +2,71 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInstallData = getInstallData;
 exports.getAddress = getAddress;
-exports.getPackedSignature = getPackedSignature;
+exports.getDefaultValidatorAddress = getDefaultValidatorAddress;
+exports.packSignature = packSignature;
 exports.getDeployArgs = getDeployArgs;
 exports.getSmartAccount = getSmartAccount;
 exports.getSessionSmartAccount = getSessionSmartAccount;
 exports.getGuardianSmartAccount = getGuardianSmartAccount;
+exports.signEip7702InitData = signEip7702InitData;
+exports.getEip7702InitCall = getEip7702InitCall;
 const viem_1 = require("viem");
 const account_abstraction_1 = require("viem/account-abstraction");
 const modules_1 = require("../modules");
 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 = '0x00000000006a1bF4cBa18564Ecc916c3Cf768111';
-const NEXUS_FACTORY_ADDRESS = '0x0000000000e70c5ebEBdEc2457508f6d1709bF55';
-const NEXUS_BOOTSTRAP_ADDRESS = '0x00000000001Cf4667Bfd7be8f67D01d63938784b';
+const NEXUS_IMPLEMENTATION_ADDRESS = '0x000000000032dDC454C3BDcba80484Ad5A798705';
+const NEXUS_FACTORY_ADDRESS = '0x0000000000679A258c64d2F20F310e12B64b7375';
+const NEXUS_BOOTSTRAP_ADDRESS = '0x00000000006eFb61D8c9546FF1B500de3f244EA7';
+const NEXUS_IMPLEMENTATION_1_0_0 = '0x000000039dfcad030719b07296710f045f0558f7';
+const NEXUS_BOOTSTRAP_1_0_0 = '0x00000008c901d8871b6f6942de0b5d9ccf3873d3';
+const NEXUS_K1_VALIDATOR = '0x00000004171351c442b202678c48d8ab5b321e8f';
 const NEXUS_CREATION_CODE = '0x60806040526102aa803803806100148161018c565b92833981016040828203126101885781516001600160a01b03811692909190838303610188576020810151906001600160401b03821161018857019281601f8501121561018857835161006e610069826101c5565b61018c565b9481865260208601936020838301011161018857815f926020809301865e8601015260017f90b772c2cb8a51aa7a8a65fc23543c6d022d5b3f8e2b92eed79fba7eef8293005d823b15610176577f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b031916821790557fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b5f80a282511561015e575f8091610146945190845af43d15610156573d91610137610069846101c5565b9283523d5f602085013e6101e0565b505b604051606b908161023f8239f35b6060916101e0565b50505034156101485763b398979f60e01b5f5260045ffd5b634c9c8ce360e01b5f5260045260245ffd5b5f80fd5b6040519190601f01601f191682016001600160401b038111838210176101b157604052565b634e487b7160e01b5f52604160045260245ffd5b6001600160401b0381116101b157601f01601f191660200190565b9061020457508051156101f557805190602001fd5b63d6bda27560e01b5f5260045ffd5b81511580610235575b610215575090565b639996b31560e01b5f9081526001600160a01b0391909116600452602490fd5b50803b1561020d56fe60806040523615605c575f8073ffffffffffffffffffffffffffffffffffffffff7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5416368280378136915af43d5f803e156058573d5ff35b3d5ffd5b00fea164736f6c634300081b000a';
 function getDeployArgs(config) {
+    if (config.initData) {
+        const factoryData = (0, viem_1.decodeFunctionData)({
+            abi: (0, viem_1.parseAbi)([
+                'function createAccount(address eoaOwner,uint256 index,address[] attesters,uint8 threshold)',
+            ]),
+            data: config.initData.factoryData,
+        });
+        if (factoryData.functionName !== 'createAccount') {
+            throw new error_1.AccountConfigurationNotSupportedError('Invalid factory data', 'nexus');
+        }
+        const owner = factoryData.args[0];
+        const index = factoryData.args[1];
+        const attesters = factoryData.args[2];
+        const threshold = factoryData.args[3];
+        const salt = (0, viem_1.keccak256)((0, viem_1.encodePacked)(['address', 'uint256', 'address[]', 'uint8'], [owner, index, attesters, threshold]));
+        const implementation = config.initData.factory === NEXUS_FACTORY_ADDRESS
+            ? NEXUS_IMPLEMENTATION_ADDRESS
+            : NEXUS_IMPLEMENTATION_1_0_0;
+        const registry = viem_1.zeroAddress;
+        const bootstrapData = (0, viem_1.encodeFunctionData)({
+            abi: (0, viem_1.parseAbi)([
+                'function initNexusWithSingleValidator(address validator,bytes data,address registry,address[] attesters,uint8 threshold)',
+            ]),
+            functionName: 'initNexusWithSingleValidator',
+            args: [NEXUS_K1_VALIDATOR, owner, registry, attesters, threshold],
+        });
+        const initData = (0, viem_1.encodeAbiParameters)([{ type: 'address' }, { type: 'bytes' }], [NEXUS_BOOTSTRAP_1_0_0, bootstrapData]);
+        const initializationCallData = (0, viem_1.encodeFunctionData)({
+            abi: (0, viem_1.parseAbi)(['function initializeAccount(bytes)']),
+            functionName: 'initializeAccount',
+            args: [initData],
+        });
+        return {
+            salt,
+            factory: config.initData.factory,
+            factoryData: config.initData.factoryData,
+            implementation,
+            initData,
+            initializationCallData,
+        };
+    }
     const salt = (0, viem_1.keccak256)('0x');
     const moduleSetup = (0, modules_1.getSetup)(config);
     // Filter out the default validator
@@ -27,9 +75,8 @@ function getDeployArgs(config) {
         ? defaultValidator.initData
         : '0x';
     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)({
+    const bootstrapData = (0, viem_1.size)(defaultValidatorInitData)
+        ? (0, viem_1.encodeFunctionData)({
             abi: (0, viem_1.parseAbi)([
                 'struct BootstrapConfig {address module;bytes initData;}',
                 'struct BootstrapPreValidationHookConfig {uint256 hookType;address module;bytes data;}',
@@ -56,8 +103,35 @@ function getDeployArgs(config) {
                 })),
                 [],
             ],
-        }),
-    ]);
+        })
+        : (0, viem_1.encodeFunctionData)({
+            abi: (0, viem_1.parseAbi)([
+                'struct BootstrapConfig {address module;bytes initData;}',
+                'struct BootstrapPreValidationHookConfig {uint256 hookType;address module;bytes data;}',
+                'function initNexusNoRegistry(BootstrapConfig[] calldata validators,BootstrapConfig[] calldata executors,BootstrapConfig calldata hook,BootstrapConfig[] calldata fallbacks,BootstrapPreValidationHookConfig[] calldata preValidationHooks) external',
+            ]),
+            functionName: 'initNexusNoRegistry',
+            args: [
+                validators.map((v) => ({
+                    module: v.address,
+                    initData: v.initData,
+                })),
+                moduleSetup.executors.map((e) => ({
+                    module: e.address,
+                    initData: e.initData,
+                })),
+                {
+                    module: viem_1.zeroAddress,
+                    initData: '0x',
+                },
+                moduleSetup.fallbacks.map((f) => ({
+                    module: f.address,
+                    initData: f.initData,
+                })),
+                [],
+            ],
+        });
+    const initData = (0, viem_1.encodeAbiParameters)([{ type: 'address' }, { type: 'bytes' }], [NEXUS_BOOTSTRAP_ADDRESS, bootstrapData]);
     const factoryData = (0, viem_1.encodeFunctionData)({
         abi: (0, viem_1.parseAbi)(['function createAccount(bytes,bytes32)']),
         functionName: 'createAccount',
@@ -74,23 +148,32 @@ function getDeployArgs(config) {
         salt,
         implementation: NEXUS_IMPLEMENTATION_ADDRESS,
         initializationCallData,
+        initData,
     };
 }
 function getAddress(config) {
-    const { factory, salt, initializationCallData } = getDeployArgs(config);
-    const accountInitData = (0, viem_1.encodeAbiParameters)([
-        {
-            name: 'address',
-            type: 'address',
-        },
-        {
-            name: 'calldata',
-            type: 'bytes',
-        },
-    ], [NEXUS_IMPLEMENTATION_ADDRESS, initializationCallData]);
-    const hashedInitcode = (0, viem_1.keccak256)((0, viem_1.concat)([NEXUS_CREATION_CODE, accountInitData]));
-    const hash = (0, viem_1.keccak256)((0, viem_1.encodePacked)(['bytes1', 'address', 'bytes32', 'bytes'], ['0xff', factory, salt, hashedInitcode]));
-    const address = (0, viem_1.slice)(hash, 12, 32);
+    const { factory, salt, initializationCallData, implementation } = getDeployArgs(config);
+    const creationCode = factory === NEXUS_FACTORY_ADDRESS
+        ? NEXUS_CREATION_CODE
+        : '0x603d3d8160223d3973000000039dfcad030719b07296710f045f0558f760095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3';
+    const accountInitData = factory === NEXUS_FACTORY_ADDRESS
+        ? (0, viem_1.encodeAbiParameters)([
+            {
+                name: 'address',
+                type: 'address',
+            },
+            {
+                name: 'calldata',
+                type: 'bytes',
+            },
+        ], [implementation, initializationCallData])
+        : '0x';
+    const address = (0, viem_1.getContractAddress)({
+        opcode: 'CREATE2',
+        from: factory,
+        salt,
+        bytecode: (0, viem_1.concat)([creationCode, accountInitData]),
+    });
     return address;
 }
 function getInstallData(module) {
@@ -121,20 +204,34 @@ function getInstallData(module) {
         args: [module.type, module.address, module.initData],
     });
 }
-async function getPackedSignature(signFn, hash, validator, transformSignature = (signature) => signature) {
-    const signature = await signFn(hash);
-    const validatorAddress = validator.address === NEXUS_DEFAULT_VALIDATOR_ADDRESS
+function getDefaultValidatorAddress(version) {
+    if (!version) {
+        return NEXUS_DEFAULT_VALIDATOR_ADDRESS;
+    }
+    switch (version) {
+        case '1.0.2':
+            return '0x0000002D6DB27c52E3C11c1Cf24072004AC75cBa';
+        case '1.2.0':
+            return '0x00000000d12897ddadc2044614a9677b191a2d95';
+        case 'rhinestone-1.0.0-beta':
+            return '0x0000000000e9e6e96bcaa3c113187cdb7e38aed9';
+        case 'rhinestone-1.0.0':
+            return NEXUS_DEFAULT_VALIDATOR_ADDRESS;
+    }
+}
+async function packSignature(signature, validator, transformSignature = (signature) => signature, defaultValidatorAddress = NEXUS_DEFAULT_VALIDATOR_ADDRESS) {
+    const validatorAddress = validator.address === defaultValidatorAddress
         ? viem_1.zeroAddress
         : validator.address;
     const packedSig = (0, viem_1.encodePacked)(['address', 'bytes'], [validatorAddress, transformSignature(signature)]);
     return packedSig;
 }
-async function getSmartAccount(client, address, owners, validatorAddress, sign) {
+async function getSmartAccount(client, address, owners, validatorAddress, sign, defaultValidatorAddress = NEXUS_DEFAULT_VALIDATOR_ADDRESS) {
     return getBaseSmartAccount(address, client, validatorAddress, async () => {
         return (0, validators_1.getMockSignature)(owners);
-    }, sign);
+    }, sign, defaultValidatorAddress);
 }
-async function getSessionSmartAccount(client, address, session, validatorAddress, enableData, sign) {
+async function getSessionSmartAccount(client, address, session, validatorAddress, enableData, sign, defaultValidatorAddress = NEXUS_DEFAULT_VALIDATOR_ADDRESS) {
     return await getBaseSmartAccount(address, client, validatorAddress, async () => {
         const dummyOpSignature = (0, validators_1.getMockSignature)(session.owners);
         if (enableData) {
@@ -147,16 +244,16 @@ async function getSessionSmartAccount(client, address, session, validatorAddress
             return (0, validators_1.encodeSmartSessionSignature)(validators_1.SMART_SESSION_MODE_ENABLE, (0, validators_1.getPermissionId)(session), signature, enableData);
         }
         return (0, validators_1.encodeSmartSessionSignature)(validators_1.SMART_SESSION_MODE_USE, (0, validators_1.getPermissionId)(session), signature);
-    });
+    }, defaultValidatorAddress);
 }
-async function getGuardianSmartAccount(client, address, guardians, validatorAddress, sign) {
+async function getGuardianSmartAccount(client, address, guardians, validatorAddress, sign, defaultValidatorAddress = NEXUS_DEFAULT_VALIDATOR_ADDRESS) {
     return await getBaseSmartAccount(address, client, validatorAddress, async () => {
         return (0, validators_1.getMockSignature)(guardians);
     }, async (hash) => {
         return await sign(hash);
-    });
+    }, defaultValidatorAddress);
 }
-async function getBaseSmartAccount(address, client, nonceValidatorAddress, getStubSignature, signUserOperation) {
+async function getBaseSmartAccount(address, client, nonceValidatorAddress, getStubSignature, signUserOperation, defaultValidatorAddress) {
     return await (0, account_abstraction_1.toSmartAccount)({
         client,
         entryPoint: {
@@ -185,7 +282,7 @@ async function getBaseSmartAccount(address, client, nonceValidatorAddress, getSt
             return {};
         },
         async getNonce(args) {
-            const validatorAddress = nonceValidatorAddress === NEXUS_DEFAULT_VALIDATOR_ADDRESS
+            const validatorAddress = nonceValidatorAddress === defaultValidatorAddress
                 ? viem_1.zeroAddress
                 : nonceValidatorAddress;
             const TIMESTAMP_ADJUSTMENT = 16777215n; // max value for size 3
@@ -229,3 +326,63 @@ async function getBaseSmartAccount(address, client, nonceValidatorAddress, getSt
         },
     });
 }
+async function signEip7702InitData(config, eoa) {
+    const { initData } = getDeployArgs(config);
+    if (!eoa.signTypedData) {
+        throw new error_1.SigningNotSupportedForAccountError();
+    }
+    const signature = await eoa.signTypedData({
+        domain: {
+            name: 'Nexus',
+            version: '1.2.0',
+        },
+        types: {
+            Initialize: [
+                { name: 'nexus', type: 'address' },
+                { name: 'chainIds', type: 'uint256[]' },
+                { name: 'initData', type: 'bytes' },
+            ],
+        },
+        primaryType: 'Initialize',
+        message: {
+            nexus: NEXUS_IMPLEMENTATION_ADDRESS,
+            chainIds: [0n],
+            initData,
+        },
+    });
+    return signature;
+}
+async function getEip7702InitCall(config, signature) {
+    function getEncodedData(initData) {
+        const chainIds = [0n];
+        const chainIdIndex = 0n;
+        const chainIdsLength = 1n;
+        const encodedData = (0, viem_1.encodePacked)(['uint256', 'uint256', 'uint256', 'bytes'], [chainIdIndex, chainIdsLength, chainIds[0], initData]);
+        return encodedData;
+    }
+    const { initData } = getDeployArgs(config);
+    const encodedData = getEncodedData(initData);
+    const accountFullData = (0, viem_1.concat)([signature, encodedData]);
+    const accountInitCallData = (0, viem_1.encodeFunctionData)({
+        abi: [
+            {
+                type: 'function',
+                inputs: [
+                    {
+                        type: 'bytes',
+                        name: 'initData',
+                    },
+                ],
+                outputs: [],
+                stateMutability: 'nonpayable',
+                name: 'initializeAccount',
+            },
+        ],
+        functionName: 'initializeAccount',
+        args: [accountFullData],
+    });
+    return {
+        initData: accountInitCallData,
+        contract: NEXUS_IMPLEMENTATION_ADDRESS,
+    };
+}

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

@@ -13,27 +13,41 @@ const MOCK_MODULE_ADDRESS = '0x28de6501fa86f2e6cd0b33c3aabdaeb4a1b93f3f';
                     type: 'ecdsa',
                     accounts: [consts_1.accountA, consts_1.accountB],
                 },
-                rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(factory).toEqual('0x0000000000e70c5ebEBdEc2457508f6d1709bF55');
-            (0, vitest_1.expect)(factoryData).toEqual('0xea6d13ac0000000000000000000000000000000000000000000000000000000000000040c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470000000000000000000000000000000000000000000000000000000000000036000000000000000000000000000000000001cf4667bfd7be8f67d01d63938784b000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000002e441bede0300000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000024000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000f6c02c78ded62973b43bfa523b247da09948693600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
+            (0, vitest_1.expect)(factory).toEqual('0x0000000000679A258c64d2F20F310e12B64b7375');
+            (0, vitest_1.expect)(factoryData).toEqual('0xea6d13ac0000000000000000000000000000000000000000000000000000000000000040c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470000000000000000000000000000000000000000000000000000000000000036000000000000000000000000000000000006efb61d8c9546ff1b500de3f244ea7000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000002e441bede0300000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000024000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000f6c02c78ded62973b43bfa523b247da09948693600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
             (0, vitest_1.expect)(salt).toEqual('0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470');
-            (0, vitest_1.expect)(implementation).toEqual('0x00000000006a1bF4cBa18564Ecc916c3Cf768111');
-            (0, vitest_1.expect)(initializationCallData).toEqual('0x4b6a14190000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000036000000000000000000000000000000000001cf4667bfd7be8f67d01d63938784b000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000002e441bede0300000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000024000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000f6c02c78ded62973b43bfa523b247da09948693600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
+            (0, vitest_1.expect)(implementation).toEqual('0x000000000032dDC454C3BDcba80484Ad5A798705');
+            (0, vitest_1.expect)(initializationCallData).toEqual('0x4b6a14190000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000036000000000000000000000000000000000006efb61d8c9546ff1b500de3f244ea7000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000002e441bede0300000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000024000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000f6c02c78ded62973b43bfa523b247da09948693600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
         });
         (0, vitest_1.test)('Passkey owner', () => {
             const { factory, factoryData, salt, implementation, initializationCallData, } = (0, nexus_1.getDeployArgs)({
                 owners: {
                     type: 'passkey',
-                    account: consts_1.passkeyAccount,
+                    accounts: [consts_1.passkeyAccount],
                 },
-                rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(factory).toEqual('0x0000000000e70c5ebEBdEc2457508f6d1709bF55');
-            (0, vitest_1.expect)(factoryData).toEqual('0xea6d13ac0000000000000000000000000000000000000000000000000000000000000040c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47000000000000000000000000000000000000000000000000000000000000003a000000000000000000000000000000000001cf4667bfd7be8f67d01d63938784b0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000032441bede0300000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000578c4cb0e472a5462da43c495c3f3300000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060580a9af0569ad3905b26a703201b358aa0904236642ebe79b22a19d00d3737637d46f725a5427ae45a9569259bf67e1e16b187d7b3ad1ed70138c4f0409677d19c9a01073b202db2ed56e604ad11db557d8c3ad75181619597f21b830f2da82a0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
+            (0, vitest_1.expect)(factory).toEqual('0x0000000000679A258c64d2F20F310e12B64b7375');
+            (0, vitest_1.expect)(factoryData).toEqual('0xea6d13ac0000000000000000000000000000000000000000000000000000000000000040c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000006efb61d8c9546ff1b500de3f244ea7000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000003448643787600000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000578c4cb0e472a5462da43c495c3f33000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001580a9af0569ad3905b26a703201b358aa0904236642ebe79b22a19d00d3737637d46f725a5427ae45a9569259bf67e1e16b187d7b3ad1ed70138c4f0409677d100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
             (0, vitest_1.expect)(salt).toEqual('0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470');
-            (0, vitest_1.expect)(implementation).toEqual('0x00000000006a1bF4cBa18564Ecc916c3Cf768111');
-            (0, vitest_1.expect)(initializationCallData).toEqual('0x4b6a1419000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000003a000000000000000000000000000000000001cf4667bfd7be8f67d01d63938784b0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000032441bede0300000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000578c4cb0e472a5462da43c495c3f3300000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060580a9af0569ad3905b26a703201b358aa0904236642ebe79b22a19d00d3737637d46f725a5427ae45a9569259bf67e1e16b187d7b3ad1ed70138c4f0409677d19c9a01073b202db2ed56e604ad11db557d8c3ad75181619597f21b830f2da82a0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
+            (0, vitest_1.expect)(implementation).toEqual('0x000000000032dDC454C3BDcba80484Ad5A798705');
+            (0, vitest_1.expect)(initializationCallData).toEqual('0x4b6a1419000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000006efb61d8c9546ff1b500de3f244ea7000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000003448643787600000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000578c4cb0e472a5462da43c495c3f33000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001580a9af0569ad3905b26a703201b358aa0904236642ebe79b22a19d00d3737637d46f725a5427ae45a9569259bf67e1e16b187d7b3ad1ed70138c4f0409677d100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
+        });
+        (0, vitest_1.test)('Existing account', () => {
+            const { factory, factoryData } = (0, nexus_1.getDeployArgs)({
+                owners: {
+                    type: 'ecdsa',
+                    accounts: [consts_1.accountA, consts_1.accountB],
+                },
+                initData: {
+                    address: '0xBecba00993a919FfD35064a777E94643014A19Aa',
+                    factory: '0x00000bb19a3579F4D779215dEf97AFbd0e30DB55',
+                    factoryData: '0x0d51f0b7000000000000000000000000db8fca317427c3f85b6734af6455f287011c54b50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+                    intentExecutorInstalled: false,
+                },
+            });
+            (0, vitest_1.expect)(factory).toEqual('0x00000bb19a3579F4D779215dEf97AFbd0e30DB55');
+            (0, vitest_1.expect)(factoryData).toEqual('0x0d51f0b7000000000000000000000000db8fca317427c3f85b6734af6455f287011c54b50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
         });
     });
     (0, vitest_1.describe)('Get Address', () => {
@@ -43,19 +57,32 @@ const MOCK_MODULE_ADDRESS = '0x28de6501fa86f2e6cd0b33c3aabdaeb4a1b93f3f';
                     type: 'ecdsa',
                     accounts: [consts_1.accountA, consts_1.accountB],
                 },
-                rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(address).toEqual('0x0cd1c38d4cdffdbbd4ac192babf70110ad250668');
+            (0, vitest_1.expect)(address).toEqual('0x0681de31e060b384F0b08A3bAC99E9bDFf302474');
         });
         (0, vitest_1.test)('Passkey owner', () => {
             const address = (0, nexus_1.getAddress)({
                 owners: {
                     type: 'passkey',
-                    account: consts_1.passkeyAccount,
+                    accounts: [consts_1.passkeyAccount],
+                },
+            });
+            (0, vitest_1.expect)(address).toEqual('0x894b88C04B4DE6AbDdcE81E8bdc91927E37d6ceD');
+        });
+        (0, vitest_1.test)('Existing account', () => {
+            const address = (0, nexus_1.getAddress)({
+                owners: {
+                    type: 'ecdsa',
+                    accounts: [consts_1.accountA, consts_1.accountB],
+                },
+                initData: {
+                    address: '0xBecba00993a919FfD35064a777E94643014A19Aa',
+                    factory: '0x00000bb19a3579F4D779215dEf97AFbd0e30DB55',
+                    factoryData: '0x0d51f0b7000000000000000000000000db8fca317427c3f85b6734af6455f287011c54b50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+                    intentExecutorInstalled: false,
                 },
-                rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(address).toEqual('0x35e1c3f1ded30246aa2ca361342c3ee0d0749293');
+            (0, vitest_1.expect)(address).toEqual('0xBecba00993a919FfD35064a777E94643014A19Aa');
         });
     });
     (0, vitest_1.describe)('Get Install Data', () => {
@@ -72,13 +99,12 @@ const MOCK_MODULE_ADDRESS = '0x28de6501fa86f2e6cd0b33c3aabdaeb4a1b93f3f';
     });
     (0, vitest_1.describe)('Get Packed Signature', () => {
         (0, vitest_1.test)('Mock signature', async () => {
-            const hash = '0xabcd';
             const mockSignature = '0x1234';
             const validator = {
                 address: '0xe35b75e5ec3c04e9cefa8e581fbee859f56edeb4',
                 isRoot: true,
             };
-            const signature = await (0, nexus_1.getPackedSignature)(async (_) => mockSignature, hash, validator);
+            const signature = await (0, nexus_1.packSignature)(mockSignature, validator);
             (0, vitest_1.expect)(signature).toEqual('0xe35b75e5ec3c04e9cefa8e581fbee859f56edeb41234');
         });
     });

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

@@ -13,9 +13,9 @@ 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): Promise<`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 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, getPackedSignature, getDeployArgs, getSmartAccount, getSessionSmartAccount, getGuardianSmartAccount, };
+export { getInstallData, getAddress, packSignature, getDeployArgs, getSmartAccount, getSessionSmartAccount, getGuardianSmartAccount, };
 //# 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,EAIZ,KAAK,GAAG,EAER,KAAK,YAAY,EAIlB,MAAM,MAAM,CAAA;AACb,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAEhC,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAQ/C,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;AAchF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;EAiErD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBAalD;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,0BAQvE;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,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,iEAyClC;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;AAkGD,OAAO,EACL,cAAc,EACd,UAAU,EACV,kBAAkB,EAClB,aAAa,EACb,eAAe,EACf,sBAAsB,EACtB,uBAAuB,GACxB,CAAA"}
+{"version":3,"file":"safe.d.ts","sourceRoot":"","sources":["../../../accounts/safe.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,GAAG,EACR,KAAK,OAAO,EAOZ,KAAK,GAAG,EAER,KAAK,YAAY,EAIlB,MAAM,MAAM,CAAA;AACb,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAEhC,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAQ/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAK1E,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAgBhF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;EA4FrD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBAalD;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,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,iEAyClC;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;AAwGD,OAAO,EACL,cAAc,EACd,UAAU,EACV,aAAa,EACb,aAAa,EACb,eAAe,EACf,sBAAsB,EACtB,uBAAuB,GACxB,CAAA"}