Merge pull request #1979 from Web3Auth/feat/aa-update-transport-param

account abstraction - make only url or transport required
Web3Auth · Oct 10, 2024 · ba25fd4 · ba25fd4
2 parents bae12fd + ed7e781
commit ba25fd4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/packages/providers/account-abstraction-provider/src/providers/AccountAbstractionProvider.ts b/packages/providers/account-abstraction-provider/src/providers/AccountAbstractionProvider.ts
@@ -107,16 +107,16 @@ export class AccountAbstractionProvider extends BaseProvider<AccountAbstractionP
     // setup bundler and paymaster
     if (this.config.paymasterConfig) {
       this._paymasterClient = createPaymasterClient({
-        transport: http(this.config.paymasterConfig.url),
         ...this.config.paymasterConfig,
+        transport: this.config.paymasterConfig.transport ?? http(this.config.paymasterConfig.url),
       });
     }
     this._bundlerClient = createBundlerClient({
+      ...this.config.bundlerConfig,
       account: this.smartAccount,
       client: this._publicClient,
-      transport: http(this.config.bundlerConfig.url),
+      transport: this.config.bundlerConfig.transport ?? http(this.config.bundlerConfig.url),
       paymaster: this._paymasterClient,
-      ...this.config.bundlerConfig,
     });
 
     const providerHandlers = getProviderHandlers({

diff --git a/packages/providers/account-abstraction-provider/src/providers/types.ts b/packages/providers/account-abstraction-provider/src/providers/types.ts
@@ -1,11 +1,9 @@
 import { createBundlerClient, createPaymasterClient } from "viem/account-abstraction";
 
-export type BundlerConfig = {
-  url: string;
-} & Omit<Parameters<typeof createBundlerClient>[0], "account" | "client" | "transport" | "paymaster"> &
-  Partial<Pick<Parameters<typeof createBundlerClient>[0], "transport">>;
+type Transport = Parameters<typeof createBundlerClient>[0]["transport"];
 
-export type PaymasterConfig = {
-  url: string;
-} & Omit<Parameters<typeof createPaymasterClient>[0], "transport"> &
-  Partial<Pick<Parameters<typeof createPaymasterClient>[0], "transport">>;
+export type BundlerConfig = Omit<Parameters<typeof createBundlerClient>[0], "account" | "client" | "transport" | "paymaster"> &
+  ({ url: string; transport?: Transport } | { url?: string; transport: Transport });
+
+export type PaymasterConfig = Omit<Parameters<typeof createPaymasterClient>[0], "transport"> &
+  ({ url: string; transport?: Transport } | { url?: string; transport: Transport });