@rhinestone/sdk 0.1.0 → 0.2.0

package/dist/example.js

@@ -1,6 +1,13 @@
 "use strict";
 // import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts'
-// import { baseSepolia, arbitrumSepolia, optimismSepolia } from 'viem/chains'
+// import {
+//   baseSepolia,
+//   arbitrumSepolia,
+//   optimismSepolia,
+//   arbitrum,
+//   base,
+//   optimism,
+// } from 'viem/chains'
 // import {
 //   Chain,
 //   createPublicClient,
@@ -10,7 +17,6 @@
 //   Hex,
 //   http,
 //   parseEther,
-//   parseUnits,
 // } from 'viem'
 // import { createRhinestoneAccount } from './index'
 // const fundingPrivateKey = process.env.FUNDING_PRIVATE_KEY
@@ -21,9 +27,11 @@
 // if (!rhinestoneApiKey) {
 //   throw new Error('RHINESTONE_API_KEY is not set')
 // }
+// // const sourceChain = base
+// // const targetChain = arbitrum
 // const sourceChain = baseSepolia
 // const targetChain = arbitrumSepolia
-// const usdc = getTokenAddress(sourceChain)
+// // const usdc = getTokenAddress(sourceChain)
 // const usdcTarget = getTokenAddress(targetChain)
 // const usdcAmount = 1n
 // const fundingAccount = privateKeyToAccount(fundingPrivateKey as Hex)
@@ -42,13 +50,13 @@
 //   generatePrivateKey(),
 // ])
 // const privateKeyA =
-//   '0x04ba71050a787d8b50dbe6cfd35810276699a9eb6dae8c0ac48ccbf8d891324c'
+//   '0x207335e6a3d13577ba379d6427920f031d9a97a125574e1caede8e5d9b6e176a'
 // const accountA = privateKeyToAccount(privateKeyA)
 // const privateKeyB =
-//   '0x921e8d0b257173f92791f47c14ecb84f0545a897a7b12f477a9fb743c1d2b2e3'
+//   '0xc1cff725a1929c69569893737ae925c31cf0976e599515cda458097ad073e267'
 // const accountB = privateKeyToAccount(privateKeyB)
 // const privateKeyC =
-//   '0xc55f1b744fcd9781d6a711fa8347dd41cf6fb662249aede85ed77e95bb2f3aa2'
+//   '0xcb4c6331c960640e761301d8bcc4a08b77dd5dc825b5fd898568c112a0f808fe'
 // const accountC = privateKeyToAccount(privateKeyC)
 // const rhinestoneAccount = await createRhinestoneAccount({
 //   account: {
@@ -56,7 +64,9 @@
 //   },
 //   owners: {
 //     type: 'ecdsa',
-//     accounts: [accountA, accountB],
+//     accounts: [accountA, accountB, accountC],
+//     threshold: 2,
+//     // accounts: [accountA],
 //   },
 //   rhinestoneApiKey,
 //   deployerAccount: fundingAccount,
@@ -74,23 +84,23 @@
 //   })
 //   await publicClient.waitForTransactionReceipt({ hash: txHash })
 // }
-// const usdcBalance = await publicClient.readContract({
-//   address: usdc,
-//   abi: erc20Abi,
-//   functionName: 'balanceOf',
-//   args: [address],
-// })
-// if (usdcBalance < usdcAmount) {
-//   const txHash2 = await fundingClient.sendTransaction({
-//     to: usdc,
-//     data: encodeFunctionData({
-//       abi: erc20Abi,
-//       functionName: 'transfer',
-//       args: [address, usdcAmount],
-//     }),
-//   })
-//   await publicClient.waitForTransactionReceipt({ hash: txHash2 })
-// }
+// // const usdcBalance = await publicClient.readContract({
+// //   address: usdc,
+// //   abi: erc20Abi,
+// //   functionName: 'balanceOf',
+// //   args: [address],
+// // })
+// // if (usdcBalance < usdcAmount) {
+// //   const txHash2 = await fundingClient.sendTransaction({
+// //     to: usdc,
+// //     data: encodeFunctionData({
+// //       abi: erc20Abi,
+// //       functionName: 'transfer',
+// //       args: [address, usdcAmount],
+// //     }),
+// //   })
+// //   await publicClient.waitForTransactionReceipt({ hash: txHash2 })
+// // }
 // const bundleId = await rhinestoneAccount.sendTransactions({
 //   sourceChain,
 //   targetChain,
@@ -123,6 +133,12 @@
 //       return '0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d'
 //     case optimismSepolia.id:
 //       return '0x5fd84259d66Cd46123540766Be93DFE6D43130D7'
+//     case base.id:
+//       return '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913'
+//     case arbitrum.id:
+//       return '0xaf88d065e77c8cC2239327C5EDb3A432268e5831'
+//     case optimism.id:
+//       return '0x0b2c639c533813f4aa9d7837caf62653d097ff85'
 //     default:
 //       throw new Error('Unsupported chain')
 //   }

package/dist/services/{account.d.ts → account/index.d.ts}

@@ -1,5 +1,5 @@
-import { Chain, Account } from 'viem';
-import { RhinestoneAccountConfig } from '../types';
+import { Account, Chain } from 'viem';
+import { RhinestoneAccountConfig } from '../../types';
 declare function getAddress(config: RhinestoneAccountConfig): Promise<`0x${string}`>;
 declare function isDeployed(chain: Chain, config: RhinestoneAccountConfig): Promise<boolean>;
 declare function deploy(deployer: Account, chain: Chain, config: RhinestoneAccountConfig): Promise<void>;
@@ -10,4 +10,4 @@ declare function getDeployArgs(config: RhinestoneAccountConfig): Promise<{
     hashedInitcode: `0x${string}`;
 }>;
 export { getAddress, isDeployed, getDeployArgs, deploy };
-//# sourceMappingURL=account.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist/services/account/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../services/account/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,KAAK,EAQN,MAAM,MAAM,CAAA;AAEb,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAKrD,iBAAe,UAAU,CAAC,MAAM,EAAE,uBAAuB,0BAUxD;AAED,iBAAe,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,uBAAuB,oBAgBtE;AAED,iBAAe,MAAM,CACnB,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,uBAAuB,iBAiBhC;AAED,iBAAe,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;GAS3D;AAED,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,CAAA"}

package/dist/services/account/index.js

@@ -0,0 +1,54 @@
+import { createPublicClient, http, createWalletClient, size, keccak256, encodePacked, slice, } from 'viem';
+import { getDeployArgs as getSafeDeployArgs } from './safe';
+import { getDeployArgs as getNexusDeployArgs } from './nexus';
+async function getAddress(config) {
+    const { factory, salt, hashedInitcode } = await getDeployArgs(config);
+    const hash = keccak256(encodePacked(['bytes1', 'address', 'bytes32', 'bytes'], ['0xff', factory, salt, hashedInitcode]));
+    const address = slice(hash, 12, 32);
+    return address;
+}
+async function isDeployed(chain, config) {
+    const publicClient = createPublicClient({
+        chain: chain,
+        transport: http(),
+    });
+    const address = await getAddress(config);
+    const code = await publicClient.getCode({
+        address,
+    });
+    if (!code) {
+        return false;
+    }
+    if (code.startsWith('0xef0100') && code.length === 48) {
+        throw new Error('EIP-7702 accounts are not yet supported');
+    }
+    return size(code) > 0;
+}
+async function deploy(deployer, chain, config) {
+    const { factory, factoryData } = await getDeployArgs(config);
+    const publicClient = createPublicClient({
+        chain: chain,
+        transport: http(),
+    });
+    const client = createWalletClient({
+        account: deployer,
+        chain: chain,
+        transport: http(),
+    });
+    const tx = await client.sendTransaction({
+        to: factory,
+        data: factoryData,
+    });
+    await publicClient.waitForTransactionReceipt({ hash: tx });
+}
+async function getDeployArgs(config) {
+    switch (config.account.type) {
+        case 'safe': {
+            return getSafeDeployArgs(config);
+        }
+        case 'nexus': {
+            return getNexusDeployArgs(config);
+        }
+    }
+}
+export { getAddress, isDeployed, getDeployArgs, deploy };

package/dist/services/account/nexus.d.ts

@@ -0,0 +1,9 @@
+import { RhinestoneAccountConfig } from '../../types';
+declare function getDeployArgs(config: RhinestoneAccountConfig): Promise<{
+    factory: `0x${string}`;
+    factoryData: `0x${string}`;
+    salt: `0x${string}`;
+    hashedInitcode: `0x${string}`;
+}>;
+export { getDeployArgs };
+//# sourceMappingURL=nexus.d.ts.map

package/dist/services/account/nexus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nexus.d.ts","sourceRoot":"","sources":["../../../services/account/nexus.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAkBrD,iBAAe,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;GAqE3D;AAED,OAAO,EAAE,aAAa,EAAE,CAAA"}

package/dist/services/account/nexus.js

@@ -0,0 +1,67 @@
+import { concat, encodeAbiParameters, encodeFunctionData, keccak256, parseAbi, encodePacked, zeroAddress, } from 'viem';
+import { getValidator, OMNI_ACCOUNT_MOCK_ATTESTER_ADDRESS, RHINESTONE_ATTESTER_ADDRESS, RHINESTONE_MODULE_REGISTRY_ADDRESS, } from '../modules';
+import { HOOK_ADDRESS, SAME_CHAIN_MODULE_ADDRESS, TARGET_MODULE_ADDRESS, } from '../orchestrator';
+const NEXUS_FACTORY_ADDRESS = '0x000000c3A93d2c5E02Cb053AC675665b1c4217F9';
+const NEXUS_BOOTSTRAP_ADDRESS = '0x879fa30248eeb693dcCE3eA94a743622170a3658';
+async function getDeployArgs(config) {
+    const salt = keccak256('0x');
+    const initData = encodeAbiParameters([{ type: 'address' }, { type: 'bytes' }], [
+        NEXUS_BOOTSTRAP_ADDRESS,
+        encodeFunctionData({
+            abi: parseAbi([
+                'struct BootstrapConfig {address module;bytes initData;}',
+                'function initNexus(BootstrapConfig[] calldata validators,BootstrapConfig[] calldata executors,BootstrapConfig calldata hook,BootstrapConfig[] calldata fallbacks,address registry,address[] calldata attesters,uint8 threshold) external',
+            ]),
+            functionName: 'initNexus',
+            args: [
+                [
+                    {
+                        module: getValidator(config).address,
+                        initData: getValidator(config).initData,
+                    },
+                ],
+                [
+                    {
+                        module: SAME_CHAIN_MODULE_ADDRESS,
+                        initData: '0x',
+                    },
+                    {
+                        module: TARGET_MODULE_ADDRESS,
+                        initData: '0x',
+                    },
+                    {
+                        module: HOOK_ADDRESS,
+                        initData: '0x',
+                    },
+                ],
+                {
+                    module: zeroAddress,
+                    initData: '0x',
+                },
+                [
+                    {
+                        module: TARGET_MODULE_ADDRESS,
+                        initData: encodePacked(['bytes4', 'bytes1', 'bytes'], ['0x3a5be8cb', '0x00', '0x']),
+                    },
+                ],
+                RHINESTONE_MODULE_REGISTRY_ADDRESS,
+                [RHINESTONE_ATTESTER_ADDRESS, OMNI_ACCOUNT_MOCK_ATTESTER_ADDRESS],
+                1,
+            ],
+        }),
+    ]);
+    const factoryData = encodeFunctionData({
+        abi: parseAbi(['function createAccount(bytes,bytes32)']),
+        functionName: 'createAccount',
+        args: [initData, salt],
+    });
+    const actualSalt = keccak256(concat([initData, salt]));
+    const hashedInitcode = '0xbf5658acdb0d71e91f2e2ac658b87c63b81f244ccb8c0aef176c5e397e08c2ba';
+    return {
+        factory: NEXUS_FACTORY_ADDRESS,
+        factoryData,
+        salt: actualSalt,
+        hashedInitcode,
+    };
+}
+export { getDeployArgs };

package/dist/services/account/safe.d.ts

@@ -0,0 +1,9 @@
+import { RhinestoneAccountConfig } from '../../types';
+declare function getDeployArgs(config: RhinestoneAccountConfig): Promise<{
+    factory: `0x${string}`;
+    factoryData: `0x${string}`;
+    salt: `0x${string}`;
+    hashedInitcode: `0x${string}`;
+}>;
+export { getDeployArgs };
+//# sourceMappingURL=safe.d.ts.map

package/dist/services/account/safe.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"safe.d.ts","sourceRoot":"","sources":["../../../services/account/safe.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAmBrD,iBAAe,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;GAyF3D;AAsBD,OAAO,EAAE,aAAa,EAAE,CAAA"}

package/dist/services/account/safe.js

@@ -0,0 +1,107 @@
+import { encodeFunctionData, encodeAbiParameters, encodePacked, keccak256, parseAbi, zeroAddress, } from 'viem';
+import { OMNI_ACCOUNT_MOCK_ATTESTER_ADDRESS, RHINESTONE_ATTESTER_ADDRESS, getValidator, } from '../modules';
+import { HOOK_ADDRESS, SAME_CHAIN_MODULE_ADDRESS, TARGET_MODULE_ADDRESS, } from '../orchestrator';
+const SAFE_7579_LAUNCHPAD_ADDRESS = '0x7579011aB74c46090561ea277Ba79D510c6C00ff';
+const SAFE_7579_ADAPTER_ADDRESS = '0x7579ee8307284f293b1927136486880611f20002';
+const SAFE_SINGLETON_ADDRESS = '0x29fcb43b46531bca003ddc8fcb67ffe91900c762';
+const SAFE_PROXY_FACTORY_ADDRESS = '0x4e1dcf7ad4e460cfd30791ccc4f9c8a4f820ec67';
+const NO_SAFE_OWNER_ADDRESS = '0xbabe99e62d8bcbd3acf5ccbcfcd4f64fe75e5e72';
+async function getDeployArgs(config) {
+    {
+        const owners = getOwners(config);
+        const threshold = getThreshold(config);
+        const initData = encodeFunctionData({
+            abi: 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,
+                encodeFunctionData({
+                    abi: parseAbi([
+                        'struct ModuleInit {address module;bytes initData;}',
+                        'function addSafe7579(address safe7579,ModuleInit[] calldata validators,ModuleInit[] calldata executors,ModuleInit[] calldata fallbacks, ModuleInit[] calldata hooks,address[] calldata attesters,uint8 threshold) external',
+                    ]),
+                    functionName: 'addSafe7579',
+                    args: [
+                        SAFE_7579_ADAPTER_ADDRESS,
+                        [
+                            {
+                                module: getValidator(config).address,
+                                initData: getValidator(config).initData,
+                            },
+                        ],
+                        [
+                            {
+                                module: SAME_CHAIN_MODULE_ADDRESS,
+                                initData: '0x',
+                            },
+                            {
+                                module: TARGET_MODULE_ADDRESS,
+                                initData: '0x',
+                            },
+                            {
+                                module: HOOK_ADDRESS,
+                                initData: '0x',
+                            },
+                        ],
+                        [
+                            {
+                                module: TARGET_MODULE_ADDRESS,
+                                initData: encodeAbiParameters([
+                                    { name: 'selector', type: 'bytes4' },
+                                    { name: 'flags', type: 'bytes1' },
+                                    { name: 'data', type: 'bytes' },
+                                ], ['0x3a5be8cb', '0x00', '0x']),
+                            },
+                        ],
+                        [],
+                        [RHINESTONE_ATTESTER_ADDRESS, OMNI_ACCOUNT_MOCK_ATTESTER_ADDRESS],
+                        1,
+                    ],
+                }),
+                SAFE_7579_ADAPTER_ADDRESS,
+                zeroAddress,
+                BigInt(0),
+                zeroAddress,
+            ],
+        });
+        const saltNonce = 0n;
+        const factoryData = encodeFunctionData({
+            abi: parseAbi([
+                'function createProxyWithNonce(address singleton,bytes calldata initializer,uint256 saltNonce) external payable returns (address)',
+            ]),
+            functionName: 'createProxyWithNonce',
+            args: [SAFE_SINGLETON_ADDRESS, initData, saltNonce],
+        });
+        const salt = keccak256(encodePacked(['bytes32', 'uint256'], [keccak256(initData), saltNonce]));
+        const hashedInitcode = '0xe298282cefe913ab5d282047161268a8222e4bd4ed106300c547894bbefd31ee';
+        return {
+            factory: SAFE_PROXY_FACTORY_ADDRESS,
+            factoryData,
+            salt,
+            hashedInitcode,
+        };
+    }
+}
+function getOwners(config) {
+    const ownerSet = config.owners;
+    switch (ownerSet.type) {
+        case 'ecdsa':
+            return ownerSet.accounts.map((account) => account.address);
+        case 'passkey':
+            return [NO_SAFE_OWNER_ADDRESS];
+    }
+}
+function getThreshold(config) {
+    const ownerSet = config.owners;
+    switch (ownerSet.type) {
+        case 'ecdsa':
+            return ownerSet.threshold ? BigInt(ownerSet.threshold) : 1n;
+        case 'passkey':
+            return 1n;
+    }
+}
+export { getDeployArgs };

package/dist/services/modules.d.ts

@@ -22,13 +22,11 @@ interface WebauthnSignature {
     r: bigint;
     s: bigint;
 }
-declare const SAFE_7579_LAUNCHPAD_ADDRESS: Address;
-declare const SAFE_7579_ADAPTER_ADDRESS: Address;
 declare const OMNI_ACCOUNT_MOCK_ATTESTER_ADDRESS: Address;
+declare const RHINESTONE_MODULE_REGISTRY_ADDRESS: Address;
 declare const RHINESTONE_ATTESTER_ADDRESS: Address;
-declare function toOwners(config: RhinestoneAccountConfig): `0x${string}`[];
 declare function getValidator(config: RhinestoneAccountConfig): Module;
 export declare function getWebauthnValidatorSignature({ webauthn, signature, usePrecompiled, }: WebauthnValidatorSignature): `0x${string}`;
 export declare function isRip7212SupportedNetwork(chain: Chain): boolean;
-export { getValidator, toOwners, SAFE_7579_LAUNCHPAD_ADDRESS, SAFE_7579_ADAPTER_ADDRESS, OMNI_ACCOUNT_MOCK_ATTESTER_ADDRESS, RHINESTONE_ATTESTER_ADDRESS, };
+export { getValidator, OMNI_ACCOUNT_MOCK_ATTESTER_ADDRESS, RHINESTONE_MODULE_REGISTRY_ADDRESS, RHINESTONE_ATTESTER_ADDRESS, };
 //# sourceMappingURL=modules.d.ts.map

package/dist/services/modules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../services/modules.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAEP,KAAK,EAEL,GAAG,EAIJ,MAAM,MAAM,CAAA;AAYb,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAElD,KAAK,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,UAAU,GAAG,MAAM,CAAA;AAEhE,UAAU,MAAM;IACd,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,GAAG,CAAA;IACb,UAAU,EAAE,GAAG,CAAA;IACf,iBAAiB,EAAE,GAAG,CAAA;IACtB,IAAI,EAAE,UAAU,CAAA;CACjB;AAcD,UAAU,YAAY;IACpB,iBAAiB,EAAE,GAAG,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAA;CAC3B;AAED,UAAU,0BAA0B;IAClC,QAAQ,EAAE,YAAY,CAAA;IACtB,SAAS,EAAE,iBAAiB,GAAG,GAAG,GAAG,UAAU,CAAA;IAC/C,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,UAAU,iBAAiB;IACzB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV;AAED,QAAA,MAAM,2BAA2B,EAAE,OACW,CAAA;AAC9C,QAAA,MAAM,yBAAyB,EAAE,OACa,CAAA;AAE9C,QAAA,MAAM,kCAAkC,EAAE,OACI,CAAA;AAE9C,QAAA,MAAM,2BAA2B,EAAE,OACW,CAAA;AAS9C,iBAAS,QAAQ,CAAC,MAAM,EAAE,uBAAuB,mBAQhD;AAED,iBAAS,YAAY,CAAC,MAAM,EAAE,uBAAuB,UAcpD;AAkFD,wBAAgB,6BAA6B,CAAC,EAC5C,QAAQ,EACR,SAAS,EACT,cAAsB,GACvB,EAAE,0BAA0B,iBA6C5B;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,KAAK,WAarD;AA0BD,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,2BAA2B,EAC3B,yBAAyB,EACzB,kCAAkC,EAClC,2BAA2B,GAC5B,CAAA"}
+{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../services/modules.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAEP,KAAK,EAEL,GAAG,EAIJ,MAAM,MAAM,CAAA;AAYb,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAElD,KAAK,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,UAAU,GAAG,MAAM,CAAA;AAEhE,UAAU,MAAM;IACd,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,GAAG,CAAA;IACb,UAAU,EAAE,GAAG,CAAA;IACf,iBAAiB,EAAE,GAAG,CAAA;IACtB,IAAI,EAAE,UAAU,CAAA;CACjB;AAcD,UAAU,YAAY;IACpB,iBAAiB,EAAE,GAAG,CAAA;IACtB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAA;CAC3B;AAED,UAAU,0BAA0B;IAClC,QAAQ,EAAE,YAAY,CAAA;IACtB,SAAS,EAAE,iBAAiB,GAAG,GAAG,GAAG,UAAU,CAAA;IAC/C,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,UAAU,iBAAiB;IACzB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV;AAED,QAAA,MAAM,kCAAkC,EAAE,OACI,CAAA;AAE9C,QAAA,MAAM,kCAAkC,EAAE,OACI,CAAA;AAC9C,QAAA,MAAM,2BAA2B,EAAE,OACW,CAAA;AAM9C,iBAAS,YAAY,CAAC,MAAM,EAAE,uBAAuB,UAcpD;AAqFD,wBAAgB,6BAA6B,CAAC,EAC5C,QAAQ,EACR,SAAS,EACT,cAAsB,GACvB,EAAE,0BAA0B,iBA6C5B;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,KAAK,WAarD;AA0BD,OAAO,EACL,YAAY,EACZ,kCAAkC,EAClC,kCAAkC,EAClC,2BAA2B,GAC5B,CAAA"}

package/dist/services/modules.js

@@ -1,21 +1,10 @@
 import { bytesToHex, encodeAbiParameters, hexToBytes, keccak256, toHex, } from 'viem';
 import { arbitrum, arbitrumSepolia, base, baseSepolia, optimism, optimismSepolia, polygon, polygonAmoy, } from 'viem/chains';
-const SAFE_7579_LAUNCHPAD_ADDRESS = '0x7579011aB74c46090561ea277Ba79D510c6C00ff';
-const SAFE_7579_ADAPTER_ADDRESS = '0x7579ee8307284f293b1927136486880611f20002';
 const OMNI_ACCOUNT_MOCK_ATTESTER_ADDRESS = '0x6D0515e8E499468DCe9583626f0cA15b887f9d03';
+const RHINESTONE_MODULE_REGISTRY_ADDRESS = '0x000000000069e2a187aeffb852bf3ccdc95151b2';
 const RHINESTONE_ATTESTER_ADDRESS = '0x000000333034E9f539ce08819E12c1b8Cb29084d';
 const OWNABLE_VALIDATOR_ADDRESS = '0x2483DA3A338895199E5e538530213157e931Bf06';
 const WEBAUTHN_VALIDATOR_ADDRESS = '0x2f167e55d42584f65e2e30a748f41ee75a311414';
-const NO_SAFE_OWNER_ADDRESS = '0xbabe99e62d8bcbd3acf5ccbcfcd4f64fe75e5e72';
-function toOwners(config) {
-    const ownerSet = config.owners;
-    switch (ownerSet.type) {
-        case 'ecdsa':
-            return ownerSet.accounts.map((account) => account.address);
-        case 'passkey':
-            return [NO_SAFE_OWNER_ADDRESS];
-    }
-}
 function getValidator(config) {
     const ownerSet = config.owners;
     switch (ownerSet.type) {
@@ -37,7 +26,10 @@ function getOwnableValidator({ threshold, owners, }) {
         initData: encodeAbiParameters([
             { name: 'threshold', type: 'uint256' },
             { name: 'owners', type: 'address[]' },
-        ], [BigInt(threshold), owners.sort()]),
+        ], [
+            BigInt(threshold),
+            owners.map((owner) => owner.toLowerCase()).sort(),
+        ]),
         deInitData: '0x',
         additionalContext: '0x',
         type: 'validator',
@@ -171,4 +163,4 @@ function parsePublicKey(publicKey) {
         y: BigInt(bytesToHex(y)),
     };
 }
-export { getValidator, toOwners, SAFE_7579_LAUNCHPAD_ADDRESS, SAFE_7579_ADAPTER_ADDRESS, OMNI_ACCOUNT_MOCK_ATTESTER_ADDRESS, RHINESTONE_ATTESTER_ADDRESS, };
+export { getValidator, OMNI_ACCOUNT_MOCK_ATTESTER_ADDRESS, RHINESTONE_MODULE_REGISTRY_ADDRESS, RHINESTONE_ATTESTER_ADDRESS, };

package/dist/services/orchestrator/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../services/orchestrator/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,GAAG,EAGJ,MAAM,MAAM,CAAA;AAGb,OAAO,EACL,WAAW,EAEX,iBAAiB,EAIlB,MAAM,SAAS,CAAA;AAYhB,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,iBAAiB,GAAG,GAAG,CAMtE;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAwBjD;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,GAAG,GAAG,iBAAiB,CAiCrE;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,GAAG,GAAG,WAAW,CAkClE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../services/orchestrator/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,GAAG,EAGJ,MAAM,MAAM,CAAA;AAEb,OAAO,EACL,WAAW,EAEX,iBAAiB,EAIlB,MAAM,SAAS,CAAA;AAYhB,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,iBAAiB,GAAG,GAAG,CAMtE;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAwBjD;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,GAAG,GAAG,iBAAiB,CAiCrE;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,GAAG,GAAG,WAAW,CAkClE"}

package/dist/services/transaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../services/transaction.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,YAAY,EAQlB,MAAM,gBAAgB,CAAA;AAQvB,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAY,MAAM,UAAU,CAAA;AAEzE,iBAAe,gBAAgB,CAC7B,MAAM,EAAE,uBAAuB,EAC/B,WAAW,EAAE,WAAW,mBAiEzB;AAED,iBAAe,gBAAgB,CAAC,MAAM,EAAE,uBAAuB,EAAE,EAAE,EAAE,MAAM,yBAa1E;AAmCD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../services/transaction.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,YAAY,EAQlB,MAAM,gBAAgB,CAAA;AAOvB,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAY,MAAM,UAAU,CAAA;AAEzE,iBAAe,gBAAgB,CAC7B,MAAM,EAAE,uBAAuB,EAC/B,WAAW,EAAE,WAAW,mBAiEzB;AAED,iBAAe,gBAAgB,CAAC,MAAM,EAAE,uBAAuB,EAAE,EAAE,EAAE,MAAM,yBAa1E;AAmCD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,CAAA"}

package/dist/types.d.ts

@@ -12,7 +12,7 @@ interface WebauthnValidatorConfig {
 type OwnerSet = OwnableValidatorConfig | WebauthnValidatorConfig;
 interface RhinestoneAccountConfig {
     account: {
-        type: 'safe';
+        type: 'safe' | 'nexus';
     };
     owners: OwnerSet;
     rhinestoneApiKey: string;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAE1D,UAAU,sBAAsB;IAC9B,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,UAAU,uBAAuB;IAC/B,IAAI,EAAE,SAAS,CAAA;IACf,OAAO,EAAE,eAAe,CAAA;CACzB;AAED,KAAK,QAAQ,GAAG,sBAAsB,GAAG,uBAAuB,CAAA;AAChE,UAAU,uBAAuB;IAC/B,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAA;KACb,CAAA;IACD,MAAM,EAAE,QAAQ,CAAA;IAChB,gBAAgB,EAAE,MAAM,CAAA;IACxB,eAAe,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE;QACT,IAAI,EAAE,SAAS,CAAA;QACf,MAAM,EAAE,MAAM,CAAA;KACf,CAAA;IACD,OAAO,CAAC,EAAE;QACR,IAAI,EAAE,SAAS,CAAA;QACf,MAAM,EAAE,MAAM,CAAA;KACf,CAAA;CACF;AAED,UAAU,IAAI;IACZ,EAAE,EAAE,OAAO,CAAA;IACX,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,UAAU,YAAY;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,UAAU,WAAW;IACnB,WAAW,EAAE,KAAK,CAAA;IAClB,WAAW,EAAE,KAAK,CAAA;IAClB,KAAK,EAAE,IAAI,EAAE,CAAA;IACb,aAAa,EAAE,YAAY,EAAE,CAAA;CAC9B;AAED,YAAY,EAAE,uBAAuB,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAE1D,UAAU,sBAAsB;IAC9B,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,UAAU,uBAAuB;IAC/B,IAAI,EAAE,SAAS,CAAA;IACf,OAAO,EAAE,eAAe,CAAA;CACzB;AAED,KAAK,QAAQ,GAAG,sBAAsB,GAAG,uBAAuB,CAAA;AAChE,UAAU,uBAAuB;IAC/B,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KACvB,CAAA;IACD,MAAM,EAAE,QAAQ,CAAA;IAChB,gBAAgB,EAAE,MAAM,CAAA;IACxB,eAAe,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE;QACT,IAAI,EAAE,SAAS,CAAA;QACf,MAAM,EAAE,MAAM,CAAA;KACf,CAAA;IACD,OAAO,CAAC,EAAE;QACR,IAAI,EAAE,SAAS,CAAA;QACf,MAAM,EAAE,MAAM,CAAA;KACf,CAAA;CACF;AAED,UAAU,IAAI;IACZ,EAAE,EAAE,OAAO,CAAA;IACX,IAAI,CAAC,EAAE,GAAG,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,UAAU,YAAY;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,UAAU,WAAW;IACnB,WAAW,EAAE,KAAK,CAAA;IAClB,WAAW,EAAE,KAAK,CAAA;IAClB,KAAK,EAAE,IAAI,EAAE,CAAA;IACb,aAAa,EAAE,YAAY,EAAE,CAAA;CAC9B;AAED,YAAY,EAAE,uBAAuB,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhinestone/sdk",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "End-to-end chain abstraction and modularity toolkit",
   "author": {
     "name": "Rhinestone",

package/dist/services/account.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../services/account.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAQL,OAAO,EAOR,MAAM,MAAM,CAAA;AAOb,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAelD,iBAAe,UAAU,CAAC,MAAM,EAAE,uBAAuB,0BAUxD;AAED,iBAAe,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,uBAAuB,oBAgBtE;AAED,iBAAe,MAAM,CACnB,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,uBAAuB,iBAiBhC;AAED,iBAAe,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;GA6F3D;AAED,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,CAAA"}

package/dist/services/account.js

@@ -1,127 +0,0 @@
-import { createPublicClient, http, encodeAbiParameters, encodeFunctionData, parseAbi, zeroAddress, createWalletClient, size, keccak256, encodePacked, slice, } from 'viem';
-import { HOOK_ADDRESS, SAME_CHAIN_MODULE_ADDRESS, TARGET_MODULE_ADDRESS, } from './orchestrator';
-import { getValidator, toOwners, SAFE_7579_LAUNCHPAD_ADDRESS, SAFE_7579_ADAPTER_ADDRESS, OMNI_ACCOUNT_MOCK_ATTESTER_ADDRESS, RHINESTONE_ATTESTER_ADDRESS, } from './modules';
-const SAFE_SINGLETON_ADDRESS = '0x29fcb43b46531bca003ddc8fcb67ffe91900c762';
-const SAFE_PROXY_FACTORY_ADDRESS = '0x4e1dcf7ad4e460cfd30791ccc4f9c8a4f820ec67';
-async function getAddress(config) {
-    const { factory, salt, hashedInitcode } = await getDeployArgs(config);
-    const hash = keccak256(encodePacked(['bytes1', 'address', 'bytes32', 'bytes'], ['0xff', factory, salt, hashedInitcode]));
-    const address = slice(hash, 12, 32);
-    return address;
-}
-async function isDeployed(chain, config) {
-    const publicClient = createPublicClient({
-        chain: chain,
-        transport: http(),
-    });
-    const address = await getAddress(config);
-    const code = await publicClient.getCode({
-        address,
-    });
-    if (!code) {
-        return false;
-    }
-    if (code.startsWith('0xef0100') && code.length === 48) {
-        throw new Error('EIP-7702 accounts are not yet supported');
-    }
-    return size(code) > 0;
-}
-async function deploy(deployer, chain, config) {
-    const { factory, factoryData } = await getDeployArgs(config);
-    const publicClient = createPublicClient({
-        chain: chain,
-        transport: http(),
-    });
-    const client = createWalletClient({
-        account: deployer,
-        chain: chain,
-        transport: http(),
-    });
-    const tx = await client.sendTransaction({
-        to: factory,
-        data: factoryData,
-    });
-    await publicClient.waitForTransactionReceipt({ hash: tx });
-}
-async function getDeployArgs(config) {
-    switch (config.account.type) {
-        case 'safe': {
-            const owners = toOwners(config);
-            const initializer = encodeFunctionData({
-                abi: 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,
-                    BigInt(1),
-                    SAFE_7579_LAUNCHPAD_ADDRESS,
-                    encodeFunctionData({
-                        abi: parseAbi([
-                            'struct ModuleInit {address module;bytes initData;}',
-                            'function addSafe7579(address safe7579,ModuleInit[] calldata validators,ModuleInit[] calldata executors,ModuleInit[] calldata fallbacks, ModuleInit[] calldata hooks,address[] calldata attesters,uint8 threshold) external',
-                        ]),
-                        functionName: 'addSafe7579',
-                        args: [
-                            SAFE_7579_ADAPTER_ADDRESS,
-                            [
-                                {
-                                    module: getValidator(config).address,
-                                    initData: getValidator(config).initData,
-                                },
-                            ],
-                            [
-                                {
-                                    module: SAME_CHAIN_MODULE_ADDRESS,
-                                    initData: '0x',
-                                },
-                                {
-                                    module: TARGET_MODULE_ADDRESS,
-                                    initData: '0x',
-                                },
-                                {
-                                    module: HOOK_ADDRESS,
-                                    initData: '0x',
-                                },
-                            ],
-                            [
-                                {
-                                    module: TARGET_MODULE_ADDRESS,
-                                    initData: encodeAbiParameters([
-                                        { name: 'selector', type: 'bytes4' },
-                                        { name: 'flags', type: 'bytes1' },
-                                        { name: 'data', type: 'bytes' },
-                                    ], ['0x3a5be8cb', '0x00', '0x']),
-                                },
-                            ],
-                            [],
-                            [RHINESTONE_ATTESTER_ADDRESS, OMNI_ACCOUNT_MOCK_ATTESTER_ADDRESS],
-                            1,
-                        ],
-                    }),
-                    SAFE_7579_ADAPTER_ADDRESS,
-                    zeroAddress,
-                    BigInt(0),
-                    zeroAddress,
-                ],
-            });
-            const saltNonce = 0n;
-            const factoryData = encodeFunctionData({
-                abi: parseAbi([
-                    'function createProxyWithNonce(address singleton,bytes calldata initializer,uint256 saltNonce) external payable returns (address)',
-                ]),
-                functionName: 'createProxyWithNonce',
-                args: [SAFE_SINGLETON_ADDRESS, initializer, saltNonce],
-            });
-            const salt = keccak256(encodePacked(['bytes32', 'uint256'], [keccak256(initializer), saltNonce]));
-            const hashedInitcode = '0xe298282cefe913ab5d282047161268a8222e4bd4ed106300c547894bbefd31ee';
-            return {
-                factory: SAFE_PROXY_FACTORY_ADDRESS,
-                factoryData,
-                salt,
-                hashedInitcode,
-            };
-        }
-    }
-}
-export { getAddress, isDeployed, getDeployArgs, deploy };