permissionless 0.2.13 → 0.2.15

package/_types/accounts/trust/toTrustSmartAccount.d.ts

@@ -1,5 +1,6 @@
-import { type Account, type Address, type Assign, type Chain, type Client, type EIP1193Provider, type LocalAccount, type OneOf, type Transport, type WalletClient } from "viem";
+import { type Account, type Address, type Assign, type Chain, type Client, type LocalAccount, type OneOf, type Transport, type WalletClient } from "viem";
 import { type SmartAccount, type SmartAccountImplementation, entryPoint06Abi } from "viem/account-abstraction";
+import { type EthereumProvider } from "../../utils/toOwner";
 /**
  * Default addresses for Trust Smart Account
  */
@@ -9,7 +10,7 @@ export declare const TRUST_ADDRESSES: {
 };
 export type ToTrustSmartAccountParameters = {
     client: Client;
-    owner: OneOf<EIP1193Provider | WalletClient<Transport, Chain | undefined, Account> | LocalAccount>;
+    owner: OneOf<EthereumProvider | WalletClient<Transport, Chain | undefined, Account> | LocalAccount>;
     factoryAddress?: Address;
     entryPoint: {
         address: Address;

package/_types/accounts/trust/toTrustSmartAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toTrustSmartAccount.d.ts","sourceRoot":"","sources":["../../../accounts/trust/toTrustSmartAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,eAAe,EAEpB,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,YAAY,EAGpB,MAAM,MAAM,CAAA;AAIb,OAAO,EACH,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAE/B,eAAe,EAIlB,MAAM,0BAA0B,CAAA;AA8BjC;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE;IAC1B,iCAAiC,EAAE,OAAO,CAAA;IAC1C,cAAc,EAAE,OAAO,CAAA;CAK1B,CAAA;AAED,MAAM,MAAM,6BAA6B,GAAG;IACxC,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,KAAK,CACN,eAAe,GACf,YAAY,CAAC,SAAS,EAAE,KAAK,GAAG,SAAS,EAAE,OAAO,CAAC,GACnD,YAAY,CACjB,CAAA;IACD,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,UAAU,EAAE;QACR,OAAO,EAAE,OAAO,CAAA;QAChB,OAAO,EAAE,KAAK,CAAA;KACjB,CAAA;IACD,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,iCAAiC,CAAC,EAAE,OAAO,CAAA;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,+BAA+B,GAAG,MAAM,CAChD,0BAA0B,CACtB,OAAO,eAAe,EACtB,KAAK,CAMR,EACD;IAAE,IAAI,EAAE,WAAW,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,CAC5D,CAAA;AAED,MAAM,MAAM,6BAA6B,GACrC,YAAY,CAAC,+BAA+B,CAAC,CAAA;AAEjD;;;;GAIG;AACH,wBAAsB,mBAAmB,CACrC,UAAU,EAAE,6BAA6B,GAC1C,OAAO,CAAC,6BAA6B,CAAC,CAkHxC"}
+{"version":3,"file":"toTrustSmartAccount.d.ts","sourceRoot":"","sources":["../../../accounts/trust/toTrustSmartAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,MAAM,EACX,KAAK,KAAK,EACV,KAAK,MAAM,EAEX,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,YAAY,EAGpB,MAAM,MAAM,CAAA;AAIb,OAAO,EACH,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAE/B,eAAe,EAIlB,MAAM,0BAA0B,CAAA;AAGjC,OAAO,EAAE,KAAK,gBAAgB,EAAW,MAAM,qBAAqB,CAAA;AA2BpE;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE;IAC1B,iCAAiC,EAAE,OAAO,CAAA;IAC1C,cAAc,EAAE,OAAO,CAAA;CAK1B,CAAA;AAED,MAAM,MAAM,6BAA6B,GAAG;IACxC,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,KAAK,CACN,gBAAgB,GAChB,YAAY,CAAC,SAAS,EAAE,KAAK,GAAG,SAAS,EAAE,OAAO,CAAC,GACnD,YAAY,CACjB,CAAA;IACD,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,UAAU,EAAE;QACR,OAAO,EAAE,OAAO,CAAA;QAChB,OAAO,EAAE,KAAK,CAAA;KACjB,CAAA;IACD,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,iCAAiC,CAAC,EAAE,OAAO,CAAA;IAC3C,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,+BAA+B,GAAG,MAAM,CAChD,0BAA0B,CACtB,OAAO,eAAe,EACtB,KAAK,CAMR,EACD;IAAE,IAAI,EAAE,WAAW,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,CAC5D,CAAA;AAED,MAAM,MAAM,6BAA6B,GACrC,YAAY,CAAC,+BAA+B,CAAC,CAAA;AAEjD;;;;GAIG;AACH,wBAAsB,mBAAmB,CACrC,UAAU,EAAE,6BAA6B,GAC1C,OAAO,CAAC,6BAA6B,CAAC,CAkHxC"}

package/_types/actions/erc7579/isModuleInstalled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isModuleInstalled.d.ts","sourceRoot":"","sources":["../../../actions/erc7579/isModuleInstalled.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EAEX,KAAK,GAAG,EACR,KAAK,KAAK,EACV,KAAK,SAAS,EAIjB,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,YAAY,EACf,MAAM,0BAA0B,CAAA;AAIjC,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,kBAAkB,CAAA;AAErE,MAAM,MAAM,2BAA2B,CACnC,aAAa,SAAS,YAAY,GAAG,SAAS,IAC9C,wBAAwB,CAAC,aAAa,CAAC,GAAG;IAC1C,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CACC;IACI,iBAAiB,EAAE,GAAG,CAAA;CACzB,GACD;IACI,OAAO,EAAE,GAAG,CAAA;CACf,CACN,CAAA;AAEL,wBAAsB,iBAAiB,CACnC,aAAa,SAAS,YAAY,GAAG,SAAS,EAE9C,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,GAAG,SAAS,EAAE,aAAa,CAAC,EAC3D,UAAU,EAAE,2BAA2B,CAAC,aAAa,CAAC,GACvD,OAAO,CAAC,OAAO,CAAC,CAgGlB"}
+{"version":3,"file":"isModuleInstalled.d.ts","sourceRoot":"","sources":["../../../actions/erc7579/isModuleInstalled.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EAEX,KAAK,GAAG,EACR,KAAK,KAAK,EACV,KAAK,SAAS,EAIjB,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,YAAY,EACf,MAAM,0BAA0B,CAAA;AAIjC,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,kBAAkB,CAAA;AAErE,MAAM,MAAM,2BAA2B,CACnC,aAAa,SAAS,YAAY,GAAG,SAAS,IAC9C,wBAAwB,CAAC,aAAa,CAAC,GAAG;IAC1C,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CACC;IACI,iBAAiB,EAAE,GAAG,CAAA;CACzB,GACD;IACI,OAAO,EAAE,GAAG,CAAA;CACf,CACN,CAAA;AAEL,wBAAsB,iBAAiB,CACnC,aAAa,SAAS,YAAY,GAAG,SAAS,EAE9C,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,GAAG,SAAS,EAAE,aAAa,CAAC,EAC3D,UAAU,EAAE,2BAA2B,CAAC,aAAa,CAAC,GACvD,OAAO,CAAC,OAAO,CAAC,CA2FlB"}

package/_types/utils/encodeInstallModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encodeInstallModule.d.ts","sourceRoot":"","sources":["../../utils/encodeInstallModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,GAAG,EACR,KAAK,KAAK,EAGb,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,YAAY,EACf,MAAM,0BAA0B,CAAA;AACjC,OAAO,EACH,KAAK,UAAU,EAElB,MAAM,mCAAmC,CAAA;AAG1C,MAAM,MAAM,4BAA4B,GAAG;IACvC,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CACH;IACI,OAAO,EAAE,GAAG,CAAA;CACf,GACD;IACI,QAAQ,EAAE,GAAG,CAAA;CAChB,CACN,CAAA;AAED,MAAM,MAAM,6BAA6B,CACrC,aAAa,SAAS,YAAY,GAAG,SAAS,IAC9C,wBAAwB,CAAC,aAAa,CAAC,GAAG;IAC1C,OAAO,EAAE,4BAA4B,EAAE,GAAG,4BAA4B,CAAA;CACzE,CAAA;AAED,wBAAgB,mBAAmB,CAC/B,aAAa,SAAS,YAAY,GAAG,SAAS,EAChD,UAAU,EAAE,6BAA6B,CAAC,aAAa,CAAC;;;;IA+CzD"}
+{"version":3,"file":"encodeInstallModule.d.ts","sourceRoot":"","sources":["../../utils/encodeInstallModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,GAAG,EACR,KAAK,KAAK,EAGb,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,YAAY,EACf,MAAM,0BAA0B,CAAA;AACjC,OAAO,EACH,KAAK,UAAU,EAElB,MAAM,mCAAmC,CAAA;AAG1C,MAAM,MAAM,4BAA4B,GAAG;IACvC,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CACH;IACI,OAAO,EAAE,GAAG,CAAA;CACf,GACD;IACI,QAAQ,EAAE,GAAG,CAAA;CAChB,CACN,CAAA;AAED,MAAM,MAAM,6BAA6B,CACrC,aAAa,SAAS,YAAY,GAAG,SAAS,IAC9C,wBAAwB,CAAC,aAAa,CAAC,GAAG;IAC1C,OAAO,EAAE,4BAA4B,EAAE,GAAG,4BAA4B,CAAA;CACzE,CAAA;AAED,wBAAgB,mBAAmB,CAC/B,aAAa,SAAS,YAAY,GAAG,SAAS,EAChD,UAAU,EAAE,6BAA6B,CAAC,aAAa,CAAC;;;;IAkDzD"}

package/_types/utils/encodeUninstallModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encodeUninstallModule.d.ts","sourceRoot":"","sources":["../../utils/encodeUninstallModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,GAAG,EACR,KAAK,KAAK,EAGb,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,YAAY,EACf,MAAM,0BAA0B,CAAA;AACjC,OAAO,EACH,KAAK,UAAU,EAElB,MAAM,mCAAmC,CAAA;AAG1C,MAAM,MAAM,8BAA8B,GAAG;IACzC,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CACH;IACI,OAAO,EAAE,GAAG,CAAA;CACf,GACD;IACI,UAAU,EAAE,GAAG,CAAA;CAClB,CACN,CAAA;AAED,MAAM,MAAM,+BAA+B,CACvC,aAAa,SAAS,YAAY,GAAG,SAAS,IAC9C,wBAAwB,CAAC,aAAa,CAAC,GAAG;IAC1C,OAAO,EAAE,8BAA8B,EAAE,GAAG,8BAA8B,CAAA;CAC7E,CAAA;AAED,wBAAgB,qBAAqB,CACjC,aAAa,SAAS,YAAY,GAAG,SAAS,EAChD,UAAU,EAAE,+BAA+B,CAAC,aAAa,CAAC;;;;IA+C3D"}
+{"version":3,"file":"encodeUninstallModule.d.ts","sourceRoot":"","sources":["../../utils/encodeUninstallModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,GAAG,EACR,KAAK,KAAK,EAGb,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,YAAY,EACf,MAAM,0BAA0B,CAAA;AACjC,OAAO,EACH,KAAK,UAAU,EAElB,MAAM,mCAAmC,CAAA;AAG1C,MAAM,MAAM,8BAA8B,GAAG;IACzC,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CACH;IACI,OAAO,EAAE,GAAG,CAAA;CACf,GACD;IACI,UAAU,EAAE,GAAG,CAAA;CAClB,CACN,CAAA;AAED,MAAM,MAAM,+BAA+B,CACvC,aAAa,SAAS,YAAY,GAAG,SAAS,IAC9C,wBAAwB,CAAC,aAAa,CAAC,GAAG;IAC1C,OAAO,EAAE,8BAA8B,EAAE,GAAG,8BAA8B,CAAA;CAC7E,CAAA;AAED,wBAAgB,qBAAqB,CACjC,aAAa,SAAS,YAAY,GAAG,SAAS,EAChD,UAAU,EAAE,+BAA+B,CAAC,aAAa,CAAC;;;;IAkD3D"}

package/_types/utils/toOwner.d.ts

@@ -1,6 +1,9 @@
-import { type Account, type Address, type Chain, type EIP1193Provider, type LocalAccount, type OneOf, type Transport, type WalletClient } from "viem";
-export declare function toOwner({ owner, address }: {
-    owner: OneOf<EIP1193Provider | WalletClient<Transport, Chain | undefined, Account> | LocalAccount>;
+import { type Account, type Address, type Chain, type LocalAccount, type OneOf, type Transport, type WalletClient } from "viem";
+export type EthereumProvider = {
+    request(...args: any): Promise<any>;
+};
+export declare function toOwner<provider extends EthereumProvider>({ owner, address }: {
+    owner: OneOf<provider | WalletClient<Transport, Chain | undefined, Account> | LocalAccount>;
     address?: Address;
 }): Promise<LocalAccount>;
 //# sourceMappingURL=toOwner.d.ts.map

package/_types/utils/toOwner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toOwner.d.ts","sourceRoot":"","sources":["../../utils/toOwner.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,eAAe,EAGpB,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,YAAY,EAGpB,MAAM,MAAM,CAAA;AAMb,wBAAsB,OAAO,CAAC,EAC1B,KAAK,EACL,OAAO,EACV,EAAE;IACC,KAAK,EAAE,KAAK,CACN,eAAe,GACf,YAAY,CAAC,SAAS,EAAE,KAAK,GAAG,SAAS,EAAE,OAAO,CAAC,GACnD,YAAY,CACjB,CAAA;IACD,OAAO,CAAC,EAAE,OAAO,CAAA;CACpB,GAAG,OAAO,CAAC,YAAY,CAAC,CA6DxB"}
+{"version":3,"file":"toOwner.d.ts","sourceRoot":"","sources":["../../utils/toOwner.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,SAAS,EACd,KAAK,YAAY,EAGpB,MAAM,MAAM,CAAA;AAMb,MAAM,MAAM,gBAAgB,GAAG;IAAE,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;CAAE,CAAA;AAEtE,wBAAsB,OAAO,CAAC,QAAQ,SAAS,gBAAgB,EAAE,EAC7D,KAAK,EACL,OAAO,EACV,EAAE;IACC,KAAK,EAAE,KAAK,CACN,QAAQ,GACR,YAAY,CAAC,SAAS,EAAE,KAAK,GAAG,SAAS,EAAE,OAAO,CAAC,GACnD,YAAY,CACjB,CAAA;IACD,OAAO,CAAC,EAAE,OAAO,CAAA;CACpB,GAAG,OAAO,CAAC,YAAY,CAAC,CAyDxB"}

package/accounts/biconomy/toBiconomySmartAccount.ts

@@ -2,7 +2,6 @@ import type {
     Account,
     Assign,
     Chain,
-    EIP1193Provider,
     OneOf,
     Prettify,
     Transport,
@@ -31,7 +30,7 @@ import {
 } from "viem/account-abstraction"
 import { signMessage } from "viem/actions"
 import { getAccountNonce } from "../../actions/public/getAccountNonce"
-import { toOwner } from "../../utils/toOwner"
+import { type EthereumProvider, toOwner } from "../../utils/toOwner"
 import { BiconomyAbi, FactoryAbi } from "./abi/BiconomySmartAccountAbi"
 
 const BICONOMY_PROXY_CREATION_CODE =
@@ -95,7 +94,7 @@ export type ToBiconomySmartAccountParameters = Prettify<{
     client: Client
     owners: [
         OneOf<
-            | EIP1193Provider
+            | EthereumProvider
             | WalletClient<Transport, Chain | undefined, Account>
             | LocalAccount
         >
@@ -176,15 +175,9 @@ const getAccountAddress = async ({
 }
 
 /**
- * Build a Biconomy modular smart account from a private key, that use the ECDSA signer behind the scene
- * @param client
- * @param privateKey
- * @param entryPoint
- * @param index
- * @param factoryAddress
- * @param ecdsaModuleAddress
+ * @deprecated Biconomy Smart Account is deprecated. Please use toNexusSmartAccount instead.
+ * @see toNexusSmartAccount
  */
-
 export async function toBiconomySmartAccount(
     parameters: ToBiconomySmartAccountParameters
 ): Promise<ToBiconomySmartAccountReturnType> {

package/accounts/index.ts

@@ -43,6 +43,13 @@ import {
     toBiconomySmartAccount
 } from "./biconomy/toBiconomySmartAccount"
 
+import {
+    type NexusSmartAccountImplementation,
+    type ToNexusSmartAccountParameters,
+    type ToNexusSmartAccountReturnType,
+    toNexusSmartAccount
+} from "./nexus/toNexusSmartAccount"
+
 import {
     type ThirdwebSmartAccountImplementation,
     type ToThirdwebSmartAccountParameters,
@@ -74,6 +81,10 @@ export {
     type SafeVersion,
     type KernelVersion,
     toEcdsaKernelSmartAccount,
+    type NexusSmartAccountImplementation,
+    type ToNexusSmartAccountParameters,
+    type ToNexusSmartAccountReturnType,
+    toNexusSmartAccount,
     type ToBiconomySmartAccountReturnType,
     type ToBiconomySmartAccountParameters,
     type BiconomySmartAccountImplementation,

package/accounts/kernel/toEcdsaKernelSmartAccount.ts

@@ -2,7 +2,6 @@ import type {
     Account,
     Assign,
     Chain,
-    EIP1193Provider,
     OneOf,
     Transport,
     WalletClient
@@ -32,7 +31,7 @@ import { signMessage as _signMessage, getChainId } from "viem/actions"
 import { getAction } from "viem/utils"
 import { getAccountNonce } from "../../actions/public/getAccountNonce"
 import { getSenderAddress } from "../../actions/public/getSenderAddress"
-import { toOwner } from "../../utils/toOwner"
+import { type EthereumProvider, toOwner } from "../../utils/toOwner"
 import { KernelInitAbi } from "./abi/KernelAccountAbi"
 import { KernelV3InitAbi, KernelV3_1AccountAbi } from "./abi/KernelV3AccountAbi"
 import { KernelV3MetaFactoryDeployWithFactoryAbi } from "./abi/KernelV3MetaFactoryAbi"
@@ -305,7 +304,7 @@ export type ToEcdsaKernelSmartAccountParameters<
     client: Client
     owners: [
         OneOf<
-            | EIP1193Provider
+            | EthereumProvider
             | WalletClient<Transport, Chain | undefined, Account>
             | LocalAccount
         >

package/accounts/light/toLightSmartAccount.ts

@@ -4,7 +4,6 @@ import {
     type Assign,
     type Chain,
     type Client,
-    type EIP1193Provider,
     type Hex,
     type LocalAccount,
     type OneOf,
@@ -29,7 +28,7 @@ import { getChainId, signMessage } from "viem/actions"
 import { getAction } from "viem/utils"
 import { getAccountNonce } from "../../actions/public/getAccountNonce"
 import { getSenderAddress } from "../../actions/public/getSenderAddress"
-import { toOwner } from "../../utils/toOwner"
+import { type EthereumProvider, toOwner } from "../../utils/toOwner"
 
 const getAccountInitCode = async (
     owner: Address,
@@ -81,7 +80,7 @@ export type ToLightSmartAccountParameters<
         version: entryPointVersion
     }
     owner: OneOf<
-        | EIP1193Provider
+        | EthereumProvider
         | WalletClient<Transport, Chain | undefined, Account>
         | LocalAccount
     >

package/accounts/nexus/toNexusSmartAccount.ts

@@ -0,0 +1,330 @@
+import type {
+    Account,
+    Assign,
+    Chain,
+    OneOf,
+    Prettify,
+    Transport,
+    TypedDataDefinition,
+    WalletClient
+} from "viem"
+import {
+    type Address,
+    type Client,
+    type Hex,
+    type LocalAccount,
+    concat,
+    concatHex,
+    domainSeparator,
+    encodeAbiParameters,
+    encodeFunctionData,
+    encodePacked,
+    getTypesForEIP712Domain,
+    hashMessage,
+    hashTypedData,
+    keccak256,
+    stringToHex,
+    toHex,
+    validateTypedData
+} from "viem"
+import {
+    type SmartAccount,
+    type SmartAccountImplementation,
+    entryPoint07Abi,
+    entryPoint07Address,
+    getUserOperationHash,
+    toSmartAccount
+} from "viem/account-abstraction"
+import { getChainId, readContract } from "viem/actions"
+import { getAction } from "viem/utils"
+import { getAccountNonce } from "../../actions/public/getAccountNonce"
+import { encode7579Calls } from "../../utils"
+import { type EthereumProvider, toOwner } from "../../utils/toOwner"
+
+const wrapMessageHash = (
+    messageHash: Hex,
+    {
+        accountAddress,
+        version,
+        chainId
+    }: {
+        accountAddress: Address
+        version: "1.0.0"
+        chainId: number
+    }
+) => {
+    const _domainSeparator = domainSeparator({
+        domain: {
+            name: "Nexus",
+            version: version,
+            chainId,
+            verifyingContract: accountAddress
+        }
+    })
+    const parentStructHash = keccak256(
+        encodeAbiParameters(
+            [{ type: "bytes32" }, { type: "bytes32" }],
+            [
+                keccak256(stringToHex("PersonalSign(bytes prefixed)")),
+                messageHash
+            ]
+        )
+    )
+    return keccak256(concatHex(["0x1901", _domainSeparator, parentStructHash]))
+}
+
+/**
+ * The account creation ABI for Biconomy Smart Account (from the biconomy SmartAccountFactory)
+ */
+
+/**
+ * Default addresses for Biconomy Smart Account
+ */
+const BICONOMY_ADDRESSES: {
+    K1_VALIDATOR_FACTORY_ADDRESS: Address
+    K1_VALIDATOR_ADDRESS: Address
+} = {
+    K1_VALIDATOR_FACTORY_ADDRESS: "0x00000bb19a3579F4D779215dEf97AFbd0e30DB55",
+    K1_VALIDATOR_ADDRESS: "0x00000004171351c442B202678c48D8AB5B321E8f"
+}
+
+export type ToNexusSmartAccountParameters = Prettify<{
+    client: Client
+    owners: [
+        OneOf<
+            | EthereumProvider
+            | WalletClient<Transport, Chain | undefined, Account>
+            | LocalAccount
+        >
+    ]
+    version: "1.0.0"
+    address?: Address | undefined
+    entryPoint?: {
+        address: Address
+        version: "0.7"
+    }
+    index?: bigint
+    factoryAddress?: Address
+    validatorAddress?: Address
+    attesters?: Address[]
+    threshold?: number
+}>
+
+export type NexusSmartAccountImplementation = Assign<
+    SmartAccountImplementation<typeof entryPoint07Abi, "0.7">,
+    { sign: NonNullable<SmartAccountImplementation["sign"]> }
+>
+
+export type ToNexusSmartAccountReturnType = Prettify<
+    SmartAccount<NexusSmartAccountImplementation>
+>
+
+export async function toNexusSmartAccount(
+    parameters: ToNexusSmartAccountParameters
+): Promise<ToNexusSmartAccountReturnType> {
+    const {
+        owners,
+        client,
+        index = 0n,
+        address,
+        version,
+        factoryAddress = BICONOMY_ADDRESSES.K1_VALIDATOR_FACTORY_ADDRESS,
+        validatorAddress = BICONOMY_ADDRESSES.K1_VALIDATOR_ADDRESS,
+        attesters = [],
+        threshold = 0
+    } = parameters
+
+    const localOwner = await toOwner({ owner: owners[0] })
+
+    const entryPoint = {
+        address: parameters.entryPoint?.address ?? entryPoint07Address,
+        abi: entryPoint07Abi,
+        version: parameters.entryPoint?.version ?? "0.7"
+    }
+
+    let accountAddress: Address | undefined = address
+
+    const getFactoryArgs = async () => {
+        return {
+            factory: factoryAddress,
+            factoryData: encodeFunctionData({
+                abi: [
+                    {
+                        name: "createAccount",
+                        type: "function",
+                        stateMutability: "nonpayable",
+                        inputs: [
+                            { type: "address", name: "eoaOwner" },
+                            { type: "uint256", name: "index" },
+                            { type: "address[]", name: "attesters" },
+                            { type: "uint8", name: "threshold" }
+                        ],
+                        outputs: [{ type: "address" }]
+                    }
+                ],
+                functionName: "createAccount",
+                args: [localOwner.address, index, attesters, threshold]
+            })
+        }
+    }
+
+    let chainId: number
+    const getMemoizedChainId = async () => {
+        if (chainId) return chainId
+        chainId = client.chain
+            ? client.chain.id
+            : await getAction(client, getChainId, "getChainId")({})
+        return chainId
+    }
+
+    return toSmartAccount({
+        client,
+        entryPoint,
+        getFactoryArgs,
+        async getAddress() {
+            if (accountAddress) return accountAddress
+
+            accountAddress = await readContract(client, {
+                address: factoryAddress,
+                abi: [
+                    {
+                        name: "computeAccountAddress",
+                        type: "function",
+                        stateMutability: "view",
+                        inputs: [
+                            { type: "address", name: "eoaOwner" },
+                            { type: "uint256", name: "index" },
+                            { type: "address[]", name: "attesters" },
+                            { type: "uint8", name: "threshold" }
+                        ],
+                        outputs: [{ type: "address" }]
+                    }
+                ],
+                functionName: "computeAccountAddress",
+                args: [localOwner.address, index, attesters, threshold]
+            })
+
+            return accountAddress
+        },
+        async getNonce(args) {
+            const TIMESTAMP_ADJUSTMENT = 16777215n // max value for size 3
+            const defaultedKey = (args?.key ?? 0n) % TIMESTAMP_ADJUSTMENT
+            const defaultedValidationMode = "0x00"
+            const key = concat([
+                toHex(defaultedKey, { size: 3 }),
+                defaultedValidationMode,
+                validatorAddress
+            ])
+
+            const address = await this.getAddress()
+
+            return getAccountNonce(client, {
+                address,
+                entryPointAddress: entryPoint.address,
+                key: BigInt(key)
+            })
+        },
+        encodeCalls: async (calls) => {
+            return encode7579Calls({
+                mode: {
+                    type: calls.length > 1 ? "batchcall" : "call",
+                    revertOnError: false,
+                    selector: "0x",
+                    context: "0x"
+                },
+                callData: calls
+            })
+        },
+        async getStubSignature() {
+            const dynamicPart = validatorAddress.substring(2).padEnd(40, "0")
+            return `0x0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000${dynamicPart}000000000000000000000000000000000000000000000000000000000000004181d4b4981670cb18f99f0b4a66446df1bf5b204d24cfcb659bf38ba27a4359b5711649ec2423c5e1247245eba2964679b6a1dbb85c992ae40b9b00c6935b02ff1b00000000000000000000000000000000000000000000000000000000000000` as Hex
+        },
+        async sign({ hash }) {
+            return this.signMessage({ message: hash })
+        },
+        async signMessage({ message }) {
+            const wrappedMessageHash = wrapMessageHash(hashMessage(message), {
+                version,
+                accountAddress: await this.getAddress(),
+                chainId: await getMemoizedChainId()
+            })
+
+            const signature = await localOwner.signMessage({
+                message: {
+                    raw: wrappedMessageHash
+                }
+            })
+
+            return encodePacked(
+                ["address", "bytes"],
+                [validatorAddress, signature]
+            )
+        },
+        async signTypedData(typedData) {
+            const {
+                message,
+                primaryType,
+                types: _types,
+                domain
+            } = typedData as TypedDataDefinition
+
+            const types = {
+                EIP712Domain: getTypesForEIP712Domain({
+                    domain: domain
+                }),
+                ..._types
+            }
+
+            validateTypedData({
+                domain,
+                message,
+                primaryType,
+                types
+            })
+
+            const typedHash = hashTypedData({
+                message,
+                primaryType,
+                types,
+                domain
+            })
+
+            const wrappedMessageHash = wrapMessageHash(typedHash, {
+                version,
+                accountAddress: await this.getAddress(),
+                chainId: await getMemoizedChainId()
+            })
+
+            const signature = await localOwner.signMessage({
+                message: {
+                    raw: wrappedMessageHash
+                }
+            })
+
+            return encodePacked(
+                ["address", "bytes"],
+                [validatorAddress, signature]
+            )
+        },
+        async signUserOperation(parameters) {
+            const { chainId = await getMemoizedChainId(), ...userOperation } =
+                parameters
+
+            if (!chainId) throw new Error("Chain id not found")
+
+            const hash = getUserOperationHash({
+                userOperation: {
+                    ...userOperation,
+                    sender: userOperation.sender ?? (await this.getAddress()),
+                    signature: "0x"
+                },
+                entryPointAddress: entryPoint.address,
+                entryPointVersion: entryPoint.version,
+                chainId: chainId
+            })
+            return await localOwner.signMessage({
+                message: { raw: hash as Hex }
+            })
+        }
+    })
+}

package/accounts/safe/toSafeSmartAccount.ts

@@ -4,7 +4,6 @@ import {
     type Assign,
     type Chain,
     type Client,
-    type EIP1193Provider,
     type Hex,
     type LocalAccount,
     type OneOf,
@@ -42,6 +41,7 @@ import { getAction } from "viem/utils"
 import { getAccountNonce } from "../../actions/public/getAccountNonce"
 import { isSmartAccountDeployed, toOwner } from "../../utils"
 import { encode7579Calls } from "../../utils/encode7579Calls"
+import type { EthereumProvider } from "../../utils/toOwner"
 
 export type SafeVersion = "1.4.1"
 
@@ -940,7 +940,7 @@ export type ToSafeSmartAccountParameters<
     client: Client
     owners: [
         OneOf<
-            | EIP1193Provider
+            | EthereumProvider
             | WalletClient<Transport, Chain | undefined, Account>
             | LocalAccount
         >
@@ -1439,12 +1439,9 @@ export async function toSafeSmartAccount<
                 entryPoint: entryPoint.address
             }
 
-            let isDeployed = false
-
             if ("initCode" in userOperation) {
                 message.paymasterAndData =
                     userOperation.paymasterAndData ?? "0x"
-                isDeployed = userOperation.initCode === "0x"
             }
 
             if ("factory" in userOperation) {
@@ -1458,14 +1455,6 @@ export async function toSafeSmartAccount<
                     ...userOperation,
                     sender: userOperation.sender ?? (await this.getAddress())
                 })
-                isDeployed = !userOperation.factory
-            }
-
-            let verifyingContract = safe4337ModuleAddress
-
-            if (erc7579LaunchpadAddress && !isDeployed) {
-                verifyingContract =
-                    userOperation.sender ?? (await this.getAddress())
             }
 
             const signatures = [
@@ -1475,7 +1464,7 @@ export async function toSafeSmartAccount<
                         account: localOwner,
                         domain: {
                             chainId,
-                            verifyingContract
+                            verifyingContract: safe4337ModuleAddress
                         },
                         types:
                             entryPoint.version === "0.6"

package/accounts/simple/toSimpleSmartAccount.ts

@@ -4,7 +4,6 @@ import {
     type Assign,
     type Chain,
     type Client,
-    type EIP1193Provider,
     type Hex,
     type LocalAccount,
     type OneOf,
@@ -26,7 +25,7 @@ import { getChainId, signMessage } from "viem/actions"
 import { getAction } from "viem/utils"
 import { getAccountNonce } from "../../actions/public/getAccountNonce"
 import { getSenderAddress } from "../../actions/public/getSenderAddress"
-import { toOwner } from "../../utils/toOwner"
+import { type EthereumProvider, toOwner } from "../../utils/toOwner"
 
 const getAccountInitCode = async (
     owner: Address,
@@ -71,7 +70,7 @@ export type ToSimpleSmartAccountParameters<
 > = {
     client: Client
     owner: OneOf<
-        | EIP1193Provider
+        | EthereumProvider
         | WalletClient<Transport, Chain | undefined, Account>
         | LocalAccount
     >

package/accounts/thirdweb/toThirdwebSmartAccount.ts

@@ -4,7 +4,6 @@ import type {
     Assign,
     Chain,
     Client,
-    EIP1193Provider,
     LocalAccount,
     OneOf,
     Transport,
@@ -25,7 +24,7 @@ import {
     toSmartAccount
 } from "viem/account-abstraction"
 import { getAction, toHex } from "viem/utils"
-import { toOwner } from "../../utils/toOwner"
+import { type EthereumProvider, toOwner } from "../../utils/toOwner"
 import { encodeCallData } from "./utils/encodeCallData"
 import { getAccountAddress } from "./utils/getAccountAddress"
 import { getFactoryData } from "./utils/getFactoryData"
@@ -49,7 +48,7 @@ export type ToThirdwebSmartAccountParameters<
 > = {
     client: Client
     owner: OneOf<
-        | EIP1193Provider
+        | EthereumProvider
         | WalletClient<Transport, Chain | undefined, Account>
         | LocalAccount
     >

package/accounts/trust/toTrustSmartAccount.ts

@@ -4,7 +4,6 @@ import {
     type Assign,
     type Chain,
     type Client,
-    type EIP1193Provider,
     type Hex,
     type LocalAccount,
     type OneOf,
@@ -27,7 +26,7 @@ import {
 } from "viem/account-abstraction"
 import { getAction } from "viem/utils"
 import { getSenderAddress } from "../../actions/public/getSenderAddress"
-import { toOwner } from "../../utils/toOwner"
+import { type EthereumProvider, toOwner } from "../../utils/toOwner"
 import { encodeCallData } from "./utils/encodeCallData"
 import { getFactoryData } from "./utils/getFactoryData"
 
@@ -69,7 +68,7 @@ export const TRUST_ADDRESSES: {
 export type ToTrustSmartAccountParameters = {
     client: Client
     owner: OneOf<
-        | EIP1193Provider
+        | EthereumProvider
         | WalletClient<Transport, Chain | undefined, Account>
         | LocalAccount
     >