add SimpleProvider the base of EIP1193Provider

web3 · Jun 18, 2023 · 5801c44 · 5801c44
1 parent f9ba36d
commit 5801c44
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/packages/web3-core/src/utils.ts b/packages/web3-core/src/utils.ts
@@ -54,7 +54,8 @@ export const isLegacySendAsyncProvider = <API extends Web3APISpec>(
 export const isSupportedProvider = <API extends Web3APISpec>(
 	provider: SupportedProviders<API>,
 ): provider is SupportedProviders<API> =>
-	Web3BaseProvider.isWeb3Provider(provider) ||
+	isWeb3Provider(provider) ||
+	isEIP1193Provider(provider) ||
 	isLegacyRequestProvider(provider) ||
 	isLegacySendAsyncProvider(provider) ||
 	isLegacySendProvider(provider);

diff --git a/packages/web3-types/src/web3_base_provider.ts b/packages/web3-types/src/web3_base_provider.ts
@@ -94,6 +94,12 @@ export interface LegacyRequestProvider {
 	): void;
 }
 
+export interface SimpleProvider<API extends Web3APISpec> {
+	request<Method extends Web3APIMethod<API>, ResponseType = Web3APIReturnType<API, Method>>(
+		args: Web3APIPayload<API, Method>,
+	): Promise<JsonRpcResponseWithResult<ResponseType> | unknown>;
+}
+
 export interface ProviderInfo {
 	chainId: string;
 }
@@ -102,16 +108,12 @@ export type ProviderChainId = string;
 
 export type ProviderAccounts = string[];
 
-export interface EIP1193Provider<API extends Web3APISpec> {
+export interface EIP1193Provider<API extends Web3APISpec> extends SimpleProvider<API> {
 	on(event: 'connect', listener: (info: ProviderInfo) => void): void;
 	on(event: 'disconnect', listener: (error: ProviderRpcError) => void): void;
 	on(event: 'message', listener: (message: ProviderMessage) => void): void;
 	on(event: 'chainChanged', listener: (chainId: ProviderChainId) => void): void;
 	on(event: 'accountsChanged', listener: (accounts: ProviderAccounts) => void): void;
-
-	request<Method extends Web3APIMethod<API>, ResponseType = Web3APIReturnType<API, Method>>(
-		args: Web3APIPayload<API, Method>,
-	): Promise<JsonRpcResponseWithResult<ResponseType> | unknown>;
 }
 
 // Provider interface compatible with EIP-1193
@@ -258,7 +260,8 @@ export type SupportedProviders<API extends Web3APISpec = Web3EthExecutionAPI> =
 	| Web3BaseProvider<API>
 	| LegacyRequestProvider
 	| LegacySendProvider
-	| LegacySendAsyncProvider;
+	| LegacySendAsyncProvider
+	| SimpleProvider<API>;
 
 export type Web3BaseProviderConstructor = new <API extends Web3APISpec>(
 	url: string,