Merge pull request #1941 from AmbireTech/config/revert-87e5a81e75059ff2f8d7ccfdb667bcf4f3d37e12

Config / Revert 87e5a81 (that reverted merging the `v2` branch in the `release/v2.80` branch)

Author: superKalo

contracts/compiled/BalanceGetter.json

@@ -21,6 +21,10 @@ contract BalanceGetter is Simulation {
     uint8 decimals;
     bytes error;
   }
+  struct BalanceInfo {
+    uint256 amount;
+    bytes error;
+  }
   struct BalancesAtNonce {
     TokenInfo[] balances;
     uint nonce;
@@ -36,6 +40,13 @@ contract BalanceGetter is Simulation {
     info.decimals = token.decimals();
   }
 
+  function getERC20TokenBalance(
+    IAmbireAccount account,
+    IERC20 token
+  ) external view returns (BalanceInfo memory info) {
+    info.amount = token.balanceOf(address(account));
+  }
+
   function getBalances(
     IAmbireAccount account,
     address[] calldata tokenAddrs
@@ -64,6 +75,27 @@ contract BalanceGetter is Simulation {
     return (results, gasleft(), blockNumber);
   }
 
+  function getBalancesOf(
+    IAmbireAccount account,
+    address[] calldata tokenAddrs
+  ) public view returns (BalanceInfo[] memory) {
+    uint len = tokenAddrs.length;
+    BalanceInfo[] memory results = new BalanceInfo[](len);
+    
+    for (uint256 i = 0; i < len; i++) {
+      if (tokenAddrs[i] == address(0)) {
+        results[i] = BalanceInfo(address(account).balance, bytes(''));
+      } else {
+        try this.getERC20TokenBalance(account, IERC20(tokenAddrs[i])) returns (BalanceInfo memory balanceInfo) {
+          results[i] = balanceInfo;
+        } catch (bytes memory e) {
+          results[i].error = e.length > 0 ? e : bytes('unkn');
+        }
+      }
+    }
+    return results;
+  }
+
   // Compare the tokens balances before (balancesA) and after simulation (balancesB)
   // and return the delta (with simulation)
   function getDelta(

contracts/deployless/BalanceGetter.sol

@@ -4,8 +4,8 @@ export const ACTIVITY_REFRESH_INTERVAL = 5000 // 5 seconds
 export const ACTIVE_EXTENSION_DEFI_POSITIONS_UPDATE_INTERVAL = 300000 // 5 minutes
 export const ACTIVE_EXTENSION_PORTFOLIO_UPDATE_INTERVAL = 2 * 60 * 1000 // 2 minutes
 export const INACTIVE_EXTENSION_PORTFOLIO_UPDATE_INTERVAL = 600000 // 10 minutes
-export const SMART_ACCOUNT_IDENTITY_RETRY_INTERVAL = 900000 // 15 minutes
-export const VIEW_ONLY_ACCOUNT_IDENTITY_GET_INTERVAL = 900000 // 15 minutes
+export const SMART_ACCOUNT_IDENTITY_RETRY_INTERVAL = 300000 // 5 minutes
+export const VIEW_ONLY_ACCOUNT_IDENTITY_GET_INTERVAL = 300000 // 5 minutes
 export const ACCOUNT_STATE_PENDING_INTERVAL = 8000 // 8 seconds
 export const ACCOUNT_STATE_STAND_BY_INTERVAL = 300000 // 5 minutes
 export const NETWORKS_UPDATE_INTERVAL = 8 * 60 * 60 * 1000

src/consts/intervals.ts

@@ -516,7 +516,7 @@ export class AccountPickerController extends EventEmitter implements IAccountPic
     // should never happen
     if (accountsOnPageWithThisAcc.length === 0) {
       const message = `accountPicker: account ${account.addr} was not found in the accountsOnPage.`
-      this.emitError({ message, level: 'silent', sendCrashReport: true, error: new Error(message) })
+      this.emitError({ message, level: 'silent', error: new Error(message) })
 
       return []
     }
@@ -935,7 +935,7 @@ export class AccountPickerController extends EventEmitter implements IAccountPic
     // Should never happen
     if (!nextAccount) {
       const message = 'accountPicker: selectNextAccount called, but no next account found.'
-      this.emitError({ message, level: 'silent', sendCrashReport: true, error: new Error(message) })
+      this.emitError({ message, level: 'silent', error: new Error(message) })
     }
 
     this.selectNextAccountStatus = 'SUCCESS'
@@ -989,7 +989,7 @@ export class AccountPickerController extends EventEmitter implements IAccountPic
     // called - there is a check if the keyIterator exists.
     if (!this.keyIterator) {
       const message = 'accountPicker: #deriveAccounts called, but keyIterator was missing'
-      this.emitError({ message, level: 'silent', sendCrashReport: true, error: new Error(message) })
+      this.emitError({ message, level: 'silent', error: new Error(message) })
 
       return []
     }

src/controllers/accountPicker/accountPicker.ts

@@ -28,7 +28,6 @@ import { IProvidersController } from '../../interfaces/provider'
 import { IStorageController } from '../../interfaces/storage'
 import {
   getUniqueAccountsArray,
-  isAmbireV1LinkedAccount,
   isAmbireV2Account,
   isSmartAccount
 } from '../../libs/account/account'
@@ -53,8 +52,19 @@ export class AccountsController extends EventEmitter implements IAccountsControl
 
   #callRelayer: Function
 
+  /**
+   * Creating Ambire smart account identity is needed but not critical, user
+   * is still able to interact and transfer funds with a smart account one.
+   * So schedule an interval to retry after import, allowing the user
+   * to import the account even if the first Relayer identity create call fails.
+   */
   #smartAccountIdentityCreateInterval: IRecurringTimeout
 
+  /**
+   * Getting view-only accounts’ identity is needed but not critical,
+   * so schedule an interval to retry after import, allowing the user
+   * to import the account even if the first Relayer identity fetch fails.
+   */
   #viewOnlyAccountGetIdentityInterval: IRecurringTimeout
 
   #accounts: Account[] = []
@@ -102,19 +112,12 @@ export class AccountsController extends EventEmitter implements IAccountsControl
     this.#onAccountStateUpdate = onAccountStateUpdate
     this.#callRelayer = relayerCall.bind({ url: relayerUrl, fetch })
 
-    // Getting view-only accounts’ identity is needed but not critical,
-    // so schedule an interval to retry after import, allowing the user
-    // to import the account even if the first Relayer identity fetch fails.
     this.#viewOnlyAccountGetIdentityInterval = new RecurringTimeout(
       this.setViewOnlyAccountIdentitiesIfNeeded.bind(this),
       VIEW_ONLY_ACCOUNT_IDENTITY_GET_INTERVAL,
       this.emitError.bind(this)
     )
 
-    // Creating Ambire smart account identity is needed but not critical, user
-    // is still able to interact and transfer funds with a smart account one.
-    // So schedule an interval to retry after import, allowing the user
-    // to import the account even if the first Relayer identity create call fails.
     this.#smartAccountIdentityCreateInterval = new RecurringTimeout(
       this.createSmartAccountIdentitiesIfNeeded.bind(this),
       SMART_ACCOUNT_IDENTITY_RETRY_INTERVAL,

src/controllers/accounts/accounts.ts

@@ -168,7 +168,10 @@ export class ContinuousUpdatesController extends EventEmitter {
       ? this.#main.activity.broadcastedButNotConfirmed[this.#main.selectedAccount.account.addr]
       : []
     if (selectedAccountBroadcastedButNotConfirmed.length) return
-    await this.#main.updateSelectedAccountPortfolio({ maxDataAgeMs: 60 * 1000 })
+    await this.#main.updateSelectedAccountPortfolio({
+      maxDataAgeMs: 60 * 1000,
+      maxDataAgeMsUnused: 60 * 60 * 1000
+    })
   }
 
   async #updateAccountsOpsStatuses() {

src/controllers/continuousUpdates/continuousUpdates.ts

@@ -122,7 +122,7 @@ export class EstimationController extends EventEmitter {
     // NOTE: at some point we should check all the "?" signs below and if
     // an error pops out, we should notify the user about it
     let networkFeeTokens =
-      this.#portfolio.getLatestPortfolioState(op.accountAddr)?.[op.chainId.toString()]?.result
+      this.#portfolio.getAccountPortfolioState(op.accountAddr)?.[op.chainId.toString()]?.result
         ?.feeTokens ?? []
 
     // This could happen only in a race when a NOT currently selected account is
@@ -132,11 +132,11 @@ export class EstimationController extends EventEmitter {
     if (networkFeeTokens.length === 0) {
       await this.#portfolio.updateSelectedAccount(op.accountAddr, [network])
       networkFeeTokens =
-        this.#portfolio.getLatestPortfolioState(op.accountAddr)?.[op.chainId.toString()]?.result
+        this.#portfolio.getAccountPortfolioState(op.accountAddr)?.[op.chainId.toString()]?.result
           ?.feeTokens ?? []
     }
 
-    const gasTankResult = this.#portfolio.getLatestPortfolioState(op.accountAddr)?.gasTank?.result
+    const gasTankResult = this.#portfolio.getAccountPortfolioState(op.accountAddr)?.gasTank?.result
     const gasTankFeeTokens = isPortfolioGasTankResult(gasTankResult)
       ? gasTankResult.gasTankTokens
       : []

src/controllers/estimation/estimation.ts

@@ -557,10 +557,14 @@ export class MainController extends EventEmitter implements IMainController {
 
     if (selectedAccountAddr) {
       const FIVE_MINUTES = 1000 * 60 * 5
+      const ONE_HOUR = 1000 * 60 * 60
       this.domains.batchReverseLookup(this.accounts.accounts.map((a) => a.addr))
 
       if (!(this.activity.broadcastedButNotConfirmed[selectedAccountAddr] || []).length) {
-        this.updateSelectedAccountPortfolio({ maxDataAgeMs: FIVE_MINUTES })
+        this.updateSelectedAccountPortfolio({
+          maxDataAgeMs: FIVE_MINUTES,
+          maxDataAgeMsUnused: ONE_HOUR
+        })
         this.defiPositions.updatePositions({ maxDataAgeMs: FIVE_MINUTES })
       }
 
@@ -650,7 +654,8 @@ export class MainController extends EventEmitter implements IMainController {
     // will block the UI until these are resolved.
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.reloadSelectedAccount({
-      maxDataAgeMs: 5 * 60 * 1000
+      maxDataAgeMs: 5 * 60 * 1000,
+      maxDataAgeMsUnused: 60 * 60 * 1000
     })
   }
 
@@ -1357,9 +1362,10 @@ export class MainController extends EventEmitter implements IMainController {
   async reloadSelectedAccount(options?: {
     chainIds?: bigint[]
     maxDataAgeMs?: number
+    maxDataAgeMsUnused?: number
     isManualReload?: boolean
   }) {
-    const { chainIds, isManualReload = false, maxDataAgeMs } = options || {}
+    const { chainIds, isManualReload = false, maxDataAgeMsUnused, maxDataAgeMs } = options || {}
     const networksToUpdate = chainIds
       ? this.networks.networks.filter((n) => chainIds.includes(n.chainId))
       : undefined
@@ -1385,6 +1391,7 @@ export class MainController extends EventEmitter implements IMainController {
       this.updateSelectedAccountPortfolio({
         networks: networksToUpdate,
         isManualUpdate: isManualReload,
+        maxDataAgeMsUnused,
         maxDataAgeMs
       }),
       this.defiPositions.updatePositions({ chainIds, maxDataAgeMs, forceUpdate: isManualReload })
@@ -1401,15 +1408,15 @@ export class MainController extends EventEmitter implements IMainController {
     // and not the selected account portfolio the flag isOffline
     // and the errors of the selected account portfolio should
     // come in the same tick. Otherwise the UI may flash the wrong error.
-    const latestState = this.portfolio.getLatestPortfolioState(accountAddr)
-    const latestStateKeys = Object.keys(latestState)
-    const isAllLoaded = latestStateKeys.every((chainId) => {
-      return isNetworkReady(latestState[chainId]) && !latestState[chainId]?.isLoading
+    const portfolioState = this.portfolio.getAccountPortfolioState(accountAddr)
+    const portfolioStateKeys = Object.keys(portfolioState)
+    const isAllLoaded = portfolioStateKeys.every((chainId) => {
+      return isNetworkReady(portfolioState[chainId]) && !portfolioState[chainId]?.isLoading
     })
 
     // Set isOffline back to false if the portfolio is loading.
     // This is done to prevent the UI from flashing the offline error
-    if (!latestStateKeys.length || !isAllLoaded) {
+    if (!portfolioStateKeys.length || !isAllLoaded) {
       // Skip unnecessary updates
       if (!this.isOffline) return
 
@@ -1418,8 +1425,8 @@ export class MainController extends EventEmitter implements IMainController {
       return
     }
 
-    const allPortfolioNetworksHaveErrors = latestStateKeys.every((chainId) => {
-      const state = latestState[chainId]
+    const allPortfolioNetworksHaveErrors = portfolioStateKeys.every((chainId) => {
+      const state = portfolioState[chainId]
 
       return !!state?.criticalError
     })
@@ -1444,8 +1451,9 @@ export class MainController extends EventEmitter implements IMainController {
     networks?: Network[]
     isManualUpdate?: boolean
     maxDataAgeMs?: number
+    maxDataAgeMsUnused?: number
   }) {
-    const { networks, maxDataAgeMs, isManualUpdate } = opts || {}
+    const { networks, maxDataAgeMs, maxDataAgeMsUnused, isManualUpdate } = opts || {}
 
     await this.initialLoadPromise
     if (!this.selectedAccount.account) return
@@ -1467,7 +1475,7 @@ export class MainController extends EventEmitter implements IMainController {
             states: await this.accounts.getOrFetchAccountStates(this.selectedAccount.account.addr)
           }
         : undefined,
-      { maxDataAgeMs, isManualUpdate }
+      { maxDataAgeMs, maxDataAgeMsUnused, isManualUpdate }
     )
     this.#updateIsOffline()
   }