@account-kit/smart-contracts 4.0.0-beta.7 → 4.0.0-beta.8

package/src/light-account/clients/multiOwnerAlchemyClient.ts

@@ -1,8 +1,6 @@
 import type { HttpTransport, SmartAccountSigner } from "@aa-sdk/core";
 import {
-  AlchemyProviderConfigSchema,
-  createAlchemyPublicRpcClient,
-  createAlchemySmartAccountClientFromExisting,
+  createAlchemySmartAccountClient,
   type AlchemySmartAccountClient,
   type AlchemySmartAccountClientConfig,
 } from "@account-kit/infra";
@@ -13,20 +11,16 @@ import {
   type MultiOwnerLightAccount,
   type MultiOwnerLightAccountClientActions,
 } from "@account-kit/smart-contracts";
-import { custom, type Chain, type CustomTransport, type Transport } from "viem";
+import { type Chain } from "viem";
 
 export type AlchemyMultiOwnerLightAccountClientConfig<
   TSigner extends SmartAccountSigner = SmartAccountSigner
 > = Omit<
   CreateMultiOwnerLightAccountParams<HttpTransport, TSigner>,
-  "transport" | "chain" | "type"
+  "transport" | "type"
 > &
   Omit<
-    AlchemySmartAccountClientConfig<
-      Transport,
-      Chain,
-      MultiOwnerLightAccount<TSigner>
-    >,
+    AlchemySmartAccountClientConfig<Chain, MultiOwnerLightAccount<TSigner>>,
     "account"
   >;
 
@@ -36,7 +30,6 @@ export async function createMultiOwnerLightAccountAlchemyClient<
   params: AlchemyMultiOwnerLightAccountClientConfig<TSigner>
 ): Promise<
   AlchemySmartAccountClient<
-    CustomTransport,
     Chain | undefined,
     MultiOwnerLightAccount<TSigner>,
     MultiOwnerLightAccountClientActions<TSigner>
@@ -49,13 +42,15 @@ export async function createMultiOwnerLightAccountAlchemyClient<
  * @example
  * ```ts
  * import { createMultiOwnerLightAccountAlchemyClient } from "@account-kit/smart-contracts";
- * import { sepolia } from "@account-kit/infra";
+ * import { sepolia, alchemy } from "@account-kit/infra";
  * import { LocalAccountSigner } from "@aa-sdk/core";
  * import { generatePrivateKey } from "viem"
  *
  * const lightAccountClient = await createMultiOwnerLightAccountAlchemyClient({
- *  apiKey: "your-api-key",
- *  chain: sepolia,
+ *  transport: alchemy({
+ *    apiKey: "your-api-key",
+ *  }),
+ *  chain: sepolia
  *  signer: LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey())
  * });
  * ```
@@ -63,25 +58,22 @@ export async function createMultiOwnerLightAccountAlchemyClient<
  * @param {AlchemyMultiOwnerLightAccountClientConfig} config The configuration for creating the Alchemy client
  * @returns {Promise<AlchemySmartAccountClient>} A promise that resolves to an `AlchemySmartAccountClient` object containing the created account information and methods
  */
-export async function createMultiOwnerLightAccountAlchemyClient(
-  config: AlchemyMultiOwnerLightAccountClientConfig
-): Promise<AlchemySmartAccountClient> {
-  const { chain, opts, ...connectionConfig } =
-    AlchemyProviderConfigSchema.parse(config);
-
-  const client = createAlchemyPublicRpcClient({
-    chain,
-    connectionConfig,
-  });
-
+export async function createMultiOwnerLightAccountAlchemyClient({
+  opts,
+  transport,
+  chain,
+  ...config
+}: AlchemyMultiOwnerLightAccountClientConfig): Promise<AlchemySmartAccountClient> {
   const account = await createMultiOwnerLightAccount({
-    transport: custom(client),
     ...config,
+    transport,
+    chain,
   });
 
-  return createAlchemySmartAccountClientFromExisting({
+  return createAlchemySmartAccountClient({
     ...config,
-    client,
+    transport,
+    chain,
     account,
     opts,
   }).extend(multiOwnerLightAccountClientActions);

package/src/msca/client/alchemyClient.ts

@@ -1,8 +1,6 @@
 import type { SmartAccountSigner } from "@aa-sdk/core";
 import {
-  AlchemyProviderConfigSchema,
-  createAlchemyPublicRpcClient,
-  createAlchemySmartAccountClientFromExisting,
+  createAlchemySmartAccountClient,
   type AlchemySmartAccountClient,
   type AlchemySmartAccountClientConfig,
 } from "@account-kit/infra";
@@ -18,22 +16,16 @@ import {
   type MultiOwnerPluginActions,
   type PluginManagerActions,
 } from "@account-kit/smart-contracts";
-import {
-  custom,
-  type Chain,
-  type CustomTransport,
-  type HttpTransport,
-  type Transport,
-} from "viem";
+import { type Chain, type HttpTransport } from "viem";
 
 export type AlchemyModularAccountClientConfig<
   TSigner extends SmartAccountSigner = SmartAccountSigner
 > = Omit<
   CreateMultiOwnerModularAccountParams<HttpTransport, TSigner>,
-  "transport" | "chain"
+  "transport"
 > &
   Omit<
-    AlchemySmartAccountClientConfig<Transport, Chain, LightAccount<TSigner>>,
+    AlchemySmartAccountClientConfig<Chain, LightAccount<TSigner>>,
     "account"
   >;
 
@@ -43,7 +35,6 @@ export function createModularAccountAlchemyClient<
   params: AlchemyModularAccountClientConfig<TSigner>
 ): Promise<
   AlchemySmartAccountClient<
-    CustomTransport,
     Chain | undefined,
     MultiOwnerModularAccount<TSigner>,
     MultiOwnerPluginActions<MultiOwnerModularAccount<TSigner>> &
@@ -58,12 +49,12 @@ export function createModularAccountAlchemyClient<
  * @example
  * ```ts
  * import { createModularAccountAlchemyClient } from "@account-kit/smart-contracts";
- * import { sepolia } from "@account-kit/infra";
+ * import { sepolia, alchemy } from "@account-kit/infra";
  * import { LocalAccountSigner } from "@aa-sdk/core";
  * import { generatePrivateKey } from "viem"
  *
  * const alchemyAccountClient = await createModularAccountAlchemyClient({
- *  apiKey: "your-api-key",
+ *  transport: alchemy({ apiKey: "your-api-key" }),
  *  chain: sepolia,
  *  signer: LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey())
  * });
@@ -75,22 +66,16 @@ export function createModularAccountAlchemyClient<
 export async function createModularAccountAlchemyClient(
   config: AlchemyModularAccountClientConfig
 ): Promise<AlchemySmartAccountClient> {
-  const { chain, opts, ...connectionConfig } =
-    AlchemyProviderConfigSchema.parse(config);
-
-  const client = createAlchemyPublicRpcClient({
-    chain,
-    connectionConfig,
-  });
+  const { transport, chain, opts } = config;
 
   const account = await createMultiOwnerModularAccount({
-    transport: custom(client),
     ...config,
+    transport,
+    chain,
   });
 
-  return createAlchemySmartAccountClientFromExisting({
+  return createAlchemySmartAccountClient({
     ...config,
-    client,
     account,
     opts,
   })

package/src/msca/client/multiSigAlchemyClient.ts

@@ -3,9 +3,7 @@ import {
   type SmartAccountSigner,
 } from "@aa-sdk/core";
 import {
-  AlchemyProviderConfigSchema,
-  createAlchemyPublicRpcClient,
-  createAlchemySmartAccountClientFromExisting,
+  createAlchemySmartAccountClient,
   type AlchemySmartAccountClient,
   type AlchemySmartAccountClientConfig,
 } from "@account-kit/infra";
@@ -23,13 +21,7 @@ import {
   type MultisigUserOperationContext,
   type PluginManagerActions,
 } from "@account-kit/smart-contracts";
-import {
-  custom,
-  type Chain,
-  type CustomTransport,
-  type HttpTransport,
-  type Transport,
-} from "viem";
+import { type Chain, type HttpTransport } from "viem";
 
 // todo: this file seems somewhat duplicated with ./modularAccountClient.ts, but that file has some multi-owner specific fields. Is there a way to refactor these two to de-dupe?
 
@@ -37,11 +29,10 @@ export type AlchemyMultisigAccountClientConfig<
   TSigner extends SmartAccountSigner = SmartAccountSigner
 > = Omit<
   CreateMultisigModularAccountParams<HttpTransport, TSigner>,
-  "transport" | "chain"
+  "transport"
 > &
   Omit<
     AlchemySmartAccountClientConfig<
-      Transport,
       Chain,
       LightAccount<TSigner>,
       MultisigUserOperationContext
@@ -55,7 +46,6 @@ export function createMultisigAccountAlchemyClient<
   params: AlchemyMultisigAccountClientConfig<TSigner>
 ): Promise<
   AlchemySmartAccountClient<
-    CustomTransport,
     Chain | undefined,
     MultisigModularAccount<TSigner>,
     MultisigPluginActions<MultisigModularAccount<TSigner>> &
@@ -76,7 +66,7 @@ export function createMultisigAccountAlchemyClient<
  * import { generatePrivateKey } from "viem"
  *
  * const alchemyAccountClient = await createMultisigAccountAlchemyClient({
- *  apiKey: "your-api-key",
+ *  transport: alchemy({ apiKey: "your-api-key" }),
  *  chain: sepolia,
  *  signer: LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey()),
  *  owners: [...], // other owners on the account
@@ -91,7 +81,6 @@ export async function createMultisigAccountAlchemyClient(
   config: AlchemyMultisigAccountClientConfig
 ): Promise<
   AlchemySmartAccountClient<
-    Transport,
     Chain | undefined,
     MultisigModularAccount<SmartAccountSigner>,
     MultisigPluginActions<MultisigModularAccount<SmartAccountSigner>> &
@@ -100,26 +89,16 @@ export async function createMultisigAccountAlchemyClient(
     MultisigUserOperationContext
   >
 > {
-  const { chain, opts, ...connectionConfig } =
-    AlchemyProviderConfigSchema.parse(config);
-
-  const client = createAlchemyPublicRpcClient({
-    chain,
-    connectionConfig,
-  });
+  const { transport, opts, chain } = config;
 
   const account = await createMultisigModularAccount({
-    transport: custom(client),
     ...config,
+    transport,
+    chain,
   });
 
-  return createAlchemySmartAccountClientFromExisting<
-    Chain | undefined,
-    MultisigModularAccount<SmartAccountSigner>,
-    MultisigUserOperationContext
-  >({
+  return createAlchemySmartAccountClient({
     ...config,
-    client,
     account,
     opts,
     signUserOperation: multisigSignatureMiddleware,

package/src/msca/plugins/multi-owner/plugin.ts

@@ -38,7 +38,8 @@ type ExecutionActions<
   TContext extends UserOperationContext | undefined =
     | UserOperationContext
     | undefined,
-  TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>
+  TEntryPointVersion extends
+    GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>,
 > = {
   updateOwners: (
     args: Pick<
@@ -50,7 +51,7 @@ type ExecutionActions<
     > &
       UserOperationOverridesParameter<TEntryPointVersion> &
       GetAccountParameter<TAccount> &
-      GetContextParameter<TContext>
+      GetContextParameter<TContext>,
   ) => Promise<SendUserOperationResult<TEntryPointVersion>>;
 };
 
@@ -69,20 +70,21 @@ type ManagementActions<
   TContext extends UserOperationContext | undefined =
     | Record<string, any>
     | undefined,
-  TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>
+  TEntryPointVersion extends
+    GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>,
 > = {
   installMultiOwnerPlugin: (
     args: UserOperationOverridesParameter<TEntryPointVersion> &
       InstallMultiOwnerPluginParams &
       GetAccountParameter<TAccount> &
-      GetContextParameter<TContext>
+      GetContextParameter<TContext>,
   ) => Promise<SendUserOperationResult<TEntryPointVersion>>;
 };
 
 type ReadAndEncodeActions<
   TAccount extends SmartContractAccount | undefined =
     | SmartContractAccount
-    | undefined
+    | undefined,
 > = {
   encodeUpdateOwners: (
     args: Pick<
@@ -91,7 +93,7 @@ type ReadAndEncodeActions<
         "updateOwners"
       >,
       "args"
-    >
+    >,
   ) => Hex;
 
   encodeEip712Domain: (
@@ -101,11 +103,11 @@ type ReadAndEncodeActions<
         "eip712Domain"
       >,
       "args"
-    >
+    >,
   ) => Hex;
 
   readEip712Domain: (
-    args: GetAccountParameter<TAccount>
+    args: GetAccountParameter<TAccount>,
   ) => Promise<
     ReadContractReturnType<
       typeof MultiOwnerPluginExecutionFunctionAbi,
@@ -120,7 +122,7 @@ type ReadAndEncodeActions<
         "isValidSignature"
       >,
       "args"
-    >
+    >,
   ) => Hex;
 
   readIsValidSignature: (
@@ -131,7 +133,7 @@ type ReadAndEncodeActions<
       >,
       "args"
     > &
-      GetAccountParameter<TAccount>
+      GetAccountParameter<TAccount>,
   ) => Promise<
     ReadContractReturnType<
       typeof MultiOwnerPluginExecutionFunctionAbi,
@@ -146,7 +148,7 @@ export type MultiOwnerPluginActions<
     | undefined,
   TContext extends UserOperationContext | undefined =
     | UserOperationContext
-    | undefined
+    | undefined,
 > = ExecutionActions<TAccount, TContext> &
   ManagementActions<TAccount, TContext> &
   ReadAndEncodeActions<TAccount>;
@@ -177,7 +179,7 @@ export const MultiOwnerPlugin: Plugin<typeof MultiOwnerPluginAbi> = {
   },
   getContract: <C extends Client>(
     client: C,
-    address?: Address
+    address?: Address,
   ): GetContractReturnType<
     typeof MultiOwnerPluginAbi,
     PublicClient,
@@ -205,9 +207,9 @@ export const multiOwnerPluginActions: <
     | undefined,
   TContext extends UserOperationContext | undefined =
     | UserOperationContext
-    | undefined
+    | undefined,
 >(
-  client: Client<TTransport, TChain, TAccount>
+  client: Client<TTransport, TChain, TAccount>,
 ) => MultiOwnerPluginActions<TAccount, TContext> = (client) => ({
   updateOwners({ args, overrides, context, account = client.account }) {
     if (!account) {
@@ -217,7 +219,7 @@ export const multiOwnerPluginActions: <
       throw new IncompatibleClientError(
         "SmartAccountClient",
         "updateOwners",
-        client
+        client,
       );
     }
 
@@ -243,7 +245,7 @@ export const multiOwnerPluginActions: <
       throw new IncompatibleClientError(
         "SmartAccountClient",
         "installMultiOwnerPlugin",
-        client
+        client,
       );
     }
 
@@ -259,7 +261,7 @@ export const multiOwnerPluginActions: <
 
     if (!pluginAddress) {
       throw new Error(
-        "missing MultiOwnerPlugin address for chain " + chain.name
+        "missing MultiOwnerPlugin address for chain " + chain.name,
       );
     }
 
@@ -295,7 +297,7 @@ export const multiOwnerPluginActions: <
       throw new IncompatibleClientError(
         "SmartAccountClient",
         "readEip712Domain",
-        client
+        client,
       );
     }
 
@@ -322,7 +324,7 @@ export const multiOwnerPluginActions: <
       throw new IncompatibleClientError(
         "SmartAccountClient",
         "readIsValidSignature",
-        client
+        client,
       );
     }
 

package/src/msca/plugins/multisig/plugin.ts

@@ -38,7 +38,8 @@ type ExecutionActions<
   TContext extends UserOperationContext | undefined =
     | UserOperationContext
     | undefined,
-  TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>
+  TEntryPointVersion extends
+    GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>,
 > = {
   updateOwnership: (
     args: Pick<
@@ -50,7 +51,7 @@ type ExecutionActions<
     > &
       UserOperationOverridesParameter<TEntryPointVersion> &
       GetAccountParameter<TAccount> &
-      GetContextParameter<TContext>
+      GetContextParameter<TContext>,
   ) => Promise<SendUserOperationResult<TEntryPointVersion>>;
 };
 
@@ -69,20 +70,21 @@ type ManagementActions<
   TContext extends UserOperationContext | undefined =
     | Record<string, any>
     | undefined,
-  TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>
+  TEntryPointVersion extends
+    GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>,
 > = {
   installMultisigPlugin: (
     args: UserOperationOverridesParameter<TEntryPointVersion> &
       InstallMultisigPluginParams &
       GetAccountParameter<TAccount> &
-      GetContextParameter<TContext>
+      GetContextParameter<TContext>,
   ) => Promise<SendUserOperationResult<TEntryPointVersion>>;
 };
 
 type ReadAndEncodeActions<
   TAccount extends SmartContractAccount | undefined =
     | SmartContractAccount
-    | undefined
+    | undefined,
 > = {
   encodeUpdateOwnership: (
     args: Pick<
@@ -91,7 +93,7 @@ type ReadAndEncodeActions<
         "updateOwnership"
       >,
       "args"
-    >
+    >,
   ) => Hex;
 
   encodeEip712Domain: (
@@ -101,11 +103,11 @@ type ReadAndEncodeActions<
         "eip712Domain"
       >,
       "args"
-    >
+    >,
   ) => Hex;
 
   readEip712Domain: (
-    args: GetAccountParameter<TAccount>
+    args: GetAccountParameter<TAccount>,
   ) => Promise<
     ReadContractReturnType<
       typeof MultisigPluginExecutionFunctionAbi,
@@ -120,7 +122,7 @@ type ReadAndEncodeActions<
         "isValidSignature"
       >,
       "args"
-    >
+    >,
   ) => Hex;
 
   readIsValidSignature: (
@@ -131,7 +133,7 @@ type ReadAndEncodeActions<
       >,
       "args"
     > &
-      GetAccountParameter<TAccount>
+      GetAccountParameter<TAccount>,
   ) => Promise<
     ReadContractReturnType<
       typeof MultisigPluginExecutionFunctionAbi,
@@ -146,7 +148,7 @@ export type MultisigPluginActions<
     | undefined,
   TContext extends UserOperationContext | undefined =
     | UserOperationContext
-    | undefined
+    | undefined,
 > = ExecutionActions<TAccount, TContext> &
   ManagementActions<TAccount, TContext> &
   ReadAndEncodeActions<TAccount>;
@@ -176,7 +178,7 @@ export const MultisigPlugin: Plugin<typeof MultisigPluginAbi> = {
   },
   getContract: <C extends Client>(
     client: C,
-    address?: Address
+    address?: Address,
   ): GetContractReturnType<typeof MultisigPluginAbi, PublicClient, Address> => {
     if (!client.chain) throw new ChainNotFoundError();
 
@@ -200,9 +202,9 @@ export const multisigPluginActions: <
     | undefined,
   TContext extends UserOperationContext | undefined =
     | UserOperationContext
-    | undefined
+    | undefined,
 >(
-  client: Client<TTransport, TChain, TAccount>
+  client: Client<TTransport, TChain, TAccount>,
 ) => MultisigPluginActions<TAccount, TContext> = (client) => ({
   updateOwnership({ args, overrides, context, account = client.account }) {
     if (!account) {
@@ -212,7 +214,7 @@ export const multisigPluginActions: <
       throw new IncompatibleClientError(
         "SmartAccountClient",
         "updateOwnership",
-        client
+        client,
       );
     }
 
@@ -238,7 +240,7 @@ export const multisigPluginActions: <
       throw new IncompatibleClientError(
         "SmartAccountClient",
         "installMultisigPlugin",
-        client
+        client,
       );
     }
 
@@ -260,7 +262,7 @@ export const multisigPluginActions: <
       pluginAddress,
       pluginInitData: encodeAbiParameters(
         [{ type: "address[]" }, { type: "uint256" }],
-        params.args
+        params.args,
       ),
       dependencies,
       overrides,
@@ -291,7 +293,7 @@ export const multisigPluginActions: <
       throw new IncompatibleClientError(
         "SmartAccountClient",
         "readEip712Domain",
-        client
+        client,
       );
     }
 
@@ -318,7 +320,7 @@ export const multisigPluginActions: <
       throw new IncompatibleClientError(
         "SmartAccountClient",
         "readIsValidSignature",
-        client
+        client,
       );
     }