ignore mismatching internal eth-json-rpc provider types

legobeat · Oct 5, 2023 · bc269f5 · bc269f5
1 parent fb03fa2
commit bc269f5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/packages/gas-fee-controller/src/GasFeeController.ts b/packages/gas-fee-controller/src/GasFeeController.ts
@@ -342,7 +342,7 @@ export class GasFeeController extends PollingController<
     this.legacyAPIEndpoint = legacyAPIEndpoint;
     this.clientId = clientId;
 
-    this.ethQuery = new EthQuery(this.#getProvider());
+    this.ethQuery = new EthQuery(this.#getProvider() as any);
 
     if (onNetworkStateChange && getChainId) {
       this.currentChainId = getChainId();
@@ -417,7 +417,8 @@ export class GasFeeController extends PollingController<
       isEIP1559Compatible = false;
     }
 
-    const ethQuery = new EthQuery(networkClient.provider);
+    // TODO: provider type alignment
+    const ethQuery = new EthQuery(networkClient.provider as any);
 
     const gasFeeCalculations = await determineGasFeeCalculations({
       isEIP1559Compatible,
@@ -588,7 +589,7 @@ export class GasFeeController extends PollingController<
     const newChainId = networkControllerState.providerConfig.chainId;
 
     if (newChainId !== this.currentChainId) {
-      this.ethQuery = new EthQuery(this.#getProvider());
+      this.ethQuery = new EthQuery(this.#getProvider() as any);
       await this.resetPolling();
 
       this.currentChainId = newChainId;

diff --git a/packages/network-controller/src/NetworkController.ts b/packages/network-controller/src/NetworkController.ts
@@ -980,7 +980,8 @@ export class NetworkController extends BaseControllerV2<
     }
 
     const networkClient = this.getNetworkClientById(networkClientId);
-    const ethQuery = new EthQuery(networkClient.provider);
+    // TODO: Provider type alignment
+    const ethQuery = new EthQuery(networkClient.provider as any);
 
     return new Promise((resolve, reject) => {
       ethQuery.sendAsync(
@@ -1545,6 +1546,7 @@ export class NetworkController extends BaseControllerV2<
       });
     }
 
-    this.#ethQuery = new EthQuery(this.#providerProxy);
+    // TODO: Provider type alignment
+    this.#ethQuery = new EthQuery(this.#providerProxy as any);
   }
 }
diff --git a/packages/network-controller/src/create-network-client.ts b/packages/network-controller/src/create-network-client.ts
@@ -68,7 +68,8 @@ export function createNetworkClient(
           rpcUrl: networkConfig.rpcUrl,
         });
 
-  const rpcProvider = providerFromMiddleware(rpcApiMiddleware);
+  // FIXME: types
+  const rpcProvider = providerFromMiddleware(rpcApiMiddleware as any);
 
   const blockTrackerOpts =
     // eslint-disable-next-line n/no-process-env
@@ -77,7 +78,8 @@ export function createNetworkClient(
       : {};
   const blockTracker = new PollingBlockTracker({
     ...blockTrackerOpts,
-    provider: rpcProvider,
+    // FIXME: types
+    provider: rpcProvider as any,
   });
 
   const networkMiddleware =

diff --git a/packages/transaction-controller/src/TransactionController.ts b/packages/transaction-controller/src/TransactionController.ts
@@ -316,7 +316,8 @@ export class TransactionController extends BaseController<
     this.provider = provider;
     this.messagingSystem = messenger;
     this.getNetworkState = getNetworkState;
-    this.ethQuery = new EthQuery(provider);
+    // TODO: Provider type alignment
+    this.ethQuery = new EthQuery(provider as any);
     this.isSendFlowHistoryDisabled = disableSendFlowHistory ?? false;
     this.isHistoryDisabled = disableHistory ?? false;
     this.registry = new MethodRegistry({ provider });
@@ -389,7 +390,8 @@ export class TransactionController extends BaseController<
     );
 
     onNetworkStateChange(() => {
-      this.ethQuery = new EthQuery(this.provider);
+      // TODO: Provider type alignment
+      this.ethQuery = new EthQuery(this.provider as any);
       this.registry = new MethodRegistry({ provider: this.provider });
     });