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

Author: superKalo

src/controllers/portfolio/portfolio.test.ts

@@ -19,7 +19,7 @@ import { getAccountState } from '../../libs/accountState/accountState'
 import * as defiPricesLib from '../../libs/defiPositions/defiPrices'
 import { getProviderId } from '../../libs/defiPositions/helpers'
 import * as defiProviders from '../../libs/defiPositions/providers'
-import { DeFiPositionsError } from '../../libs/defiPositions/types'
+import { AssetType, DeFiPositionsError } from '../../libs/defiPositions/types'
 import {
   erc721CollectionToLearnedAssetKeys,
   learnedErc721sToHints
@@ -2067,6 +2067,85 @@ describe('Portfolio Controller ', () => {
       restore()
     })
 
+    it("Uniswap V3 shouldn't lose its API enhancement (e.g. rewards) when the discovery call is skipped", async () => {
+      const { controller } = await prepareTest()
+
+      // A formatted discovery response carrying a Debank Uniswap V3 entry. It's mocked rather than
+      // relying on the live API, since Debank's coverage of a given account varies over time.
+      const discoveryWithDebankUniV3 = {
+        data: {
+          defi: {
+            updatedAt: Date.now(),
+            isForceUpdate: false,
+            positions: [
+              {
+                providerName: 'Uniswap V3',
+                chainId: 1n,
+                source: 'debank' as const,
+                iconUrl: '',
+                siteUrl: 'https://app.uniswap.org',
+                type: 'common' as const,
+                positions: [
+                  {
+                    id: 'debank-uni-v3-eth',
+                    assets: [
+                      {
+                        address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+                        symbol: 'WETH',
+                        name: 'Wrapped Ether',
+                        decimals: 18,
+                        amount: 1000000000000000000n,
+                        priceIn: { price: 3000, baseCurrency: 'usd' },
+                        value: 3000,
+                        type: AssetType.Liquidity,
+                        iconUrl: ''
+                      }
+                    ],
+                    additionalData: { positionIndex: 'debank-uni-v3-eth', name: 'Liquidity Pool' }
+                  }
+                ],
+                positionInUSD: 3000
+              }
+            ]
+          },
+          hints: null,
+          otherNetworksDefiCounts: {}
+        },
+        discoveryTime: 1,
+        errors: []
+      }
+
+      // @ts-expect-error - getPortfolioFromApiDiscovery is private, spied on at runtime
+      const discoverySpy: any = jest.spyOn(controller, 'getPortfolioFromApiDiscovery')
+      // First update: the custom (deployless) position is enhanced with the Debank entry (source: 'mixed')
+      discoverySpy.mockResolvedValueOnce(discoveryWithDebankUniV3)
+      // Second update: a skipped discovery returns null. This is a routine occurrence (the data is
+      // still fresh) and is NOT a failure.
+      discoverySpy.mockResolvedValueOnce(null)
+
+      await controller.updateSelectedAccount(DEFI_TEST_ACCOUNT.addr, [ethereum])
+      const firstResult = controller.getAccountPortfolioState(DEFI_TEST_ACCOUNT.addr)['1']!.result
+      const uniBeforeSkip = firstResult?.defiPositions.positionsByProvider.find(
+        (p) => getProviderId(p.providerName) === 'uniswap v3'
+      )
+
+      // Check before updating again to ensure it's mixed
+      expect(uniBeforeSkip?.source).toBe('mixed')
+
+      await controller.updateSelectedAccount(DEFI_TEST_ACCOUNT.addr, [ethereum], undefined, {
+        defiMaxDataAgeMs: 0,
+        isManualUpdate: true
+      })
+
+      const secondResult = controller.getAccountPortfolioState(DEFI_TEST_ACCOUNT.addr)['1']!.result
+      const uniAfterSkip = secondResult?.defiPositions.positionsByProvider.find(
+        (p) => getProviderId(p.providerName) === 'uniswap v3'
+      )
+
+      // MUST BE MIXED!!!!!
+      expect(uniAfterSkip?.source).toBe('mixed')
+    })
+
     describe('Defi apps', () => {
       it('should skip update if canSkipUpdate=true', async () => {
         const { controller } = await prepareTest()

src/controllers/portfolio/portfolio.ts

@@ -1340,7 +1340,7 @@ export class PortfolioController extends EventEmitter implements IPortfolioContr
           network,
           this.#fetch,
           state.result?.defiPositions.positionsByProvider || [],
-          discoveryData?.data?.defi?.positions || [],
+          discoveryData?.data?.defi?.positions,
           getIsExternalApiDefiPositionsCallSuccessful(discoveryData)
         )
       ])

src/libs/portfolio/helpers.test.ts

@@ -276,6 +276,13 @@ describe('Portfolio helpers', () => {
 
       expect(total.usd).toBe(150.05)
     })
+    it('Returns the defi total when there are no tokens', () => {
+      const defiState = structuredClone(PORTFOLIO_STATE['1']?.result?.defiPositions!)
+
+      const total = getTotal([], defiState)
+
+      expect(total.usd).toBeGreaterThan(0)
+    })
   })
   describe('getHintsError', () => {
     it('NoApiHintsError is returned if there are no previous hints', () => {

src/libs/portfolio/helpers.ts

@@ -569,6 +569,12 @@ export const getTotal = (
     )
   }
 
+  // In case the user doesn't have any tokens or the function is calculating for the custom
+  // network `defiApps` that doesn't have any tokens
+  if (!Object.keys(tokensTotal).length && Object.keys(defiTotal).length > 0) {
+    return defiTotal
+  }
+
   return Object.keys(tokensTotal).reduce((cur, key) => {
     cur[key] = (tokensTotal[key] || 0) + (defiTotal[key] || 0)