remove stale web3 providers

sysweb3 has a getter on the provider which will reinit to the active network

Author: jagdeep sidhu

package.json

@@ -63,7 +63,7 @@
     "@heroicons/react": "^1.0.6",
     "@reduxjs/toolkit": "^2.8.2",
     "@sidhujag/sysweb3-core": "^1.0.27",
-    "@sidhujag/sysweb3-keyring": "^1.0.574",
+    "@sidhujag/sysweb3-keyring": "^1.0.579",
     "@sidhujag/sysweb3-network": "^1.0.106",
     "@sidhujag/sysweb3-utils": "^1.1.271",
     "@tippyjs/react": "^4.2.6",
@@ -179,6 +179,7 @@
     "node-forge": "^1.3.2",
     "valibot": "^1.2.0",
     "glob": "^10.5.0",
+    "test-exclude": "^7.0.0",
     "cookie": "^0.7.0",
     "tmp": "^0.2.4",
     "jws": "^4.0.1",

source/scripts/Background/controllers/MainController.ts

@@ -3413,14 +3413,11 @@ class MainController {
           try {
             // For background transaction updates, do not toggle UI loading flags
 
-            // Safe access to transaction objects with error handling
-            const web3Provider = this.ethereumTransaction?.web3Provider;
             const txs =
               await this.transactionsManager.utils.updateTransactionsFromCurrentAccount(
                 currentAccount,
                 isBitcoinBased,
                 activeNetwork.url,
-                web3Provider,
                 currentAccountTxs,
                 isPolling,
                 isRapidPolling
@@ -4053,16 +4050,11 @@ class MainController {
           const startTime = Date.now();
 
           try {
-            // Safe access to transaction objects with error handling
-            const web3Provider = this.ethereumTransaction?.web3Provider;
-
             const updatedBalance =
               await this.balancesManager.utils.getBalanceUpdatedForAccount(
                 currentAccount,
                 isBitcoinBased,
-                activeNetwork.url,
-                web3Provider
-                // No need to pass a provider - let the manager use its own
+                activeNetwork.url
               );
 
             // Calculate latency
@@ -5471,16 +5463,10 @@ class MainController {
       throw new Error('NFT validation only supported on EVM networks');
     }
 
-    const abortController = new AbortController();
-    const provider = new CustomJsonRpcProvider(
-      abortController.signal,
-      activeNetwork.url
-    );
-
     return this.evmAssetsController.validateNftContract(
       contractAddress,
       walletAddress,
-      provider
+      this.ethereumTransaction.web3Provider
     );
   }
 
@@ -5737,23 +5723,11 @@ class MainController {
     networkUrl: string
   ): Promise<string> {
     try {
-      // For EVM networks, use the existing web3 provider
-      const provider = isBitcoinBased
-        ? null
-        : this.ethereumTransaction.web3Provider;
-
-      if (!isBitcoinBased && !provider) {
-        console.error(
-          '[MainController] No web3 provider available for EVM network'
-        );
-        return '0';
-      }
       const balance =
         await this.balancesManager.utils.getBalanceUpdatedForAccount(
           account,
           isBitcoinBased,
-          networkUrl,
-          provider
+          networkUrl
         );
 
       return balance;

source/scripts/Background/controllers/assets/evm.ts

@@ -15,6 +15,7 @@ import isEmpty from 'lodash/isEmpty';
 
 import { BatchBalanceController } from '../balances/BatchBalanceController';
 import { Queue } from '../transactions/queue';
+import { getController } from 'scripts/Background';
 import store from 'state/store';
 import {
   ITokenEthProps,
@@ -1189,16 +1190,7 @@ const EvmAssetsController = (): IEvmAssetsController => {
     }
   > => {
     try {
-      const { activeNetwork } = store.getState().vault;
-
-      // Create a simple abort controller for the provider
-      const abortController = new AbortController();
-
-      // Create a provider for the current network
-      const provider = new CustomJsonRpcProvider(
-        abortController.signal,
-        activeNetwork.url
-      );
+      const provider = getController().wallet.ethereumTransaction.web3Provider;
 
       // Use the discovery function which handles both ERC-721 and ERC-1155
       const discovery = await discoverNftTokens(

source/scripts/Background/controllers/assets/syscoin.ts

@@ -318,12 +318,13 @@ const SysAssetsControler = (): ISysAssetsController => {
   ): Promise<ISysTokensAssetReponse[]> => {
     const requestOptions = 'details=tokenBalances&tokens=nonzero';
 
-    const { tokensAsset } = await fetchBackendAccountCached(
+    const accountData = await fetchBackendAccountCached(
       ensureTrailingSlash(networkUrl),
       xpubOrAddress,
       requestOptions,
       true
     );
+    const tokensAsset = accountData?.tokensAsset;
 
     // IMPORTANT: For SPT tokens, we should ONLY use tokensAsset array
     // tokens array contains regular UTXO addresses without assetGuid

source/scripts/Background/controllers/balances/evm.ts

@@ -13,6 +13,12 @@ const EvmBalanceController = (
     currentAccount: IKeyringAccountState
   ) => {
     const provider = web3Provider;
+    if (!provider) {
+      console.error(
+        '[EvmBalanceController] Missing provider in getEvmBalanceForAccount'
+      );
+      return '0';
+    }
 
     const getBalance = await provider.getBalance(currentAccount.address);
 

source/scripts/Background/controllers/balances/index.ts

@@ -1,7 +1,6 @@
-import {
-  CustomJsonRpcProvider,
-  IKeyringAccountState,
-} from '@sidhujag/sysweb3-keyring';
+import { IKeyringAccountState } from '@sidhujag/sysweb3-keyring';
+
+import { getController } from 'scripts/Background';
 
 import EvmBalanceController from './evm';
 import SyscoinBalanceController from './syscoin';
@@ -11,8 +10,7 @@ const BalancesManager = (): IBalancesManager => {
   const getBalanceUpdatedForAccount = async (
     currentAccount: IKeyringAccountState,
     isBitcoinBased: boolean,
-    networkUrl: string,
-    provider: CustomJsonRpcProvider
+    networkUrl: string
   ) => {
     switch (isBitcoinBased) {
       case true:
@@ -24,12 +22,18 @@ const BalancesManager = (): IBalancesManager => {
         return getSysBalance;
 
       case false:
-        if (!provider) {
-          throw new Error('No valid web3Provider for EVM balance fetching');
+        // Always pull the latest provider at call time (prevents stale references across network switches)
+        const web3Provider =
+          getController().wallet.ethereumTransaction.web3Provider;
+        if (!web3Provider) {
+          console.error(
+            '[BalancesManager] No web3 provider available for EVM balance fetch'
+          );
+          return '0';
         }
 
         // Create EVM controller fresh with current provider
-        const evmController = EvmBalanceController(provider);
+        const evmController = EvmBalanceController(web3Provider);
         const getEvmBalance = await evmController.getEvmBalanceForAccount(
           currentAccount
         );

source/scripts/Background/controllers/balances/types.ts

@@ -1,7 +1,4 @@
-import {
-  CustomJsonRpcProvider,
-  IKeyringAccountState,
-} from '@sidhujag/sysweb3-keyring';
+import { IKeyringAccountState } from '@sidhujag/sysweb3-keyring';
 
 export interface IEvmBalanceController {
   getEvmBalanceForAccount: (
@@ -20,8 +17,7 @@ export interface IBalancesManagerUtils {
   getBalanceUpdatedForAccount: (
     currentAccount: IKeyringAccountState,
     isBitcoinBased: boolean,
-    networkUrl: string,
-    provider: CustomJsonRpcProvider | null
+    networkUrl: string
   ) => Promise<string>;
 }
 

source/scripts/Background/controllers/transactions/index.ts

@@ -1,8 +1,6 @@
-import {
-  CustomJsonRpcProvider,
-  IKeyringAccountState,
-} from '@sidhujag/sysweb3-keyring';
+import { IKeyringAccountState } from '@sidhujag/sysweb3-keyring';
 
+import { getController } from 'scripts/Background';
 import store from 'state/store';
 import { IAccountTransactions } from 'state/vault/types';
 import { isTransactionInBlock } from 'utils/transactionUtils';
@@ -44,7 +42,6 @@ const TransactionsManager = (): ITransactionsManager => {
     currentAccount: IKeyringAccountState,
     isBitcoinBased: boolean,
     activeNetworkUrl: string,
-    web3Provider: CustomJsonRpcProvider,
     accountTransactions?: IAccountTransactions,
     isPolling?: boolean,
     isRapidPolling?: boolean
@@ -82,10 +79,9 @@ const TransactionsManager = (): ITransactionsManager => {
         activeNetworkUrl
       );
     } else {
-      if (!web3Provider) {
-        console.error('No valid web3Provider for EVM transaction polling');
-        return [];
-      }
+      // Always pull the latest provider at call time (prevents stale references across network switches)
+      const web3Provider =
+        getController().wallet.ethereumTransaction.web3Provider;
       result = await EvmTransactionsController().pollingEvmTransactions(
         web3Provider,
         isPolling,

source/scripts/Background/controllers/transactions/syscoin.ts

@@ -14,13 +14,15 @@ const SysTransactionController = (): ISysTransactionsController => {
   ): Promise<ISysTransaction[]> => {
     const requestOptions = 'details=txs&pageSize=30';
 
-    const { transactions }: { transactions: ISysTransaction[] } =
-      await fetchBackendAccountCached(
-        networkUrl,
-        xpubOrAddress,
-        requestOptions,
-        true
-      );
+    const accountData = await fetchBackendAccountCached(
+      networkUrl,
+      xpubOrAddress,
+      requestOptions,
+      true
+    );
+    const transactions = (accountData as any)?.transactions as
+      | ISysTransaction[]
+      | undefined;
 
     // Ensure we always return an array, even if transactions is falsy
     return Array.isArray(transactions) ? transactions : [];
@@ -81,13 +83,15 @@ const SysTransactionController = (): ISysTransactionsController => {
     pageSize: number = 30
   ): Promise<ISysTransaction[]> => {
     const requestOptions = `details=txs&page=${page}&pageSize=${pageSize}`;
-    const { transactions }: { transactions: ISysTransaction[] } =
-      await fetchBackendAccountCached(
-        networkUrl,
-        xpubOrAddress,
-        requestOptions,
-        true
-      );
+    const accountData = await fetchBackendAccountCached(
+      networkUrl,
+      xpubOrAddress,
+      requestOptions,
+      true
+    );
+    const transactions = (accountData as any)?.transactions as
+      | ISysTransaction[]
+      | undefined;
     return Array.isArray(transactions) ? transactions : [];
   };
 

source/scripts/Background/controllers/transactions/types.ts

@@ -218,7 +218,6 @@ export interface ITransactionsManagerUtils {
     currentAccount: IKeyringAccountState,
     isBitcoinBased: boolean,
     activeNetworkUrl: string,
-    web3Provider: CustomJsonRpcProvider,
     accountTransactions?: IAccountTransactions,
     isPolling?: boolean,
     isRapidPolling?: boolean