Merge pull request #1732 from curvefi/feat/search-by-any-address

feat: allow searching for markets by either amm or vault address

Author: 0xAlunara

apps/main/src/llamalend/features/market-list/LlamaMarketExpandedPanel.tsx

@@ -64,8 +64,8 @@ export const LlamaMarketExpandedPanel: ExpandedPanel<LlamaMarket> = ({ row: { or
   const { data: earnings, error: earningsError } = useUserMarketStats(market, LlamaMarketColumnId.UserEarnings)
   const { data: deposited, error: depositedError } = useUserMarketStats(market, LlamaMarketColumnId.UserDeposited)
   const {
-    address,
     controllerAddress,
+    favoriteKey,
     assets,
     leverage,
     liquidityUsd,
@@ -99,7 +99,7 @@ export const LlamaMarketExpandedPanel: ExpandedPanel<LlamaMarket> = ({ row: { or
                     confirmationText={t`Market address copied`}
                     data-testid={`copy-market-address-${controllerAddress}`}
                   />
-                  <FavoriteMarketButton address={address} />
+                  <FavoriteMarketButton address={favoriteKey} />
                 </Stack>
               </Stack>
             }

apps/main/src/llamalend/features/market-list/cells/MarketTitleCell/MarketBadges.tsx

@@ -25,7 +25,7 @@ const poolTypeTooltips: Record<LlamaMarketType, () => string> = {
 
 /** Displays badges for a pool, such as the chain icon and the pool type. */
 export const MarketBadges = ({ market, isMobile }: { market: LlamaMarket; isMobile: boolean }) => {
-  const { address, type, leverage, deprecatedMessage } = market
+  const { favoriteKey, type, leverage, deprecatedMessage } = market
   const isSmall = useMediaQuery('(max-width:1250px)')
   const { isCollateralEroded } = useUserMarketStats(market)?.data ?? {}
   return (
@@ -68,7 +68,7 @@ export const MarketBadges = ({ market, isMobile }: { market: LlamaMarket; isMobi
         </Tooltip>
       )}
 
-      <FavoriteMarketButton address={address} desktopOnly />
+      <FavoriteMarketButton address={favoriteKey} desktopOnly />
     </Stack>
   )
 }

apps/main/src/llamalend/features/market-list/columns.tsx

@@ -78,7 +78,8 @@ export const LLAMA_MARKET_COLUMNS = [
     cell: MarketTitleCell,
     filterFn: filterByText(
       'controllerAddress',
-      'address',
+      'ammAddress',
+      'vaultAddress',
       'assets.borrowed.address',
       'assets.borrowed.symbol',
       'assets.collateral.address',

apps/main/src/llamalend/queries/market-list/llama-market-stats.ts

@@ -29,7 +29,7 @@ const earningsColumns = [
  * @returns The stats data and an error if any
  */
 export function useUserMarketStats(market: LlamaMarket, column?: LlamaMarketColumnId) {
-  const { type, userHasPositions, address: marketAddress, controllerAddress, chain } = market
+  const { type, userHasPositions, controllerAddress, chain } = market
   const { address: userAddress } = useAccount()
   const { data: collateralUsdRate, isLoading: collateralUsdRateLoading } = useTokenUsdPrice({
     blockchainId: market.chain,
@@ -47,8 +47,6 @@ export function useUserMarketStats(market: LlamaMarket, column?: LlamaMarketColu
   const enableMintStats = enableStats && type === LlamaMarketType.Mint
 
   const params = { userAddress, contractAddress: controllerAddress, blockchainId: chain }
-  // todo: api will be updated to use controller address for earnings too
-  const earningsParams = { ...params, contractAddress: marketAddress }
 
   const {
     data: lendData,
@@ -60,7 +58,7 @@ export function useUserMarketStats(market: LlamaMarket, column?: LlamaMarketColu
     data: earnData,
     error: earnError,
     isLoading: loadingEarn,
-  } = useUserLendingVaultEarnings(earningsParams, enableEarnings)
+  } = useUserLendingVaultEarnings(params, enableEarnings)
 
   const { data: mintData, error: mintError, isLoading: loadingMint } = useUserMintMarketStats(params, enableMintStats)
 

apps/main/src/llamalend/queries/market-list/llama-markets.ts

@@ -39,8 +39,9 @@ export type AssetDetails = {
 
 export type LlamaMarket = {
   chain: Chain
-  address: Address
+  ammAddress: Address
   controllerAddress: Address
+  vaultAddress: Address | null
   assets: Assets
   maxLtv: number
   utilizationPercent: number
@@ -68,6 +69,7 @@ export type LlamaMarket = {
   deprecatedMessage: string | null
   userHasPositions: Record<MarketRateType, boolean> | null // null means no positions in either market and makes easy to filter
   createdAt: number
+  favoriteKey: Address // this differs per market type; for lend markets the vault address, for mint markets the amm address
 }
 
 export type LlamaMarketsResult = {
@@ -151,6 +153,7 @@ const convertLendingVault = (
     totalDebt,
     totalDebtUsd,
     vault,
+    llamma,
     collateralToken,
     borrowedToken,
     borrowedBalanceUsd,
@@ -174,8 +177,9 @@ const convertLendingVault = (
   const totalExtraRewardApr = (extraRewardApr ?? []).reduce((acc, x) => acc + x.rate, 0)
   return {
     chain,
-    address: vault,
     controllerAddress: controller,
+    ammAddress: llamma,
+    vaultAddress: vault,
     assets: {
       borrowed: {
         ...borrowedToken,
@@ -239,6 +243,7 @@ const convertLendingVault = (
           }
         : null,
     createdAt: new Date(createdAt).getTime(),
+    favoriteKey: vault,
   }
 }
 
@@ -274,8 +279,9 @@ const convertMintMarket = (
   const name = collateralIndex > 1 ? `${collateralSymbol}${collateralIndex}` : collateralSymbol
   return {
     chain,
-    address: llamma,
     controllerAddress: address,
+    ammAddress: llamma,
+    vaultAddress: null, // mint markets dont have these
     assets: {
       borrowed: {
         symbol: stablecoinToken.symbol,
@@ -323,6 +329,7 @@ const convertMintMarket = (
     leverage,
     userHasPositions: hasBorrow ? { [MarketRateType.Borrow]: hasBorrow, [MarketRateType.Supply]: false } : null,
     createdAt: new Date(createdAt).getTime(),
+    favoriteKey: llamma,
   }
 }