From 0a8d8676aa52f2f1eadaf5fb2ac3ea64d092c244 Mon Sep 17 00:00:00 2001
From: legobt <6wbvkn0j@anonaddy.me>
Date: Wed, 4 Oct 2023 04:32:19 +0000
Subject: [PATCH] replace EthJsonProvider with LegacyEthereumProvider

---
 src/json-rpc-provider-types.ts | 52 +++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/json-rpc-provider-types.ts b/src/json-rpc-provider-types.ts
index 8f515aeb0..fee6cd6cb 100644
--- a/src/json-rpc-provider-types.ts
+++ b/src/json-rpc-provider-types.ts
@@ -1,7 +1,6 @@
 import type SafeEventEmitter from '@metamask/safe-event-emitter';
 
-import type { Hex } from './hex';
-import type { JsonRpcParams, Json } from './json';
+import type { JsonRpcParams, JsonRpcRequest, Json } from './json';
 import type { PartialOrAbsent } from './misc';
 
 /**
@@ -28,30 +27,37 @@ export type EIP1993Provider = SafeEventEmitter & {
 };
 
 /**
- * An extension of the EIP-1193 specification for an Ethereum JavaScript Provider.
+ * The interface for a legacy Ethereum provider.
  *
- * For details, see:
- * - [EIP-1193](https://eips.ethereum.org/EIPS/eip-1193)
- * - [BaseProvider]{@link https://github.com/MetaMask/providers/blob/main/src/BaseProvider.ts} in package [@metamask/providers](https://www.npmjs.com/package/@metamask/providers)
- * - https://docs.metamask.io/wallet/reference/provider-api/
+ * This provider follows conventions that pre-date
+ * [EIP-1193](https://eips.ethereum.org/EIPS/eip-1193). It is not compliant with
+ * any Ethereum provider standard.
  */
-export type EthJsonRpcProvider = EIP1993Provider & {
-  /**
-   * The chain ID of the currently connected Ethereum chain, represented as 0x-prefixed hexstring.
-   * See [chainId.network]{@link https://chainid.network} for more information.
-   */
-  chainId: Hex | null;
-
+export type LegacyEthereumProvider = {
   /**
-   * The user's currently selected Ethereum address as a 0x-prefixed hexstring.
-   * If read-access is denied, null is returned.
-   */
-  selectedAddress: Hex | null;
-
-  /**
-   * Returns true if the provider has a connection to the network and is able to process requests for the active chain.
+   * Send a provider request asynchronously.
    *
-   * @returns Whether the provider can process RPC requests.
+   * @param req - The request to send.
+   * @param callback - A function that is called upon the success or failure of the request.
    */
-  isConnected(): boolean;
+  sendAsync<Result extends Json = Json>(
+    req: Partial<JsonRpcRequest>,
+    callback: SendAsyncCallback<Result>,
+  ): void;
 };
+
+type SendAsyncCallback<Result extends Json> = (
+  ...args:
+    | [error: EverythingButNull, result: undefined]
+    | [error: null, result: Result]
+) => void;
+
+// What it says on the tin. We omit `null`, as that value is used for a
+// successful response to indicate a lack of an error.
+type EverythingButNull =
+  | string
+  | number
+  | boolean
+  | object
+  | symbol
+  | undefined;