Merge pull request #2192 from AmbireTech/release/v2.88.5

Release / v2.88.5

Author: superKalo

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.88.4",
+  "version": "2.88.5",
   "name": "ambire-common",
   "description": "Common ground for the Ambire apps",
   "scripts": {

src/classes/recurringTimeout/recurringTimeout.ts

@@ -122,7 +122,11 @@ export class RecurringTimeout implements IRecurringTimeout {
 
   #scheduleStart(opts: RecurringTimeoutStartOptions = {}) {
     if (this.running) return
-    this.#pendingStart = opts // collect latest opts for this tick
+    this.#pendingStart = {
+      timeout: opts.timeout ?? this.#pendingStart?.timeout,
+      runImmediately: opts.runImmediately || this.#pendingStart?.runImmediately,
+      allowOverlap: opts.allowOverlap || this.#pendingStart?.allowOverlap
+    }
     if (this.startScheduled) return
     this.startScheduled = true
 

src/consts/coingecko.ts

@@ -10,6 +10,14 @@ const COINGECKO_BASE_URL = 'https://www.coingecko.com/en/coins/'
 export function geckoIdMapper(address: string, network: Network): string | null {
   if (address === ZeroAddress) return network.nativeAssetId
 
+  // citrea wrapepd cbtc
+  if (network.chainId === 4114n && address === '0x3100000000000000000000000000000000000006')
+    return network.nativeAssetId
+
+  // citrea wbtc
+  if (network.chainId === 4114n && address === '0xDF240DC08B0FdaD1d93b74d5048871232f6BEA3d')
+    return 'wrapped-bitcoin'
+
   // we currently can't map aave so we're leaving this
   if (address === '0x4da27a545c0c5B758a6BA100e3a049001de870f5') return 'aave'
 

src/consts/dapps/dapps.ts

@@ -78,7 +78,6 @@ export const featuredDapps = new Set([
   'snapshot.box/#/s:ambire.eth',
   'lido.fi',
   'bitrefill.com',
-  'altitude.fi',
   'drops.bot',
   'app.barterswap.xyz'
 ])
@@ -421,7 +420,7 @@ export const defiLlamaProtocolIdsToExclude: string[] = [
 
 export const categoriesNotToFilterOut = ['DEX Aggregator']
 export const categoriesToExclude = ['CEX', 'Developer Tools']
-export const dappsNotToFilterOutByDomain = ['snapshot.box', 'bungee.exchange']
+export const dappsNotToFilterOutByDomain = ['snapshot.box', 'bungee.exchange', 'altitude.fi']
 
 export const CATEGORY_MAP: Record<string, string> = {
   'AI Agents': 'AI Agents',

src/controllers/signAccountOp/signAccountOp.ts

@@ -128,7 +128,6 @@ import { failedPaymasters } from '../../services/paymaster/FailedPaymasters'
 import { ZERO_ADDRESS } from '../../services/socket/constants'
 import shortenAddress from '../../utils/shortenAddress'
 import { generateUuid } from '../../utils/uuid'
-import wait from '../../utils/wait'
 import { EstimationController } from '../estimation/estimation'
 import { EstimationStatus } from '../estimation/types'
 import EventEmitter from '../eventEmitter/eventEmitter'
@@ -1335,8 +1334,6 @@ export class SignAccountOpController extends EventEmitter implements ISignAccoun
     // Destroy sub-controllers
     this.estimation.destroy()
     this.gasPrice.destroy()
-    this.gasPrice = null as any
-    this.estimation = null as any
     // Other cleanup
     this.#hwCleanup()
     this.gasPrices = undefined

src/interfaces/network.ts

@@ -179,14 +179,12 @@ export type RelayerNetwork = {
     symbol: string
     name: string
     coingeckoId: string
-    icon: string
     decimals: number
     wrapped: {
       address: string
       symbol: string
       name: string
       coingeckoId: string
-      icon: string
       decimals: number
     }
     oldNativeAssetSymbols?: string[]

src/libs/networks/networks.ts

@@ -1,5 +1,3 @@
-/* eslint-disable import/no-extraneous-dependencies */
-
 import { toBeHex } from 'ethers'
 
 import { AMBIRE_ACCOUNT_FACTORY, OPTIMISTIC_ORACLE, SINGLETON } from '../../consts/deploy'

src/libs/portfolio/helpers.ts

@@ -6,6 +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 } from '../../interfaces/assets'
 import { Network } from '../../interfaces/network'
 import { RPCProvider } from '../../interfaces/provider'
 import { AssetType } from '../defiPositions/types'
@@ -802,3 +803,19 @@ export const getHintsError = (
     level: isLastUpdateTooOld ? 'critical' : 'silent'
   }
 }
+
+export const getHardcodedCitreaPrices = (address: string): Price | null => {
+  const stables = [
+    '0x8D82c4E3c936C7B5724A382a9c5a4E6Eb7aB6d5D',
+    '0xE045e6c36cF77FAA2CfB54466D71A3aEF7bbE839',
+    '0x9f3096Bac87e7F03DC09b0B416eB0DF837304dc4'
+  ]
+  if (stables.indexOf(address) !== -1) {
+    return {
+      baseCurrency: 'usd',
+      price: 1
+    }
+  }
+
+  return null
+}

src/libs/portfolio/portfolio.ts

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-cycle */
 /* eslint-disable no-restricted-syntax */
 import { ZeroAddress } from 'ethers'
 /* eslint-disable guard-for-in */
@@ -15,7 +14,12 @@ import { Deployless, fromDescriptor } from '../deployless/deployless'
 import batcher from './batcher'
 import { geckoRequestBatcher, geckoResponseIdentifier } from './gecko'
 import { getNFTs, getTokens } from './getOnchainBalances'
-import { formatExternalHintsAPIResponse, mergeERC721s, tokenFilter } from './helpers'
+import {
+  formatExternalHintsAPIResponse,
+  getHardcodedCitreaPrices,
+  mergeERC721s,
+  tokenFilter
+} from './helpers'
 import {
   CollectionResult,
   ExternalHintsAPIResponse,
@@ -346,6 +350,12 @@ export class Portfolio {
 
     // Re-map/filter into our format
     const getPriceFromCache = (address: string, _priceRecency: number = priceRecency) => {
+      // hardcode citrea prices
+      if (this.network.chainId === 4114n) {
+        const citreaTokenPrice = getHardcodedCitreaPrices(address)
+        if (citreaTokenPrice) return [citreaTokenPrice]
+      }
+
       const cached = priceCache.get(address)
       if (!cached) return null
       const [timestamp, entry] = cached

src/utils/networks.ts

@@ -89,7 +89,7 @@ const convertToAmbireNetworkFormat = async (network: ChainlistNetwork): Promise<
     name: network.name,
     chainId: BigInt(network.chainId),
     rpcUrls: [workingRpcUrl ?? network.rpc[0]],
-    explorerUrl: network.explorers[0].url,
+    explorerUrl: network.explorers[0]?.url || '',
     selectedRpcUrl: workingRpcUrl || '',
     platformId,
     nativeAssetId,