@toruslabs/ethereum-controllers 8.2.0 → 8.3.0

package/dist/lib.cjs/AccountAbstraction/AccountAbstractionController.js

@@ -98,12 +98,19 @@ class AccountAbstractionController extends baseControllers.BaseController {
       chain,
       transport: viem.http(providerConfig.rpcTarget)
     });
+    // viem wallet client using json-rpc account from eoaProvider
     const aaEngine = new auth.JRPCEngine();
     aaEngine.push(eoaInterceptorMiddleware(eoaAddress));
     aaEngine.push(eoaProviderAsMiddleware(eoaProvider));
     const provider = auth.providerFromEngine(aaEngine);
+    // need to hoist the account address https://viem.sh/docs/clients/wallet#optional-hoist-the-account
+    const eoaWalletClient = viem.createWalletClient({
+      account: eoaAddress,
+      chain,
+      transport: viem.custom(provider)
+    });
     this._smartAccount = await this.config.smartAccountInit.getSmartAccount({
-      owner: provider,
+      walletClient: eoaWalletClient,
       client: this._publicClient
     });
     if (this.config.paymasterConfig) {

package/dist/lib.cjs/AccountAbstraction/smartAccounts/BiconomySmartAccount.js

@@ -20,7 +20,7 @@ class BiconomySmartAccount {
         version: ((_this$options2 = this.options) === null || _this$options2 === void 0 || (_this$options2 = _this$options2.entryPoint) === null || _this$options2 === void 0 ? void 0 : _this$options2.version) || "0.6"
       }
     }, params), {}, {
-      owners: [params.owner],
+      owners: [params.walletClient],
       client: params.client
     }));
   }

package/dist/lib.cjs/AccountAbstraction/smartAccounts/KernelSmartAccount.js

@@ -13,7 +13,7 @@ class KernelSmartAccount {
   }
   async getSmartAccount(params) {
     return accounts.toEcdsaKernelSmartAccount(_objectSpread(_objectSpread(_objectSpread({}, this.options || {}), params), {}, {
-      owners: [params.owner],
+      owners: [params.walletClient],
       client: params.client
     }));
   }

package/dist/lib.cjs/AccountAbstraction/smartAccounts/MetamaskSmartAccount.js

@@ -0,0 +1,54 @@
+'use strict';
+
+var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var delegationToolkit = require('@metamask/delegation-toolkit');
+var constants = require('../../utils/constants.js');
+
+function isImplementationHybrid(implementation) {
+  return implementation === delegationToolkit.Implementation.Hybrid;
+}
+class MetamaskSmartAccount {
+  constructor(options) {
+    _defineProperty(this, "name", constants.SMART_ACCOUNT.METAMASK);
+    _defineProperty(this, "options", void 0);
+    this.options = options;
+  }
+  async getSmartAccount(input) {
+    var _this$options, _this$options2, _this$options3, _this$options4, _this$options5, _this$options6, _this$options7, _this$options$multiSi, _this$options8, _this$options9, _this$options$deployS;
+    const hybridSignatory = {
+      walletClient: input.walletClient,
+      webAuthnAccount: (_this$options = this.options) === null || _this$options === void 0 || (_this$options = _this$options.hybridParams) === null || _this$options === void 0 ? void 0 : _this$options.webAuthnAccount,
+      keyId: (_this$options2 = this.options) === null || _this$options2 === void 0 || (_this$options2 = _this$options2.hybridParams) === null || _this$options2 === void 0 ? void 0 : _this$options2.keyId
+    };
+    const multiSigSignatory = [{
+      walletClient: input.walletClient
+    }, ...(((_this$options3 = this.options) === null || _this$options3 === void 0 || (_this$options3 = _this$options3.multiSigParams) === null || _this$options3 === void 0 ? void 0 : _this$options3.additionalSignerWalletClients) || []).map(walletClient => ({
+      walletClient
+    }))];
+    const [eoaAddress] = await input.walletClient.getAddresses();
+    const hybridDeployParams = [eoaAddress, [...(((_this$options4 = this.options) === null || _this$options4 === void 0 || (_this$options4 = _this$options4.hybridParams) === null || _this$options4 === void 0 ? void 0 : _this$options4.p256KeyIds) || [])], [...(((_this$options5 = this.options) === null || _this$options5 === void 0 || (_this$options5 = _this$options5.hybridParams) === null || _this$options5 === void 0 ? void 0 : _this$options5.p256XValues) || [])], [...(((_this$options6 = this.options) === null || _this$options6 === void 0 || (_this$options6 = _this$options6.hybridParams) === null || _this$options6 === void 0 ? void 0 : _this$options6.p256YValues) || [])]];
+    const multiSigDeployParams = [[eoaAddress, ...(((_this$options7 = this.options) === null || _this$options7 === void 0 || (_this$options7 = _this$options7.multiSigParams) === null || _this$options7 === void 0 ? void 0 : _this$options7.additionalSignerAddresses) || [])], (_this$options$multiSi = (_this$options8 = this.options) === null || _this$options8 === void 0 || (_this$options8 = _this$options8.multiSigParams) === null || _this$options8 === void 0 ? void 0 : _this$options8.threshold) !== null && _this$options$multiSi !== void 0 ? _this$options$multiSi : BigInt(1 + (((_this$options9 = this.options) === null || _this$options9 === void 0 || (_this$options9 = _this$options9.multiSigParams) === null || _this$options9 === void 0 || (_this$options9 = _this$options9.additionalSignerWalletClients) === null || _this$options9 === void 0 ? void 0 : _this$options9.length) || 0))];
+    const baseParams = {
+      client: input.client,
+      deploySalt: (_this$options$deployS = this.options.deploySalt) !== null && _this$options$deployS !== void 0 ? _this$options$deployS : "0x0"
+    };
+    if (isImplementationHybrid(this.options.implementation)) {
+      const params = _objectSpread(_objectSpread({}, baseParams), {}, {
+        implementation: this.options.implementation,
+        deployParams: hybridDeployParams,
+        signatory: hybridSignatory
+      });
+      return delegationToolkit.toMetaMaskSmartAccount(params);
+    } else {
+      const params = _objectSpread(_objectSpread({}, baseParams), {}, {
+        implementation: this.options.implementation,
+        deployParams: multiSigDeployParams,
+        signatory: multiSigSignatory
+      });
+      return delegationToolkit.toMetaMaskSmartAccount(params);
+    }
+  }
+}
+
+exports.MetamaskSmartAccount = MetamaskSmartAccount;

package/dist/lib.cjs/AccountAbstraction/smartAccounts/NexusSmartAccount.js

@@ -21,7 +21,7 @@ class NexusSmartAccount {
       },
       version: ((_this$options3 = this.options) === null || _this$options3 === void 0 ? void 0 : _this$options3.version) || "1.0.0"
     }, params), {}, {
-      owners: [params.owner],
+      owners: [params.walletClient],
       client: params.client
     }));
   }

package/dist/lib.cjs/AccountAbstraction/smartAccounts/SafeSmartAccount.js

@@ -21,7 +21,7 @@ class SafeSmartAccount {
       },
       version: ((_this$options3 = this.options) === null || _this$options3 === void 0 ? void 0 : _this$options3.version) || "1.4.1"
     }, params), {}, {
-      owners: [params.owner],
+      owners: [params.walletClient],
       client: params.client
     }));
   }

package/dist/lib.cjs/AccountAbstraction/smartAccounts/TrustSmartAccount.js

@@ -20,7 +20,7 @@ class TrustSmartAccount {
         version: ((_this$options2 = this.options) === null || _this$options2 === void 0 || (_this$options2 = _this$options2.entryPoint) === null || _this$options2 === void 0 ? void 0 : _this$options2.version) || "0.6"
       }
     }, params), {}, {
-      owner: params.owner,
+      owner: params.walletClient,
       client: params.client
     }));
   }

package/dist/lib.cjs/index.js

@@ -4,6 +4,7 @@ var AccountTrackerController = require('./Account/AccountTrackerController.js');
 var AccountAbstractionController = require('./AccountAbstraction/AccountAbstractionController.js');
 var BiconomySmartAccount = require('./AccountAbstraction/smartAccounts/BiconomySmartAccount.js');
 var KernelSmartAccount = require('./AccountAbstraction/smartAccounts/KernelSmartAccount.js');
+var MetamaskSmartAccount = require('./AccountAbstraction/smartAccounts/MetamaskSmartAccount.js');
 var NexusSmartAccount = require('./AccountAbstraction/smartAccounts/NexusSmartAccount.js');
 var SafeSmartAccount = require('./AccountAbstraction/smartAccounts/SafeSmartAccount.js');
 var TrustSmartAccount = require('./AccountAbstraction/smartAccounts/TrustSmartAccount.js');
@@ -46,6 +47,7 @@ exports.eoaInterceptorMiddleware = AccountAbstractionController.eoaInterceptorMi
 exports.eoaProviderAsMiddleware = AccountAbstractionController.eoaProviderAsMiddleware;
 exports.BiconomySmartAccount = BiconomySmartAccount.BiconomySmartAccount;
 exports.KernelSmartAccount = KernelSmartAccount.KernelSmartAccount;
+exports.MetamaskSmartAccount = MetamaskSmartAccount.MetamaskSmartAccount;
 exports.NexusSmartAccount = NexusSmartAccount.NexusSmartAccount;
 exports.SafeSmartAccount = SafeSmartAccount.SafeSmartAccount;
 exports.TrustSmartAccount = TrustSmartAccount.TrustSmartAccount;

package/dist/lib.cjs/types/AccountAbstraction/smartAccounts/BiconomySmartAccount.d.ts

@@ -1,5 +1,5 @@
 import { ToBiconomySmartAccountParameters } from "permissionless/accounts";
-import { Client, EIP1193Provider } from "viem";
+import { Client, WalletClient } from "viem";
 import { SmartAccount } from "viem/account-abstraction";
 import { BiconomySmartAccountConfig, ISmartAccount } from "../../utils/interfaces";
 export declare class BiconomySmartAccount implements ISmartAccount {
@@ -7,7 +7,7 @@ export declare class BiconomySmartAccount implements ISmartAccount {
     private options;
     constructor(options?: BiconomySmartAccountConfig);
     getSmartAccount(params: {
-        owner: EIP1193Provider;
+        walletClient: WalletClient;
         client: Client;
     } & Pick<ToBiconomySmartAccountParameters, "index" | "nonceKey" | "address">): Promise<SmartAccount>;
 }

package/dist/lib.cjs/types/AccountAbstraction/smartAccounts/KernelSmartAccount.d.ts

@@ -1,4 +1,4 @@
-import { Client, EIP1193Provider } from "viem";
+import { Client, WalletClient } from "viem";
 import { SmartAccount } from "viem/account-abstraction";
 import { ISmartAccount, KernelSmartAccountConfig, KernelSmartAccountParameters } from "../../utils/interfaces";
 export declare class KernelSmartAccount implements ISmartAccount {
@@ -6,7 +6,7 @@ export declare class KernelSmartAccount implements ISmartAccount {
     private options;
     constructor(options?: KernelSmartAccountConfig);
     getSmartAccount(params: {
-        owner: EIP1193Provider;
+        walletClient: WalletClient;
         client: Client;
     } & Pick<KernelSmartAccountParameters, "address" | "nonceKey" | "index">): Promise<SmartAccount>;
 }

package/dist/lib.cjs/types/AccountAbstraction/smartAccounts/LightSmartAccount.d.ts

@@ -1,5 +1,5 @@
 import { ToLightSmartAccountParameters } from "permissionless/accounts";
-import { Client, EIP1193Provider } from "viem";
+import { Client, WalletClient } from "viem";
 import { SmartAccount } from "viem/account-abstraction";
 import { ISmartAccount, LightSmartAccountConfig } from "../../utils/interfaces";
 export declare class LightSmartAccount implements ISmartAccount {
@@ -7,7 +7,7 @@ export declare class LightSmartAccount implements ISmartAccount {
     private options;
     constructor(options?: LightSmartAccountConfig);
     getSmartAccount(params: {
-        owner: EIP1193Provider;
+        walletClient: WalletClient;
         client: Client;
     } & Pick<ToLightSmartAccountParameters, "address" | "index" | "nonceKey">): Promise<SmartAccount>;
 }

package/dist/lib.cjs/types/AccountAbstraction/smartAccounts/MetamaskSmartAccount.d.ts

@@ -0,0 +1,28 @@
+import { Implementation, ToMetaMaskSmartAccountParameters } from "@metamask/delegation-toolkit";
+import { Client, Hex, WalletClient } from "viem";
+import { SmartAccount, WebAuthnAccount } from "viem/account-abstraction";
+import { ISmartAccount } from "../../utils/interfaces";
+type MetamaskSmartAccountConfig<TImplementation extends Implementation> = Omit<ToMetaMaskSmartAccountParameters<TImplementation>, "client" | "signatory" | "deployParams"> & {
+    hybridParams?: {
+        p256KeyIds?: string[];
+        p256XValues?: bigint[];
+        p256YValues?: bigint[];
+        webAuthnAccount?: WebAuthnAccount;
+        keyId?: Hex;
+    };
+    multiSigParams?: {
+        additionalSignerAddresses: Hex[];
+        additionalSignerWalletClients: WalletClient[];
+        threshold: bigint;
+    };
+};
+export declare class MetamaskSmartAccount<TImplementation extends Implementation> implements ISmartAccount {
+    readonly name: string;
+    private options;
+    constructor(options?: MetamaskSmartAccountConfig<TImplementation>);
+    getSmartAccount(input: {
+        walletClient: WalletClient;
+        client: Client;
+    }): Promise<SmartAccount>;
+}
+export {};

package/dist/lib.cjs/types/AccountAbstraction/smartAccounts/NexusSmartAccount.d.ts

@@ -1,5 +1,5 @@
 import { ToNexusSmartAccountParameters } from "permissionless/accounts";
-import { Client, EIP1193Provider } from "viem";
+import { Client, WalletClient } from "viem";
 import { SmartAccount } from "viem/account-abstraction";
 import { ISmartAccount, NexusSmartAccountConfig } from "../../utils/interfaces";
 export declare class NexusSmartAccount implements ISmartAccount {
@@ -7,7 +7,7 @@ export declare class NexusSmartAccount implements ISmartAccount {
     private options;
     constructor(options?: NexusSmartAccountConfig);
     getSmartAccount(params: {
-        owner: EIP1193Provider;
+        walletClient: WalletClient;
         client: Client;
     } & Pick<ToNexusSmartAccountParameters, "index" | "address">): Promise<SmartAccount>;
 }

package/dist/lib.cjs/types/AccountAbstraction/smartAccounts/SafeSmartAccount.d.ts

@@ -1,4 +1,4 @@
-import { Client, EIP1193Provider } from "viem";
+import { Client, WalletClient } from "viem";
 import { SmartAccount } from "viem/account-abstraction";
 import { ISmartAccount, SafeSmartAccountConfig, SafeSmartAccountParameters } from "../../utils/interfaces";
 export declare class SafeSmartAccount implements ISmartAccount {
@@ -6,7 +6,7 @@ export declare class SafeSmartAccount implements ISmartAccount {
     private options;
     constructor(options?: SafeSmartAccountConfig);
     getSmartAccount(params: {
-        owner: EIP1193Provider;
+        walletClient: WalletClient;
         client: Client;
     } & Pick<SafeSmartAccountParameters, "address" | "nonceKey" | "saltNonce" | "validUntil" | "validAfter">): Promise<SmartAccount>;
 }

package/dist/lib.cjs/types/AccountAbstraction/smartAccounts/SimpleSmartAccount.d.ts

@@ -1,4 +1,4 @@
-import { Client, EIP1193Provider } from "viem";
+import { Client, WalletClient } from "viem";
 import { SmartAccount } from "viem/account-abstraction";
 import { ISmartAccount, SimpleSmartAccountConfig } from "../../utils/interfaces";
 export declare class SimpleSmartAccount implements ISmartAccount {
@@ -6,7 +6,7 @@ export declare class SimpleSmartAccount implements ISmartAccount {
     private options;
     constructor(options?: SimpleSmartAccountConfig);
     getSmartAccount(params: {
-        owner: EIP1193Provider;
+        walletClient: WalletClient;
         client: Client;
     }): Promise<SmartAccount>;
 }

package/dist/lib.cjs/types/AccountAbstraction/smartAccounts/TrustSmartAccount.d.ts

@@ -1,4 +1,4 @@
-import { Client, EIP1193Provider } from "viem";
+import { Client, WalletClient } from "viem";
 import { SmartAccount } from "viem/account-abstraction";
 import { ISmartAccount, TrustSmartAccountConfig, TrustSmartAccountParameters } from "../../utils/interfaces";
 export declare class TrustSmartAccount implements ISmartAccount {
@@ -6,7 +6,7 @@ export declare class TrustSmartAccount implements ISmartAccount {
     private options;
     constructor(options?: TrustSmartAccountConfig);
     getSmartAccount(params: {
-        owner: EIP1193Provider;
+        walletClient: WalletClient;
         client: Client;
     } & Pick<TrustSmartAccountParameters, "address" | "nonceKey" | "index">): Promise<SmartAccount>;
 }

package/dist/lib.cjs/types/AccountAbstraction/smartAccounts/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./BiconomySmartAccount";
 export * from "./KernelSmartAccount";
+export * from "./MetamaskSmartAccount";
 export * from "./NexusSmartAccount";
 export * from "./SafeSmartAccount";
 export * from "./TrustSmartAccount";

package/dist/lib.cjs/types/utils/constants.d.ts

@@ -83,4 +83,5 @@ export declare const SMART_ACCOUNT: {
     LIGHT: string;
     SIMPLE: string;
     NEXUS: string;
+    METAMASK: string;
 };

package/dist/lib.cjs/types/utils/helpers.d.ts

@@ -25,7 +25,7 @@ export declare const GAS_LIMITS: {
 export declare function bnLessThan(a: string | number, b: string | number): boolean;
 export declare const getIpfsEndpoint: (path: string) => string;
 export declare function sanitizeNftMetdataUrl(url: string): string;
-export declare function getChainType(chainId: string): "mainnet" | "testnet" | "custom";
+export declare function getChainType(chainId: string): "custom" | "mainnet" | "testnet";
 export declare const addEtherscanTransactions: (params: {
     txn: EtherscanTransaction[];
     lowerCaseSelectedAddress: string;

package/dist/lib.cjs/types/utils/interfaces.d.ts

@@ -3,7 +3,7 @@ import { JRPCRequest, Json } from "@web3auth/auth";
 import { MutexInterface } from "async-mutex";
 import { AccessList, TypedDataDomain, TypedDataField } from "ethers";
 import { ToBiconomySmartAccountParameters, toEcdsaKernelSmartAccount, ToLightSmartAccountParameters, ToNexusSmartAccountParameters, toSafeSmartAccount, toSimpleSmartAccount, toTrustSmartAccount } from "permissionless/accounts";
-import { Client, EIP1193Provider } from "viem";
+import { Client, WalletClient } from "viem";
 import { createBundlerClient, createPaymasterClient, SmartAccount, UserOperationReceipt } from "viem/account-abstraction";
 import { METHOD_TYPES, SMART_ACCOUNT, TRANSACTION_ENVELOPE_TYPES } from "./constants";
 export type CustomTokenInfo = BaseTokenInfo & {
@@ -444,7 +444,7 @@ export type TrustSmartAccountParameters = Parameters<typeof toTrustSmartAccount>
 export type TrustSmartAccountConfig = Omit<TrustSmartAccountParameters, "owner" | "client" | "address" | "nonceKey" | "index">;
 export interface ISmartAccount {
     getSmartAccount(params: {
-        owner: EIP1193Provider;
+        walletClient: WalletClient;
         client: Client;
     }): Promise<SmartAccount>;
 }

package/dist/lib.cjs/utils/constants.js

@@ -334,7 +334,8 @@ const SMART_ACCOUNT = {
   // TODO: disabled because of pimlico issues
   LIGHT: "light",
   SIMPLE: "simple",
-  NEXUS: "nexus"
+  NEXUS: "nexus",
+  METAMASK: "metamask"
 };
 
 exports.ARBITRUM_MAINNET_CHAIN_ID = ARBITRUM_MAINNET_CHAIN_ID;

package/dist/lib.esm/AccountAbstraction/AccountAbstractionController.js

@@ -5,7 +5,7 @@ import { BaseController, TransactionStatus } from '@toruslabs/base-controllers';
 import { JRPCEngine, providerFromEngine } from '@web3auth/auth';
 import { isHexString } from 'ethers';
 import log from 'loglevel';
-import { defineChain, createPublicClient, http, createWalletClient, parseEther, toHex } from 'viem';
+import { defineChain, createPublicClient, http, createWalletClient, custom, parseEther, toHex } from 'viem';
 import { createPaymasterClient, createBundlerClient } from 'viem/account-abstraction';
 
 const eoaInterceptorMiddleware = eoaAddress => (req, res, next, end) => {
@@ -96,12 +96,20 @@ class AccountAbstractionController extends BaseController {
       chain,
       transport: http(providerConfig.rpcTarget)
     });
+
+    // viem wallet client using json-rpc account from eoaProvider
     const aaEngine = new JRPCEngine();
     aaEngine.push(eoaInterceptorMiddleware(eoaAddress));
     aaEngine.push(eoaProviderAsMiddleware(eoaProvider));
     const provider = providerFromEngine(aaEngine);
+    // need to hoist the account address https://viem.sh/docs/clients/wallet#optional-hoist-the-account
+    const eoaWalletClient = createWalletClient({
+      account: eoaAddress,
+      chain,
+      transport: custom(provider)
+    });
     this._smartAccount = await this.config.smartAccountInit.getSmartAccount({
-      owner: provider,
+      walletClient: eoaWalletClient,
       client: this._publicClient
     });
     if (this.config.paymasterConfig) {

package/dist/lib.esm/AccountAbstraction/smartAccounts/BiconomySmartAccount.js

@@ -18,7 +18,7 @@ class BiconomySmartAccount {
         version: ((_this$options2 = this.options) === null || _this$options2 === void 0 || (_this$options2 = _this$options2.entryPoint) === null || _this$options2 === void 0 ? void 0 : _this$options2.version) || "0.6"
       }
     }, params), {}, {
-      owners: [params.owner],
+      owners: [params.walletClient],
       client: params.client
     }));
   }

package/dist/lib.esm/AccountAbstraction/smartAccounts/KernelSmartAccount.js

@@ -11,7 +11,7 @@ class KernelSmartAccount {
   }
   async getSmartAccount(params) {
     return toEcdsaKernelSmartAccount(_objectSpread(_objectSpread(_objectSpread({}, this.options || {}), params), {}, {
-      owners: [params.owner],
+      owners: [params.walletClient],
       client: params.client
     }));
   }

package/dist/lib.esm/AccountAbstraction/smartAccounts/MetamaskSmartAccount.js

@@ -0,0 +1,52 @@
+import _objectSpread from '@babel/runtime/helpers/objectSpread2';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import { toMetaMaskSmartAccount, Implementation } from '@metamask/delegation-toolkit';
+import { SMART_ACCOUNT } from '../../utils/constants.js';
+
+function isImplementationHybrid(implementation) {
+  return implementation === Implementation.Hybrid;
+}
+class MetamaskSmartAccount {
+  constructor(options) {
+    _defineProperty(this, "name", SMART_ACCOUNT.METAMASK);
+    _defineProperty(this, "options", void 0);
+    this.options = options;
+  }
+  async getSmartAccount(input) {
+    var _this$options, _this$options2, _this$options3, _this$options4, _this$options5, _this$options6, _this$options7, _this$options$multiSi, _this$options8, _this$options9, _this$options$deployS;
+    const hybridSignatory = {
+      walletClient: input.walletClient,
+      webAuthnAccount: (_this$options = this.options) === null || _this$options === void 0 || (_this$options = _this$options.hybridParams) === null || _this$options === void 0 ? void 0 : _this$options.webAuthnAccount,
+      keyId: (_this$options2 = this.options) === null || _this$options2 === void 0 || (_this$options2 = _this$options2.hybridParams) === null || _this$options2 === void 0 ? void 0 : _this$options2.keyId
+    };
+    const multiSigSignatory = [{
+      walletClient: input.walletClient
+    }, ...(((_this$options3 = this.options) === null || _this$options3 === void 0 || (_this$options3 = _this$options3.multiSigParams) === null || _this$options3 === void 0 ? void 0 : _this$options3.additionalSignerWalletClients) || []).map(walletClient => ({
+      walletClient
+    }))];
+    const [eoaAddress] = await input.walletClient.getAddresses();
+    const hybridDeployParams = [eoaAddress, [...(((_this$options4 = this.options) === null || _this$options4 === void 0 || (_this$options4 = _this$options4.hybridParams) === null || _this$options4 === void 0 ? void 0 : _this$options4.p256KeyIds) || [])], [...(((_this$options5 = this.options) === null || _this$options5 === void 0 || (_this$options5 = _this$options5.hybridParams) === null || _this$options5 === void 0 ? void 0 : _this$options5.p256XValues) || [])], [...(((_this$options6 = this.options) === null || _this$options6 === void 0 || (_this$options6 = _this$options6.hybridParams) === null || _this$options6 === void 0 ? void 0 : _this$options6.p256YValues) || [])]];
+    const multiSigDeployParams = [[eoaAddress, ...(((_this$options7 = this.options) === null || _this$options7 === void 0 || (_this$options7 = _this$options7.multiSigParams) === null || _this$options7 === void 0 ? void 0 : _this$options7.additionalSignerAddresses) || [])], (_this$options$multiSi = (_this$options8 = this.options) === null || _this$options8 === void 0 || (_this$options8 = _this$options8.multiSigParams) === null || _this$options8 === void 0 ? void 0 : _this$options8.threshold) !== null && _this$options$multiSi !== void 0 ? _this$options$multiSi : BigInt(1 + (((_this$options9 = this.options) === null || _this$options9 === void 0 || (_this$options9 = _this$options9.multiSigParams) === null || _this$options9 === void 0 || (_this$options9 = _this$options9.additionalSignerWalletClients) === null || _this$options9 === void 0 ? void 0 : _this$options9.length) || 0))];
+    const baseParams = {
+      client: input.client,
+      deploySalt: (_this$options$deployS = this.options.deploySalt) !== null && _this$options$deployS !== void 0 ? _this$options$deployS : "0x0"
+    };
+    if (isImplementationHybrid(this.options.implementation)) {
+      const params = _objectSpread(_objectSpread({}, baseParams), {}, {
+        implementation: this.options.implementation,
+        deployParams: hybridDeployParams,
+        signatory: hybridSignatory
+      });
+      return toMetaMaskSmartAccount(params);
+    } else {
+      const params = _objectSpread(_objectSpread({}, baseParams), {}, {
+        implementation: this.options.implementation,
+        deployParams: multiSigDeployParams,
+        signatory: multiSigSignatory
+      });
+      return toMetaMaskSmartAccount(params);
+    }
+  }
+}
+
+export { MetamaskSmartAccount };

package/dist/lib.esm/AccountAbstraction/smartAccounts/NexusSmartAccount.js

@@ -19,7 +19,7 @@ class NexusSmartAccount {
       },
       version: ((_this$options3 = this.options) === null || _this$options3 === void 0 ? void 0 : _this$options3.version) || "1.0.0"
     }, params), {}, {
-      owners: [params.owner],
+      owners: [params.walletClient],
       client: params.client
     }));
   }

package/dist/lib.esm/AccountAbstraction/smartAccounts/SafeSmartAccount.js

@@ -19,7 +19,7 @@ class SafeSmartAccount {
       },
       version: ((_this$options3 = this.options) === null || _this$options3 === void 0 ? void 0 : _this$options3.version) || "1.4.1"
     }, params), {}, {
-      owners: [params.owner],
+      owners: [params.walletClient],
       client: params.client
     }));
   }

package/dist/lib.esm/AccountAbstraction/smartAccounts/TrustSmartAccount.js

@@ -18,7 +18,7 @@ class TrustSmartAccount {
         version: ((_this$options2 = this.options) === null || _this$options2 === void 0 || (_this$options2 = _this$options2.entryPoint) === null || _this$options2 === void 0 ? void 0 : _this$options2.version) || "0.6"
       }
     }, params), {}, {
-      owner: params.owner,
+      owner: params.walletClient,
       client: params.client
     }));
   }

package/dist/lib.esm/index.js

@@ -32,6 +32,7 @@ export { addCurrencies, conversionGTE, conversionGreaterThan, conversionLTE, con
 export { BNToHex, GAS_LIMITS, addEtherscanTransactions, bnLessThan, formatDate, formatPastTx, formatTime, getChainType, getEthTxStatus, getEtherScanHashLink, getIpfsEndpoint, hexToBn, isAddressByChainId, sanitizeNftMetdataUrl, toChecksumAddressByChainId } from './utils/helpers.js';
 export { BiconomySmartAccount } from './AccountAbstraction/smartAccounts/BiconomySmartAccount.js';
 export { KernelSmartAccount } from './AccountAbstraction/smartAccounts/KernelSmartAccount.js';
+export { MetamaskSmartAccount } from './AccountAbstraction/smartAccounts/MetamaskSmartAccount.js';
 export { NexusSmartAccount } from './AccountAbstraction/smartAccounts/NexusSmartAccount.js';
 export { SafeSmartAccount } from './AccountAbstraction/smartAccounts/SafeSmartAccount.js';
 export { TrustSmartAccount } from './AccountAbstraction/smartAccounts/TrustSmartAccount.js';

package/dist/lib.esm/utils/constants.js

@@ -333,7 +333,8 @@ const SMART_ACCOUNT = {
   // TODO: disabled because of pimlico issues
   LIGHT: "light",
   SIMPLE: "simple",
-  NEXUS: "nexus"
+  NEXUS: "nexus",
+  METAMASK: "metamask"
 };
 
 export { ARBITRUM_MAINNET_CHAIN_ID, ARBITRUM_TESTNET_CHAIN_ID, AVALANCHE_MAINNET_CHAIN_ID, AVALANCHE_TESTNET_CHAIN_ID, BASE_CHAIN_ID, BASE_TESTNET_CHAIN_ID, BSC_MAINNET_CHAIN_ID, BSC_TESTNET_CHAIN_ID, CELO_MAINNET_CHAIN_ID, CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP, COINGECKO_PLATFORMS_CHAIN_CODE_MAP, COINGECKO_SUPPORTED_CURRENCIES, CONTRACT_TYPE_ERC1155, CONTRACT_TYPE_ERC20, CONTRACT_TYPE_ERC721, CONTRACT_TYPE_ETH, ERC1155_INTERFACE_ID, ERC721_ENUMERABLE_INTERFACE_ID, ERC721_INTERFACE_ID, ERC721_METADATA_INTERFACE_ID, GAS_ESTIMATE_TYPES, LINEA_CHAIN_ID, LINEA_SEPOLIA_CHAIN_ID, LOCALHOST, MAINNET_CHAIN_ID, METHOD_TYPES, MM_NFT_API_SUPPORTED_CHAINS, MM_TOKEN_API_SUPPORTED_CHAINS, OLD_ERC721_LIST, OPTIMISM_MAINNET_CHAIN_ID, OPTIMISM_TESTNET_CHAIN_ID, POLYGON_AMOY_CHAIN_ID, POLYGON_CHAIN_ID, SEPOLIA_CHAIN_ID, SMART_ACCOUNT, SUPPORTED_NETWORKS, TEST_CHAINS, TRANSACTION_ENVELOPE_TYPES, XDAI_CHAIN_ID };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "8.2.0",
+  "version": "8.3.0",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "sideEffects": false,
@@ -20,11 +20,12 @@
   },
   "dependencies": {
     "@ethereumjs/util": "^9.1.0",
-    "@toruslabs/base-controllers": "^8.1.0",
+    "@metamask/delegation-toolkit": "^0.9.0",
+    "@toruslabs/base-controllers": "^8.3.0",
     "@toruslabs/http-helpers": "^8.1.1",
-    "@web3auth/auth": "^10.2.3",
+    "@web3auth/auth": "^10.4.0",
     "async-mutex": "^0.5.0",
-    "bignumber.js": "^9.1.2",
+    "bignumber.js": "^9.2.1",
     "bn.js": "^5.2.1",
     "deepmerge": "^4.3.1",
     "ethers": "^6.13.5",
@@ -32,8 +33,8 @@
     "fast-safe-stringify": "^2.1.1",
     "jsonschema": "^1.5.0",
     "loglevel": "^1.9.2",
-    "permissionless": "^0.2.38",
-    "viem": "^2.23.15"
+    "permissionless": "^0.2.41",
+    "viem": "^2.26.5"
   },
   "peerDependencies": {
     "@babel/runtime": "7.x"
@@ -62,7 +63,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ca2533b18b1b9783d87b76f412d2a9ef0873f8c8",
+  "gitHead": "2a59a607de44fd524f284cf61584861b5f798f25",
   "devDependencies": {
     "@typechain/ethers-v6": "^0.5.1",
     "typechain": "^8.3.2"