diff --git a/AGENTS.md b/AGENTS.md index acb48c02..0dac92db 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -176,8 +176,9 @@ When touching transaction and position flows, validation MUST include all releva 38. **Morpho vault query schema integrity**: shared Morpho vault metadata/rate queries must only request fields confirmed on the live `Vault`/`VaultState` schema. Do not add speculative top-level fields to the registry query, and do not swallow schema errors in a way that turns the global vault registry into an empty success state. 39. **User position discovery integrity**: when a shared upstream supports chain-scoped bulk position discovery (`userAddress_in` plus `chainId_in` or equivalent), use that batched chokepoint to collect position market keys before falling back to per-chain queries. Do not force one `userByAddress` request per chain when the backend can already return mixed-chain positions in one response. 40. **Source-discovery failure integrity**: market/position source-discovery hooks must fail closed when both primary and fallback providers fail for a chain. Do not convert dual-source fetch failures into empty success states; surface typed errors with source and network metadata so callers can fall back explicitly or show the failure. -41. **Oracle metadata source integrity**: oracle vendor/type/feed classification must resolve from the scanner metadata source keyed by `chainId + oracleAddress`. Do not reintroduce Morpho API `oracles` feed enrichment into market objects or UI/filter/warning logic as a fallback source for oracle structure. -42. **Mixed oracle badge signal integrity**: when a standard or meta oracle contains both classified feeds and unknown/unverified feeds, vendor badges and their tooltips must preserve both signals together (known vendor icon(s) plus unknown indicator/text) instead of collapsing to only the recognized vendor. +41. **Envio market-detail read integrity**: when Envio backs market-detail participants or activity tables, share-to-asset conversions must use the already-loaded live market state keyed by `chainId + market.uniqueKey` instead of a second indexer totals query; participant caches must not store state-derived converted values behind a key that ignores the live state; event/liquidation tables must fetch only the requested page window with correct merged ordering rather than scanning full market history unless the UI explicitly requires an exact total count; provider fallbacks must page at the provider boundary or fail closed with typed source/network errors instead of fetching full history and slicing client-side or returning empty success on missing subgraph configuration; unknown-total pagination must use an explicit open-ended `hasNextPage` mode instead of synthesizing a moving “last page”; and page transitions in that mode must start from a neutral loading state rather than reusing stale rows from the previous page. +42. **Oracle metadata source integrity**: oracle vendor/type/feed classification must resolve from the scanner metadata source keyed by `chainId + oracleAddress`. Do not reintroduce Morpho API `oracles` feed enrichment into market objects or UI/filter/warning logic as a fallback source for oracle structure. +43. **Mixed oracle badge signal integrity**: when a standard or meta oracle contains both classified feeds and unknown/unverified feeds, vendor badges and their tooltips must preserve both signals together (known vendor icon(s) plus unknown indicator/text) instead of collapsing to only the recognized vendor. ### REQUIRED: Regression Rule Capture diff --git a/src/components/shared/table-pagination.tsx b/src/components/shared/table-pagination.tsx index d6d1316a..53e508fc 100644 --- a/src/components/shared/table-pagination.tsx +++ b/src/components/shared/table-pagination.tsx @@ -8,9 +8,8 @@ import { TooltipContent } from '@/components/shared/tooltip-content'; import { Button } from '@/components/ui/button'; import { cn } from '@/utils'; -type TablePaginationProps = { +type TablePaginationBaseProps = { currentPage: number; - totalPages: number; totalEntries: number; pageSize: number; onPageChange: (page: number) => void; @@ -18,22 +17,41 @@ type TablePaginationProps = { showEntryCount?: boolean; }; +type FixedPaginationProps = { + mode: 'fixed'; + totalPages: number; +}; + +type OpenPaginationProps = { + mode: 'open'; + hasNextPage: boolean; +}; + +type TablePaginationProps = TablePaginationBaseProps & (FixedPaginationProps | OpenPaginationProps); + type PaginationToken = number | 'ellipsis'; export function TablePagination({ currentPage, - totalPages, totalEntries, pageSize, onPageChange, isLoading = false, showEntryCount = true, + ...paginationProps }: TablePaginationProps) { const [jumpPage, setJumpPage] = useState(''); const [isJumpOpen, setIsJumpOpen] = useState(false); + const isOpenEnded = paginationProps.mode === 'open'; + const hasNextPage = isOpenEnded ? (paginationProps.hasNextPage ?? false) : false; + const effectiveTotalPages = isOpenEnded ? currentPage + Number(hasNextPage) : paginationProps.totalPages; // Early return after all hooks - if (totalPages === 0) { + if (isOpenEnded && currentPage === 1 && !hasNextPage && totalEntries === 0) { + return null; + } + + if (effectiveTotalPages === 0) { return null; } @@ -42,7 +60,7 @@ export function TablePagination({ const handleJumpToPage = () => { const page = Number.parseInt(jumpPage, 10); - if (page >= 1 && page <= totalPages) { + if (page >= 1 && page <= effectiveTotalPages) { onPageChange(page); setJumpPage(''); setIsJumpOpen(false); @@ -57,24 +75,48 @@ export function TablePagination({ // Generate fixed-length page numbers to keep controls spatially stable. const getPageNumbers = (): PaginationToken[] => { + if (isOpenEnded) { + const pages: PaginationToken[] = []; + + if (currentPage > 1) { + pages.push(currentPage - 1); + } + + pages.push(currentPage); + + if (hasNextPage) { + pages.push(currentPage + 1); + } + + return pages; + } + const pages: PaginationToken[] = []; - if (totalPages <= 7) { - for (let i = 1; i <= totalPages; i++) { + if (effectiveTotalPages <= 7) { + for (let i = 1; i <= effectiveTotalPages; i++) { pages.push(i); } return pages; } if (currentPage <= 4) { - return [1, 2, 3, 4, 5, 'ellipsis', totalPages]; + return [1, 2, 3, 4, 5, 'ellipsis', effectiveTotalPages]; } - if (currentPage >= totalPages - 3) { - return [1, 'ellipsis', totalPages - 4, totalPages - 3, totalPages - 2, totalPages - 1, totalPages]; + if (currentPage >= effectiveTotalPages - 3) { + return [ + 1, + 'ellipsis', + effectiveTotalPages - 4, + effectiveTotalPages - 3, + effectiveTotalPages - 2, + effectiveTotalPages - 1, + effectiveTotalPages, + ]; } - return [1, 'ellipsis', currentPage - 1, currentPage, currentPage + 1, 'ellipsis', totalPages]; + return [1, 'ellipsis', currentPage - 1, currentPage, currentPage + 1, 'ellipsis', effectiveTotalPages]; }; const getItemKey = (page: PaginationToken, idx: number) => { @@ -86,7 +128,7 @@ export function TablePagination({ const pageNumbers = getPageNumbers(); - const paginationControlWidthClass = totalPages > 1000 ? 'w-10 text-xs' : 'w-8 text-sm'; + const paginationControlWidthClass = effectiveTotalPages > 1000 ? 'w-10 text-xs' : 'w-8 text-sm'; return (
@@ -136,7 +178,7 @@ export function TablePagination({ {/* Jump to page - only show if more than 10 pages */} - {totalPages > 10 && ( + {!isOpenEnded && effectiveTotalPages > 10 && (
} /> } @@ -179,7 +221,7 @@ export function TablePagination({ size="sm" type="number" min={1} - max={totalPages} + max={effectiveTotalPages} value={jumpPage} onChange={(e) => setJumpPage(e.target.value)} onKeyPress={handleKeyPress} diff --git a/src/data-sources/envio/fetchers.ts b/src/data-sources/envio/fetchers.ts new file mode 100644 index 00000000..ccbfb67c --- /dev/null +++ b/src/data-sources/envio/fetchers.ts @@ -0,0 +1,8 @@ +import { monarchGraphqlFetcher } from '@/data-sources/monarch-api/fetchers'; + +/** + * Envio-backed Monarch GraphQL currently shares the Monarch API endpoint. + * Keep a dedicated fetcher alias so market-detail hooks can depend on an + * Envio chokepoint without coupling to vault-specific naming. + */ +export const envioGraphqlFetcher = monarchGraphqlFetcher; diff --git a/src/data-sources/envio/market-detail.ts b/src/data-sources/envio/market-detail.ts new file mode 100644 index 00000000..c5962f09 --- /dev/null +++ b/src/data-sources/envio/market-detail.ts @@ -0,0 +1,368 @@ +import { envioGraphqlFetcher } from './fetchers'; +import { + envioBorrowersPageQuery, + envioBorrowRepayPageQuery, + envioLiquidationsPageQuery, + envioSuppliersPageQuery, + envioSupplyWithdrawPageQuery, +} from '@/graphql/envio-queries'; +import { convertSharesToAssets } from '@/utils/positions'; +import type { + Market, + MarketActivityTransaction, + MarketBorrower, + MarketLiquidationTransaction, + MarketSupplier, + PaginatedMarketActivityTransactions, + PaginatedMarketBorrowers, + PaginatedMarketLiquidations, + PaginatedMarketSuppliers, +} from '@/utils/types'; + +const ENVIO_SCAN_BATCH_SIZE = 1000; +const PARTICIPANT_CACHE_TTL_MS = 2 * 60 * 1000; + +type CacheEntry = { + data: T; + timestamp: number; +}; + +type BorrowSharePriceState = Pick; + +type EnvioSupplierRow = { + user: string; + supplyShares: string; +}; + +type EnvioBorrowerRow = { + user: string; + borrowShares: string; + collateral: string; +}; + +type CachedBorrowerPosition = { + userAddress: string; + borrowShares: string; + collateral: string; +}; + +type EnvioGraphqlResponse = { + data?: T; +}; + +type EnvioSuppliersPageResponse = EnvioGraphqlResponse<{ + Position: EnvioSupplierRow[]; +}>; + +type EnvioBorrowersPageResponse = EnvioGraphqlResponse<{ + Position: EnvioBorrowerRow[]; +}>; + +type EnvioActivityEventRow = { + txHash: string; + timestamp: string; + assets: string; + onBehalf: string; +}; + +type EnvioSupplyWithdrawPageResponse = EnvioGraphqlResponse<{ + supplies: EnvioActivityEventRow[]; + withdraws: EnvioActivityEventRow[]; +}>; + +type EnvioBorrowRepayPageResponse = EnvioGraphqlResponse<{ + borrows: EnvioActivityEventRow[]; + repays: EnvioActivityEventRow[]; +}>; + +type EnvioLiquidationRow = { + txHash: string; + timestamp: string; + caller: string; + borrower: string; + repaidAssets: string; + seizedAssets: string; + badDebtAssets: string; +}; + +type EnvioLiquidationsPageResponse = EnvioGraphqlResponse<{ + Morpho_Liquidate: EnvioLiquidationRow[]; +}>; + +const suppliersCache = new Map>(); +const borrowersCache = new Map>(); + +const toCacheKey = (parts: Array): string => parts.join(':'); + +const getCachedValue = (cache: Map>, cacheKey: string, ttlMs: number): T | null => { + const cached = cache.get(cacheKey); + if (!cached) return null; + if (Date.now() - cached.timestamp >= ttlMs) { + cache.delete(cacheKey); + return null; + } + return cached.data; +}; + +const setCachedValue = (cache: Map>, cacheKey: string, data: T): T => { + cache.set(cacheKey, { + data, + timestamp: Date.now(), + }); + return data; +}; + +const paginateItems = (items: T[], pageSize: number, skip: number) => { + return { + items: items.slice(skip, skip + pageSize), + totalCount: items.length, + }; +}; + +const paginateWindowedItems = (items: T[], pageSize: number, skip: number) => { + const sliceEnd = skip + pageSize; + const pageItems = items.slice(skip, sliceEnd); + const hasNextPage = items.length > sliceEnd; + const totalCount = skip >= items.length ? items.length : Math.max(items.length, skip + pageItems.length + Number(hasNextPage)); + + return { + items: pageItems, + totalCount, + hasNextPage, + }; +}; + +const toTimestamp = (value: string): number => Number.parseInt(value, 10); + +const scanAllPages = async ({ fetchPage }: { fetchPage: (offset: number, limit: number) => Promise }): Promise => { + const items: T[] = []; + let offset = 0; + + while (true) { + const pageItems = await fetchPage(offset, ENVIO_SCAN_BATCH_SIZE); + items.push(...pageItems); + + if (pageItems.length < ENVIO_SCAN_BATCH_SIZE) { + return items; + } + + offset += pageItems.length; + } +}; + +const getCachedOrLoad = async ({ + cache, + cacheKey, + ttlMs, + loader, +}: { + cache: Map>; + cacheKey: string; + ttlMs: number; + loader: () => Promise; +}): Promise => { + const cached = getCachedValue(cache, cacheKey, ttlMs); + if (cached) return cached; + return setCachedValue(cache, cacheKey, await loader()); +}; + +const sortActivityTransactions = (left: MarketActivityTransaction, right: MarketActivityTransaction): number => { + if (right.timestamp !== left.timestamp) { + return right.timestamp - left.timestamp; + } + + return right.hash.localeCompare(left.hash); +}; + +const mapEnvioActivityRows = (rows: EnvioActivityEventRow[], type: MarketActivityTransaction['type']): MarketActivityTransaction[] => { + return rows.map((event) => ({ + type, + hash: event.txHash, + timestamp: toTimestamp(event.timestamp), + amount: event.assets, + userAddress: event.onBehalf, + })); +}; + +const convertBorrowSharesToAssets = (borrowShares: string, marketState: BorrowSharePriceState): string => { + return convertSharesToAssets(BigInt(borrowShares), BigInt(marketState.borrowAssets), BigInt(marketState.borrowShares)).toString(); +}; + +const mapCachedBorrowers = (positions: CachedBorrowerPosition[], marketState: BorrowSharePriceState): MarketBorrower[] => { + return positions.map((position) => ({ + userAddress: position.userAddress, + borrowAssets: convertBorrowSharesToAssets(position.borrowShares, marketState), + collateral: position.collateral, + })); +}; + +const fetchEnvioSuppliersAll = async (marketId: string, chainId: number, minShares: string): Promise => { + const cacheKey = toCacheKey(['suppliers', chainId, marketId.toLowerCase(), minShares]); + + return getCachedOrLoad({ + cache: suppliersCache, + cacheKey, + ttlMs: PARTICIPANT_CACHE_TTL_MS, + loader: async () => { + return scanAllPages({ + fetchPage: async (offset, limit) => { + const response = await envioGraphqlFetcher(envioSuppliersPageQuery, { + chainId, + marketId, + minShares, + limit, + offset, + }); + + return (response.data?.Position ?? []).map((position) => ({ + userAddress: position.user, + supplyShares: position.supplyShares, + })); + }, + }); + }, + }); +}; + +const fetchEnvioBorrowersAll = async (marketId: string, chainId: number, minShares: string): Promise => { + const cacheKey = toCacheKey(['borrowers', chainId, marketId.toLowerCase(), minShares]); + + return getCachedOrLoad({ + cache: borrowersCache, + cacheKey, + ttlMs: PARTICIPANT_CACHE_TTL_MS, + loader: async () => { + return scanAllPages({ + fetchPage: async (offset, limit) => { + const response = await envioGraphqlFetcher(envioBorrowersPageQuery, { + chainId, + marketId, + minShares, + limit, + offset, + }); + + return (response.data?.Position ?? []).map((position) => ({ + userAddress: position.user, + borrowShares: position.borrowShares, + collateral: position.collateral, + })); + }, + }); + }, + }); +}; + +const fetchEnvioSupplyWithdrawWindow = async ( + marketId: string, + chainId: number, + minAssets: string, + limit: number, +): Promise => { + const response = await envioGraphqlFetcher(envioSupplyWithdrawPageQuery, { + chainId, + marketId, + minAssets, + limit, + offset: 0, + }); + + const supplies = mapEnvioActivityRows(response.data?.supplies ?? [], 'MarketSupply'); + const withdraws = mapEnvioActivityRows(response.data?.withdraws ?? [], 'MarketWithdraw'); + + return [...supplies, ...withdraws].sort(sortActivityTransactions); +}; + +const fetchEnvioBorrowRepayWindow = async ( + marketId: string, + chainId: number, + minAssets: string, + limit: number, +): Promise => { + const response = await envioGraphqlFetcher(envioBorrowRepayPageQuery, { + chainId, + marketId, + minAssets, + limit, + offset: 0, + }); + + const borrows = mapEnvioActivityRows(response.data?.borrows ?? [], 'MarketBorrow'); + const repays = mapEnvioActivityRows(response.data?.repays ?? [], 'MarketRepay'); + + return [...borrows, ...repays].sort(sortActivityTransactions); +}; + +const fetchEnvioLiquidationsWindow = async ( + marketId: string, + chainId: number, + offset: number, + limit: number, +): Promise => { + const response = await envioGraphqlFetcher(envioLiquidationsPageQuery, { + chainId, + marketId, + limit, + offset, + }); + + return (response.data?.Morpho_Liquidate ?? []).map((event) => ({ + type: 'MarketLiquidation' as const, + hash: event.txHash, + timestamp: toTimestamp(event.timestamp), + liquidator: event.caller, + repaidAssets: event.repaidAssets, + seizedAssets: event.seizedAssets, + badDebtAssets: event.badDebtAssets, + })); +}; + +export const fetchEnvioMarketSuppliers = async ( + marketId: string, + chainId: number, + minShares = '0', + first = 8, + skip = 0, +): Promise => { + return paginateItems(await fetchEnvioSuppliersAll(marketId, chainId, minShares), first, skip); +}; + +export const fetchEnvioMarketBorrowers = async ( + marketId: string, + chainId: number, + marketState: BorrowSharePriceState, + minShares = '0', + first = 10, + skip = 0, +): Promise => { + return paginateItems(mapCachedBorrowers(await fetchEnvioBorrowersAll(marketId, chainId, minShares), marketState), first, skip); +}; + +export const fetchEnvioMarketSupplies = async ( + marketId: string, + chainId: number, + minAssets = '0', + first = 8, + skip = 0, +): Promise => { + return paginateWindowedItems(await fetchEnvioSupplyWithdrawWindow(marketId, chainId, minAssets, skip + first + 1), first, skip); +}; + +export const fetchEnvioMarketBorrows = async ( + marketId: string, + chainId: number, + minAssets = '0', + first = 8, + skip = 0, +): Promise => { + return paginateWindowedItems(await fetchEnvioBorrowRepayWindow(marketId, chainId, minAssets, skip + first + 1), first, skip); +}; + +export const fetchEnvioMarketLiquidations = async ( + marketId: string, + chainId: number, + first = 8, + skip = 0, +): Promise => { + return paginateWindowedItems(await fetchEnvioLiquidationsWindow(marketId, chainId, skip, first + 1), first, 0); +}; diff --git a/src/data-sources/morpho-api/market-liquidations.ts b/src/data-sources/morpho-api/market-liquidations.ts index 1feef13d..7fe7cfd6 100644 --- a/src/data-sources/morpho-api/market-liquidations.ts +++ b/src/data-sources/morpho-api/market-liquidations.ts @@ -1,5 +1,5 @@ import { marketLiquidationsQuery } from '@/graphql/morpho-api-queries'; -import type { MarketLiquidationTransaction } from '@/utils/types'; // Import unified type +import type { PaginatedMarketLiquidations } from '@/utils/types'; import { morphoGraphqlFetcher } from './fetchers'; // Type for the raw Morpho API response structure @@ -19,6 +19,9 @@ type MorphoAPILiquidationsResponse = { data?: { transactions?: { items?: MorphoAPILiquidationItem[]; + pageInfo?: { + countTotal: number; + }; }; }; }; @@ -26,12 +29,13 @@ type MorphoAPILiquidationsResponse = { /** * Fetches market liquidation activities from the Morpho Blue API. * @param marketId The unique key or ID of the market. - * @returns A promise resolving to an array of unified MarketLiquidationTransaction objects. + * @returns A promise resolving to paginated unified MarketLiquidationTransaction objects. */ -export const fetchMorphoMarketLiquidations = async (marketId: string): Promise => { +export const fetchMorphoMarketLiquidations = async (marketId: string, first = 8, skip = 0): Promise => { const variables = { uniqueKey: marketId, - // Morpho API query might not need first/skip for liquidations, adjust if needed + first, + skip, }; try { @@ -39,22 +43,25 @@ export const fetchMorphoMarketLiquidations = async (marketId: string): Promise ({ - type: 'MarketLiquidation', // Standardize type - hash: item.hash, - timestamp: item.timestamp, - liquidator: item.data.liquidator, - repaidAssets: item.data.repaidAssets, - seizedAssets: item.data.seizedAssets, - badDebtAssets: item.data.badDebtAssets, - // Removed optional fields not present in the simplified type - })); + return { + items: items.map((item) => ({ + type: 'MarketLiquidation', // Standardize type + hash: item.hash, + timestamp: item.timestamp, + liquidator: item.data.liquidator, + repaidAssets: item.data.repaidAssets, + seizedAssets: item.data.seizedAssets, + badDebtAssets: item.data.badDebtAssets, + })), + totalCount, + }; } catch (error) { console.error(`Error fetching or processing Morpho API market liquidations for ${marketId}:`, error); if (error instanceof Error) { diff --git a/src/data-sources/subgraph/fetchers.ts b/src/data-sources/subgraph/fetchers.ts index f48562be..ae01d002 100644 --- a/src/data-sources/subgraph/fetchers.ts +++ b/src/data-sources/subgraph/fetchers.ts @@ -1,3 +1,22 @@ +import type { SupportedNetworks } from '@/utils/networks'; +import { getSubgraphUrl } from '@/utils/subgraph-urls'; + +const createSubgraphProviderError = (network: SupportedNetworks, message: string): Error => { + return Object.assign(new Error(message), { + source: 'subgraph' as const, + network, + }); +}; + +export const requireSubgraphUrl = (network: SupportedNetworks): string => { + const subgraphUrl = getSubgraphUrl(network); + if (subgraphUrl) { + return subgraphUrl; + } + + throw createSubgraphProviderError(network, `No Subgraph URL configured for network ${network}`); +}; + export const subgraphGraphqlFetcher = async ( apiUrl: string, // Subgraph URL can vary query: string, diff --git a/src/data-sources/subgraph/market-borrowers.ts b/src/data-sources/subgraph/market-borrowers.ts index f03be539..30ea7f5e 100644 --- a/src/data-sources/subgraph/market-borrowers.ts +++ b/src/data-sources/subgraph/market-borrowers.ts @@ -1,8 +1,8 @@ import { marketBorrowersQuery } from '@/graphql/morpho-subgraph-queries'; import type { SupportedNetworks } from '@/utils/networks'; -import { getSubgraphUrl } from '@/utils/subgraph-urls'; +import { convertSharesToAssets } from '@/utils/positions'; import type { MarketBorrower, PaginatedMarketBorrowers } from '@/utils/types'; -import { subgraphGraphqlFetcher } from './fetchers'; +import { requireSubgraphUrl, subgraphGraphqlFetcher } from './fetchers'; // Type for the Subgraph response type SubgraphBorrowerItem = { @@ -58,11 +58,7 @@ export const fetchSubgraphMarketBorrowers = async ( pageSize = 10, skip = 0, ): Promise => { - const subgraphUrl = getSubgraphUrl(network); - if (!subgraphUrl) { - console.warn(`No Subgraph URL configured for network: ${network}. Returning empty results.`); - return { items: [], totalCount: 0 }; - } + const subgraphUrl = requireSubgraphUrl(network); const cacheKey = getCacheKey(marketId, network, minShares); const now = Date.now(); @@ -72,9 +68,7 @@ export const fetchSubgraphMarketBorrowers = async ( let allMappedItems: MarketBorrower[]; if (cached && now - cached.timestamp < CACHE_TTL) { - // Use cached data allMappedItems = cached.data; - console.log(`Using cached borrowers data for ${marketId} (${allMappedItems.length} items)`); } else { // Fetch fresh data - always fetch top 1000 items (subgraph limit) const variables = { @@ -86,6 +80,12 @@ export const fetchSubgraphMarketBorrowers = async ( try { const result = await subgraphGraphqlFetcher(subgraphUrl, marketBorrowersQuery, variables); + if (!result.data) { + throw Object.assign(new Error(`Subgraph returned no borrower data for market ${marketId} on network ${network}`), { + source: 'subgraph' as const, + network, + }); + } const positions = result.data?.positions ?? []; const market = result.data?.market; @@ -99,12 +99,7 @@ export const fetchSubgraphMarketBorrowers = async ( // Convert borrow shares to borrow assets // borrowAssets = (shares * totalBorrow) / totalBorrowShares const shares = BigInt(position.shares); - let borrowAssets = '0'; - - if (totalBorrowShares > 0n) { - const assets = (shares * totalBorrow) / totalBorrowShares; - borrowAssets = assets.toString(); - } + const borrowAssets = convertSharesToAssets(shares, totalBorrow, totalBorrowShares).toString(); // Get collateral balance from nested positions (should be exactly 1) const collateralBalance = position.account.positions[0]?.balance ?? '0'; @@ -121,8 +116,6 @@ export const fetchSubgraphMarketBorrowers = async ( data: allMappedItems, timestamp: now, }); - - console.log(`Fetched and cached ${allMappedItems.length} borrowers for ${marketId}`); } catch (error) { console.error(`Error fetching or processing Subgraph market borrowers for ${marketId}:`, error); if (error instanceof Error) { diff --git a/src/data-sources/subgraph/market-borrows.ts b/src/data-sources/subgraph/market-borrows.ts index 2e5d7a7a..c94901d7 100644 --- a/src/data-sources/subgraph/market-borrows.ts +++ b/src/data-sources/subgraph/market-borrows.ts @@ -1,8 +1,7 @@ import { marketBorrowsRepaysQuery } from '@/graphql/morpho-subgraph-queries'; import type { SupportedNetworks } from '@/utils/networks'; -import { getSubgraphUrl } from '@/utils/subgraph-urls'; import type { MarketActivityTransaction, PaginatedMarketActivityTransactions } from '@/utils/types'; // Import shared type -import { subgraphGraphqlFetcher } from './fetchers'; +import { requireSubgraphUrl, subgraphGraphqlFetcher } from './fetchers'; // Types specific to the Subgraph response for this query type SubgraphBorrowRepayItem = { @@ -23,10 +22,9 @@ type SubgraphBorrowsRepaysResponse = { /** * Fetches market borrow/repay activities from the Subgraph. - * NOTE: Because borrows and repays are fetched separately and merged client-side, - * we cannot do proper server-side pagination. Instead, we fetch a large batch (200 items) - * from both sources, merge and sort them, then apply client-side pagination. - * This ensures correct ordering and prevents skipped items. + * Because borrows and repays are fetched separately and merged client-side, + * we fetch the requested prefix window from both streams, merge them, and then + * derive the requested page plus `hasNextPage`. * @param marketId The ID of the market. * @param loanAssetId The address of the loan asset. * @param network The blockchain network. @@ -43,13 +41,9 @@ export const fetchSubgraphMarketBorrows = async ( first = 8, skip = 0, ): Promise => { - const subgraphUrl = getSubgraphUrl(network); - if (!subgraphUrl) { - console.warn(`No Subgraph URL configured for network: ${network}. Returning empty results.`); - return { items: [], totalCount: 0 }; - } + const subgraphUrl = requireSubgraphUrl(network); - const fetchBatchSize = 200; + const fetchBatchSize = skip + first + 1; const variables = { marketId, @@ -61,6 +55,12 @@ export const fetchSubgraphMarketBorrows = async ( try { const result = await subgraphGraphqlFetcher(subgraphUrl, marketBorrowsRepaysQuery, variables); + if (!result.data) { + throw Object.assign(new Error(`Subgraph returned no borrow activity data for market ${marketId} on network ${network}`), { + source: 'subgraph' as const, + network, + }); + } const borrows = result.data?.borrows ?? []; const repays = result.data?.repays ?? []; @@ -88,11 +88,13 @@ export const fetchSubgraphMarketBorrows = async ( const startIndex = skip; const endIndex = skip + first; const items = combined.slice(startIndex, endIndex); - const totalCount = combined.length; + const hasNextPage = combined.length > endIndex; + const totalCount = skip >= combined.length ? combined.length : Math.max(combined.length, skip + items.length + Number(hasNextPage)); return { items, totalCount, + hasNextPage, }; } catch (error) { console.error(`Error fetching or processing Subgraph market borrows for ${marketId}:`, error); diff --git a/src/data-sources/subgraph/market-liquidations.ts b/src/data-sources/subgraph/market-liquidations.ts index 3880d328..7e7373f7 100644 --- a/src/data-sources/subgraph/market-liquidations.ts +++ b/src/data-sources/subgraph/market-liquidations.ts @@ -1,8 +1,7 @@ -import { marketLiquidationsAndBadDebtQuery } from '@/graphql/morpho-subgraph-queries'; +import { marketLiquidationBadDebtQuery, marketLiquidationsPageQuery } from '@/graphql/morpho-subgraph-queries'; import type { SupportedNetworks } from '@/utils/networks'; -import { getSubgraphUrl } from '@/utils/subgraph-urls'; -import type { MarketLiquidationTransaction } from '@/utils/types'; // Import simplified type -import { subgraphGraphqlFetcher } from './fetchers'; +import type { MarketLiquidationTransaction, PaginatedMarketLiquidations } from '@/utils/types'; +import { requireSubgraphUrl, subgraphGraphqlFetcher } from './fetchers'; // Types specific to the Subgraph response items type SubgraphLiquidateItem = { @@ -27,53 +26,87 @@ type SubgraphBadDebtItem = { type SubgraphLiquidationsResponse = { data?: { liquidates?: SubgraphLiquidateItem[]; + }; +}; + +type SubgraphLiquidationBadDebtResponse = { + data?: { badDebtRealizations?: SubgraphBadDebtItem[]; }; }; /** * Fetches market liquidation activities from the Subgraph. - * Combines liquidation events with associated bad debt realizations. + * Fetches only the requested liquidation page and then resolves bad debt for those page rows. * @param marketId The ID of the market. * @param network The blockchain network. - * @returns A promise resolving to an array of simplified MarketLiquidationTransaction objects. + * @returns A promise resolving to paginated MarketLiquidationTransaction objects. */ export const fetchSubgraphMarketLiquidations = async ( marketId: string, network: SupportedNetworks, -): Promise => { - const subgraphUrl = getSubgraphUrl(network); - if (!subgraphUrl) { - console.warn(`No Subgraph URL configured for network: ${network}. Returning empty results.`); - return []; - } + first = 8, + skip = 0, +): Promise => { + const subgraphUrl = requireSubgraphUrl(network); - const variables = { marketId }; + const variables = { + marketId, + first: first + 1, + skip, + }; try { - const result = await subgraphGraphqlFetcher(subgraphUrl, marketLiquidationsAndBadDebtQuery, variables); + const result = await subgraphGraphqlFetcher(subgraphUrl, marketLiquidationsPageQuery, variables); + if (!result.data) { + throw Object.assign(new Error(`Subgraph returned no liquidation data for market ${marketId} on network ${network}`), { + source: 'subgraph' as const, + network, + }); + } const liquidates = result.data?.liquidates ?? []; - const badDebtItems = result.data?.badDebtRealizations ?? []; + const hasNextPage = liquidates.length > first; + const pageLiquidations = liquidates.slice(0, first); + const liquidationIds = pageLiquidations.map((liquidation) => liquidation.id); + const badDebtResult = + liquidationIds.length === 0 + ? null + : await subgraphGraphqlFetcher(subgraphUrl, marketLiquidationBadDebtQuery, { + liquidationIds, + }); + + if (badDebtResult && !badDebtResult.data) { + throw Object.assign(new Error(`Subgraph returned no bad debt data for market ${marketId} on network ${network}`), { + source: 'subgraph' as const, + network, + }); + } + + const badDebtItems = badDebtResult?.data?.badDebtRealizations ?? []; // Create a map for quick lookup of bad debt by liquidation ID const badDebtMap = new Map(); - badDebtItems.forEach((item) => { + for (const item of badDebtItems) { badDebtMap.set(item.liquidation.id, item.badDebt); - }); + } // Map liquidations, adding bad debt information - return liquidates.map((liq) => ({ + const items: MarketLiquidationTransaction[] = pageLiquidations.map((liq) => ({ type: 'MarketLiquidation', hash: liq.hash, timestamp: typeof liq.timestamp === 'string' ? Number.parseInt(liq.timestamp, 10) : liq.timestamp, - // Subgraph query doesn't provide liquidator, use empty string or default liquidator: liq.liquidator.id, - repaidAssets: liq.repaid, // Loan asset repaid - seizedAssets: liq.amount, // Collateral seized - // Fetch bad debt from the map using the liquidate event ID - badDebtAssets: badDebtMap.get(liq.id) ?? '0', // Default to '0' if no bad debt entry + repaidAssets: liq.repaid, + seizedAssets: liq.amount, + badDebtAssets: badDebtMap.get(liq.id) ?? '0', })); + + return { + items, + totalCount: skip + items.length + Number(hasNextPage), + hasNextPage, + }; } catch (error) { console.error(`Error fetching or processing Subgraph market liquidations for ${marketId}:`, error); if (error instanceof Error) { diff --git a/src/data-sources/subgraph/market-suppliers.ts b/src/data-sources/subgraph/market-suppliers.ts index 9558e13a..1f11e575 100644 --- a/src/data-sources/subgraph/market-suppliers.ts +++ b/src/data-sources/subgraph/market-suppliers.ts @@ -1,8 +1,7 @@ import { marketSuppliersQuery } from '@/graphql/morpho-subgraph-queries'; import type { SupportedNetworks } from '@/utils/networks'; -import { getSubgraphUrl } from '@/utils/subgraph-urls'; import type { MarketSupplier, PaginatedMarketSuppliers } from '@/utils/types'; -import { subgraphGraphqlFetcher } from './fetchers'; +import { requireSubgraphUrl, subgraphGraphqlFetcher } from './fetchers'; // Type for the Subgraph response type SubgraphSupplierItem = { @@ -50,11 +49,7 @@ export const fetchSubgraphMarketSuppliers = async ( pageSize = 8, skip = 0, ): Promise => { - const subgraphUrl = getSubgraphUrl(network); - if (!subgraphUrl) { - console.warn(`No Subgraph URL configured for network: ${network}. Returning empty results.`); - return { items: [], totalCount: 0 }; - } + const subgraphUrl = requireSubgraphUrl(network); const cacheKey = getCacheKey(marketId, network, minShares); const now = Date.now(); @@ -64,9 +59,7 @@ export const fetchSubgraphMarketSuppliers = async ( let allMappedItems: MarketSupplier[]; if (cached && now - cached.timestamp < CACHE_TTL) { - // Use cached data allMappedItems = cached.data; - console.log(`Using cached suppliers data for ${marketId} (${allMappedItems.length} items)`); } else { // Fetch fresh data - always fetch top 1000 items (subgraph limit) const variables = { @@ -78,6 +71,12 @@ export const fetchSubgraphMarketSuppliers = async ( try { const result = await subgraphGraphqlFetcher(subgraphUrl, marketSuppliersQuery, variables); + if (!result.data) { + throw Object.assign(new Error(`Subgraph returned no supplier data for market ${marketId} on network ${network}`), { + source: 'subgraph' as const, + network, + }); + } const positions = result.data?.positions ?? []; @@ -92,8 +91,6 @@ export const fetchSubgraphMarketSuppliers = async ( data: allMappedItems, timestamp: now, }); - - console.log(`Fetched and cached ${allMappedItems.length} suppliers for ${marketId}`); } catch (error) { console.error(`Error fetching or processing Subgraph market suppliers for ${marketId}:`, error); if (error instanceof Error) { diff --git a/src/data-sources/subgraph/market-supplies.ts b/src/data-sources/subgraph/market-supplies.ts index edb49b1a..f099be2b 100644 --- a/src/data-sources/subgraph/market-supplies.ts +++ b/src/data-sources/subgraph/market-supplies.ts @@ -1,8 +1,7 @@ import { marketDepositsWithdrawsQuery } from '@/graphql/morpho-subgraph-queries'; import type { SupportedNetworks } from '@/utils/networks'; -import { getSubgraphUrl } from '@/utils/subgraph-urls'; // Import shared utility import type { MarketActivityTransaction, PaginatedMarketActivityTransactions } from '@/utils/types'; -import { subgraphGraphqlFetcher } from './fetchers'; // Import shared fetcher +import { requireSubgraphUrl, subgraphGraphqlFetcher } from './fetchers'; // Types specific to the Subgraph response for this query type SubgraphSupplyWithdrawItem = { @@ -24,10 +23,9 @@ type SubgraphSuppliesWithdrawsResponse = { /** * Fetches market supply/withdraw activities (deposits/withdraws of loan asset) from the Subgraph. - * NOTE: Because deposits and withdraws are fetched separately and merged client-side, - * we cannot do proper server-side pagination. Instead, we fetch a large batch (200 items) - * from both sources, merge and sort them, then apply client-side pagination. - * This ensures correct ordering and prevents skipped items. + * Because deposits and withdraws are fetched separately and merged client-side, + * we fetch the requested prefix window from both streams, merge them, and then + * derive the requested page plus `hasNextPage`. * @param marketId The ID of the market. * @param loanAssetId The address of the loan asset. * @param network The blockchain network. @@ -44,13 +42,9 @@ export const fetchSubgraphMarketSupplies = async ( first = 8, skip = 0, ): Promise => { - const subgraphUrl = getSubgraphUrl(network); - if (!subgraphUrl) { - console.warn(`No Subgraph URL configured for network: ${network}. Returning empty results.`); - return { items: [], totalCount: 0 }; - } + const subgraphUrl = requireSubgraphUrl(network); - const fetchBatchSize = 200; + const fetchBatchSize = skip + first + 1; const variables = { marketId, @@ -62,6 +56,12 @@ export const fetchSubgraphMarketSupplies = async ( try { const result = await subgraphGraphqlFetcher(subgraphUrl, marketDepositsWithdrawsQuery, variables); + if (!result.data) { + throw Object.assign(new Error(`Subgraph returned no supply activity data for market ${marketId} on network ${network}`), { + source: 'subgraph' as const, + network, + }); + } const deposits = result.data?.deposits ?? []; const withdraws = result.data?.withdraws ?? []; @@ -89,11 +89,13 @@ export const fetchSubgraphMarketSupplies = async ( const startIndex = skip; const endIndex = skip + first; const items = combined.slice(startIndex, endIndex); - const totalCount = combined.length; + const hasNextPage = combined.length > endIndex; + const totalCount = skip >= combined.length ? combined.length : Math.max(combined.length, skip + items.length + Number(hasNextPage)); return { items, totalCount, + hasNextPage, }; } catch (error) { console.error(`Error fetching or processing Subgraph market supplies for ${marketId}:`, error); diff --git a/src/features/admin-v2/components/stats-asset-table.tsx b/src/features/admin-v2/components/stats-asset-table.tsx index 17380586..1700bc27 100644 --- a/src/features/admin-v2/components/stats-asset-table.tsx +++ b/src/features/admin-v2/components/stats-asset-table.tsx @@ -257,6 +257,7 @@ export function StatsAssetTable({ transactions, isLoading }: StatsAssetTableProp
0 && ( 0 ? Math.ceil(totalCount / pageSize) : 0; + const paginationModeProps = + hasNextPage === undefined ? { mode: 'fixed' as const, totalPages: fixedTotalPages } : { mode: 'open' as const, hasNextPage }; const handlePageChange = (page: number) => { setCurrentPage(page); @@ -160,12 +163,13 @@ export function BorrowsTable({ chainId, market, minAssets, onOpenFiltersModal }: {totalCount > 0 && ( )}
diff --git a/src/features/market-detail/components/liquidations-table.tsx b/src/features/market-detail/components/liquidations-table.tsx index cd2fa4eb..1a93888a 100644 --- a/src/features/market-detail/components/liquidations-table.tsx +++ b/src/features/market-detail/components/liquidations-table.tsx @@ -1,4 +1,4 @@ -import { useMemo, useState } from 'react'; +import { useState } from 'react'; import { Table, TableHeader, TableBody, TableRow, TableCell, TableHead } from '@/components/ui/table'; import moment from 'moment'; import { type Address, formatUnits } from 'viem'; @@ -20,20 +20,19 @@ export function LiquidationsTable({ chainId, market }: LiquidationsTableProps) { const [currentPage, setCurrentPage] = useState(1); const pageSize = 8; - const { data: liquidations, isLoading, error } = useMarketLiquidations(market?.uniqueKey, chainId); + const { data: paginatedData, isLoading, isFetching, error } = useMarketLiquidations(market?.uniqueKey, chainId, currentPage, pageSize); - const totalCount = (liquidations ?? []).length; - const totalPages = Math.ceil(totalCount / pageSize); + const liquidations = paginatedData?.items ?? []; + const totalCount = paginatedData?.totalCount ?? 0; + const hasNextPage = paginatedData?.hasNextPage; + const fixedTotalPages = totalCount > 0 ? Math.ceil(totalCount / pageSize) : 0; + const paginationModeProps = + hasNextPage === undefined ? { mode: 'fixed' as const, totalPages: fixedTotalPages } : { mode: 'open' as const, hasNextPage }; const handlePageChange = (page: number) => { setCurrentPage(page); }; - const paginatedLiquidations = useMemo(() => { - const sliced = (liquidations ?? []).slice((currentPage - 1) * pageSize, currentPage * pageSize); - return sliced; - }, [currentPage, liquidations, pageSize]); - const tableKey = `liquidations-table-${currentPage}`; if (error) { @@ -46,7 +45,7 @@ export function LiquidationsTable({ chainId, market }: LiquidationsTableProps) {
{/* Loading overlay */} - {isLoading && ( + {isFetching && (
@@ -68,7 +67,7 @@ export function LiquidationsTable({ chainId, market }: LiquidationsTableProps) { - {paginatedLiquidations.length === 0 && !isLoading ? ( + {liquidations.length === 0 && !isLoading ? ( ) : ( - paginatedLiquidations.map((liquidation: MarketLiquidationTransaction) => { + liquidations.map((liquidation: MarketLiquidationTransaction) => { const hasBadDebt = BigInt(liquidation.badDebtAssets) !== BigInt(0); const isLiquidatorAddress = liquidation.liquidator?.startsWith('0x'); @@ -162,12 +161,13 @@ export function LiquidationsTable({ chainId, market }: LiquidationsTableProps) { {totalCount > 0 && ( )}
diff --git a/src/features/market-detail/components/suppliers-table.tsx b/src/features/market-detail/components/suppliers-table.tsx index fd193765..eec08326 100644 --- a/src/features/market-detail/components/suppliers-table.tsx +++ b/src/features/market-detail/components/suppliers-table.tsx @@ -163,6 +163,7 @@ export function SuppliersTable({ chainId, market, minShares, onOpenFiltersModal {totalCount > 0 && ( 0 ? Math.ceil(totalCount / pageSize) : 0; + const paginationModeProps = + hasNextPage === undefined ? { mode: 'fixed' as const, totalPages: fixedTotalPages } : { mode: 'open' as const, hasNextPage }; const handlePageChange = (page: number) => { setCurrentPage(page); @@ -155,12 +158,13 @@ export function SuppliesTable({ chainId, market, minAssets, onOpenFiltersModal } {totalCount > 0 && ( )}
diff --git a/src/features/markets/components/markets-table-same-loan.tsx b/src/features/markets/components/markets-table-same-loan.tsx index 36ae8639..b01e1649 100644 --- a/src/features/markets/components/markets-table-same-loan.tsx +++ b/src/features/markets/components/markets-table-same-loan.tsx @@ -761,6 +761,7 @@ export function MarketsTableWithSameLoanAsset({ {/* Pagination */} {!loading && !isEmpty && markets.length > 0 && ( 1 && ( 1 && ( = { + provider: MarketDetailProvider; + fetch: () => Promise; +}; + +type RunMarketDetailFallbackParams = { + dataLabel: string; + marketId: string; + network: SupportedNetworks; + attempts: ProviderAttempt[]; +}; + +type ProviderError = { + provider: MarketDetailProvider; + message: string; +}; + +const toErrorMessage = (error: unknown): string => { + if (error instanceof Error) { + return error.message; + } + + if (typeof error === 'string') { + return error; + } + + return 'Unknown error'; +}; + +export const runMarketDetailFallback = async ({ + dataLabel, + marketId, + network, + attempts, +}: RunMarketDetailFallbackParams): Promise => { + const providerErrors: ProviderError[] = []; + let lastProvider: MarketDetailProvider | null = null; + let lastError: unknown = null; + + for (const attempt of attempts) { + lastProvider = attempt.provider; + + try { + const result = await attempt.fetch(); + if (result !== null) { + return result; + } + + const nullResultError = new Error(`${attempt.provider} returned null`); + console.error(`Failed to fetch ${dataLabel} via ${attempt.provider}:`, nullResultError); + providerErrors.push({ + provider: attempt.provider, + message: nullResultError.message, + }); + lastError = nullResultError; + } catch (error) { + console.error(`Failed to fetch ${dataLabel} via ${attempt.provider}:`, error); + providerErrors.push({ + provider: attempt.provider, + message: toErrorMessage(error), + }); + lastError = error; + } + } + + const source = lastProvider ?? 'subgraph'; + const attemptedProviders = attempts.map((attempt) => attempt.provider); + const message = `Failed to fetch ${dataLabel} for market ${marketId} on network ${network}: ${providerErrors + .map(({ provider, message: providerMessage }) => `${provider}: ${providerMessage}`) + .join('; ')}`; + const normalizedError = new Error(message, { + cause: lastError instanceof Error ? lastError : undefined, + }); + + throw Object.assign(normalizedError, { + source, + marketId, + network, + attemptedProviders, + providerErrors, + }); +}; diff --git a/src/hooks/useHistoricalSupplierPositions.ts b/src/hooks/useHistoricalSupplierPositions.ts index a2a0bda9..8ddf8caa 100644 --- a/src/hooks/useHistoricalSupplierPositions.ts +++ b/src/hooks/useHistoricalSupplierPositions.ts @@ -2,6 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import { formatUnits, type Address, type PublicClient } from 'viem'; import morphoABI from '@/abis/morpho'; import { useCustomRpcContext } from '@/components/providers/CustomRpcProvider'; +import { convertSharesToAssets } from '@/utils/positions'; import { getMorphoAddress } from '@/utils/morpho'; import { fetchBlocksWithTimestamps, type BlockWithTimestamp } from '@/utils/blockEstimation'; import type { SupportedNetworks } from '@/utils/networks'; @@ -96,7 +97,7 @@ async function fetchBlockData( const supplyShares = positionData[0]; // Convert shares to assets - const supplyAssets = blockTotalSupplyShares > 0n ? (supplyShares * blockTotalSupplyAssets) / blockTotalSupplyShares : 0n; + const supplyAssets = convertSharesToAssets(supplyShares, blockTotalSupplyAssets, blockTotalSupplyShares); dataPoint[supplier.address] = Number(formatUnits(supplyAssets, loanAssetDecimals)); } else { @@ -129,7 +130,7 @@ export function useHistoricalSupplierPositions( // Get top suppliers by current supply shares const topSuppliers: SupplierInfo[] = (suppliers ?? []).slice(0, TOP_SUPPLIERS_LIMIT).map((s) => { const shares = BigInt(s.supplyShares); - const assets = totalSupplyShares > 0n ? (shares * totalSupplyAssets) / totalSupplyShares : 0n; + const assets = convertSharesToAssets(shares, totalSupplyAssets, totalSupplyShares); return { address: s.userAddress, currentSupply: assets, diff --git a/src/hooks/useMarketBorrowers.ts b/src/hooks/useMarketBorrowers.ts index 171006a7..8d34571c 100644 --- a/src/hooks/useMarketBorrowers.ts +++ b/src/hooks/useMarketBorrowers.ts @@ -1,15 +1,35 @@ import { useCallback, useEffect } from 'react'; import { useQuery, useQueryClient } from '@tanstack/react-query'; import { supportsMorphoApi } from '@/config/dataSources'; +import { fetchEnvioMarketBorrowers } from '@/data-sources/envio/market-detail'; import { fetchMorphoMarketBorrowers } from '@/data-sources/morpho-api/market-borrowers'; import { fetchSubgraphMarketBorrowers } from '@/data-sources/subgraph/market-borrowers'; +import { runMarketDetailFallback } from '@/hooks/queries/market-detail-fallback'; import type { SupportedNetworks } from '@/utils/networks'; -import type { PaginatedMarketBorrowers } from '@/utils/types'; +import type { Market, PaginatedMarketBorrowers } from '@/utils/types'; + +const buildMarketBorrowersKey = ({ + marketId, + network, + marketState, + minShares, + page, + pageSize, +}: { + marketId: string | undefined; + network: SupportedNetworks | undefined; + marketState: Pick | undefined; + minShares: string; + page: number; + pageSize: number; +}) => { + return ['marketBorrowers', marketId, network, marketState?.borrowAssets, marketState?.borrowShares, minShares, page, pageSize] as const; +}; /** * Hook to fetch current borrowers (positions) for a specific market, - * using the appropriate data source based on the network. - * Supports pagination with server-side pagination for Morpho API. + * using Envio as the primary source with existing sources as fallback. + * Preserves exact total counts via the shared Envio scan/cache layer. * Returns borrowers sorted by borrow shares (descending). * * @param marketId The ID of the market (e.g., 0x...). @@ -22,6 +42,7 @@ import type { PaginatedMarketBorrowers } from '@/utils/types'; export const useMarketBorrowers = ( marketId: string | undefined, network: SupportedNetworks | undefined, + marketState: Pick | undefined, minShares = '1', page = 1, pageSize = 10, @@ -31,47 +52,54 @@ export const useMarketBorrowers = ( // Always filter out zero positions by ensuring minShares >= 1 const effectiveMinShares = !minShares || minShares === '0' || minShares === '' ? '1' : minShares; - const queryKey = ['marketBorrowers', marketId, network, effectiveMinShares, page, pageSize]; + const queryKey = buildMarketBorrowersKey({ + marketId, + network, + marketState, + minShares: effectiveMinShares, + page, + pageSize, + }); const queryFn = useCallback( async (targetPage: number): Promise => { - if (!marketId || !network) { + if (!marketId || !network || !marketState) { return null; } const targetSkip = (targetPage - 1) * pageSize; - let result: PaginatedMarketBorrowers | null = null; - - // Try Morpho API first if supported - if (supportsMorphoApi(network)) { - try { - console.log(`Attempting to fetch borrowers via Morpho API for ${marketId} (page ${targetPage})`); - result = await fetchMorphoMarketBorrowers(marketId, Number(network), effectiveMinShares, pageSize, targetSkip); - } catch (morphoError) { - console.error('Failed to fetch borrowers via Morpho API:', morphoError); - } - } - // Fallback to Subgraph if Morpho API failed or not supported - if (!result) { - try { - console.log(`Attempting to fetch borrowers via Subgraph for ${marketId} (page ${targetPage})`); - result = await fetchSubgraphMarketBorrowers(marketId, network, effectiveMinShares, pageSize, targetSkip); - } catch (subgraphError) { - console.error('Failed to fetch borrowers via Subgraph:', subgraphError); - throw subgraphError; - } - } - - return result; + return runMarketDetailFallback({ + dataLabel: 'borrowers', + marketId, + network, + attempts: [ + { + provider: 'envio', + fetch: () => fetchEnvioMarketBorrowers(marketId, Number(network), marketState, effectiveMinShares, pageSize, targetSkip), + }, + ...(supportsMorphoApi(network) + ? [ + { + provider: 'morpho-api' as const, + fetch: () => fetchMorphoMarketBorrowers(marketId, Number(network), effectiveMinShares, pageSize, targetSkip), + }, + ] + : []), + { + provider: 'subgraph', + fetch: () => fetchSubgraphMarketBorrowers(marketId, network, effectiveMinShares, pageSize, targetSkip), + }, + ], + }); }, - [marketId, network, effectiveMinShares, pageSize], + [marketId, network, marketState, effectiveMinShares, pageSize], ); const { data, isLoading, isFetching, error, refetch } = useQuery({ queryKey: queryKey, queryFn: async () => queryFn(page), - enabled: !!marketId && !!network, + enabled: !!marketId && !!network && !!marketState, staleTime: 1000 * 60 * 2, // 2 minutes - positions change more frequently than historical data placeholderData: (previousData) => previousData ?? null, retry: 1, @@ -79,12 +107,19 @@ export const useMarketBorrowers = ( // Prefetch adjacent pages for faster navigation useEffect(() => { - if (!marketId || !network || !data) return; + if (!marketId || !network || !marketState || !data) return; const totalPages = data.totalCount > 0 ? Math.ceil(data.totalCount / pageSize) : 0; if (page > 1) { - const prevPageKey = ['marketBorrowers', marketId, network, effectiveMinShares, page - 1, pageSize]; + const prevPageKey = buildMarketBorrowersKey({ + marketId, + network, + marketState, + minShares: effectiveMinShares, + page: page - 1, + pageSize, + }); void queryClient.prefetchQuery({ queryKey: prevPageKey, queryFn: async () => queryFn(page - 1), @@ -93,14 +128,21 @@ export const useMarketBorrowers = ( } if (page < totalPages) { - const nextPageKey = ['marketBorrowers', marketId, network, effectiveMinShares, page + 1, pageSize]; + const nextPageKey = buildMarketBorrowersKey({ + marketId, + network, + marketState, + minShares: effectiveMinShares, + page: page + 1, + pageSize, + }); void queryClient.prefetchQuery({ queryKey: nextPageKey, queryFn: async () => queryFn(page + 1), staleTime: 1000 * 60 * 2, }); } - }, [page, data, queryClient, queryFn, marketId, network, effectiveMinShares, pageSize]); + }, [page, data, queryClient, queryFn, marketId, network, marketState, effectiveMinShares, pageSize]); return { data: data, diff --git a/src/hooks/useMarketBorrows.ts b/src/hooks/useMarketBorrows.ts index f5fac444..3c47af8e 100644 --- a/src/hooks/useMarketBorrows.ts +++ b/src/hooks/useMarketBorrows.ts @@ -1,15 +1,17 @@ import { useEffect, useCallback } from 'react'; import { useQuery, useQueryClient } from '@tanstack/react-query'; import { supportsMorphoApi } from '@/config/dataSources'; +import { fetchEnvioMarketBorrows } from '@/data-sources/envio/market-detail'; import { fetchMorphoMarketBorrows } from '@/data-sources/morpho-api/market-borrows'; import { fetchSubgraphMarketBorrows } from '@/data-sources/subgraph/market-borrows'; +import { runMarketDetailFallback } from '@/hooks/queries/market-detail-fallback'; import type { SupportedNetworks } from '@/utils/networks'; import type { PaginatedMarketActivityTransactions } from '@/utils/types'; /** * Hook to fetch borrow and repay activities for a specific market's loan asset, - * using the appropriate data source based on the network. - * Supports pagination with server-side pagination for Morpho API and client-side for Subgraph. + * using Envio as the primary source with existing sources as fallback. + * Envio only loads the current page window instead of scanning the full event history. * @param marketId The ID or unique key of the market. * @param loanAssetId The address of the loan asset for the market. * @param network The blockchain network. @@ -37,30 +39,30 @@ export const useMarketBorrows = ( } const targetSkip = (targetPage - 1) * pageSize; - let result: PaginatedMarketActivityTransactions | null = null; - // Try Morpho API first if supported - if (supportsMorphoApi(network)) { - try { - console.log(`Attempting to fetch borrows via Morpho API for ${marketId} (page ${targetPage})`); - result = await fetchMorphoMarketBorrows(marketId, minAssets, pageSize, targetSkip); - } catch (morphoError) { - console.error('Failed to fetch borrows via Morpho API:', morphoError); - } - } - - // Fallback to Subgraph if Morpho API failed or not supported - if (!result) { - try { - console.log(`Attempting to fetch borrows via Subgraph for ${marketId} (page ${targetPage})`); - result = await fetchSubgraphMarketBorrows(marketId, loanAssetId, network, minAssets, pageSize, targetSkip); - } catch (subgraphError) { - console.error('Failed to fetch borrows via Subgraph:', subgraphError); - throw subgraphError; - } - } - - return result; + return runMarketDetailFallback({ + dataLabel: 'borrow and repay activity', + marketId, + network, + attempts: [ + { + provider: 'envio', + fetch: () => fetchEnvioMarketBorrows(marketId, Number(network), minAssets, pageSize, targetSkip), + }, + ...(supportsMorphoApi(network) + ? [ + { + provider: 'morpho-api' as const, + fetch: () => fetchMorphoMarketBorrows(marketId, minAssets, pageSize, targetSkip), + }, + ] + : []), + { + provider: 'subgraph', + fetch: () => fetchSubgraphMarketBorrows(marketId, loanAssetId, network, minAssets, pageSize, targetSkip), + }, + ], + }); }, [marketId, loanAssetId, network, minAssets, pageSize], ); @@ -70,7 +72,7 @@ export const useMarketBorrows = ( queryFn: async () => queryFn(page), enabled: !!marketId && !!loanAssetId && !!network, staleTime: 1000 * 60 * 5, // 5 minutes - keep cached data fresh longer - placeholderData: (previousData) => previousData ?? null, + placeholderData: () => null, retry: 1, }); @@ -78,8 +80,6 @@ export const useMarketBorrows = ( useEffect(() => { if (!marketId || !loanAssetId || !network || !data) return; - const totalPages = data.totalCount > 0 ? Math.ceil(data.totalCount / pageSize) : 0; - if (page > 1) { const prevPageKey = ['marketBorrows', marketId, loanAssetId, network, minAssets, page - 1, pageSize]; void queryClient.prefetchQuery({ @@ -89,7 +89,9 @@ export const useMarketBorrows = ( }); } - if (page < totalPages) { + const hasNextPage = data.hasNextPage ?? (data.totalCount > 0 && page < Math.ceil(data.totalCount / pageSize)); + + if (hasNextPage) { const nextPageKey = ['marketBorrows', marketId, loanAssetId, network, minAssets, page + 1, pageSize]; void queryClient.prefetchQuery({ queryKey: nextPageKey, diff --git a/src/hooks/useMarketLiquidations.ts b/src/hooks/useMarketLiquidations.ts index d15b5b3a..1c101517 100644 --- a/src/hooks/useMarketLiquidations.ts +++ b/src/hooks/useMarketLiquidations.ts @@ -1,65 +1,100 @@ -import { useQuery } from '@tanstack/react-query'; +import { useCallback, useEffect } from 'react'; +import { useQuery, useQueryClient } from '@tanstack/react-query'; import { supportsMorphoApi } from '@/config/dataSources'; +import { fetchEnvioMarketLiquidations } from '@/data-sources/envio/market-detail'; import { fetchMorphoMarketLiquidations } from '@/data-sources/morpho-api/market-liquidations'; import { fetchSubgraphMarketLiquidations } from '@/data-sources/subgraph/market-liquidations'; +import { runMarketDetailFallback } from '@/hooks/queries/market-detail-fallback'; import type { SupportedNetworks } from '@/utils/networks'; -import type { MarketLiquidationTransaction } from '@/utils/types'; // Use simplified type +import type { PaginatedMarketLiquidations } from '@/utils/types'; /** - * Hook to fetch all liquidations for a specific market, using the appropriate data source. + * Hook to fetch liquidations for a specific market, using Envio as the primary source + * with existing sources as fallback. * @param marketId The ID or unique key of the market. * @param network The blockchain network. - * @returns List of liquidation transactions for the market. + * @param page Current page number (1-indexed, defaults to 1). + * @param pageSize Number of items per page (defaults to 8). + * @returns Paginated liquidation transactions for the market. */ -export const useMarketLiquidations = (marketId: string | undefined, network: SupportedNetworks | undefined) => { - // Note: loanAssetId is not needed for liquidations query - const queryKey = ['marketLiquidations', marketId, network]; +export const useMarketLiquidations = (marketId: string | undefined, network: SupportedNetworks | undefined, page = 1, pageSize = 8) => { + const queryClient = useQueryClient(); + const queryKey = ['marketLiquidations', marketId, network, page, pageSize]; - const { data, isLoading, error, refetch } = useQuery({ - queryKey: queryKey, - queryFn: async (): Promise => { + const queryFn = useCallback( + async (targetPage: number): Promise => { if (!marketId || !network) { return null; } - let liquidations: MarketLiquidationTransaction[] | null = null; - - // Try Morpho API first if supported - if (supportsMorphoApi(network)) { - try { - console.log(`Attempting to fetch liquidations via Morpho API for ${marketId}`); - liquidations = await fetchMorphoMarketLiquidations(marketId); - } catch (morphoError) { - console.error('Failed to fetch liquidations via Morpho API:', morphoError); - // Continue to Subgraph fallback - } - } - - // If Morpho API failed or not supported, try Subgraph - if (!liquidations) { - try { - console.log(`Attempting to fetch liquidations via Subgraph for ${marketId}`); - liquidations = await fetchSubgraphMarketLiquidations(marketId, network); - } catch (subgraphError) { - console.error('Failed to fetch liquidations via Subgraph:', subgraphError); - liquidations = null; - } - } + const targetSkip = (targetPage - 1) * pageSize; - return liquidations; + return runMarketDetailFallback({ + dataLabel: 'liquidations', + marketId, + network, + attempts: [ + { + provider: 'envio', + fetch: () => fetchEnvioMarketLiquidations(marketId, Number(network), pageSize, targetSkip), + }, + ...(supportsMorphoApi(network) + ? [ + { + provider: 'morpho-api' as const, + fetch: () => fetchMorphoMarketLiquidations(marketId, pageSize, targetSkip), + }, + ] + : []), + { + provider: 'subgraph', + fetch: () => fetchSubgraphMarketLiquidations(marketId, network, pageSize, targetSkip), + }, + ], + }); }, + [marketId, network, pageSize], + ); + + const { data, isLoading, isFetching, error, refetch } = useQuery({ + queryKey: queryKey, + queryFn: async () => queryFn(page), enabled: !!marketId && !!network, staleTime: 1000 * 60 * 5, // 5 minutes, liquidations are less frequent - placeholderData: (previousData) => previousData ?? null, + placeholderData: () => null, retry: 1, }); - // Return standard react-query hook structure + useEffect(() => { + if (!marketId || !network || !data) return; + + if (page > 1) { + const prevPageKey = ['marketLiquidations', marketId, network, page - 1, pageSize]; + void queryClient.prefetchQuery({ + queryKey: prevPageKey, + queryFn: async () => queryFn(page - 1), + staleTime: 1000 * 60 * 5, + }); + } + + const hasNextPage = data.hasNextPage ?? (data.totalCount > 0 && page < Math.ceil(data.totalCount / pageSize)); + + if (hasNextPage) { + const nextPageKey = ['marketLiquidations', marketId, network, page + 1, pageSize]; + void queryClient.prefetchQuery({ + queryKey: nextPageKey, + queryFn: async () => queryFn(page + 1), + staleTime: 1000 * 60 * 5, + }); + } + }, [page, pageSize, data, marketId, network, queryClient, queryFn]); + return { - data: data, // Consumers can alias this as 'liquidations' if desired - isLoading: isLoading, - error: error, - refetch: refetch, + data, + isLoading, + isFetching, + error, + refetch, }; }; diff --git a/src/hooks/useMarketSuppliers.ts b/src/hooks/useMarketSuppliers.ts index ccaa1700..a854bbd5 100644 --- a/src/hooks/useMarketSuppliers.ts +++ b/src/hooks/useMarketSuppliers.ts @@ -1,15 +1,17 @@ import { useCallback, useEffect } from 'react'; import { useQuery, useQueryClient } from '@tanstack/react-query'; import { supportsMorphoApi } from '@/config/dataSources'; +import { fetchEnvioMarketSuppliers } from '@/data-sources/envio/market-detail'; import { fetchMorphoMarketSuppliers } from '@/data-sources/morpho-api/market-suppliers'; import { fetchSubgraphMarketSuppliers } from '@/data-sources/subgraph/market-suppliers'; +import { runMarketDetailFallback } from '@/hooks/queries/market-detail-fallback'; import type { SupportedNetworks } from '@/utils/networks'; import type { PaginatedMarketSuppliers } from '@/utils/types'; /** * Hook to fetch current suppliers (positions) for a specific market, - * using the appropriate data source based on the network. - * Supports pagination with server-side pagination for Morpho API. + * using Envio as the primary source with existing sources as fallback. + * Preserves exact total counts via the shared Envio scan/cache layer. * Returns suppliers sorted by supply shares (descending). * * @param marketId The ID of the market (e.g., 0x...). @@ -40,30 +42,30 @@ export const useMarketSuppliers = ( } const targetSkip = (targetPage - 1) * pageSize; - let result: PaginatedMarketSuppliers | null = null; - // Try Morpho API first if supported - if (supportsMorphoApi(network)) { - try { - console.log(`Attempting to fetch suppliers via Morpho API for ${marketId} (page ${targetPage})`); - result = await fetchMorphoMarketSuppliers(marketId, Number(network), effectiveMinShares, pageSize, targetSkip); - } catch (morphoError) { - console.error('Failed to fetch suppliers via Morpho API:', morphoError); - } - } - - // Fallback to Subgraph if Morpho API failed or not supported - if (!result) { - try { - console.log(`Attempting to fetch suppliers via Subgraph for ${marketId} (page ${targetPage})`); - result = await fetchSubgraphMarketSuppliers(marketId, network, effectiveMinShares, pageSize, targetSkip); - } catch (subgraphError) { - console.error('Failed to fetch suppliers via Subgraph:', subgraphError); - throw subgraphError; - } - } - - return result; + return runMarketDetailFallback({ + dataLabel: 'suppliers', + marketId, + network, + attempts: [ + { + provider: 'envio', + fetch: () => fetchEnvioMarketSuppliers(marketId, Number(network), effectiveMinShares, pageSize, targetSkip), + }, + ...(supportsMorphoApi(network) + ? [ + { + provider: 'morpho-api' as const, + fetch: () => fetchMorphoMarketSuppliers(marketId, Number(network), effectiveMinShares, pageSize, targetSkip), + }, + ] + : []), + { + provider: 'subgraph', + fetch: () => fetchSubgraphMarketSuppliers(marketId, network, effectiveMinShares, pageSize, targetSkip), + }, + ], + }); }, [marketId, network, effectiveMinShares, pageSize], ); diff --git a/src/hooks/useMarketSupplies.ts b/src/hooks/useMarketSupplies.ts index 3da92603..6048096e 100644 --- a/src/hooks/useMarketSupplies.ts +++ b/src/hooks/useMarketSupplies.ts @@ -1,15 +1,17 @@ import { useEffect, useCallback } from 'react'; import { useQuery, useQueryClient } from '@tanstack/react-query'; import { supportsMorphoApi } from '@/config/dataSources'; +import { fetchEnvioMarketSupplies } from '@/data-sources/envio/market-detail'; import { fetchMorphoMarketSupplies } from '@/data-sources/morpho-api/market-supplies'; import { fetchSubgraphMarketSupplies } from '@/data-sources/subgraph/market-supplies'; +import { runMarketDetailFallback } from '@/hooks/queries/market-detail-fallback'; import type { SupportedNetworks } from '@/utils/networks'; import type { PaginatedMarketActivityTransactions } from '@/utils/types'; /** * Hook to fetch supply and withdraw activities for a specific market's loan asset, - * using the appropriate data source based on the network. - * Supports pagination with server-side pagination for Morpho API and client-side for Subgraph. + * using Envio as the primary source with existing sources as fallback. + * Envio only loads the current page window instead of scanning the full event history. * @param marketId The ID of the market (e.g., 0x...). * @param loanAssetId The address of the loan asset for the market. * @param network The blockchain network. @@ -37,30 +39,30 @@ export const useMarketSupplies = ( } const targetSkip = (targetPage - 1) * pageSize; - let result: PaginatedMarketActivityTransactions | null = null; - // Try Morpho API first if supported - if (supportsMorphoApi(network)) { - try { - console.log(`Attempting to fetch supplies via Morpho API for ${marketId} (page ${targetPage})`); - result = await fetchMorphoMarketSupplies(marketId, minAssets, pageSize, targetSkip); - } catch (morphoError) { - console.error('Failed to fetch supplies via Morpho API:', morphoError); - } - } - - // Fallback to Subgraph if Morpho API failed or not supported - if (!result) { - try { - console.log(`Attempting to fetch supplies via Subgraph for ${marketId} (page ${targetPage})`); - result = await fetchSubgraphMarketSupplies(marketId, loanAssetId, network, minAssets, pageSize, targetSkip); - } catch (subgraphError) { - console.error('Failed to fetch supplies via Subgraph:', subgraphError); - throw subgraphError; - } - } - - return result; + return runMarketDetailFallback({ + dataLabel: 'supply and withdraw activity', + marketId, + network, + attempts: [ + { + provider: 'envio', + fetch: () => fetchEnvioMarketSupplies(marketId, Number(network), minAssets, pageSize, targetSkip), + }, + ...(supportsMorphoApi(network) + ? [ + { + provider: 'morpho-api' as const, + fetch: () => fetchMorphoMarketSupplies(marketId, minAssets, pageSize, targetSkip), + }, + ] + : []), + { + provider: 'subgraph', + fetch: () => fetchSubgraphMarketSupplies(marketId, loanAssetId, network, minAssets, pageSize, targetSkip), + }, + ], + }); }, [marketId, loanAssetId, network, minAssets, pageSize], ); @@ -70,7 +72,7 @@ export const useMarketSupplies = ( queryFn: async () => queryFn(page), enabled: !!marketId && !!loanAssetId && !!network, staleTime: 1000 * 60 * 5, // 5 minutes - keep cached data fresh longer - placeholderData: (previousData) => previousData ?? null, + placeholderData: () => null, retry: 1, }); @@ -78,8 +80,6 @@ export const useMarketSupplies = ( useEffect(() => { if (!marketId || !loanAssetId || !network || !data) return; - const totalPages = data.totalCount > 0 ? Math.ceil(data.totalCount / pageSize) : 0; - if (page > 1) { const prevPageKey = ['marketSupplies', marketId, loanAssetId, network, minAssets, page - 1, pageSize]; void queryClient.prefetchQuery({ @@ -89,7 +89,9 @@ export const useMarketSupplies = ( }); } - if (page < totalPages) { + const hasNextPage = data.hasNextPage ?? (data.totalCount > 0 && page < Math.ceil(data.totalCount / pageSize)); + + if (hasNextPage) { const nextPageKey = ['marketSupplies', marketId, loanAssetId, network, minAssets, page + 1, pageSize]; void queryClient.prefetchQuery({ queryKey: nextPageKey, diff --git a/src/hooks/usePublicAllocatorLiveData.ts b/src/hooks/usePublicAllocatorLiveData.ts index b671e273..5c70a970 100644 --- a/src/hooks/usePublicAllocatorLiveData.ts +++ b/src/hooks/usePublicAllocatorLiveData.ts @@ -6,6 +6,7 @@ import morphoABI from '@/abis/morpho'; import { PUBLIC_ALLOCATOR_ADDRESSES } from '@/constants/public-allocator'; import { getMorphoAddress } from '@/utils/morpho'; import type { SupportedNetworks } from '@/utils/networks'; +import { convertSharesToAssets } from '@/utils/positions'; // ── Types ── @@ -133,7 +134,7 @@ export function usePublicAllocatorLiveData( const totalBorrowAssets = marketData[2]; // Convert supply shares to assets - const vaultSupplyAssets = totalSupplyShares > 0n ? (supplyShares * totalSupplyAssets) / totalSupplyShares : 0n; + const vaultSupplyAssets = convertSharesToAssets(supplyShares, totalSupplyAssets, totalSupplyShares); // Market liquidity = total supply - total borrow const marketLiquidity = totalSupplyAssets - totalBorrowAssets; diff --git a/src/utils/positions.ts b/src/utils/positions.ts index ab369390..3dbec8f4 100644 --- a/src/utils/positions.ts +++ b/src/utils/positions.ts @@ -87,7 +87,7 @@ function arrayToMarket(arr: readonly bigint[]): MorphoMarketState { }; } -function convertSharesToAssets(shares: bigint, totalAssets: bigint, totalShares: bigint): bigint { +export function convertSharesToAssets(shares: bigint, totalAssets: bigint, totalShares: bigint): bigint { if (totalShares === 0n) return 0n; return (shares * totalAssets) / totalShares; } diff --git a/src/utils/types.ts b/src/utils/types.ts index c9130c31..bcd2a8a3 100644 --- a/src/utils/types.ts +++ b/src/utils/types.ts @@ -360,6 +360,7 @@ export type MarketActivityTransaction = { export type PaginatedMarketActivityTransactions = { items: MarketActivityTransaction[]; totalCount: number; + hasNextPage?: boolean; }; export type MarketLiquidationTransaction = { @@ -372,6 +373,12 @@ export type MarketLiquidationTransaction = { badDebtAssets: string; }; +export type PaginatedMarketLiquidations = { + items: MarketLiquidationTransaction[]; + totalCount: number; + hasNextPage?: boolean; +}; + export type MarketSupplier = { userAddress: string; supplyShares: string;