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

package/dist/src/accounts/safe.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;
@@ -11,78 +11,104 @@ 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 error_1 = require("./error");
 const utils_1 = require("./utils");
 const SAFE_7579_LAUNCHPAD_ADDRESS = '0x75798463024Bda64D83c94A64Bc7D7eaB41300eF';
 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_1.AccountConfigurationNotSupportedError('Invalid factory data', 'safe');
+        }
+        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) {
@@ -113,10 +139,8 @@ 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 packedSig = (0, viem_1.encodePacked)(['address', 'bytes'], [validator.address, transformSignature(signature)]);
-    return packedSig;
+async function packSignature(signature, validator, transformSignature = (signature) => signature) {
+    return (0, viem_1.encodePacked)(['address', 'bytes'], [validator.address, transformSignature(signature)]);
 }
 async function getSmartAccount(client, address, owners, validatorAddress, sign) {
     return getBaseSmartAccount(address, client, validatorAddress, async () => {
@@ -210,6 +234,9 @@ async function getBaseSmartAccount(address, client, validatorAddress, getStubSig
     });
 }
 function getOwners(config) {
+    if (!config.owners) {
+        throw new error_1.OwnersFieldRequiredError();
+    }
     const ownerSet = config.owners;
     switch (ownerSet.type) {
         case 'ecdsa':
@@ -221,6 +248,9 @@ function getOwners(config) {
     }
 }
 function getThreshold(config) {
+    if (!config.owners) {
+        throw new error_1.OwnersFieldRequiredError();
+    }
     const ownerSet = config.owners;
     switch (ownerSet.type) {
         case 'ecdsa':

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

@@ -13,11 +13,10 @@ 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('0x4e1dcf7ad4e460cfd30791ccc4f9c8a4f820ec67');
-            (0, vitest_1.expect)(factoryData).toEqual('0x1688f0b900000000000000000000000029fcb43b46531bca003ddc8fcb67ffe91900c762000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000444b63e800d0000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000075798463024bda64d83c94a64bc7d7eab41300ef00000000000000000000000000000000000000000000000000000000000001600000000000000000000000007579f2ad53b01c3d8779fe17928e0d48885b00030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000f6c02c78ded62973b43bfa523b247da0994869360000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb700000000000000000000000000000000000000000000000000000000000002a447cbbdca0000000000000000000000007579f2ad53b01c3d8779fe17928e0d48885b00030000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000e9e6e96bcaa3c113187cdb7e38aed90000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000f6c02c78ded62973b43bfa523b247da09948693600000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
-            (0, vitest_1.expect)(salt).toEqual('0xcd22c6be130453e1c7a5617c2792d41dd1d8a3ce4024819179507b20de8201f5');
+            (0, vitest_1.expect)(factoryData).toEqual('0x1688f0b900000000000000000000000029fcb43b46531bca003ddc8fcb67ffe91900c762000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000444b63e800d0000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000075798463024bda64d83c94a64bc7d7eab41300ef00000000000000000000000000000000000000000000000000000000000001600000000000000000000000007579f2ad53b01c3d8779fe17928e0d48885b00030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000f6c02c78ded62973b43bfa523b247da0994869360000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb700000000000000000000000000000000000000000000000000000000000002a447cbbdca0000000000000000000000007579f2ad53b01c3d8779fe17928e0d48885b0003000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000013fdb5234e4e3162a810f54d9f7e980000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000020000000000000000000000006092086a3dc0020cd604a68fcf5d430007d51bb7000000000000000000000000f6c02c78ded62973b43bfa523b247da09948693600000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
+            (0, vitest_1.expect)(salt).toEqual('0xf31933c8d3ab801f5d7dbfd374464b228d509d625a72334e218cbe08be7716e6');
             (0, vitest_1.expect)(implementation).toEqual('0x29fcb43b46531bca003ddc8fcb67ffe91900c762');
             (0, vitest_1.expect)(initializationCallData).toEqual(null);
         });
@@ -25,16 +24,31 @@ const MOCK_MODULE_ADDRESS = '0x28de6501fa86f2e6cd0b33c3aabdaeb4a1b93f3f';
             const { factory, factoryData, salt, implementation, initializationCallData, } = (0, safe_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('0x4e1dcf7ad4e460cfd30791ccc4f9c8a4f820ec67');
-            (0, vitest_1.expect)(factoryData).toEqual('0x1688f0b900000000000000000000000029fcb43b46531bca003ddc8fcb67ffe91900c7620000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003e4b63e800d0000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000075798463024bda64d83c94a64bc7d7eab41300ef00000000000000000000000000000000000000000000000000000000000001400000000000000000000000007579f2ad53b01c3d8779fe17928e0d48885b00030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000babe99e62d8bcbd3acf5ccbcfcd4f64fe75e5e72000000000000000000000000000000000000000000000000000000000000026447cbbdca0000000000000000000000007579f2ad53b01c3d8779fe17928e0d48885b00030000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000024000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000578c4cb0e472a5462da43c495c3f33000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000060580a9af0569ad3905b26a703201b358aa0904236642ebe79b22a19d00d3737637d46f725a5427ae45a9569259bf67e1e16b187d7b3ad1ed70138c4f0409677d19c9a01073b202db2ed56e604ad11db557d8c3ad75181619597f21b830f2da82a00000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
-            (0, vitest_1.expect)(salt).toEqual('0x1774a1bf788cc08a2f87e82e78226fd1484c5dfc9d8ae3041cf96f478e470214');
+            (0, vitest_1.expect)(factoryData).toEqual('0x1688f0b900000000000000000000000029fcb43b46531bca003ddc8fcb67ffe91900c762000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000444b63e800d0000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000075798463024bda64d83c94a64bc7d7eab41300ef00000000000000000000000000000000000000000000000000000000000001400000000000000000000000007579f2ad53b01c3d8779fe17928e0d48885b00030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000babe99e62d8bcbd3acf5ccbcfcd4f64fe75e5e7200000000000000000000000000000000000000000000000000000000000002c447cbbdca0000000000000000000000007579f2ad53b01c3d8779fe17928e0d48885b0003000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000578c4cb0e472a5462da43c495c3f330000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001580a9af0569ad3905b26a703201b358aa0904236642ebe79b22a19d00d3737637d46f725a5427ae45a9569259bf67e1e16b187d7b3ad1ed70138c4f0409677d1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005ad9ce1f5035fd62ca96cef16adaaf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
+            (0, vitest_1.expect)(salt).toEqual('0xdc83fad4a7d91e2ee81a5adc74eb2bca07d012c5259cb8ea10e89cf05de74c8d');
             (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],
+                },
+                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', () => {
@@ -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('0xd1f90bf932b56145800b608d9dd15c653270f042');
+            (0, vitest_1.expect)(address).toEqual('0x3a249204D37245504d4aB37FF88f574B222a6349');
         });
         (0, vitest_1.test)('Passkey owner', () => {
             const address = (0, safe_1.getAddress)({
                 owners: {
                     type: 'passkey',
-                    account: consts_1.passkeyAccount,
+                    accounts: [consts_1.passkeyAccount],
+                },
+            });
+            (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],
+                },
+                initData: {
+                    factory: '0x4e1dcf7ad4e460cfd30791ccc4f9c8a4f820ec67',
+                    factoryData: '0x1688f0b90000000000000000000000007579011ab74c46090561ea277ba79d510c6c00ff0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000844fff40e1ec88f0966a6bc17a138345cdf7519caf9a1e0bb840330108a6a4315f1028c39000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+                    address: '0xc41bb9cfB2658dD3D74Ada0862044f5f30304b38',
+                    intentExecutorInstalled: true,
                 },
-                rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(address).toEqual('0xa4a75e55097539ef474613c56d2e70942af42e52');
+            (0, vitest_1.expect)(address).toEqual('0xc41bb9cfB2658dD3D74Ada0862044f5f30304b38');
         });
     });
     (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, safe_1.getPackedSignature)(async (_) => mockSignature, hash, validator);
+            const signature = await (0, safe_1.packSignature)(mockSignature, validator);
             (0, vitest_1.expect)(signature).toEqual('0xe35b75e5ec3c04e9cefa8e581fbee859f56edeb41234');
         });
     });

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

@@ -0,0 +1,27 @@
+import type { WebAuthnP256 } from 'ox';
+import { type Account, type Address, type Chain, type Hex } from 'viem';
+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, updateV: boolean) => Promise<Hex>;
+    signPasskey: (account: WebAuthnAccount, params: T) => Promise<{
+        webauthn: WebAuthnP256.SignMetadata;
+        signature: Hex;
+    }>;
+};
+declare function signWithMultiFactorAuth<T>(signers: SignerSet & {
+    type: 'owner';
+    kind: 'multi-factor';
+}, chain: Chain, address: Address, params: T, isUserOpHash: boolean, signMain: (signers: SignerSet, chain: Chain, address: Address, params: T, isUserOpHash: boolean) => Promise<Hex>): Promise<Hex>;
+declare function signWithSession<T>(signers: SignerSet & {
+    type: 'session';
+}, chain: Chain, address: Address, params: T, isUserOpHash: boolean, signMain: (signers: SignerSet, chain: Chain, address: Address, params: T, isUserOpHash: boolean) => Promise<Hex>): Promise<Hex>;
+declare function signWithGuardians<T>(signers: SignerSet & {
+    type: 'guardians';
+}, params: T, signingFunctions: SigningFunctions<T>): Promise<Hex>;
+declare function signWithOwners<T>(signers: SignerSet & {
+    type: 'owner';
+}, chain: Chain, address: Address, params: T, signingFunctions: SigningFunctions<T>, isUserOpHash: boolean, signMain: (signers: SignerSet, chain: Chain, address: Address, params: T, isUserOpHash: boolean) => Promise<Hex>): Promise<Hex>;
+export { convertOwnerSetToSignerSet, signWithMultiFactorAuth, signWithSession, signWithGuardians, signWithOwners, type SigningFunctions, };
+//# sourceMappingURL=common.d.ts.map

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

@@ -0,0 +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;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,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,CACR,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,EACT,YAAY,EAAE,OAAO,KAClB,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,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,CACR,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,EACT,YAAY,EAAE,OAAO,KAClB,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,YAAY,EAAE,OAAO,EACrB,QAAQ,EAAE,CACR,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,CAAC,EACT,YAAY,EAAE,OAAO,KAClB,OAAO,CAAC,GAAG,CAAC,GAChB,OAAO,CAAC,GAAG,CAAC,CA0Dd;AAED,OAAO,EACL,0BAA0B,EAC1B,uBAAuB,EACvB,eAAe,EACf,iBAAiB,EACjB,cAAc,EACd,KAAK,gBAAgB,GACtB,CAAA"}

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

@@ -0,0 +1,145 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertOwnerSetToSignerSet = convertOwnerSetToSignerSet;
+exports.signWithMultiFactorAuth = signWithMultiFactorAuth;
+exports.signWithSession = signWithSession;
+exports.signWithGuardians = signWithGuardians;
+exports.signWithOwners = signWithOwners;
+const viem_1 = require("viem");
+const modules_1 = require("../../modules");
+const core_1 = require("../../modules/validators/core");
+const passkeys_1 = require("./passkeys");
+function convertOwnerSetToSignerSet(owners) {
+    switch (owners.type) {
+        case 'ecdsa': {
+            return {
+                type: 'owner',
+                kind: 'ecdsa',
+                accounts: owners.accounts,
+                module: owners.module,
+            };
+        }
+        case 'passkey': {
+            return {
+                type: 'owner',
+                kind: 'passkey',
+                accounts: owners.accounts,
+                module: owners.module,
+            };
+        }
+        case 'multi-factor': {
+            return {
+                type: 'owner',
+                kind: 'multi-factor',
+                validators: owners.validators.map((validator, index) => {
+                    switch (validator.type) {
+                        case 'ecdsa': {
+                            return {
+                                type: validator.type,
+                                id: index,
+                                accounts: validator.accounts,
+                                module: validator.module,
+                            };
+                        }
+                        case 'passkey': {
+                            return {
+                                type: 'passkey',
+                                id: index,
+                                accounts: validator.accounts,
+                                module: validator.module,
+                            };
+                        }
+                    }
+                }),
+            };
+        }
+    }
+}
+async function signWithMultiFactorAuth(signers, chain, address, params, isUserOpHash, signMain) {
+    const signatures = await Promise.all(signers.validators.map(async (validator) => {
+        if (validator === null) {
+            return '0x';
+        }
+        const validatorSigners = convertOwnerSetToSignerSet(validator);
+        return signMain(validatorSigners, chain, address, params, isUserOpHash);
+    }));
+    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) => {
+            const validatorModule = (0, core_1.getValidator)(validator);
+            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;
+}
+async function signWithSession(signers, chain, address, params, isUserOpHash, signMain) {
+    const sessionSigners = convertOwnerSetToSignerSet(signers.session.owners);
+    return signMain(sessionSigners, chain, address, params, isUserOpHash);
+}
+async function signWithGuardians(signers, params, signingFunctions) {
+    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, isUserOpHash, signMain) {
+    switch (signers.kind) {
+        case 'ecdsa': {
+            // Ownable validator uses `v` value to determine which validation mode to use
+            // This is not needed for UserOps
+            const updateV = (!signers.module ||
+                signers.module?.toLowerCase() === core_1.OWNABLE_VALIDATOR_ADDRESS) &&
+                !isUserOpHash;
+            const signatures = await Promise.all(signers.accounts.map((account) => signingFunctions.signEcdsa(account, params, updateV)));
+            return (0, viem_1.concat)(signatures);
+        }
+        case 'passkey': {
+            const signatures = await Promise.all(signers.accounts.map((account) => signingFunctions.signPasskey(account, params)));
+            const usePrecompile = (0, modules_1.isRip7212SupportedNetwork)(chain);
+            const credIds = signers.accounts.map((account) => {
+                const publicKey = account.publicKey;
+                const { x, y } = (0, passkeys_1.parsePublicKey)(publicKey);
+                return (0, passkeys_1.generateCredentialId)(x, y, address);
+            });
+            const webAuthns = signatures.map((signature) => {
+                const { r, s } = (0, passkeys_1.parseSignature)(signature.signature);
+                return {
+                    authenticatorData: signature.webauthn.authenticatorData,
+                    clientDataJSON: signature.webauthn.clientDataJSON,
+                    challengeIndex: BigInt(signature.webauthn.challengeIndex),
+                    typeIndex: BigInt(signature.webauthn.typeIndex),
+                    r,
+                    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': {
+            return signWithMultiFactorAuth(signers, chain, address, params, isUserOpHash, signMain);
+        }
+        default: {
+            throw new Error('Unsupported owner kind');
+        }
+    }
+}

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

@@ -0,0 +1,5 @@
+import { type Address, type Chain, type Hex } from 'viem';
+import type { SignerSet } from '../../types';
+declare function sign(signers: SignerSet, chain: Chain, address: Address, hash: Hex, isUserOpHash: boolean): Promise<Hex>;
+export { sign };
+//# sourceMappingURL=message.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../accounts/signing/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,KAAK,EAEV,KAAK,GAAG,EAGT,MAAM,MAAM,CAAA;AAEb,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAS5C,iBAAe,IAAI,CACjB,OAAO,EAAE,SAAS,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,GAAG,CAAC,CAyBd;AA4BD,OAAO,EAAE,IAAI,EAAE,CAAA"}

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

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sign = sign;
+const viem_1 = require("viem");
+const error_1 = require("../error");
+const common_1 = require("./common");
+async function sign(signers, chain, address, hash, isUserOpHash) {
+    const signingFunctions = {
+        signEcdsa: (account, hash, updateV) => signEcdsa(account, hash, updateV),
+        signPasskey: (account, hash) => signPasskey(account, hash),
+    };
+    switch (signers.type) {
+        case 'owner': {
+            return (0, common_1.signWithOwners)(signers, chain, address, hash, signingFunctions, isUserOpHash, sign);
+        }
+        case 'session': {
+            return (0, common_1.signWithSession)(signers, chain, address, hash, isUserOpHash, sign);
+        }
+        case 'guardians': {
+            return (0, common_1.signWithGuardians)(signers, hash, signingFunctions);
+        }
+    }
+}
+async function signEcdsa(account, hash, updateV) {
+    if (!account.signMessage) {
+        throw new error_1.SigningNotSupportedForAccountError();
+    }
+    const originalSignature = await account.signMessage({
+        message: { raw: hash },
+    });
+    // Manually tweak the `v` value to trigger the message prefixing onchain
+    // https://github.com/rhinestonewtf/checknsignatures/blob/main/src/CheckNSignatures.sol#L53-L61
+    const { r, s, v } = (0, viem_1.parseSignature)(originalSignature);
+    if (!v) {
+        throw new Error('Invalid signature');
+    }
+    const newV = updateV ? v + 4n : v;
+    const newSignature = (0, viem_1.concat)([r, s, (0, viem_1.toHex)(newV)]);
+    return newSignature;
+}
+async function signPasskey(account, hash) {
+    const { webauthn, signature } = await account.sign({ hash });
+    return {
+        webauthn,
+        signature,
+    };
+}

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

@@ -0,0 +1,36 @@
+import { type Address, type Hex } from 'viem';
+interface WebAuthnSignature {
+    authenticatorData: Hex;
+    clientDataJSON: string;
+    challengeIndex: bigint;
+    typeIndex: bigint;
+    r: bigint;
+    s: bigint;
+}
+declare function parsePublicKey(publicKey: Hex | Uint8Array): {
+    x: bigint;
+    y: bigint;
+};
+declare function parseSignature(signature: Hex | Uint8Array): {
+    r: bigint;
+    s: bigint;
+};
+declare function generateCredentialId(pubKeyX: bigint, pubKeyY: bigint, account: Address): `0x${string}`;
+declare function packSignature(credIds: Hex[], usePrecompile: boolean, webAuthns: {
+    authenticatorData: Hex;
+    clientDataJSON: string;
+    challengeIndex: bigint;
+    typeIndex: bigint;
+    r: bigint;
+    s: bigint;
+}[]): Hex;
+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

@@ -0,0 +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,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"}