@rhinestone/sdk 1.5.0 → 2.0.0-beta.0

package/dist/src/accounts/nexus.js

@@ -1,23 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEip712Domain = getEip712Domain;
-exports.getInstallData = getInstallData;
-exports.getAddress = getAddress;
-exports.getDefaultValidatorAddress = getDefaultValidatorAddress;
-exports.packSignature = packSignature;
-exports.getDeployArgs = getDeployArgs;
-exports.getSmartAccount = getSmartAccount;
-exports.getGuardianSmartAccount = getGuardianSmartAccount;
-exports.signEip7702InitData = signEip7702InitData;
-exports.getEip7702InitCall = getEip7702InitCall;
-const viem_1 = require("viem");
-const account_abstraction_1 = require("viem/account-abstraction");
-const modules_1 = require("../modules");
-const validators_1 = require("../modules/validators");
-const core_1 = require("../modules/validators/core");
-const error_1 = require("./error");
-const utils_1 = require("./utils");
-const NEXUS_DEFAULT_VALIDATOR_ADDRESS = core_1.OWNABLE_VALIDATOR_ADDRESS;
+import { concat, decodeFunctionData, encodeAbiParameters, encodeFunctionData, encodePacked, getContractAddress, keccak256, parseAbi, size, toHex, zeroAddress, zeroHash, } from 'viem';
+import { entryPoint07Abi, entryPoint07Address, getUserOperationHash, toSmartAccount, } from 'viem/account-abstraction';
+import { getSetup as getModuleSetup } from '../modules/index.js';
+import { getMockSignature } from '../modules/validators/index.js';
+import { OWNABLE_VALIDATOR_ADDRESS } from '../modules/validators/core.js';
+import { AccountConfigurationNotSupportedError, Eip712DomainNotAvailableError, SigningNotSupportedForAccountError, } from './error.js';
+import { encode7579Calls, getAccountNonce } from './utils.js';
+const NEXUS_DEFAULT_VALIDATOR_ADDRESS = OWNABLE_VALIDATOR_ADDRESS;
 const NEXUS_VERSION = '1.2.0';
 const NEXUS_IMPLEMENTATION_ADDRESS = '0x000000000032ddc454c3bdcba80484ad5a798705';
 const NEXUS_FACTORY_ADDRESS = '0x0000000000679a258c64d2f20f310e12b64b7375';
@@ -40,21 +28,21 @@ function getDeployArgs(config) {
         if (v0Result) {
             return v0Result;
         }
-        throw new error_1.AccountConfigurationNotSupportedError('Invalid factory data: unrecognized schema', 'nexus');
+        throw new AccountConfigurationNotSupportedError('Invalid factory data: unrecognized schema', 'nexus');
     }
     const account = config.account;
-    const defaultSalt = (0, viem_1.keccak256)('0x');
+    const defaultSalt = keccak256('0x');
     const salt = account?.salt ?? defaultSalt;
-    const moduleSetup = (0, modules_1.getSetup)(config);
+    const moduleSetup = getModuleSetup(config);
     // Filter out the default validator
     const defaultValidator = moduleSetup.validators.find((v) => v.address === NEXUS_DEFAULT_VALIDATOR_ADDRESS);
     const defaultValidatorInitData = defaultValidator
         ? defaultValidator.initData
         : '0x';
     const validators = moduleSetup.validators.filter((v) => v.address !== NEXUS_DEFAULT_VALIDATOR_ADDRESS);
-    const bootstrapData = (0, viem_1.size)(defaultValidatorInitData)
-        ? (0, viem_1.encodeFunctionData)({
-            abi: (0, viem_1.parseAbi)([
+    const bootstrapData = size(defaultValidatorInitData)
+        ? encodeFunctionData({
+            abi: parseAbi([
                 'struct BootstrapConfig {address module;bytes initData;}',
                 'struct BootstrapPreValidationHookConfig {uint256 hookType;address module;bytes data;}',
                 'function initNexusWithDefaultValidatorAndOtherModulesNoRegistry(bytes calldata defaultValidatorInitData,BootstrapConfig[] calldata validators,BootstrapConfig[] calldata executors,BootstrapConfig calldata hook,BootstrapConfig[] calldata fallbacks,BootstrapPreValidationHookConfig[] calldata preValidationHooks) external',
@@ -71,7 +59,7 @@ function getDeployArgs(config) {
                     initData: e.initData,
                 })),
                 {
-                    module: viem_1.zeroAddress,
+                    module: zeroAddress,
                     initData: '0x',
                 },
                 moduleSetup.fallbacks.map((f) => ({
@@ -81,8 +69,8 @@ function getDeployArgs(config) {
                 [],
             ],
         })
-        : (0, viem_1.encodeFunctionData)({
-            abi: (0, viem_1.parseAbi)([
+        : encodeFunctionData({
+            abi: parseAbi([
                 'struct BootstrapConfig {address module;bytes initData;}',
                 'struct BootstrapPreValidationHookConfig {uint256 hookType;address module;bytes data;}',
                 'function initNexusNoRegistry(BootstrapConfig[] calldata validators,BootstrapConfig[] calldata executors,BootstrapConfig calldata hook,BootstrapConfig[] calldata fallbacks,BootstrapPreValidationHookConfig[] calldata preValidationHooks) external',
@@ -98,7 +86,7 @@ function getDeployArgs(config) {
                     initData: e.initData,
                 })),
                 {
-                    module: viem_1.zeroAddress,
+                    module: zeroAddress,
                     initData: '0x',
                 },
                 moduleSetup.fallbacks.map((f) => ({
@@ -108,14 +96,14 @@ function getDeployArgs(config) {
                 [],
             ],
         });
-    const initData = (0, viem_1.encodeAbiParameters)([{ type: 'address' }, { type: 'bytes' }], [NEXUS_BOOTSTRAP_ADDRESS, bootstrapData]);
-    const factoryData = (0, viem_1.encodeFunctionData)({
-        abi: (0, viem_1.parseAbi)(['function createAccount(bytes,bytes32)']),
+    const initData = encodeAbiParameters([{ type: 'address' }, { type: 'bytes' }], [NEXUS_BOOTSTRAP_ADDRESS, bootstrapData]);
+    const factoryData = encodeFunctionData({
+        abi: parseAbi(['function createAccount(bytes,bytes32)']),
         functionName: 'createAccount',
         args: [initData, salt],
     });
-    const initializationCallData = (0, viem_1.encodeFunctionData)({
-        abi: (0, viem_1.parseAbi)(['function initializeAccount(bytes)']),
+    const initializationCallData = encodeFunctionData({
+        abi: parseAbi(['function initializeAccount(bytes)']),
         functionName: 'initializeAccount',
         args: [initData],
     });
@@ -141,7 +129,7 @@ function getAddress(config) {
         ? NEXUS_CREATION_CODE
         : '0x603d3d8160223d3973000000039dfcad030719b07296710f045f0558f760095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3';
     const accountInitData = factory.toLowerCase() === NEXUS_FACTORY_ADDRESS
-        ? (0, viem_1.encodeAbiParameters)([
+        ? encodeAbiParameters([
             {
                 name: 'address',
                 type: 'address',
@@ -152,28 +140,28 @@ function getAddress(config) {
             },
         ], [implementation, initializationCallData])
         : '0x';
-    const address = (0, viem_1.getContractAddress)({
+    const address = getContractAddress({
         opcode: 'CREATE2',
         from: factory,
         salt,
-        bytecode: (0, viem_1.concat)([creationCode, accountInitData]),
+        bytecode: concat([creationCode, accountInitData]),
     });
     return address;
 }
 function getEip712Domain(config, chain) {
     if (config.initData) {
-        throw new error_1.Eip712DomainNotAvailableError('Existing Nexus accounts are not yet supported');
+        throw new Eip712DomainNotAvailableError('Existing Nexus accounts are not yet supported');
     }
     return {
         name: 'Nexus',
         version: NEXUS_VERSION,
         chainId: chain.id,
         verifyingContract: getAddress(config),
-        salt: viem_1.zeroHash,
+        salt: zeroHash,
     };
 }
 function getInstallData(module) {
-    return (0, viem_1.encodeFunctionData)({
+    return encodeFunctionData({
         abi: [
             {
                 type: 'function',
@@ -217,36 +205,36 @@ function getDefaultValidatorAddress(version) {
 }
 async function packSignature(signature, validator, transformSignature = (signature) => signature, defaultValidatorAddress = NEXUS_DEFAULT_VALIDATOR_ADDRESS) {
     const validatorAddress = validator.address === defaultValidatorAddress
-        ? viem_1.zeroAddress
+        ? zeroAddress
         : validator.address;
-    const packedSig = (0, viem_1.encodePacked)(['address', 'bytes'], [validatorAddress, transformSignature(signature)]);
+    const packedSig = encodePacked(['address', 'bytes'], [validatorAddress, transformSignature(signature)]);
     return packedSig;
 }
 async function getSmartAccount(client, address, owners, validatorAddress, sign, defaultValidatorAddress = NEXUS_DEFAULT_VALIDATOR_ADDRESS) {
     return getBaseSmartAccount(address, client, validatorAddress, async () => {
-        return (0, validators_1.getMockSignature)(owners);
+        return getMockSignature(owners);
     }, sign, defaultValidatorAddress);
 }
 async function getGuardianSmartAccount(client, address, guardians, validatorAddress, sign, defaultValidatorAddress = NEXUS_DEFAULT_VALIDATOR_ADDRESS) {
     return await getBaseSmartAccount(address, client, validatorAddress, async () => {
-        return (0, validators_1.getMockSignature)(guardians);
+        return getMockSignature(guardians);
     }, async (hash) => {
         return await sign(hash);
     }, defaultValidatorAddress);
 }
 async function getBaseSmartAccount(address, client, nonceValidatorAddress, getStubSignature, signUserOperation, defaultValidatorAddress) {
-    return await (0, account_abstraction_1.toSmartAccount)({
+    return await toSmartAccount({
         client,
         entryPoint: {
-            abi: account_abstraction_1.entryPoint07Abi,
-            address: account_abstraction_1.entryPoint07Address,
+            abi: entryPoint07Abi,
+            address: entryPoint07Address,
             version: '0.7',
         },
         async decodeCalls() {
             throw new Error('Not implemented');
         },
         async encodeCalls(calls) {
-            return (0, utils_1.encode7579Calls)({
+            return encode7579Calls({
                 mode: {
                     type: calls.length > 1 ? 'batchcall' : 'call',
                     revertOnError: false,
@@ -264,19 +252,19 @@ async function getBaseSmartAccount(address, client, nonceValidatorAddress, getSt
         },
         async getNonce(args) {
             const validatorAddress = nonceValidatorAddress === defaultValidatorAddress
-                ? viem_1.zeroAddress
+                ? zeroAddress
                 : nonceValidatorAddress;
             const TIMESTAMP_ADJUSTMENT = 16777215n; // max value for size 3
             const defaultedKey = (args?.key ?? 0n) % TIMESTAMP_ADJUSTMENT;
             const defaultedValidationMode = '0x00';
-            const key = (0, viem_1.concat)([
-                (0, viem_1.toHex)(defaultedKey, { size: 3 }),
+            const key = concat([
+                toHex(defaultedKey, { size: 3 }),
                 defaultedValidationMode,
                 validatorAddress,
             ]);
-            return (0, utils_1.getAccountNonce)(client, {
+            return getAccountNonce(client, {
                 address,
-                entryPointAddress: account_abstraction_1.entryPoint07Address,
+                entryPointAddress: entryPoint07Address,
                 key: BigInt(key),
             });
         },
@@ -293,13 +281,13 @@ async function getBaseSmartAccount(address, client, nonceValidatorAddress, getSt
             const { chainId = client.chain?.id, ...userOperation } = parameters;
             if (!chainId)
                 throw new Error('Chain id not found');
-            const hash = (0, account_abstraction_1.getUserOperationHash)({
+            const hash = getUserOperationHash({
                 userOperation: {
                     ...userOperation,
                     sender: userOperation.sender ?? (await this.getAddress()),
                     signature: '0x',
                 },
-                entryPointAddress: account_abstraction_1.entryPoint07Address,
+                entryPointAddress: entryPoint07Address,
                 entryPointVersion: '0.7',
                 chainId: chainId,
             });
@@ -314,7 +302,7 @@ async function signEip7702InitData(config, eoa) {
     }
     const { initData } = deployArgs;
     if (!eoa.signTypedData) {
-        throw new error_1.SigningNotSupportedForAccountError();
+        throw new SigningNotSupportedForAccountError();
     }
     const signature = await eoa.signTypedData({
         domain: {
@@ -342,7 +330,7 @@ function getEip7702InitCall(config, signature) {
         const chainIds = [0n];
         const chainIdIndex = 0n;
         const chainIdsLength = 1n;
-        const encodedData = (0, viem_1.encodePacked)(['uint256', 'uint256', 'uint256', 'bytes'], [chainIdIndex, chainIdsLength, chainIds[0], initData]);
+        const encodedData = encodePacked(['uint256', 'uint256', 'uint256', 'bytes'], [chainIdIndex, chainIdsLength, chainIds[0], initData]);
         return encodedData;
     }
     const deployArgs = getDeployArgs(config);
@@ -351,8 +339,8 @@ function getEip7702InitCall(config, signature) {
     }
     const { initData } = deployArgs;
     const encodedData = getEncodedData(initData);
-    const accountFullData = (0, viem_1.concat)([signature, encodedData]);
-    const accountInitCallData = (0, viem_1.encodeFunctionData)({
+    const accountFullData = concat([signature, encodedData]);
+    const accountInitCallData = encodeFunctionData({
         abi: [
             {
                 type: 'function',
@@ -377,14 +365,14 @@ function getEip7702InitCall(config, signature) {
 }
 function tryDecodeV1FactoryData(factory, factoryData) {
     try {
-        const decoded = (0, viem_1.decodeFunctionData)({
-            abi: (0, viem_1.parseAbi)(['function createAccount(bytes,bytes32)']),
+        const decoded = decodeFunctionData({
+            abi: parseAbi(['function createAccount(bytes,bytes32)']),
             data: factoryData,
         });
         const initData = decoded.args[0];
         const salt = decoded.args[1];
-        const initializationCallData = (0, viem_1.encodeFunctionData)({
-            abi: (0, viem_1.parseAbi)(['function initializeAccount(bytes)']),
+        const initializationCallData = encodeFunctionData({
+            abi: parseAbi(['function initializeAccount(bytes)']),
             functionName: 'initializeAccount',
             args: [initData],
         });
@@ -406,8 +394,8 @@ function tryDecodeV1FactoryData(factory, factoryData) {
 }
 function tryDecodeV0FactoryData(factory, factoryData) {
     try {
-        const decoded = (0, viem_1.decodeFunctionData)({
-            abi: (0, viem_1.parseAbi)([
+        const decoded = decodeFunctionData({
+            abi: parseAbi([
                 'function createAccount(address eoaOwner,uint256 index,address[] attesters,uint8 threshold)',
             ]),
             data: factoryData,
@@ -416,21 +404,21 @@ function tryDecodeV0FactoryData(factory, factoryData) {
         const index = decoded.args[1];
         const attesters = decoded.args[2];
         const threshold = decoded.args[3];
-        const salt = (0, viem_1.keccak256)((0, viem_1.encodePacked)(['address', 'uint256', 'address[]', 'uint8'], [owner, index, attesters, threshold]));
+        const salt = keccak256(encodePacked(['address', 'uint256', 'address[]', 'uint8'], [owner, index, attesters, threshold]));
         const implementation = factory.toLowerCase() === 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)([
+        const registry = zeroAddress;
+        const bootstrapData = encodeFunctionData({
+            abi: 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)']),
+        const initData = encodeAbiParameters([{ type: 'address' }, { type: 'bytes' }], [NEXUS_BOOTSTRAP_1_0_0, bootstrapData]);
+        const initializationCallData = encodeFunctionData({
+            abi: parseAbi(['function initializeAccount(bytes)']),
             functionName: 'initializeAccount',
             args: [initData],
         });
@@ -453,3 +441,4 @@ function tryDecodeV0FactoryData(factory, factoryData) {
 function isAbiDecodingError(error) {
     return (error instanceof Error && error.name === 'AbiFunctionSignatureNotFoundError');
 }
+export { getEip712Domain, getInstallData, getAddress, getDefaultValidatorAddress, packSignature, getDeployArgs, getSmartAccount, getGuardianSmartAccount, signEip7702InitData, getEip7702InitCall, };

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

@@ -1,7 +1,7 @@
 import type { Hex } from 'viem';
-import type { Module } from '../modules/common';
-import type { RhinestoneAccountConfig } from '../types';
-import type { ValidatorConfig } from './utils';
+import type { Module } from '../modules/common.js';
+import type { RhinestoneAccountConfig } from '../types.js';
+import type { ValidatorConfig } from './utils.js';
 declare function getAddress(config: RhinestoneAccountConfig): `0x${string}`;
 declare function packSignature(signature: Hex, validator: ValidatorConfig, transformSignature?: (signature: Hex) => Hex): Promise<`0x${string}`>;
 declare function getInstallData(module: Module): `0x${string}`;

package/dist/src/accounts/passport.js

@@ -1,9 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAddress = getAddress;
-exports.packSignature = packSignature;
-exports.getInstallData = getInstallData;
-const viem_1 = require("viem");
+import { concat, encodeAbiParameters, encodeFunctionData, encodePacked, getContractAddress, keccak256, padHex, } from 'viem';
 const CREATION_CODE = '0x6054600f3d396034805130553df3fe63906111273d3560e01c14602b57363d3d373d3d3d3d369030545af43d82803e156027573d90f35b3d90fd5b30543d5260203df3';
 const PASSPORT_FACTORY_ADDRESS = '0xd70c6386ca012cdeb249b4e46c53d3507d9cbb87';
 const PASSPORT_MAIN_MODULE = '0x0d1bf2f4ab334324665aeb8d481ff92cde289439';
@@ -20,25 +15,25 @@ function getAddress(config) {
         account: owner,
     }));
     const salt = encodeImageHash(owners.threshold ?? 1, ownerAccounts);
-    const accountInitData = (0, viem_1.padHex)(PASSPORT_MAIN_MODULE, { size: 32 });
-    const address = (0, viem_1.getContractAddress)({
+    const accountInitData = padHex(PASSPORT_MAIN_MODULE, { size: 32 });
+    const address = getContractAddress({
         opcode: 'CREATE2',
         from: PASSPORT_FACTORY_ADDRESS,
         salt,
-        bytecode: (0, viem_1.concat)([CREATION_CODE, accountInitData]),
+        bytecode: concat([CREATION_CODE, accountInitData]),
     });
     return address;
 }
 async function packSignature(signature, validator, transformSignature = (signature) => signature) {
     const validatorAddress = validator.address;
-    const packedSig = (0, viem_1.encodePacked)(['address', 'bytes'], [validatorAddress, transformSignature(signature)]);
+    const packedSig = encodePacked(['address', 'bytes'], [validatorAddress, transformSignature(signature)]);
     return packedSig;
 }
 function encodeImageHash(threshold, accounts) {
     const sorted = accounts.sort((a, b) => a.account.address.toLowerCase() < b.account.address.toLowerCase() ? -1 : 1);
-    let imageHash = (0, viem_1.encodePacked)(['uint256'], [BigInt(threshold)]);
+    let imageHash = encodePacked(['uint256'], [BigInt(threshold)]);
     for (const account of sorted) {
-        imageHash = (0, viem_1.keccak256)((0, viem_1.encodeAbiParameters)([
+        imageHash = keccak256(encodeAbiParameters([
             {
                 type: 'bytes32',
             },
@@ -53,7 +48,7 @@ function encodeImageHash(threshold, accounts) {
     return imageHash;
 }
 function getInstallData(module) {
-    return (0, viem_1.encodeFunctionData)({
+    return encodeFunctionData({
         abi: [
             {
                 type: 'function',
@@ -80,3 +75,4 @@ function getInstallData(module) {
         args: [module.type, module.address, module.initData],
     });
 }
+export { getAddress, packSignature, getInstallData };

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

@@ -1,8 +1,8 @@
 import { type Abi, type Address, type Chain, type Hex, type PublicClient } from 'viem';
 import { type SmartAccount, type SmartAccountImplementation } from 'viem/account-abstraction';
-import type { Module } from '../modules/common';
-import type { OwnerSet, RhinestoneAccountConfig } from '../types';
-import { type ValidatorConfig } from './utils';
+import type { Module } from '../modules/common.js';
+import type { OwnerSet, RhinestoneAccountConfig } from '../types.js';
+import { type ValidatorConfig } from './utils.js';
 declare function getDeployArgs(config: RhinestoneAccountConfig): {
     factory: `0x${string}`;
     factoryData: `0x${string}`;