@rhinestone/sdk 1.0.0-alpha.25 → 1.0.0-alpha.26

package/dist/src/accounts/nexus.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInstallData = getInstallData;
 exports.getAddress = getAddress;
+exports.getDefaultValidatorAddress = getDefaultValidatorAddress;
 exports.packSignature = packSignature;
 exports.getDeployArgs = getDeployArgs;
 exports.getSmartAccount = getSmartAccount;
@@ -20,8 +21,52 @@ const NEXUS_DEFAULT_VALIDATOR_ADDRESS = core_1.OWNABLE_VALIDATOR_ADDRESS;
 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('Invalid factory data');
+        }
+        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
@@ -107,20 +152,28 @@ function getDeployArgs(config) {
     };
 }
 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) {
@@ -151,6 +204,21 @@ function getInstallData(module) {
         args: [module.type, module.address, module.initData],
     });
 }
+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

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

@@ -35,6 +35,23 @@ const MOCK_MODULE_ADDRESS = '0x28de6501fa86f2e6cd0b33c3aabdaeb4a1b93f3f';
             (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],
+                },
+                rhinestoneApiKey: consts_1.MOCK_API_KEY,
+                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', () => {
         (0, vitest_1.test)('ECDSA owners', () => {
@@ -45,7 +62,7 @@ const MOCK_MODULE_ADDRESS = '0x28de6501fa86f2e6cd0b33c3aabdaeb4a1b93f3f';
                 },
                 rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(address).toEqual('0x0681de31e060b384f0b08a3bac99e9bdff302474');
+            (0, vitest_1.expect)(address).toEqual('0x0681de31e060b384F0b08A3bAC99E9bDFf302474');
         });
         (0, vitest_1.test)('Passkey owner', () => {
             const address = (0, nexus_1.getAddress)({
@@ -55,7 +72,23 @@ const MOCK_MODULE_ADDRESS = '0x28de6501fa86f2e6cd0b33c3aabdaeb4a1b93f3f';
                 },
                 rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(address).toEqual('0x894b88c04b4de6abddce81e8bdc91927e37d6ced');
+            (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],
+                },
+                rhinestoneApiKey: consts_1.MOCK_API_KEY,
+                initData: {
+                    address: '0xBecba00993a919FfD35064a777E94643014A19Aa',
+                    factory: '0x00000bb19a3579F4D779215dEf97AFbd0e30DB55',
+                    factoryData: '0x0d51f0b7000000000000000000000000db8fca317427c3f85b6734af6455f287011c54b50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+                    intentExecutorInstalled: false,
+                },
+            });
+            (0, vitest_1.expect)(address).toEqual('0xBecba00993a919FfD35064a777E94643014A19Aa');
         });
     });
     (0, vitest_1.describe)('Get Install Data', () => {

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,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;AAoGD,OAAO,EACL,cAAc,EACd,UAAU,EACV,aAAa,EACb,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;AAC1E,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAgBhF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;EAyFrD;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;AAkGD,OAAO,EACL,cAAc,EACd,UAAU,EACV,aAAa,EACb,aAAa,EACb,eAAe,EACf,sBAAsB,EACtB,uBAAuB,GACxB,CAAA"}

package/dist/src/accounts/safe.js

@@ -17,72 +17,97 @@ const SAFE_7579_ADAPTER_ADDRESS = '0x7579f2AD53b01c3D8779Fe17928e0D48885B0003';
 const SAFE_SINGLETON_ADDRESS = '0x29fcb43b46531bca003ddc8fcb67ffe91900c762';
 const SAFE_PROXY_FACTORY_ADDRESS = '0x4e1dcf7ad4e460cfd30791ccc4f9c8a4f820ec67';
 const NO_SAFE_OWNER_ADDRESS = '0xbabe99e62d8bcbd3acf5ccbcfcd4f64fe75e5e72';
+const SAFE_PROXY_INIT_CODE = '0x608060405234801561001057600080fd5b506040516101e63803806101e68339818101604052602081101561003357600080fd5b8101908080519060200190929190505050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614156100ca576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001806101c46022913960400191505060405180910390fd5b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505060ab806101196000396000f3fe608060405273ffffffffffffffffffffffffffffffffffffffff600054167fa619486e0000000000000000000000000000000000000000000000000000000060003514156050578060005260206000f35b3660008037600080366000845af43d6000803e60008114156070573d6000fd5b3d6000f3fea264697066735822122003d1488ee65e08fa41e58e888a9865554c535f2c77126a82cb4c0f917f31441364736f6c63430007060033496e76616c69642073696e676c65746f6e20616464726573732070726f7669646564';
 function getDeployArgs(config) {
-    {
-        const owners = getOwners(config);
-        const threshold = getThreshold(config);
-        const moduleSetup = (0, modules_1.getSetup)(config);
-        const modules = [
-            ...moduleSetup.validators,
-            ...moduleSetup.executors,
-            ...moduleSetup.fallbacks,
-            ...moduleSetup.hooks,
-        ];
-        const initData = (0, viem_1.encodeFunctionData)({
-            abi: (0, viem_1.parseAbi)([
-                'function setup(address[] calldata _owners,uint256 _threshold,address to,bytes calldata data,address fallbackHandler,address paymentToken,uint256 payment, address paymentReceiver) external',
-            ]),
-            functionName: 'setup',
-            args: [
-                owners,
-                threshold,
-                SAFE_7579_LAUNCHPAD_ADDRESS,
-                (0, viem_1.encodeFunctionData)({
-                    abi: (0, viem_1.parseAbi)([
-                        'struct ModuleInit {address module;bytes initData;uint256 moduleType}',
-                        'function addSafe7579(address safe7579,ModuleInit[] calldata modules,address[] calldata attesters,uint8 threshold) external',
-                    ]),
-                    functionName: 'addSafe7579',
-                    args: [
-                        SAFE_7579_ADAPTER_ADDRESS,
-                        modules.map((m) => ({
-                            module: m.address,
-                            initData: m.initData,
-                            moduleType: m.type,
-                        })),
-                        [],
-                        0,
-                    ],
-                }),
-                SAFE_7579_ADAPTER_ADDRESS,
-                viem_1.zeroAddress,
-                BigInt(0),
-                viem_1.zeroAddress,
-            ],
-        });
-        const saltNonce = 0n;
-        const factoryData = (0, viem_1.encodeFunctionData)({
+    if (config.initData) {
+        const factoryData = (0, viem_1.decodeFunctionData)({
             abi: (0, viem_1.parseAbi)([
                 'function createProxyWithNonce(address singleton,bytes calldata initializer,uint256 saltNonce) external payable returns (address)',
             ]),
-            functionName: 'createProxyWithNonce',
-            args: [SAFE_SINGLETON_ADDRESS, initData, saltNonce],
+            data: config.initData.factoryData,
         });
+        if (factoryData.functionName !== 'createProxyWithNonce') {
+            throw new Error('Invalid factory data');
+        }
+        const implementation = factoryData.args[0];
+        const initData = factoryData.args[1];
+        const saltNonce = factoryData.args[2];
         const salt = (0, viem_1.keccak256)((0, viem_1.encodePacked)(['bytes32', 'uint256'], [(0, viem_1.keccak256)(initData), saltNonce]));
         return {
-            factory: SAFE_PROXY_FACTORY_ADDRESS,
-            factoryData,
+            factory: config.initData.factory,
+            factoryData: config.initData.factoryData,
             salt,
-            implementation: SAFE_SINGLETON_ADDRESS,
+            implementation,
             initializationCallData: null,
         };
     }
+    const owners = getOwners(config);
+    const threshold = getThreshold(config);
+    const moduleSetup = (0, modules_1.getSetup)(config);
+    const modules = [
+        ...moduleSetup.validators,
+        ...moduleSetup.executors,
+        ...moduleSetup.fallbacks,
+        ...moduleSetup.hooks,
+    ];
+    const initData = (0, viem_1.encodeFunctionData)({
+        abi: (0, viem_1.parseAbi)([
+            'function setup(address[] calldata _owners,uint256 _threshold,address to,bytes calldata data,address fallbackHandler,address paymentToken,uint256 payment, address paymentReceiver) external',
+        ]),
+        functionName: 'setup',
+        args: [
+            owners,
+            threshold,
+            SAFE_7579_LAUNCHPAD_ADDRESS,
+            (0, viem_1.encodeFunctionData)({
+                abi: (0, viem_1.parseAbi)([
+                    'struct ModuleInit {address module;bytes initData;uint256 moduleType}',
+                    'function addSafe7579(address safe7579,ModuleInit[] calldata modules,address[] calldata attesters,uint8 threshold) external',
+                ]),
+                functionName: 'addSafe7579',
+                args: [
+                    SAFE_7579_ADAPTER_ADDRESS,
+                    modules.map((m) => ({
+                        module: m.address,
+                        initData: m.initData,
+                        moduleType: m.type,
+                    })),
+                    [],
+                    0,
+                ],
+            }),
+            SAFE_7579_ADAPTER_ADDRESS,
+            viem_1.zeroAddress,
+            BigInt(0),
+            viem_1.zeroAddress,
+        ],
+    });
+    const saltNonce = 0n;
+    const factoryData = (0, viem_1.encodeFunctionData)({
+        abi: (0, viem_1.parseAbi)([
+            'function createProxyWithNonce(address singleton,bytes calldata initializer,uint256 saltNonce) external payable returns (address)',
+        ]),
+        functionName: 'createProxyWithNonce',
+        args: [SAFE_SINGLETON_ADDRESS, initData, saltNonce],
+    });
+    const salt = (0, viem_1.keccak256)((0, viem_1.encodePacked)(['bytes32', 'uint256'], [(0, viem_1.keccak256)(initData), saltNonce]));
+    return {
+        factory: SAFE_PROXY_FACTORY_ADDRESS,
+        factoryData,
+        salt,
+        implementation: SAFE_SINGLETON_ADDRESS,
+        initializationCallData: null,
+    };
 }
 function getAddress(config) {
-    const hashedInitcode = '0xe298282cefe913ab5d282047161268a8222e4bd4ed106300c547894bbefd31ee';
-    const { factory, salt } = getDeployArgs(config);
-    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, implementation, salt } = getDeployArgs(config);
+    const constructorArgs = (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)('address singleton'), [implementation]);
+    const address = (0, viem_1.getContractAddress)({
+        opcode: 'CREATE2',
+        from: factory,
+        salt,
+        bytecode: (0, viem_1.concat)([SAFE_PROXY_INIT_CODE, constructorArgs]),
+    });
     return address;
 }
 function getInstallData(module) {
@@ -211,7 +236,6 @@ function getOwners(config) {
     const ownerSet = config.owners;
     switch (ownerSet.type) {
         case 'ecdsa':
-        case 'ecdsa-v0':
             return ownerSet.accounts.map((account) => account.address);
         case 'passkey':
             return [NO_SAFE_OWNER_ADDRESS];
@@ -223,7 +247,6 @@ function getThreshold(config) {
     const ownerSet = config.owners;
     switch (ownerSet.type) {
         case 'ecdsa':
-        case 'ecdsa-v0':
             return ownerSet.threshold ? BigInt(ownerSet.threshold) : 1n;
         case 'passkey':
             return 1n;

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

@@ -35,6 +35,23 @@ const MOCK_MODULE_ADDRESS = '0x28de6501fa86f2e6cd0b33c3aabdaeb4a1b93f3f';
             (0, vitest_1.expect)(implementation).toEqual('0x29fcb43b46531bca003ddc8fcb67ffe91900c762');
             (0, vitest_1.expect)(initializationCallData).toEqual(null);
         });
+        (0, vitest_1.test)('Existing account', () => {
+            const { factory, factoryData } = (0, safe_1.getDeployArgs)({
+                owners: {
+                    type: 'ecdsa',
+                    accounts: [consts_1.accountA, consts_1.accountB],
+                },
+                rhinestoneApiKey: consts_1.MOCK_API_KEY,
+                initData: {
+                    factory: '0x4e1dcf7ad4e460cfd30791ccc4f9c8a4f820ec67',
+                    factoryData: '0x1688f0b90000000000000000000000007579011ab74c46090561ea277ba79d510c6c00ff0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000844fff40e1ec88f0966a6bc17a138345cdf7519caf9a1e0bb840330108a6a4315f1028c39000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+                    address: '0xc41bb9cfB2658dD3D74Ada0862044f5f30304b38',
+                    intentExecutorInstalled: true,
+                },
+            });
+            (0, vitest_1.expect)(factory).toEqual('0x4e1dcf7ad4e460cfd30791ccc4f9c8a4f820ec67');
+            (0, vitest_1.expect)(factoryData).toEqual('0x1688f0b90000000000000000000000007579011ab74c46090561ea277ba79d510c6c00ff0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000844fff40e1ec88f0966a6bc17a138345cdf7519caf9a1e0bb840330108a6a4315f1028c39000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
+        });
     });
     (0, vitest_1.describe)('Get Address', () => {
         (0, vitest_1.test)('ECDSA owners', () => {
@@ -45,7 +62,7 @@ const MOCK_MODULE_ADDRESS = '0x28de6501fa86f2e6cd0b33c3aabdaeb4a1b93f3f';
                 },
                 rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(address).toEqual('0x3a249204d37245504d4ab37ff88f574b222a6349');
+            (0, vitest_1.expect)(address).toEqual('0x3a249204D37245504d4aB37FF88f574B222a6349');
         });
         (0, vitest_1.test)('Passkey owner', () => {
             const address = (0, safe_1.getAddress)({
@@ -55,7 +72,23 @@ const MOCK_MODULE_ADDRESS = '0x28de6501fa86f2e6cd0b33c3aabdaeb4a1b93f3f';
                 },
                 rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(address).toEqual('0xe86e416045645e1ca4360d5dc396e4c513277c31');
+            (0, vitest_1.expect)(address).toEqual('0xE86e416045645E1Ca4360D5DC396E4c513277C31');
+        });
+        (0, vitest_1.test)('Existing account', () => {
+            const address = (0, safe_1.getAddress)({
+                owners: {
+                    type: 'ecdsa',
+                    accounts: [consts_1.accountA, consts_1.accountB],
+                },
+                rhinestoneApiKey: consts_1.MOCK_API_KEY,
+                initData: {
+                    factory: '0x4e1dcf7ad4e460cfd30791ccc4f9c8a4f820ec67',
+                    factoryData: '0x1688f0b90000000000000000000000007579011ab74c46090561ea277ba79d510c6c00ff0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000844fff40e1ec88f0966a6bc17a138345cdf7519caf9a1e0bb840330108a6a4315f1028c39000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+                    address: '0xc41bb9cfB2658dD3D74Ada0862044f5f30304b38',
+                    intentExecutorInstalled: true,
+                },
+            });
+            (0, vitest_1.expect)(address).toEqual('0xc41bb9cfB2658dD3D74Ada0862044f5f30304b38');
         });
     });
     (0, vitest_1.describe)('Get Install Data', () => {

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

@@ -4,7 +4,7 @@ import type { WebAuthnAccount } from 'viem/account-abstraction';
 import type { OwnerSet, SignerSet } from '../../types';
 declare function convertOwnerSetToSignerSet(owners: OwnerSet): SignerSet;
 type SigningFunctions<T> = {
-    signEcdsa: (account: Account, params: T) => Promise<Hex>;
+    signEcdsa: (account: Account, params: T, updateV: boolean) => Promise<Hex>;
     signPasskey: (account: WebAuthnAccount, params: T) => Promise<{
         webauthn: WebAuthnP256.SignMetadata;
         signature: Hex;

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":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,IAAI,CAAA;AACtC,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,KAAK,EAGV,KAAK,GAAG,EAGT,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAG/D,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAQtD,iBAAS,0BAA0B,CAAC,MAAM,EAAE,QAAQ,GAAG,SAAS,CAiD/D;AAED,KAAK,gBAAgB,CAAC,CAAC,IAAI;IACzB,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACxD,WAAW,EAAE,CACX,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,CAAC,KACN,OAAO,CAAC;QACX,QAAQ,EAAE,YAAY,CAAC,YAAY,CAAA;QACnC,SAAS,EAAE,GAAG,CAAA;KACf,CAAC,CAAA;CACH,CAAA;AAED,iBAAe,uBAAuB,CAAC,CAAC,EACtC,OAAO,EAAE,SAAS,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,cAAc,CAAA;CAAE,EAC5D,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,CACR,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,KACN,OAAO,CAAC,GAAG,CAAC,GAChB,OAAO,CAAC,GAAG,CAAC,CA0Cd;AAED,iBAAe,eAAe,CAAC,CAAC,EAC9B,OAAO,EAAE,SAAS,GAAG;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,EACxC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,CACR,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,KACN,OAAO,CAAC,GAAG,CAAC,GAChB,OAAO,CAAC,GAAG,CAAC,CAKd;AAED,iBAAe,iBAAiB,CAAC,CAAC,EAChC,OAAO,EAAE,SAAS,GAAG;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,EAC1C,MAAM,EAAE,CAAC,EACT,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC,GACpC,OAAO,CAAC,GAAG,CAAC,CAOd;AAED,iBAAe,cAAc,CAAC,CAAC,EAC7B,OAAO,EAAE,SAAS,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,EACtC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,EACT,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC,EACrC,QAAQ,EAAE,CACR,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,KACN,OAAO,CAAC,GAAG,CAAC,GAChB,OAAO,CAAC,GAAG,CAAC,CA2Cd;AAED,OAAO,EACL,0BAA0B,EAC1B,uBAAuB,EACvB,eAAe,EACf,iBAAiB,EACjB,cAAc,EACd,KAAK,gBAAgB,GACtB,CAAA"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../accounts/signing/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,IAAI,CAAA;AACtC,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,KAAK,EAGV,KAAK,GAAG,EAGT,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAO/D,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAStD,iBAAS,0BAA0B,CAAC,MAAM,EAAE,QAAQ,GAAG,SAAS,CA6C/D;AAED,KAAK,gBAAgB,CAAC,CAAC,IAAI;IACzB,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC1E,WAAW,EAAE,CACX,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,CAAC,KACN,OAAO,CAAC;QACX,QAAQ,EAAE,YAAY,CAAC,YAAY,CAAA;QACnC,SAAS,EAAE,GAAG,CAAA;KACf,CAAC,CAAA;CACH,CAAA;AAED,iBAAe,uBAAuB,CAAC,CAAC,EACtC,OAAO,EAAE,SAAS,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,cAAc,CAAA;CAAE,EAC5D,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,CACR,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,KACN,OAAO,CAAC,GAAG,CAAC,GAChB,OAAO,CAAC,GAAG,CAAC,CA0Cd;AAED,iBAAe,eAAe,CAAC,CAAC,EAC9B,OAAO,EAAE,SAAS,GAAG;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,EACxC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,CACR,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,KACN,OAAO,CAAC,GAAG,CAAC,GAChB,OAAO,CAAC,GAAG,CAAC,CAKd;AAED,iBAAe,iBAAiB,CAAC,CAAC,EAChC,OAAO,EAAE,SAAS,GAAG;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,EAC1C,MAAM,EAAE,CAAC,EACT,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC,GACpC,OAAO,CAAC,GAAG,CAAC,CAOd;AAED,iBAAe,cAAc,CAAC,CAAC,EAC7B,OAAO,EAAE,SAAS,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,EACtC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,EACT,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC,EACrC,QAAQ,EAAE,CACR,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,KACN,OAAO,CAAC,GAAG,CAAC,GAChB,OAAO,CAAC,GAAG,CAAC,CAiDd;AAED,OAAO,EACL,0BAA0B,EAC1B,uBAAuB,EACvB,eAAe,EACf,iBAAiB,EACjB,cAAc,EACd,KAAK,gBAAgB,GACtB,CAAA"}

package/dist/src/accounts/signing/common.js

@@ -16,13 +16,7 @@ function convertOwnerSetToSignerSet(owners) {
                 type: 'owner',
                 kind: 'ecdsa',
                 accounts: owners.accounts,
-            };
-        }
-        case 'ecdsa-v0': {
-            return {
-                type: 'owner',
-                kind: 'ecdsa-v0',
-                accounts: owners.accounts,
+                module: owners.module,
             };
         }
         case 'passkey': {
@@ -30,6 +24,7 @@ function convertOwnerSetToSignerSet(owners) {
                 type: 'owner',
                 kind: 'passkey',
                 accounts: owners.accounts,
+                module: owners.module,
             };
         }
         case 'multi-factor': {
@@ -38,12 +33,12 @@ function convertOwnerSetToSignerSet(owners) {
                 kind: 'multi-factor',
                 validators: owners.validators.map((validator, index) => {
                     switch (validator.type) {
-                        case 'ecdsa':
-                        case 'ecdsa-v0': {
+                        case 'ecdsa': {
                             return {
                                 type: validator.type,
                                 id: index,
                                 accounts: validator.accounts,
+                                module: validator.module,
                             };
                         }
                         case 'passkey': {
@@ -51,6 +46,7 @@ function convertOwnerSetToSignerSet(owners) {
                                 type: 'passkey',
                                 id: index,
                                 accounts: validator.accounts,
+                                module: validator.module,
                             };
                         }
                     }
@@ -101,14 +97,16 @@ async function signWithSession(signers, chain, address, params, signMain) {
     return signMain(sessionSigners, chain, address, params);
 }
 async function signWithGuardians(signers, params, signingFunctions) {
-    const signatures = await Promise.all(signers.guardians.map((account) => signingFunctions.signEcdsa(account, params)));
+    const signatures = await Promise.all(signers.guardians.map((account) => signingFunctions.signEcdsa(account, params, false)));
     return (0, viem_1.concat)(signatures);
 }
 async function signWithOwners(signers, chain, address, params, signingFunctions, signMain) {
     switch (signers.kind) {
-        case 'ecdsa':
-        case 'ecdsa-v0': {
-            const signatures = await Promise.all(signers.accounts.map((account) => signingFunctions.signEcdsa(account, params)));
+        case 'ecdsa': {
+            // Ownable validator uses `v` value to determine which validation mode to use
+            const updateV = !signers.module ||
+                signers.module?.toLowerCase() === core_1.OWNABLE_VALIDATOR_ADDRESS;
+            const signatures = await Promise.all(signers.accounts.map((account) => signingFunctions.signEcdsa(account, params, updateV)));
             return (0, viem_1.concat)(signatures);
         }
         case 'passkey': {
@@ -130,6 +128,9 @@ async function signWithOwners(signers, chain, address, params, signingFunctions,
                     s,
                 };
             });
+            if (signers.module?.toLowerCase() === core_1.WEBAUTHN_V0_VALIDATOR_ADDRESS) {
+                return (0, passkeys_1.packSignatureV0)(webAuthns[0], usePrecompile);
+            }
             return (0, passkeys_1.packSignature)(credIds, usePrecompile, webAuthns);
         }
         case 'multi-factor': {

package/dist/src/accounts/signing/message.js

@@ -6,7 +6,7 @@ const error_1 = require("../error");
 const common_1 = require("./common");
 async function sign(signers, chain, address, hash) {
     const signingFunctions = {
-        signEcdsa: (account, hash) => signEcdsa(account, hash),
+        signEcdsa: (account, hash, updateV) => signEcdsa(account, hash, updateV),
         signPasskey: (account, hash) => signPasskey(account, hash),
     };
     switch (signers.type) {
@@ -21,7 +21,7 @@ async function sign(signers, chain, address, hash) {
         }
     }
 }
-async function signEcdsa(account, hash) {
+async function signEcdsa(account, hash, updateV) {
     if (!account.signMessage) {
         throw new error_1.SigningNotSupportedForAccountError();
     }
@@ -34,7 +34,7 @@ async function signEcdsa(account, hash) {
     if (!v) {
         throw new Error('Invalid signature');
     }
-    const newV = v + 4n;
+    const newV = updateV ? v + 4n : v;
     const newSignature = (0, viem_1.concat)([r, s, (0, viem_1.toHex)(newV)]);
     return newSignature;
 }

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

@@ -24,6 +24,13 @@ declare function packSignature(credIds: Hex[], usePrecompile: boolean, webAuthns
     r: bigint;
     s: bigint;
 }[]): Hex;
-export { parsePublicKey, parseSignature, generateCredentialId, packSignature };
+declare function packSignatureV0(webauthn: {
+    authenticatorData: Hex;
+    clientDataJSON: string;
+    typeIndex: number | bigint;
+    r: bigint;
+    s: bigint;
+}, usePrecompiled: boolean): `0x${string}`;
+export { parsePublicKey, parseSignature, generateCredentialId, packSignature, packSignatureV0, };
 export type { WebAuthnSignature };
 //# sourceMappingURL=passkeys.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"passkeys.d.ts","sourceRoot":"","sources":["../../../../accounts/signing/passkeys.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAGZ,KAAK,GAAG,EAGT,MAAM,MAAM,CAAA;AAEb,UAAU,iBAAiB;IACzB,iBAAiB,EAAE,GAAG,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV;AAED,iBAAS,cAAc,CAAC,SAAS,EAAE,GAAG,GAAG,UAAU,GAAG;IACpD,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV,CAUA;AAED,iBAAS,cAAc,CAAC,SAAS,EAAE,GAAG,GAAG,UAAU,GAAG;IACpD,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV,CASA;AAED,iBAAS,oBAAoB,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,iBAkBjB;AAED,iBAAS,aAAa,CACpB,OAAO,EAAE,GAAG,EAAE,EACd,aAAa,EAAE,OAAO,EACtB,SAAS,EAAE;IACT,iBAAiB,EAAE,GAAG,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV,EAAE,GACF,GAAG,CAqDL;AAED,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,oBAAoB,EAAE,aAAa,EAAE,CAAA;AAC9E,YAAY,EAAE,iBAAiB,EAAE,CAAA"}
+{"version":3,"file":"passkeys.d.ts","sourceRoot":"","sources":["../../../../accounts/signing/passkeys.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAGZ,KAAK,GAAG,EAGT,MAAM,MAAM,CAAA;AAEb,UAAU,iBAAiB;IACzB,iBAAiB,EAAE,GAAG,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV;AAED,iBAAS,cAAc,CAAC,SAAS,EAAE,GAAG,GAAG,UAAU,GAAG;IACpD,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV,CAUA;AAED,iBAAS,cAAc,CAAC,SAAS,EAAE,GAAG,GAAG,UAAU,GAAG;IACpD,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV,CASA;AAED,iBAAS,oBAAoB,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,iBAkBjB;AAED,iBAAS,aAAa,CACpB,OAAO,EAAE,GAAG,EAAE,EACd,aAAa,EAAE,OAAO,EACtB,SAAS,EAAE;IACT,iBAAiB,EAAE,GAAG,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV,EAAE,GACF,GAAG,CAqDL;AAED,iBAAS,eAAe,CACtB,QAAQ,EAAE;IACR,iBAAiB,EAAE,GAAG,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAA;IAC1B,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV,EACD,cAAc,EAAE,OAAO,iBAqCxB;AAED,OAAO,EACL,cAAc,EACd,cAAc,EACd,oBAAoB,EACpB,aAAa,EACb,eAAe,GAChB,CAAA;AACD,YAAY,EAAE,iBAAiB,EAAE,CAAA"}

package/dist/src/accounts/signing/passkeys.js

@@ -4,6 +4,7 @@ exports.parsePublicKey = parsePublicKey;
 exports.parseSignature = parseSignature;
 exports.generateCredentialId = generateCredentialId;
 exports.packSignature = packSignature;
+exports.packSignatureV0 = packSignatureV0;
 const viem_1 = require("viem");
 function parsePublicKey(publicKey) {
     const bytes = typeof publicKey === 'string' ? (0, viem_1.hexToBytes)(publicKey) : publicKey;
@@ -88,3 +89,37 @@ function packSignature(credIds, usePrecompile, webAuthns) {
         },
     ], [credIds, usePrecompile, webAuthns]);
 }
+function packSignatureV0(webauthn, usePrecompiled) {
+    return (0, viem_1.encodeAbiParameters)([
+        { type: 'bytes', name: 'authenticatorData' },
+        {
+            type: 'string',
+            name: 'clientDataJSON',
+        },
+        {
+            type: 'uint256',
+            name: 'responseTypeLocation',
+        },
+        {
+            type: 'uint256',
+            name: 'r',
+        },
+        {
+            type: 'uint256',
+            name: 's',
+        },
+        {
+            type: 'bool',
+            name: 'usePrecompiled',
+        },
+    ], [
+        webauthn.authenticatorData,
+        webauthn.clientDataJSON,
+        typeof webauthn.typeIndex === 'bigint'
+            ? webauthn.typeIndex
+            : BigInt(webauthn.typeIndex),
+        webauthn.r,
+        webauthn.s,
+        usePrecompiled,
+    ]);
+}

package/dist/src/accounts/signing/passkeys.test.js

@@ -70,4 +70,19 @@ const passkeys_1 = require("./passkeys");
             (0, vitest_1.expect)(packed).toEqual('0x0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000026be9646e4d64132d1a1789a467d0501e948d23afce6792d963f401434d7bef339437809df26444a849d303b1174543f0851df5fae657da19f3bb0d92356426ea00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000001700000000000000000000000000000000000000000000000000000000000000017474c214167b8a4704cf06f75287a738e7ddbcca9cc0383db6dac6a7d090f4ee024ff8e2a2e8c54aa8cf5f36e3b6125016c3d58d896e3a85c5cd2cd0027a2625000000000000000000000000000000000000000000000000000000000000002549960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97631d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000867b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a22313971416351415643657563467438745153697a424264627857364a6b65785f336e41656a64527556656b222c226f726967696e223a22687474703a2f2f6c6f63616c686f73743a35313733222c2263726f73734f726967696e223a66616c73657d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000170000000000000000000000000000000000000000000000000000000000000001f60f80fe3fd029d1b380d631f0b659bfbc8f8f60921a88e1e123c159aa540f920ed337464d1bb813dc5f9c3e81998185370da49cc525e9f42cdf805f1030aff8000000000000000000000000000000000000000000000000000000000000002549960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97631d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000867b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a2234703254695a70546f6f4c43464659544332486d4d50564d69566a5a476768434a30647a377a5544456541222c226f726967696e223a22687474703a2f2f6c6f63616c686f73743a35313733222c2263726f73734f726967696e223a66616c73657d0000000000000000000000000000000000000000000000000000');
         });
     });
+    (0, vitest_1.describe)('Pack Signature V0', () => {
+        (0, vitest_1.test)('single', () => {
+            const usePrecompile = false;
+            const webAuthns = {
+                authenticatorData: '0x49960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97631d00000000',
+                clientDataJSON: '{"type":"webauthn.get","challenge":"4p2TiZpTooLCFFYTC2HmMPVMiVjZGghCJ0dz7zUDEeA","origin":"http://localhost:5173","crossOrigin":false}',
+                challengeIndex: 23n,
+                typeIndex: 1n,
+                r: 111296353735534357766084082487308191701889898756402773464442570100570127077266n,
+                s: 6705566102199758127831148650668918567109283965479844611524279039128750829560n,
+            };
+            const packed = (0, passkeys_1.packSignatureV0)(webAuthns, usePrecompile);
+            (0, vitest_1.expect)(packed).toEqual('0x00000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000001f60f80fe3fd029d1b380d631f0b659bfbc8f8f60921a88e1e123c159aa540f920ed337464d1bb813dc5f9c3e81998185370da49cc525e9f42cdf805f1030aff80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002549960de5880e8c687434170f6476605b8fe4aeb9a28632c7995cf3ba831d97631d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000867b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a2234703254695a70546f6f4c43464659544332486d4d50564d69566a5a476768434a30647a377a5544456541222c226f726967696e223a22687474703a2f2f6c6f63616c686f73743a35313733222c2263726f73734f726967696e223a66616c73657d0000000000000000000000000000000000000000000000000000');
+        });
+    });
 });