Merge pull request #261 from pimlicolabs/fix-public-actions

Fix public actions type
pimlicolabs · Aug 6, 2024 · b6c6c6c · b6c6c6c
2 parents 623f380 + cc5e8a9
commit b6c6c6c
Show file tree

Hide file tree

Showing 33 changed files with 615 additions and 208 deletions.
diff --git a/packages/permissionless/accounts/biconomy/privateKeyToBiconomySmartAccount.ts b/packages/permissionless/accounts/biconomy/privateKeyToBiconomySmartAccount.ts
@@ -37,7 +37,7 @@ export async function privateKeyToBiconomySmartAccount<
         TChain,
         undefined,
         PublicRpcSchema,
-        PublicActions
+        PublicActions<TTransport, TChain>
     >,
     {
         privateKey,

diff --git a/packages/permissionless/accounts/biconomy/signerToBiconomySmartAccount.ts b/packages/permissionless/accounts/biconomy/signerToBiconomySmartAccount.ts
@@ -220,7 +220,7 @@ export async function signerToBiconomySmartAccount<
         TChain,
         undefined,
         PublicRpcSchema,
-        PublicActions
+        PublicActions<TTransport, TChain>
     >,
     {
         signer,

diff --git a/packages/permissionless/accounts/kernel/signerToEcdsaKernelSmartAccount.ts b/packages/permissionless/accounts/kernel/signerToEcdsaKernelSmartAccount.ts
@@ -381,7 +381,7 @@ export async function signerToEcdsaKernelSmartAccount<
         TChain,
         undefined,
         PublicRpcSchema,
-        PublicActions
+        PublicActions<TTransport, TChain>
     >,
     {
         signer,

diff --git a/packages/permissionless/accounts/light/privateKeyToLightSmartAccount.ts b/packages/permissionless/accounts/light/privateKeyToLightSmartAccount.ts
@@ -38,7 +38,7 @@ export async function privateKeyToLightSmartAccount<
         TChain,
         undefined,
         PublicRpcSchema,
-        PublicActions
+        PublicActions<TTransport, TChain>
     >,
     { privateKey, ...rest }: PrivateKeyToLightSmartAccountParameters<entryPoint>
 ): Promise<LightSmartAccount<entryPoint, TTransport, TChain>> {

diff --git a/packages/permissionless/accounts/light/signerToLightSmartAccount.ts b/packages/permissionless/accounts/light/signerToLightSmartAccount.ts
@@ -199,7 +199,7 @@ export async function signerToLightSmartAccount<
         TChain,
         undefined,
         PublicRpcSchema,
-        PublicActions
+        PublicActions<TTransport, TChain>
     >,
     {
         signer,

diff --git a/packages/permissionless/accounts/safe/privateKeyToSafeSmartAccount.ts b/packages/permissionless/accounts/safe/privateKeyToSafeSmartAccount.ts
@@ -37,7 +37,7 @@ export async function privateKeyToSafeSmartAccount<
         TChain,
         undefined,
         PublicRpcSchema,
-        PublicActions
+        PublicActions<TTransport, TChain>
     >,
     { privateKey, ...rest }: PrivateKeyToSafeSmartAccountParameters<entryPoint>
 ): Promise<SafeSmartAccount<entryPoint, TTransport, TChain>> {

diff --git a/packages/permissionless/accounts/safe/signerToSafeSmartAccount.ts b/packages/permissionless/accounts/safe/signerToSafeSmartAccount.ts
@@ -1096,7 +1096,7 @@ export async function signerToSafeSmartAccount<
         TChain,
         undefined,
         PublicRpcSchema,
-        PublicActions
+        PublicActions<TTransport, TChain>
     >,
     args: SignerToSafeSmartAccountParameters<
         entryPoint,

diff --git a/packages/permissionless/accounts/simple/privateKeyToSimpleSmartAccount.ts b/packages/permissionless/accounts/simple/privateKeyToSimpleSmartAccount.ts
@@ -38,7 +38,7 @@ export async function privateKeyToSimpleSmartAccount<
         TChain,
         undefined,
         PublicRpcSchema,
-        PublicActions
+        PublicActions<TTransport, TChain>
     >,
     {
         privateKey,

diff --git a/packages/permissionless/accounts/simple/signerToSimpleSmartAccount.ts b/packages/permissionless/accounts/simple/signerToSimpleSmartAccount.ts
@@ -150,7 +150,7 @@ export async function signerToSimpleSmartAccount<
         TChain,
         undefined,
         PublicRpcSchema,
-        PublicActions
+        PublicActions<TTransport, TChain>
     >,
     {
         signer,

diff --git a/packages/permissionless/accounts/toSmartAccount.ts b/packages/permissionless/accounts/toSmartAccount.ts
@@ -50,7 +50,13 @@ export function toSmartAccount<
     signTypedData
 }: TAccountSource & {
     source: TSource
-    client: Client<transport, chain, undefined, PublicRpcSchema, PublicActions>
+    client: Client<
+        transport,
+        chain,
+        undefined,
+        PublicRpcSchema,
+        PublicActions<transport, chain>
+    >
     entryPoint: TEntryPoint
     getNonce: (key?: bigint) => Promise<bigint>
     getInitCode: () => Promise<Hex>

diff --git a/packages/permissionless/accounts/trust/privateKeyToTrustSmartAccount.ts b/packages/permissionless/accounts/trust/privateKeyToTrustSmartAccount.ts
@@ -37,7 +37,7 @@ export async function privateKeyToTrustSmartAccount<
         TChain,
         undefined,
         PublicRpcSchema,
-        PublicActions
+        PublicActions<TTransport, TChain>
     >,
     { privateKey, ...rest }: PrivateKeyToTrustSmartAccountParameters<entryPoint>
 ): Promise<TrustSmartAccount<entryPoint, TTransport, TChain>> {

diff --git a/packages/permissionless/accounts/trust/signerToTrustSmartAccount.ts b/packages/permissionless/accounts/trust/signerToTrustSmartAccount.ts
@@ -108,7 +108,7 @@ export async function signerToTrustSmartAccount<
         TChain,
         undefined,
         PublicRpcSchema,
-        PublicActions
+        PublicActions<TTransport, TChain>
     >,
     {
         signer,

diff --git a/packages/permissionless/accounts/types.ts b/packages/permissionless/accounts/types.ts
@@ -34,12 +34,18 @@ export class SignTransactionNotSupportedBySmartAccount extends BaseError {
 
 export type SmartAccount<
     entryPoint extends EntryPoint,
-    TSource extends string = string,
-    transport extends Transport = Transport,
-    chain extends Chain | undefined = Chain | undefined,
+    TSource extends string,
+    transport extends Transport,
+    chain extends Chain | undefined,
     TAbi extends Abi | readonly unknown[] = Abi
 > = LocalAccount<TSource> & {
-    client: Client<transport, chain, undefined, PublicRpcSchema, PublicActions>
+    client: Client<
+        transport,
+        chain,
+        undefined,
+        PublicRpcSchema,
+        PublicActions<transport, chain>
+    >
     entryPoint: entryPoint
     getNonce: (key?: bigint) => Promise<bigint>
     getInitCode: () => Promise<Hex>

diff --git a/packages/permissionless/actions/erc7579.ts b/packages/permissionless/actions/erc7579.ts
@@ -36,33 +36,77 @@ import {
 
 export type Erc7579Actions<
     TEntryPoint extends EntryPoint,
-    TSmartAccount extends SmartAccount<TEntryPoint> | undefined
+    TTransport extends Transport,
+    TChain extends Chain | undefined,
+    TSmartAccount extends
+        | SmartAccount<TEntryPoint, string, TTransport, TChain>
+        | undefined
 > = {
     accountId: (
         args?: TSmartAccount extends undefined
-            ? GetAccountParameter<TEntryPoint, TSmartAccount>
+            ? GetAccountParameter<
+                  TEntryPoint,
+                  TTransport,
+                  TChain,
+                  TSmartAccount
+              >
             : undefined
     ) => Promise<string>
     installModule: (
-        args: InstallModuleParameters<TEntryPoint, TSmartAccount>
+        args: InstallModuleParameters<
+            TEntryPoint,
+            TTransport,
+            TChain,
+            TSmartAccount
+        >
     ) => Promise<Hash>
     installModules: (
-        args: InstallModulesParameters<TEntryPoint, TSmartAccount>
+        args: InstallModulesParameters<
+            TEntryPoint,
+            TTransport,
+            TChain,
+            TSmartAccount
+        >
     ) => Promise<Hash>
     isModuleInstalled: (
-        args: IsModuleInstalledParameters<TEntryPoint, TSmartAccount>
+        args: IsModuleInstalledParameters<
+            TEntryPoint,
+            TTransport,
+            TChain,
+            TSmartAccount
+        >
     ) => Promise<boolean>
     supportsExecutionMode: (
-        args: SupportsExecutionModeParameters<TEntryPoint, TSmartAccount>
+        args: SupportsExecutionModeParameters<
+            TEntryPoint,
+            TTransport,
+            TChain,
+            TSmartAccount
+        >
     ) => Promise<boolean>
     supportsModule: (
-        args: SupportsModuleParameters<TEntryPoint, TSmartAccount>
+        args: SupportsModuleParameters<
+            TEntryPoint,
+            TTransport,
+            TChain,
+            TSmartAccount
+        >
     ) => Promise<boolean>
     uninstallModule: (
-        args: UninstallModuleParameters<TEntryPoint, TSmartAccount>
+        args: UninstallModuleParameters<
+            TEntryPoint,
+            TTransport,
+            TChain,
+            TSmartAccount
+        >
     ) => Promise<Hash>
     uninstallModules: (
-        args: UninstallModulesParameters<TEntryPoint, TSmartAccount>
+        args: UninstallModulesParameters<
+            TEntryPoint,
+            TTransport,
+            TChain,
+            TSmartAccount
+        >
     ) => Promise<Hash>
 }
 
@@ -92,47 +136,49 @@ export function erc7579Actions<TEntryPoint extends EntryPoint>(_args: {
     entryPoint: TEntryPoint
 }) {
     return <
-        TSmartAccount extends SmartAccount<TEntryPoint> | undefined,
         TTransport extends Transport,
-        TChain extends Chain | undefined
+        TChain extends Chain | undefined,
+        TSmartAccount extends
+            | SmartAccount<TEntryPoint, string, TTransport, TChain>
+            | undefined
     >(
         client: Client<TTransport, TChain, TSmartAccount>
-    ): Erc7579Actions<TEntryPoint, TSmartAccount> => ({
+    ): Erc7579Actions<TEntryPoint, TTransport, TChain, TSmartAccount> => ({
         accountId: (args) => accountId(client, args),
         installModule: (args) =>
-            installModule<TEntryPoint, TSmartAccount, TTransport, TChain>(
+            installModule<TEntryPoint, TTransport, TChain, TSmartAccount>(
                 client,
                 args
             ),
         installModules: (args) =>
-            installModules<TEntryPoint, TSmartAccount, TTransport, TChain>(
+            installModules<TEntryPoint, TTransport, TChain, TSmartAccount>(
                 client,
                 args
             ),
         isModuleInstalled: (args) =>
-            isModuleInstalled<TEntryPoint, TSmartAccount, TTransport, TChain>(
+            isModuleInstalled<TEntryPoint, TTransport, TChain, TSmartAccount>(
                 client,
                 args
             ),
         supportsExecutionMode: (args) =>
             supportsExecutionMode<
                 TEntryPoint,
-                TSmartAccount,
                 TTransport,
-                TChain
+                TChain,
+                TSmartAccount
             >(client, args),
         supportsModule: (args) =>
-            supportsModule<TEntryPoint, TSmartAccount, TTransport, TChain>(
+            supportsModule<TEntryPoint, TTransport, TChain, TSmartAccount>(
                 client,
                 args
             ),
         uninstallModule: (args) =>
-            uninstallModule<TEntryPoint, TSmartAccount, TTransport, TChain>(
+            uninstallModule<TEntryPoint, TTransport, TChain, TSmartAccount>(
                 client,
                 args
             ),
         uninstallModules: (args) =>
-            uninstallModules<TEntryPoint, TSmartAccount, TTransport, TChain>(
+            uninstallModules<TEntryPoint, TTransport, TChain, TSmartAccount>(
                 client,
                 args
             )

diff --git a/packages/permissionless/actions/erc7579/accountId.ts b/packages/permissionless/actions/erc7579/accountId.ts
@@ -1,4 +1,5 @@
 import {
+    type CallParameters,
     type Chain,
     type Client,
     ContractFunctionExecutionError,
@@ -14,13 +15,15 @@ import { AccountOrClientNotFoundError } from "../../utils/signUserOperationHashW
 
 export async function accountId<
     TEntryPoint extends EntryPoint,
-    TSmartAccount extends SmartAccount<TEntryPoint> | undefined,
-    TTransport extends Transport = Transport,
-    TChain extends Chain | undefined = Chain | undefined
+    TTransport extends Transport,
+    TChain extends Chain | undefined,
+    TSmartAccount extends
+        | SmartAccount<TEntryPoint, string, TTransport, TChain>
+        | undefined
 >(
     client: Client<TTransport, TChain, TSmartAccount>,
     args?: TSmartAccount extends undefined
-        ? GetAccountParameter<TEntryPoint, TSmartAccount>
+        ? GetAccountParameter<TEntryPoint, TTransport, TChain, TSmartAccount>
         : undefined
 ): Promise<string> {
     let account_ = client.account
@@ -35,7 +38,12 @@ export async function accountId<
         })
     }
 
-    const account = parseAccount(account_) as SmartAccount<TEntryPoint>
+    const account = parseAccount(account_) as SmartAccount<
+        TEntryPoint,
+        string,
+        TTransport,
+        TChain
+    >
 
     const publicClient = account.client
 
@@ -73,7 +81,7 @@ export async function accountId<
                     abi,
                     functionName: "accountId"
                 })
-            })
+            } as unknown as CallParameters<TChain>)
 
             if (!result || !result.data) {
                 throw new Error("accountId result is empty")