Merge branch 'release/v2.89' of github.com:AmbireTech/ambire-common into release/v2.89

Author: Oxbobby

src/controllers/portfolio/portfolio.ts

@@ -61,6 +61,7 @@ import {
 import {
   AccountAssetsState,
   AccountState,
+  ExchangeInfoMap,
   ExtendedError,
   ExtendedErrorWithLevel,
   ExternalAPITokenMarketDataResponse,
@@ -208,6 +209,18 @@ export class PortfolioController extends EventEmitter implements IPortfolioContr
 
   defiPositionsCountOnDisabledNetworks: PositionCountOnDisabledNetworks = {}
 
+  exchangeState: {
+    exchanges: ExchangeInfoMap | null
+    updatedAt: number | null
+    isLoading: boolean
+    retryCount: number
+  } = {
+    exchanges: null,
+    updatedAt: null,
+    isLoading: false,
+    retryCount: 0
+  }
+
   #hasSimulationChanged: Function
 
   constructor(
@@ -294,6 +307,48 @@ export class PortfolioController extends EventEmitter implements IPortfolioContr
     })
   }
 
+  async updateExchangeList() {
+    if (this.exchangeState.isLoading || this.exchangeState.retryCount >= 5) return
+
+    this.exchangeState.isLoading = true
+
+    this.emitUpdate()
+
+    try {
+      const response = await this.#fetch('https://cena.ambire.com/api/v3/exchanges')
+
+      if (!response.ok) {
+        throw new Error(`Failed to fetch exchange list: ${response.statusText}`)
+      }
+
+      const exchanges: ExchangeInfoMap = (await response.json()).data
+
+      this.exchangeState = {
+        exchanges,
+        updatedAt: Date.now(),
+        isLoading: false,
+        retryCount: 0
+      }
+    } catch (e: any) {
+      this.exchangeState.isLoading = false
+      this.exchangeState.retryCount += 1
+      this.emitError({
+        level: 'silent',
+        error: e,
+        message: `Error while fetching exchange list: ${e.message}`
+      })
+
+      setTimeout(
+        async () => {
+          await this.updateExchangeList()
+        },
+        10 * 60 * 1000
+      )
+    } finally {
+      this.emitUpdate()
+    }
+  }
+
   async #load() {
     try {
       await this.#networks.initialLoadPromise
@@ -331,6 +386,9 @@ export class PortfolioController extends EventEmitter implements IPortfolioContr
     }
 
     this.emitUpdate()
+
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    this.updateExchangeList()
   }
 
   #getHasFundedHotAccount(): boolean {
@@ -757,7 +815,8 @@ export class PortfolioController extends EventEmitter implements IPortfolioContr
       amount: BigInt(t.amount || 0),
       chainId: BigInt(t.chainId || 1),
       availableAmount: BigInt(t.availableAmount || 0),
-      flags: getFlags(res.data, 'gasTank', t.chainId, t.address, t.name, t.symbol)
+      flags: getFlags(res.data, 'gasTank', t.chainId, t.address, t.name, t.symbol),
+      marketDataIn: []
     }))
 
     accountState.gasTank = {

src/controllers/swapAndBridge/swapAndBridge.ts

@@ -1468,9 +1468,7 @@ export class SwapAndBridgeController extends EventEmitter implements ISwapAndBri
           canTopUpGasTank: false,
           rewardsType: null
         },
-        marketData: {
-          marketDataIn: []
-        },
+        marketDataIn: [],
         priceIn: price ? [{ baseCurrency: 'usd', price }] : []
       }
 

src/controllers/transaction/transactionFormState.ts

@@ -481,9 +481,7 @@ export class TransactionFormState extends EventEmitter {
           canTopUpGasTank: false,
           rewardsType: null
         },
-        marketData: {
-          marketDataIn: []
-        },
+        marketDataIn: [],
         priceIn: price ? [{ baseCurrency: 'usd', price }] : []
       }
 

src/interfaces/assets.ts

@@ -12,21 +12,21 @@ export interface TokenMarketDataByCurrency {
   /**
    * 24-hour trading volume of the token.
    */
-  volume24h?: number | null
+  volume24h?: number
   /**
    * Market capitalization of the token.
    */
-  marketCap?: number | null
+  marketCap?: number
   /**
    * Percentage change in price over the last 24 hours.
    */
-  change24h?: number | null
-}
-
-export type TokenMarketData = {
-  marketDataIn: TokenMarketDataByCurrency[]
+  change24h?: number
+  /**
+   * Fully diluted valuation of the token
+   */
+  fullyDilutedValuation?: number
   /**
-   * Ids of exchanges where the token is traded.
+   * The total supply of the token
    */
-  exchanges?: string[]
+  totalSupply?: number
 }

src/libs/defiPositions/defiPositions.ts

@@ -405,9 +405,7 @@ const enhancePortfolioTokensWithDefiPositions = (
               notYetHandledTokensToAdd.push({
                 amount: asset.amount,
                 latestAmount: asset.amount,
-                marketData: {
-                  marketDataIn: []
-                },
+                marketDataIn: [],
                 // Only list the borrowed asset with no price
                 priceIn:
                   asset.type === AssetType.Collateral && asset.priceIn ? [asset.priceIn] : [],

src/libs/portfolio/helpers.ts

@@ -6,7 +6,7 @@ import IERC20 from '../../../contracts/compiled/IERC20.json'
 import gasTankFeeTokens from '../../consts/gasTankFeeTokens'
 import humanizerInfoRaw from '../../consts/humanizer/humanizerInfo.json'
 import { PINNED_TOKENS } from '../../consts/pinnedTokens'
-import { Price, TokenMarketData } from '../../interfaces/assets'
+import { Price } from '../../interfaces/assets'
 import { Network } from '../../interfaces/network'
 import { RPCProvider } from '../../interfaces/provider'
 import { AssetType } from '../defiPositions/types'
@@ -26,7 +26,6 @@ import {
   PortfolioNetworkResult,
   SuspectedType,
   ToBeLearnedAssets,
-  TokenDataCache,
   TokenDataCacheValue,
   TokenResult,
   TokenValidationResult,
@@ -394,9 +393,9 @@ export const validateERC20Token = async (
   let decimals
   try {
     ;[balance, symbol, decimals] = await Promise.all([
-      erc20.balanceOf(accountId).catch((e) => handleERC20Error(e, 'balance')),
-      erc20.symbol().catch((e) => handleERC20Error(e, 'symbol')),
-      erc20.decimals().catch((e) => handleERC20Error(e, 'decimals'))
+      erc20.balanceOf!(accountId).catch((e) => handleERC20Error(e, 'balance')),
+      erc20.symbol!().catch((e) => handleERC20Error(e, 'symbol')),
+      erc20.decimals!().catch((e) => handleERC20Error(e, 'decimals'))
     ])
   } catch (e) {
     handleERC20Error(e, 'token validation')
@@ -833,32 +832,34 @@ export const convertApiTokenDataToTokenDataCache = (
   if (!tokenData) {
     return {
       priceIn: [],
-      marketData: {
-        marketDataIn: [],
-        exchanges: []
-      }
+      marketDataIn: []
     }
   }
 
   const baseCurrency = (tokenData.baseCurrency || 'usd') as 'usd' // stop ts from complaining, we only support usd as base currency for now
   const price = (tokenData.price || tokenData.usd) as number | undefined
 
-  const baseCurrency24hChange = tokenData[`${baseCurrency}_24h_change`] || null
-  const baseCurrency24hVolume = tokenData[`${baseCurrency}_24h_vol`] || null
-  const baseCurrencyMarketCap = tokenData[`${baseCurrency}_market_cap`] || null
+  const baseCurrency24hChange = tokenData[`${baseCurrency}_24h_change`]
+  const baseCurrency24hVolume = tokenData[`${baseCurrency}_24h_vol`]
+  const baseCurrencyMarketCap = tokenData[`${baseCurrency}_market_cap`]
+  const fullyDilutedValuation = tokenData[`${baseCurrency}_fully_diluted_valuation`]
+  const website = tokenData.homepage ? tokenData.homepage[0] : undefined
 
   return {
     priceIn: typeof price === 'number' ? [{ baseCurrency, price }] : [],
-    marketData: {
-      marketDataIn: [
-        {
-          baseCurrency,
-          change24h: baseCurrency24hChange,
-          volume24h: baseCurrency24hVolume,
-          marketCap: baseCurrencyMarketCap
-        }
-      ],
-      exchanges: tokenData.exchanges || []
+    marketDataIn: [
+      {
+        baseCurrency,
+        change24h: baseCurrency24hChange,
+        volume24h: baseCurrency24hVolume,
+        marketCap: baseCurrencyMarketCap,
+        fullyDilutedValuation: fullyDilutedValuation,
+        totalSupply: tokenData.total_supply
+      }
+    ],
+    meta: {
+      exchanges: tokenData.exchanges || [],
+      website: website
     }
   }
 }

src/libs/portfolio/interfaces.ts

@@ -1,5 +1,5 @@
 import { AccountId, AccountOnchainState } from '../../interfaces/account'
-import { Price, TokenMarketData } from '../../interfaces/assets'
+import { Price, TokenMarketDataByCurrency } from '../../interfaces/assets'
 import { BaseAccount } from '../account/BaseAccount'
 import { AccountOp } from '../accountOp/accountOp'
 import {
@@ -21,6 +21,17 @@ export type TokenError = string | '0x'
 export type AccountAssetsState = { [chainId: string]: boolean }
 export type SuspectedType = 'suspected' | null
 
+export type ExchangeInfo = {
+  id: string
+  name: string
+  url: string
+  image: string
+}
+
+export type ExchangeInfoMap = {
+  [exchangeId: string]: ExchangeInfo
+}
+
 export type TokenResult = {
   symbol: string
   name: string
@@ -33,7 +44,14 @@ export type TokenResult = {
   simulationAmount?: bigint
   amountPostSimulation?: bigint
   priceIn: Price[]
-  marketData: TokenMarketData
+  marketDataIn: TokenMarketDataByCurrency[]
+  meta?: {
+    /**
+     * Ids of exchanges where the token is traded.
+     */
+    exchanges?: string[]
+    website?: string
+  }
   flags: {
     onGasTank: boolean
     rewardsType: 'wallet-vesting' | 'wallet-rewards' | 'wallet-projected-rewards' | null
@@ -67,10 +85,7 @@ export interface CollectionResult extends TokenResult {
   }
 }
 
-export type TokenDataCacheValue = {
-  priceIn: Price[]
-  marketData: TokenMarketData
-}
+export type TokenDataCacheValue = Pick<TokenResult, 'marketDataIn' | 'priceIn' | 'meta'>
 
 /**
  * Cache for token data
@@ -121,10 +136,13 @@ export type ExternalAPITokenMarketDataResponse = {
   /**
    * Despite the name, this is a percentage, not USD value change.
    */
+  usd_fully_diluted_valuation?: number
   usd_24h_change: number
   usd_market_cap: number
   usd_24h_vol: number
+  total_supply?: number
   exchanges: string[]
+  homepage?: string[]
 }
 
 /**