@charterlabs/rhinestone-sdk 0.2.7-dev.2 → 0.2.7-dev.4

package/dist/src/accounts/index.js

@@ -1,37 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Eip7702NotSupportedForAccountError = exports.SignMessageNotSupportedByAccountError = exports.SigningNotSupportedForAccountError = exports.SmartSessionsNotEnabledError = exports.FactoryArgsNotAvailableError = exports.ExistingEip7702AccountsNotSupportedError = exports.Eip7702AccountMustHaveEoaError = exports.AccountError = exports.isAccountError = void 0;
+exports.WalletClientNoConnectedAccountError = exports.SmartSessionsNotEnabledError = exports.SigningNotSupportedForAccountError = exports.OwnersFieldRequiredError = exports.ModuleInstallationNotSupportedError = exports.FactoryArgsNotAvailableError = exports.ExistingEip7702AccountsNotSupportedError = exports.EoaSigningNotSupportedError = exports.EoaSigningMethodNotConfiguredError = exports.Eip7702NotSupportedForAccountError = exports.Eip7702AccountMustHaveEoaError = exports.AccountConfigurationNotSupportedError = exports.AccountError = exports.isAccountError = void 0;
 exports.getModuleInstallationCalls = getModuleInstallationCalls;
 exports.getModuleUninstallationCalls = getModuleUninstallationCalls;
 exports.getAddress = getAddress;
+exports.checkAddress = checkAddress;
 exports.getAccountProvider = getAccountProvider;
 exports.getInitCode = getInitCode;
 exports.signEip7702InitData = signEip7702InitData;
 exports.getEip7702InitCall = getEip7702InitCall;
+exports.is7702 = is7702;
 exports.isDeployed = isDeployed;
 exports.deploy = deploy;
-exports.deployStandaloneWithEoa = deployStandaloneWithEoa;
+exports.setup = setup;
 exports.toErc6492Signature = toErc6492Signature;
 exports.getSmartAccount = getSmartAccount;
 exports.getSmartSessionSmartAccount = getSmartSessionSmartAccount;
 exports.getGuardianSmartAccount = getGuardianSmartAccount;
 exports.getPackedSignature = getPackedSignature;
 exports.getTypedDataPackedSignature = getTypedDataPackedSignature;
+exports.deployStandaloneWithEoa = deployStandaloneWithEoa;
 const viem_1 = require("viem");
 const execution_1 = require("../execution");
 const smart_session_1 = require("../execution/smart-session");
+const modules_1 = require("../modules");
 const validators_1 = require("../modules/validators");
 const core_1 = require("../modules/validators/core");
 const error_1 = require("./error");
+Object.defineProperty(exports, "AccountConfigurationNotSupportedError", { enumerable: true, get: function () { return error_1.AccountConfigurationNotSupportedError; } });
 Object.defineProperty(exports, "AccountError", { enumerable: true, get: function () { return error_1.AccountError; } });
 Object.defineProperty(exports, "Eip7702AccountMustHaveEoaError", { enumerable: true, get: function () { return error_1.Eip7702AccountMustHaveEoaError; } });
 Object.defineProperty(exports, "Eip7702NotSupportedForAccountError", { enumerable: true, get: function () { return error_1.Eip7702NotSupportedForAccountError; } });
+Object.defineProperty(exports, "EoaSigningMethodNotConfiguredError", { enumerable: true, get: function () { return error_1.EoaSigningMethodNotConfiguredError; } });
+Object.defineProperty(exports, "EoaSigningNotSupportedError", { enumerable: true, get: function () { return error_1.EoaSigningNotSupportedError; } });
 Object.defineProperty(exports, "ExistingEip7702AccountsNotSupportedError", { enumerable: true, get: function () { return error_1.ExistingEip7702AccountsNotSupportedError; } });
 Object.defineProperty(exports, "FactoryArgsNotAvailableError", { enumerable: true, get: function () { return error_1.FactoryArgsNotAvailableError; } });
 Object.defineProperty(exports, "isAccountError", { enumerable: true, get: function () { return error_1.isAccountError; } });
+Object.defineProperty(exports, "ModuleInstallationNotSupportedError", { enumerable: true, get: function () { return error_1.ModuleInstallationNotSupportedError; } });
+Object.defineProperty(exports, "OwnersFieldRequiredError", { enumerable: true, get: function () { return error_1.OwnersFieldRequiredError; } });
 Object.defineProperty(exports, "SigningNotSupportedForAccountError", { enumerable: true, get: function () { return error_1.SigningNotSupportedForAccountError; } });
-Object.defineProperty(exports, "SignMessageNotSupportedByAccountError", { enumerable: true, get: function () { return error_1.SignMessageNotSupportedByAccountError; } });
 Object.defineProperty(exports, "SmartSessionsNotEnabledError", { enumerable: true, get: function () { return error_1.SmartSessionsNotEnabledError; } });
+Object.defineProperty(exports, "WalletClientNoConnectedAccountError", { enumerable: true, get: function () { return error_1.WalletClientNoConnectedAccountError; } });
 const kernel_1 = require("./kernel");
 const nexus_1 = require("./nexus");
 const safe_1 = require("./safe");
@@ -55,12 +64,21 @@ function getDeployArgs(config) {
         case 'startale': {
             return (0, startale_1.getDeployArgs)(config);
         }
+        case 'eoa': {
+            throw new Error('EOA accounts do not have deploy args');
+        }
     }
 }
 function getInitCode(config) {
     if (is7702(config)) {
         return undefined;
     }
+    else if (config.account?.type === 'eoa') {
+        return undefined;
+    }
+    else if (config.initData) {
+        return config.initData;
+    }
     else {
         const { factory, factoryData } = getDeployArgs(config);
         if (!factory || !factoryData) {
@@ -82,10 +100,16 @@ async function signEip7702InitData(config) {
         case 'nexus': {
             return await (0, nexus_1.signEip7702InitData)(config, eoa);
         }
+        case 'eoa': {
+            throw new error_1.Eip7702NotSupportedForAccountError(account.type);
+        }
         case 'safe':
         case 'kernel':
         case 'startale': {
-            throw new Error(`7702 is not supported for account type ${account.type}`);
+            throw new error_1.Eip7702NotSupportedForAccountError(account.type);
+        }
+        default: {
+            throw new error_1.Eip7702NotSupportedForAccountError(account.type);
         }
     }
 }
@@ -98,7 +122,10 @@ async function getEip7702InitCall(config, signature) {
         case 'safe':
         case 'kernel':
         case 'startale': {
-            throw new Error(`7702 is not supported for account type ${account.type}`);
+            throw new error_1.Eip7702NotSupportedForAccountError(account.type);
+        }
+        default: {
+            throw new error_1.Eip7702NotSupportedForAccountError(account.type);
         }
     }
 }
@@ -119,6 +146,9 @@ function getModuleInstallationCalls(config, module) {
             case 'startale': {
                 return [(0, startale_1.getInstallData)(module)];
             }
+            case 'eoa': {
+                throw new error_1.ModuleInstallationNotSupportedError(account.type);
+            }
         }
     }
     const installData = getInstallData();
@@ -179,12 +209,29 @@ function getAddress(config) {
         case 'startale': {
             return (0, startale_1.getAddress)(config);
         }
+        case 'eoa': {
+            if (!config.eoa) {
+                throw new error_1.AccountError({
+                    message: 'EOA account must have an EOA configured',
+                });
+            }
+            return config.eoa.address;
+        }
+    }
+}
+function checkAddress(config) {
+    if (!config.initData) {
+        return true;
     }
+    return (config.initData.address.toLowerCase() === getAddress(config).toLowerCase());
 }
 // Signs and packs a signature to be EIP-1271 compatible
 async function getPackedSignature(config, signers, chain, validator, hash, transformSignature = (signature) => signature) {
+    if (config.account?.type === 'eoa') {
+        throw new error_1.EoaSigningNotSupportedError('packed signatures');
+    }
     signers = signers ?? (0, common_1.convertOwnerSetToSignerSet)(config.owners);
-    const signFn = (hash) => (0, message_1.sign)(signers, chain, address, hash);
+    const signFn = (hash) => (0, message_1.sign)(signers, chain, address, hash, false);
     const account = getAccountProvider(config);
     const address = getAddress(config);
     switch (account.type) {
@@ -194,7 +241,8 @@ async function getPackedSignature(config, signers, chain, validator, hash, trans
         }
         case 'nexus': {
             const signature = await signFn(hash);
-            return (0, nexus_1.packSignature)(signature, validator, transformSignature);
+            const defaultValidatorAddress = (0, nexus_1.getDefaultValidatorAddress)(account.version);
+            return (0, nexus_1.packSignature)(signature, validator, transformSignature, defaultValidatorAddress);
         }
         case 'kernel': {
             const signature = await signFn((0, kernel_1.wrapMessageHash)(hash, address));
@@ -204,10 +252,16 @@ async function getPackedSignature(config, signers, chain, validator, hash, trans
             const signature = await signFn(hash);
             return (0, startale_1.packSignature)(signature, validator, transformSignature);
         }
+        default: {
+            throw new Error(`Unsupported account type: ${account.type}`);
+        }
     }
 }
 // Signs and packs a signature to be EIP-1271 compatible
 async function getTypedDataPackedSignature(config, signers, chain, validator, parameters, transformSignature = (signature) => signature) {
+    if (config.account?.type === 'eoa') {
+        throw new error_1.EoaSigningNotSupportedError('packed signatures');
+    }
     const address = getAddress(config);
     signers = signers ?? (0, common_1.convertOwnerSetToSignerSet)(config.owners);
     const signFn = (parameters) => (0, typedData_1.sign)(signers, chain, address, parameters);
@@ -219,11 +273,12 @@ async function getTypedDataPackedSignature(config, signers, chain, validator, pa
         }
         case 'nexus': {
             const signature = await signFn(parameters);
-            return (0, nexus_1.packSignature)(signature, validator, transformSignature);
+            const defaultValidatorAddress = (0, nexus_1.getDefaultValidatorAddress)(account.version);
+            return (0, nexus_1.packSignature)(signature, validator, transformSignature, defaultValidatorAddress);
         }
         case 'kernel': {
             const address = getAddress(config);
-            const signMessageFn = (hash) => (0, message_1.sign)(signers, chain, address, hash);
+            const signMessageFn = (hash) => (0, message_1.sign)(signers, chain, address, hash, false);
             const signature = await signMessageFn((0, kernel_1.wrapMessageHash)((0, viem_1.hashTypedData)(parameters), address));
             return (0, kernel_1.packSignature)(signature, validator, transformSignature);
         }
@@ -231,9 +286,16 @@ async function getTypedDataPackedSignature(config, signers, chain, validator, pa
             const signature = await signFn(parameters);
             return (0, startale_1.packSignature)(signature, validator, transformSignature);
         }
+        default: {
+            throw new Error(`Unsupported account type: ${account.type}`);
+        }
     }
 }
 async function isDeployed(config, chain) {
+    const account = getAccountProvider(config);
+    if (account.type === 'eoa') {
+        return true;
+    }
     const publicClient = (0, viem_1.createPublicClient)({
         chain: chain,
         transport: (0, utils_1.createTransport)(chain, config.provider),
@@ -252,10 +314,89 @@ async function isDeployed(config, chain) {
     return (0, viem_1.size)(code) > 0;
 }
 async function deploy(config, chain, session) {
-    await deployWithIntent(chain, config);
+    const account = getAccountProvider(config);
+    if (account.type === 'eoa') {
+        return false;
+    }
+    const deployed = await isDeployed(config, chain);
+    if (deployed) {
+        return false;
+    }
+    const asUserOp = config.initData && !config.initData.intentExecutorInstalled;
+    if (asUserOp) {
+        await deployWithBundler(chain, config);
+    }
+    else {
+        await deployWithIntent(chain, config);
+    }
     if (session) {
         await (0, smart_session_1.enableSmartSession)(chain, config, session);
     }
+    return true;
+}
+// Installs the missing modules
+// Checks if the provided modules are already installed
+// Useful for existing (already deployed) accounts
+async function setup(config, chain) {
+    const account = getAccountProvider(config);
+    if (account.type === 'eoa') {
+        return false;
+    }
+    const modules = (0, modules_1.getSetup)(config);
+    const publicClient = (0, viem_1.createPublicClient)({
+        chain,
+        transport: (0, utils_1.createTransport)(chain, config.provider),
+    });
+    const address = getAddress(config);
+    const allModules = [
+        ...modules.validators,
+        ...modules.executors,
+        ...modules.fallbacks,
+        ...modules.hooks,
+    ];
+    // Check if the modules are already installed
+    const installedResults = await publicClient.multicall({
+        contracts: allModules.map((module) => ({
+            address: address,
+            abi: [
+                {
+                    type: 'function',
+                    name: 'isModuleInstalled',
+                    inputs: [
+                        { type: 'uint256', name: 'moduleTypeId' },
+                        { type: 'address', name: 'module' },
+                        { type: 'bytes', name: 'additionalContext' },
+                    ],
+                    outputs: [{ type: 'bool', name: 'isInstalled' }],
+                    stateMutability: 'view',
+                },
+            ],
+            functionName: 'isModuleInstalled',
+            args: [module.type, module.address, module.additionalContext],
+        })),
+    });
+    const isInstalled = installedResults.map((result) => result.result);
+    const modulesToInstall = allModules.filter((_, index) => !isInstalled[index]);
+    if (modulesToInstall.length === 0) {
+        // Nothing to install
+        return false;
+    }
+    const calls = [];
+    for (const module of modulesToInstall) {
+        calls.push(...getModuleInstallationCalls(config, module));
+    }
+    // Select the transaction infra layer based on the intent executor status
+    const intentExecutor = (0, modules_1.getIntentExecutor)(config);
+    const hasIntentExecutor = modulesToInstall.every((module) => module.address !== intentExecutor.address);
+    let result;
+    if (hasIntentExecutor) {
+        result = await (0, execution_1.sendTransactionInternal)(config, [chain], chain, calls, {});
+    }
+    else {
+        result = await (0, execution_1.sendUserOperationInternal)(config, chain, calls);
+    }
+    await (0, execution_1.waitForExecution)(config, result, true);
+    return true;
 }
 async function deployWithIntent(chain, config) {
     const publicClient = (0, viem_1.createPublicClient)({
@@ -279,10 +420,34 @@ async function deployWithIntent(chain, config) {
     });
     await (0, execution_1.waitForExecution)(config, result, true);
 }
+async function deployWithBundler(chain, config) {
+    const publicClient = (0, viem_1.createPublicClient)({
+        chain,
+        transport: (0, utils_1.createTransport)(chain, config.provider),
+    });
+    const bundlerClient = (0, utils_1.getBundlerClient)(config, publicClient);
+    const smartAccount = await getSmartAccount(config, publicClient, chain);
+    const { factory, factoryData } = getDeployArgs(config);
+    const opHash = await bundlerClient.sendUserOperation({
+        account: smartAccount,
+        factory,
+        factoryData,
+        calls: [
+            {
+                to: viem_1.zeroAddress,
+                value: 0n,
+                data: '0x',
+            },
+        ],
+    });
+    await bundlerClient.waitForUserOperationReceipt({
+        hash: opHash,
+    });
+}
 async function deployStandaloneWithEoa(chain, config, deployer) {
-    if (is7702(config)) {
-        const account = getAccountProvider(config);
-        throw new error_1.Eip7702NotSupportedForAccountError(account.type);
+    const account = getAccountProvider(config);
+    if (account.type === 'eoa') {
+        throw new Error('EOA accounts do not have deploy args');
     }
     const publicClient = (0, viem_1.createPublicClient)({
         chain,
@@ -291,7 +456,6 @@ async function deployStandaloneWithEoa(chain, config, deployer) {
     const address = getAddress(config);
     const code = await publicClient.getCode({ address });
     if (code && code !== '0x') {
-        // Already deployed
         return;
     }
     const initCode = getInitCode(config);
@@ -332,17 +496,25 @@ async function toErc6492Signature(config, signature, chain) {
     ]);
 }
 async function getSmartAccount(config, client, chain) {
+    // EOA accounts don't need smart account functionality
+    if (config.account?.type === 'eoa') {
+        throw new Error('getSmartAccount is not supported for EOA accounts');
+    }
+    if (!config.owners) {
+        throw new error_1.OwnersFieldRequiredError();
+    }
     const account = getAccountProvider(config);
     const address = getAddress(config);
     const ownerValidator = (0, validators_1.getOwnerValidator)(config);
     const signers = (0, common_1.convertOwnerSetToSignerSet)(config.owners);
-    const signFn = (hash) => (0, message_1.sign)(signers, chain, address, hash);
+    const signFn = (hash) => (0, message_1.sign)(signers, chain, address, hash, true);
     switch (account.type) {
         case 'safe': {
             return (0, safe_1.getSmartAccount)(client, address, config.owners, ownerValidator.address, signFn);
         }
         case 'nexus': {
-            return (0, nexus_1.getSmartAccount)(client, address, config.owners, ownerValidator.address, signFn);
+            const defaultValidatorAddress = (0, nexus_1.getDefaultValidatorAddress)(account.version);
+            return (0, nexus_1.getSmartAccount)(client, address, config.owners, ownerValidator.address, signFn, defaultValidatorAddress);
         }
         case 'kernel': {
             return (0, kernel_1.getSmartAccount)(client, address, config.owners, ownerValidator.address, signFn);
@@ -363,14 +535,15 @@ async function getSmartSessionSmartAccount(config, client, chain, session, enabl
         session,
         enableData: enableData || undefined,
     };
-    const signFn = (hash) => (0, message_1.sign)(signers, chain, address, hash);
+    const signFn = (hash) => (0, message_1.sign)(signers, chain, address, hash, true);
     const account = getAccountProvider(config);
     switch (account.type) {
         case 'safe': {
             return (0, safe_1.getSessionSmartAccount)(client, address, session, smartSessionValidator.address, enableData, signFn);
         }
         case 'nexus': {
-            return (0, nexus_1.getSessionSmartAccount)(client, address, session, smartSessionValidator.address, enableData, signFn);
+            const defaultValidatorAddress = (0, nexus_1.getDefaultValidatorAddress)(account.version);
+            return (0, nexus_1.getSessionSmartAccount)(client, address, session, smartSessionValidator.address, enableData, signFn, defaultValidatorAddress);
         }
         case 'kernel': {
             return (0, kernel_1.getSessionSmartAccount)(client, address, session, smartSessionValidator.address, enableData, signFn);
@@ -391,14 +564,15 @@ async function getGuardianSmartAccount(config, client, chain, guardians) {
         type: 'guardians',
         guardians: accounts,
     };
-    const signFn = (hash) => (0, message_1.sign)(signers, chain, address, hash);
+    const signFn = (hash) => (0, message_1.sign)(signers, chain, address, hash, true);
     const account = getAccountProvider(config);
     switch (account.type) {
         case 'safe': {
             return (0, safe_1.getGuardianSmartAccount)(client, address, guardians, socialRecoveryValidator.address, signFn);
         }
         case 'nexus': {
-            return (0, nexus_1.getGuardianSmartAccount)(client, address, guardians, socialRecoveryValidator.address, signFn);
+            const defaultValidatorAddress = (0, nexus_1.getDefaultValidatorAddress)(account.version);
+            return (0, nexus_1.getGuardianSmartAccount)(client, address, guardians, socialRecoveryValidator.address, signFn, defaultValidatorAddress);
         }
         case 'kernel': {
             return (0, kernel_1.getGuardianSmartAccount)(client, address, guardians, socialRecoveryValidator.address, signFn);
@@ -409,7 +583,8 @@ async function getGuardianSmartAccount(config, client, chain, guardians) {
     }
 }
 function is7702(config) {
-    return config.eoa !== undefined;
+    const account = getAccountProvider(config);
+    return account.type !== 'eoa' && config.eoa !== undefined;
 }
 function getAccountProvider(config) {
     if (config.account) {

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

@@ -12,9 +12,8 @@ const _1 = require(".");
                     accounts: [consts_1.accountA, consts_1.accountB],
                     threshold: 1,
                 },
-                rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(address).toEqual('0x0681de31e060b384f0b08a3bac99e9bdff302474');
+            (0, vitest_1.expect)(address).toEqual('0x0681de31e060b384F0b08A3bAC99E9bDFf302474');
         });
         (0, vitest_1.test)('Safe, passkey owner with a session', () => {
             const address = (0, _1.getAddress)({
@@ -22,9 +21,8 @@ const _1 = require(".");
                     type: 'passkey',
                     accounts: [consts_1.passkeyAccount],
                 },
-                rhinestoneApiKey: consts_1.MOCK_API_KEY,
             });
-            (0, vitest_1.expect)(address).toEqual('0x894b88c04b4de6abddce81e8bdc91927e37d6ced');
+            (0, vitest_1.expect)(address).toEqual('0x894b88C04B4DE6AbDdcE81E8bdc91927E37d6ceD');
         });
     });
     (0, vitest_1.describe)('Sign', () => {

package/dist/src/accounts/json-rpc/providers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../../../accounts/json-rpc/providers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,iBAAS,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAStE;AAED,OAAO,EAAE,aAAa,EAAE,CAAA"}
+{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../../../accounts/json-rpc/providers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,iBAAS,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAetE;AAED,OAAO,EAAE,aAAa,EAAE,CAAA"}

package/dist/src/accounts/json-rpc/providers.js

@@ -1,14 +1,52 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAlchemyUrl = getAlchemyUrl;
-const shared_configs_1 = require("@rhinestone/shared-configs");
+const sharedConfigs = __importStar(require("@rhinestone/shared-configs"));
 function getAlchemyUrl(chainId, apiKey) {
-    const urlTemplate = shared_configs_1.providers.Alchemy.url_template;
-    const chainParam = shared_configs_1.providers.Alchemy.chain_mapping[chainId];
+    const providers = sharedConfigs.providerRegistry ||
+        sharedConfigs.ProviderRegistry;
+    const urlTemplate = providers.Alchemy.url_template;
+    const mapping = providers.Alchemy
+        .chain_mapping;
+    const chainParam = mapping[chainId];
     if (!chainParam) {
         throw new Error(`Unsupported chain: ${chainId}`);
     }
     return urlTemplate
         .replace('{{chain_param}}', chainParam)
-        .replace('\$\{ALCHEMY_API_KEY\}', apiKey);
+        .split('${ALCHEMY_API_KEY}')
+        .join(apiKey);
 }

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

@@ -7,9 +7,9 @@ import { type ValidatorConfig } from './utils';
 declare function getDeployArgs(config: RhinestoneAccountConfig): {
     factory: `0x${string}`;
     factoryData: `0x${string}`;
-    salt: "0x0000000000000000000000000000000000000000000000000000000000000000";
     implementation: `0x${string}`;
     initializationCallData: `0x${string}`;
+    salt: `0x${string}`;
 };
 declare function getAddress(config: RhinestoneAccountConfig): `0x${string}`;
 declare function getInstallData(module: Module): Hex[];

package/dist/src/accounts/kernel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kernel.d.ts","sourceRoot":"","sources":["../../../accounts/kernel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,GAAG,EACR,KAAK,OAAO,EAQZ,KAAK,GAAG,EAER,KAAK,YAAY,EAMlB,MAAM,MAAM,CAAA;AACb,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAEhC,MAAM,0BAA0B,CAAA;AAGjC,OAAO,EAKL,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAA;AAQ1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAC1E,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAgBhF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;EA4CrD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBASlD;AAED,iBAAS,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE,CAsE7C;AAED,iBAAe,aAAa,CAC1B,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,eAAe,EAC1B,kBAAkB,GAAE,CAAC,SAAS,EAAE,GAAG,KAAK,GAA8B,0BAYvE;AAED,iBAAS,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,GAAG,GAAG,CAoBnE;AAED,iBAAe,eAAe,CAC5B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,QAAQ,EAChB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEAYlC;AAED,iBAAe,sBAAsB,CACnC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,OAAO,EACzB,UAAU,EAAE,iBAAiB,GAAG,IAAI,EACpC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEA0ClC;AAED,iBAAe,uBAAuB,CACpC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEAclC;AA+ED,OAAO,EACL,cAAc,EACd,UAAU,EACV,aAAa,EACb,eAAe,EACf,sBAAsB,EACtB,uBAAuB,EACvB,aAAa,EACb,eAAe,GAChB,CAAA"}
+{"version":3,"file":"kernel.d.ts","sourceRoot":"","sources":["../../../accounts/kernel.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,GAAG,EACR,KAAK,OAAO,EASZ,KAAK,GAAG,EAER,KAAK,YAAY,EAMlB,MAAM,MAAM,CAAA;AACb,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAEhC,MAAM,0BAA0B,CAAA;AAGjC,OAAO,EAKL,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAA;AAQ1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAE1E,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,SAAS,CAAA;AAgBhF,iBAAS,aAAa,CAAC,MAAM,EAAE,uBAAuB;;;;;;EA+ErD;AAED,iBAAS,UAAU,CAAC,MAAM,EAAE,uBAAuB,iBASlD;AAED,iBAAS,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,EAAE,CAsE7C;AAED,iBAAe,aAAa,CAC1B,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,eAAe,EAC1B,kBAAkB,GAAE,CAAC,SAAS,EAAE,GAAG,KAAK,GAA8B,0BAYvE;AAED,iBAAS,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,GAAG,GAAG,CAoBnE;AAED,iBAAe,eAAe,CAC5B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,QAAQ,EAChB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEAYlC;AAED,iBAAe,sBAAsB,CACnC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,OAAO,EACzB,UAAU,EAAE,iBAAiB,GAAG,IAAI,EACpC,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEA0ClC;AAED,iBAAe,uBAAuB,CACpC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,QAAQ,EACnB,gBAAgB,EAAE,OAAO,EACzB,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,iEAclC;AA+ED,OAAO,EACL,cAAc,EACd,UAAU,EACV,aAAa,EACb,eAAe,EACf,sBAAsB,EACtB,uBAAuB,EACvB,aAAa,EACb,eAAe,GAChB,CAAA"}

package/dist/src/accounts/kernel.js

@@ -13,13 +13,41 @@ const account_abstraction_1 = require("viem/account-abstraction");
 const modules_1 = require("../modules");
 const common_1 = require("../modules/common");
 const validators_1 = require("../modules/validators");
+const error_1 = require("./error");
 const utils_1 = require("./utils");
 const KERNEL_META_FACTORY_ADDRESS = '0xd703aae79538628d27099b8c4f621be4ccd142d5';
 const KERNEL_IMPLEMENTATION_ADDRESS = '0xd6CEDDe84be40893d153Be9d467CD6aD37875b28';
-const KERNEL_FACTORY_ADDRESS = '0x2577507b78c2008ff367261cb6285d44ba5ef2e9';
+const KERNEL_FACTORY_ADDRESS = '0x2577507b78c2008Ff367261CB6285d44ba5eF2E9';
 const KERNEL_BYTECODE = '0x603d3d8160223d3973d6cedde84be40893d153be9d467cd6ad37875b2860095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3';
 const KERNEL_VERSION = '0.3.3';
 function getDeployArgs(config) {
+    if (config.initData) {
+        const factoryData = (0, viem_1.decodeFunctionData)({
+            abi: (0, viem_1.parseAbi)([
+                'function deployWithFactory(address factory,bytes createData,bytes32 salt)',
+            ]),
+            data: config.initData.factoryData,
+        });
+        if (factoryData.functionName !== 'deployWithFactory') {
+            throw new error_1.AccountConfigurationNotSupportedError('Invalid factory data', 'kernel');
+        }
+        const factory = factoryData.args[0];
+        const createData = factoryData.args[1];
+        const salt = factoryData.args[2];
+        const implementation = factory === KERNEL_FACTORY_ADDRESS
+            ? KERNEL_IMPLEMENTATION_ADDRESS
+            : viem_1.zeroAddress;
+        if (implementation === viem_1.zeroAddress) {
+            throw new error_1.AccountConfigurationNotSupportedError('Unsupported Kernel implementation', 'kernel');
+        }
+        return {
+            factory: config.initData.factory,
+            factoryData: config.initData.factoryData,
+            implementation,
+            initializationCallData: createData,
+            salt,
+        };
+    }
     const salt = viem_1.zeroHash;
     const moduleSetup = (0, modules_1.getSetup)(config);
     const rootValidator = (0, viem_1.concat)(['0x01', moduleSetup.validators[0].address]);