@toruslabs/ethereum-controllers 7.2.0 → 7.4.0

package/dist/lib.cjs/Preferences/PreferencesController.js

@@ -73,7 +73,8 @@ class PreferencesController extends baseControllers.BasePreferencesController {
       loginMode,
       sessionPubKey,
       aaProvider,
-      eoaAddress
+      eoaAddress,
+      mainAddress
     } = params;
     const {
       chainId
@@ -89,7 +90,8 @@ class PreferencesController extends baseControllers.BasePreferencesController {
         network: web3AuthNetwork,
         eoa_address: eoaAddress,
         aa_provider: aaProvider,
-        chain_id: chainId
+        chain_id: chainId,
+        main_address: mainAddress
       }
     });
     const {

package/dist/lib.cjs/Tokens/TokensController.js

@@ -10,23 +10,6 @@ var constants = require('../utils/constants.js');
 var contractAddresses = require('../utils/contractAddresses.js');
 var TokenHandler = require('./TokenHandler.js');
 
-function getObjectFromArrayBasedonKey(oldArray, key) {
-  return oldArray.reduce((acc, x) => {
-    const xkey = x[key];
-    if (typeof xkey === "boolean") return acc;
-    acc[xkey] = x;
-    return acc;
-  }, {});
-}
-const mergeTokenArrays = (oldArray, newArray) => {
-  const oldMap = getObjectFromArrayBasedonKey(oldArray || [], "tokenAddress");
-  const newMap = getObjectFromArrayBasedonKey(newArray || [], "tokenAddress");
-  const finalArr = newArray;
-  Object.keys(oldMap).forEach(x => {
-    if (!newMap[x] && oldMap[x].isEtherScan) finalArr.push(oldMap[x]);
-  });
-  return finalArr;
-};
 const DEFAULT_INTERVAL = 180 * 1000;
 class TokensController extends baseControllers.BaseController {
   constructor({
@@ -179,45 +162,58 @@ class TokensController extends baseControllers.BaseController {
     const userAddress = this.userSelectedAddress;
     if (userAddress === "") return;
     const oldTokens = [...this.userTokens];
-    const tokenAddresses = oldTokens.map(x => x.tokenAddress);
-    const nonZeroTokens = [];
+    // - fetch from Etherscan, if failed then fetch from TokenHandler
+    // - if there are remaining tokens, fetch either from SingleAddressContract (if failed then use TokenHandler) or TokenHandler
     try {
+      const nonZeroTokens = [];
       const currentChainId = this.config.chainId;
       if (constants.ETHERSCAN_SUPPORTED_CHAINS.includes(currentChainId)) {
         const etherscanBalances = await this.getEtherScanTokens(userAddress, currentChainId, skipCache);
         nonZeroTokens.push(...etherscanBalances);
       }
-      if (tokenAddresses.length > 0) {
+
+      // only fetch balances for tokens that are not already in the nonZeroTokens array
+      const remainingTokens = oldTokens.filter(x => !nonZeroTokens.find(y => {
+        var _y$tokenAddress, _x$tokenAddress;
+        return ((_y$tokenAddress = y.tokenAddress) === null || _y$tokenAddress === void 0 ? void 0 : _y$tokenAddress.toLocaleLowerCase()) === ((_x$tokenAddress = x.tokenAddress) === null || _x$tokenAddress === void 0 ? void 0 : _x$tokenAddress.toLocaleLowerCase());
+      }));
+      if (remainingTokens.length > 0) {
+        const remainingTokensAddresses = remainingTokens.map(x => x.tokenAddress);
         const currentSingleCallAddress = contractAddresses.SINGLE_CALL_BALANCES_ADDRESSES[currentChainId];
         if (currentSingleCallAddress) {
           const ethContract = new ethers.Contract(currentSingleCallAddress, abis.singleBalanceCheckerAbi, this.ethersProvider);
-          const result = await ethContract.balances([userAddress], tokenAddresses);
-          tokenAddresses.forEach((_, index) => {
+          const result = await ethContract.balances([userAddress], remainingTokensAddresses);
+          remainingTokensAddresses.forEach((_, index) => {
             const balance = ethers.toQuantity(result[index]);
             if (balance && balance !== "0x0") {
-              nonZeroTokens.push(_objectSpread(_objectSpread({}, oldTokens[index]), {}, {
+              nonZeroTokens.push(_objectSpread(_objectSpread({}, remainingTokens[index]), {}, {
                 balance,
                 chainId: currentChainId
               }));
             }
           });
         } else {
-          this.getTokenBalancesUsingHandler(oldTokens);
+          const fetchedRemainingTokens = await this.getTokenBalancesUsingHandler(remainingTokens);
+          nonZeroTokens.push(...fetchedRemainingTokens);
         }
       }
+      this.update({
+        tokens: {
+          [userAddress]: nonZeroTokens
+        }
+      });
     } catch (error) {
       log.error(error, "unable to fetch token balances using single call balance address");
-      this.getTokenBalancesUsingHandler(oldTokens);
-    } finally {
+      const fetchedTokens = await this.getTokenBalancesUsingHandler(oldTokens);
       this.update({
         tokens: {
-          [userAddress]: nonZeroTokens
+          [userAddress]: fetchedTokens
         }
       });
     }
   }
   async getTokenBalancesUsingHandler(customTokens) {
-    if (!this.userSelectedAddress) return;
+    if (!this.userSelectedAddress) return [];
     const currentNetworkTokens = customTokens;
     const promiseSettledResult = await Promise.allSettled(currentNetworkTokens.map(async x => {
       try {
@@ -250,11 +246,7 @@ class TokensController extends baseControllers.BaseController {
       if (x.status === "fulfilled" && x.value) acc.push(x.value);
       return acc;
     }, []);
-    this.update({
-      tokens: {
-        [this.userSelectedAddress]: mergeTokenArrays(this.userTokens, nonZeroTokens)
-      }
-    });
+    return nonZeroTokens;
   }
 }
 

package/dist/lib.esm/Preferences/PreferencesController.js

@@ -71,7 +71,8 @@ class PreferencesController extends BasePreferencesController {
       loginMode,
       sessionPubKey,
       aaProvider,
-      eoaAddress
+      eoaAddress,
+      mainAddress
     } = params;
     const {
       chainId
@@ -87,7 +88,8 @@ class PreferencesController extends BasePreferencesController {
         network: web3AuthNetwork,
         eoa_address: eoaAddress,
         aa_provider: aaProvider,
-        chain_id: chainId
+        chain_id: chainId,
+        main_address: mainAddress
       }
     });
     const {

package/dist/lib.esm/Tokens/TokensController.js

@@ -8,23 +8,6 @@ import { ETHERSCAN_SUPPORTED_CHAINS } from '../utils/constants.js';
 import { SINGLE_CALL_BALANCES_ADDRESSES } from '../utils/contractAddresses.js';
 import { TokenHandler } from './TokenHandler.js';
 
-function getObjectFromArrayBasedonKey(oldArray, key) {
-  return oldArray.reduce((acc, x) => {
-    const xkey = x[key];
-    if (typeof xkey === "boolean") return acc;
-    acc[xkey] = x;
-    return acc;
-  }, {});
-}
-const mergeTokenArrays = (oldArray, newArray) => {
-  const oldMap = getObjectFromArrayBasedonKey(oldArray || [], "tokenAddress");
-  const newMap = getObjectFromArrayBasedonKey(newArray || [], "tokenAddress");
-  const finalArr = newArray;
-  Object.keys(oldMap).forEach(x => {
-    if (!newMap[x] && oldMap[x].isEtherScan) finalArr.push(oldMap[x]);
-  });
-  return finalArr;
-};
 const DEFAULT_INTERVAL = 180 * 1000;
 class TokensController extends BaseController {
   constructor({
@@ -177,45 +160,58 @@ class TokensController extends BaseController {
     const userAddress = this.userSelectedAddress;
     if (userAddress === "") return;
     const oldTokens = [...this.userTokens];
-    const tokenAddresses = oldTokens.map(x => x.tokenAddress);
-    const nonZeroTokens = [];
+    // - fetch from Etherscan, if failed then fetch from TokenHandler
+    // - if there are remaining tokens, fetch either from SingleAddressContract (if failed then use TokenHandler) or TokenHandler
     try {
+      const nonZeroTokens = [];
       const currentChainId = this.config.chainId;
       if (ETHERSCAN_SUPPORTED_CHAINS.includes(currentChainId)) {
         const etherscanBalances = await this.getEtherScanTokens(userAddress, currentChainId, skipCache);
         nonZeroTokens.push(...etherscanBalances);
       }
-      if (tokenAddresses.length > 0) {
+
+      // only fetch balances for tokens that are not already in the nonZeroTokens array
+      const remainingTokens = oldTokens.filter(x => !nonZeroTokens.find(y => {
+        var _y$tokenAddress, _x$tokenAddress;
+        return ((_y$tokenAddress = y.tokenAddress) === null || _y$tokenAddress === void 0 ? void 0 : _y$tokenAddress.toLocaleLowerCase()) === ((_x$tokenAddress = x.tokenAddress) === null || _x$tokenAddress === void 0 ? void 0 : _x$tokenAddress.toLocaleLowerCase());
+      }));
+      if (remainingTokens.length > 0) {
+        const remainingTokensAddresses = remainingTokens.map(x => x.tokenAddress);
         const currentSingleCallAddress = SINGLE_CALL_BALANCES_ADDRESSES[currentChainId];
         if (currentSingleCallAddress) {
           const ethContract = new Contract(currentSingleCallAddress, singleBalanceCheckerAbi, this.ethersProvider);
-          const result = await ethContract.balances([userAddress], tokenAddresses);
-          tokenAddresses.forEach((_, index) => {
+          const result = await ethContract.balances([userAddress], remainingTokensAddresses);
+          remainingTokensAddresses.forEach((_, index) => {
             const balance = toQuantity(result[index]);
             if (balance && balance !== "0x0") {
-              nonZeroTokens.push(_objectSpread(_objectSpread({}, oldTokens[index]), {}, {
+              nonZeroTokens.push(_objectSpread(_objectSpread({}, remainingTokens[index]), {}, {
                 balance,
                 chainId: currentChainId
               }));
             }
           });
         } else {
-          this.getTokenBalancesUsingHandler(oldTokens);
+          const fetchedRemainingTokens = await this.getTokenBalancesUsingHandler(remainingTokens);
+          nonZeroTokens.push(...fetchedRemainingTokens);
         }
       }
+      this.update({
+        tokens: {
+          [userAddress]: nonZeroTokens
+        }
+      });
     } catch (error) {
       log.error(error, "unable to fetch token balances using single call balance address");
-      this.getTokenBalancesUsingHandler(oldTokens);
-    } finally {
+      const fetchedTokens = await this.getTokenBalancesUsingHandler(oldTokens);
       this.update({
         tokens: {
-          [userAddress]: nonZeroTokens
+          [userAddress]: fetchedTokens
         }
       });
     }
   }
   async getTokenBalancesUsingHandler(customTokens) {
-    if (!this.userSelectedAddress) return;
+    if (!this.userSelectedAddress) return [];
     const currentNetworkTokens = customTokens;
     const promiseSettledResult = await Promise.allSettled(currentNetworkTokens.map(async x => {
       try {
@@ -248,11 +244,7 @@ class TokensController extends BaseController {
       if (x.status === "fulfilled" && x.value) acc.push(x.value);
       return acc;
     }, []);
-    this.update({
-      tokens: {
-        [this.userSelectedAddress]: mergeTokenArrays(this.userTokens, nonZeroTokens)
-      }
-    });
+    return nonZeroTokens;
   }
 }
 

package/dist/types/Preferences/PreferencesController.d.ts

@@ -26,6 +26,7 @@ export declare class PreferencesController extends BasePreferencesController<Ext
     initPreferences(params: InitPreferencesParams & {
         eoaAddress?: string;
         aaProvider?: string;
+        mainAddress?: string;
     }): Promise<void>;
     getSelectedAddress(): string;
     sync(address: string): Promise<boolean>;

package/dist/types/Tokens/TokensController.d.ts

@@ -37,5 +37,5 @@ export declare class TokensController extends BaseController<EthereumTokensContr
     restartTokenDetection(): void;
     detectNewTokens(): void;
     refreshTokenBalances(skipCache?: boolean): Promise<void>;
-    getTokenBalancesUsingHandler(customTokens: CustomTokenInfo[]): Promise<void>;
+    getTokenBalancesUsingHandler(customTokens: CustomTokenInfo[]): Promise<CustomTokenInfo[]>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toruslabs/ethereum-controllers",
-  "version": "7.2.0",
+  "version": "7.4.0",
   "homepage": "https://github.com/torusresearch/controllers#readme",
   "license": "ISC",
   "sideEffects": false,
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@ethereumjs/util": "^9.1.0",
-    "@toruslabs/base-controllers": "^7.2.0",
+    "@toruslabs/base-controllers": "^7.4.0",
     "@toruslabs/http-helpers": "^7.0.0",
     "@web3auth/auth": "^9.6.4",
     "async-mutex": "^0.5.0",
@@ -63,7 +63,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4ff78b7a1aa5861366d0ce28ab48fe178f776f15",
+  "gitHead": "ac67368e2bd43af7240fd7633923ed2f5aa3f752",
   "devDependencies": {
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.8",
     "@nomicfoundation/hardhat-ethers": "^3.0.8",