refactor: decouple morpho whitelist refresh #477
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| import { supportsMorphoApi } from '@/config/dataSources'; | ||
| import { marketsWhitelistStatusQuery } from '@/graphql/morpho-api-queries'; | ||
| import { getMarketIdentityKey } from '@/utils/market-identity'; | ||
| import { ALL_SUPPORTED_NETWORKS, type SupportedNetworks } from '@/utils/networks'; | ||
| import { morphoGraphqlFetcher } from './fetchers'; | ||
|
|
||
| type MorphoWhitelistMarket = { | ||
| uniqueKey: string; | ||
| listed: boolean; | ||
| morphoBlue: { | ||
| chain: { | ||
| id: number; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| type MorphoWhitelistStatusResponse = { | ||
| data?: { | ||
| markets?: { | ||
| items?: MorphoWhitelistMarket[]; | ||
| pageInfo?: { | ||
| countTotal: number; | ||
| }; | ||
| }; | ||
| }; | ||
| errors?: { message: string }[]; | ||
| }; | ||
|
|
||
| type MorphoWhitelistStatusPage = { | ||
| items: MorphoWhitelistStatus[]; | ||
| totalCount: number; | ||
| }; | ||
|
|
||
| export type MorphoWhitelistStatus = { | ||
| chainId: number; | ||
| uniqueKey: string; | ||
| listed: boolean; | ||
| }; | ||
|
|
||
| export type MorphoWhitelistStatusRefresh = { | ||
| network: SupportedNetworks; | ||
| statuses: MorphoWhitelistStatus[]; | ||
| }; | ||
|
|
||
| const MORPHO_WHITELIST_PAGE_SIZE = 1_000; | ||
| const MORPHO_WHITELIST_TIMEOUT_MS = 15_000; | ||
| const MORPHO_WHITELIST_PAGE_BATCH_SIZE = 4; | ||
|
|
||
| const MORPHO_SUPPORTED_NETWORKS = ALL_SUPPORTED_NETWORKS.filter((network) => supportsMorphoApi(network)); | ||
|
|
||
| const fetchMorphoWhitelistStatusPage = async ( | ||
| network: SupportedNetworks, | ||
| skip: number, | ||
| pageSize: number, | ||
| ): Promise<MorphoWhitelistStatusPage | null> => { | ||
| const response = await morphoGraphqlFetcher<MorphoWhitelistStatusResponse>( | ||
| marketsWhitelistStatusQuery, | ||
| { | ||
| first: pageSize, | ||
| skip, | ||
| where: { | ||
| chainId_in: [network], | ||
| }, | ||
| }, | ||
| { | ||
| timeoutMs: MORPHO_WHITELIST_TIMEOUT_MS, | ||
| }, | ||
| ); | ||
|
|
||
| if (!response?.data?.markets?.items || !response.data.markets.pageInfo) { | ||
| console.warn(`[WhitelistStatus] Skipping failed page at skip=${skip} for network ${network}`); | ||
| return null; | ||
| } | ||
|
|
||
| return { | ||
| items: response.data.markets.items.map((market) => ({ | ||
| chainId: market.morphoBlue.chain.id, | ||
| uniqueKey: market.uniqueKey, | ||
| listed: market.listed, | ||
| })), | ||
| totalCount: response.data.markets.pageInfo.countTotal, | ||
| }; | ||
| }; | ||
|
|
||
| const fetchMorphoWhitelistStatusesForNetwork = async (network: SupportedNetworks): Promise<MorphoWhitelistStatus[]> => { | ||
| const firstPage = await fetchMorphoWhitelistStatusPage(network, 0, MORPHO_WHITELIST_PAGE_SIZE); | ||
| if (!firstPage) { | ||
| throw new Error(`[WhitelistStatus] Failed to fetch first page for network ${network}.`); | ||
| } | ||
|
|
||
| const allStatuses = [...firstPage.items]; | ||
| const firstPageCount = firstPage.items.length; | ||
| const totalCount = firstPage.totalCount; | ||
|
|
||
| if (firstPageCount === 0 && totalCount > 0) { | ||
| throw new Error(`[WhitelistStatus] Received empty first page for network ${network} while totalCount=${totalCount}.`); | ||
| } | ||
|
|
||
| const remainingOffsets: number[] = []; | ||
| for (let nextSkip = firstPageCount; nextSkip < totalCount; nextSkip += MORPHO_WHITELIST_PAGE_SIZE) { | ||
| remainingOffsets.push(nextSkip); | ||
| } | ||
|
|
||
| for (let index = 0; index < remainingOffsets.length; index += MORPHO_WHITELIST_PAGE_BATCH_SIZE) { | ||
| const offsetBatch = remainingOffsets.slice(index, index + MORPHO_WHITELIST_PAGE_BATCH_SIZE); | ||
| const settledPages = await Promise.allSettled( | ||
| offsetBatch.map((skip) => fetchMorphoWhitelistStatusPage(network, skip, MORPHO_WHITELIST_PAGE_SIZE)), | ||
| ); | ||
|
|
||
| for (const settledPage of settledPages) { | ||
| if (settledPage.status === 'rejected') { | ||
| throw settledPage.reason; | ||
| } | ||
| if (!settledPage.value) { | ||
| throw new Error(`[WhitelistStatus] Failed to fetch one of the paginated whitelist pages for network ${network}.`); | ||
| } | ||
|
|
||
| allStatuses.push(...settledPage.value.items); | ||
| } | ||
| } | ||
|
|
||
| if (allStatuses.length < totalCount) { | ||
| throw new Error( | ||
| `[WhitelistStatus] Incomplete whitelist dataset for network ${network}: fetched ${allStatuses.length} of ${totalCount}.`, | ||
| ); | ||
| } | ||
|
|
||
| return allStatuses; | ||
|
Comment on lines
+122
to
+128
There was a problem hiding this comment. Validate unique market count before returning success. Line 122 checks the raw row count, but Lines 146-149 later collapse rows by Possible fix- if (allStatuses.length < totalCount) {
+ const statusesByKey = new Map<string, MorphoWhitelistStatus>();
+ for (const status of allStatuses) {
+ statusesByKey.set(getMarketIdentityKey(status.chainId, status.uniqueKey), status);
+ }
+
+ if (statusesByKey.size !== totalCount) {
throw new Error(
- `[WhitelistStatus] Incomplete whitelist dataset for network ${network}: fetched ${allStatuses.length} of ${totalCount}.`,
+ `[WhitelistStatus] Incomplete whitelist dataset for network ${network}: fetched ${statusesByKey.size} of ${totalCount} unique markets.`,
);
}
- return allStatuses;
+ return Array.from(statusesByKey.values());Then Also applies to: 146-149 🤖 Prompt for AI Agents |
||
| }; | ||
|
|
||
| export const fetchAllMorphoWhitelistStatuses = async (): Promise<MorphoWhitelistStatusRefresh[]> => { | ||
| const settledResults = await Promise.allSettled( | ||
| MORPHO_SUPPORTED_NETWORKS.map(async (network) => ({ | ||
| network, | ||
| statuses: await fetchMorphoWhitelistStatusesForNetwork(network), | ||
| })), | ||
| ); | ||
| const successfulRefreshes: MorphoWhitelistStatusRefresh[] = []; | ||
|
|
||
| for (const settledResult of settledResults) { | ||
| if (settledResult.status === 'rejected') { | ||
| console.warn('[WhitelistStatus] Failed to fetch one network; continuing with cached/partial data.', settledResult.reason); | ||
| continue; | ||
| } | ||
|
|
||
| const statusByKey = new Map<string, MorphoWhitelistStatus>(); | ||
| for (const status of settledResult.value.statuses) { | ||
| statusByKey.set(getMarketIdentityKey(status.chainId, status.uniqueKey), status); | ||
| } | ||
|
|
||
| successfulRefreshes.push({ | ||
| network: settledResult.value.network, | ||
| statuses: Array.from(statusByKey.values()), | ||
| }); | ||
| } | ||
|
|
||
| return successfulRefreshes; | ||
|
Comment on lines
+141
to
+157
There was a problem hiding this comment. Fail closed when every network refresh fails. Lines 141-143 swallow each rejection, and Line 157 still returns Possible fix for (const settledResult of settledResults) {
if (settledResult.status === 'rejected') {
console.warn('[WhitelistStatus] Failed to fetch one network; continuing with cached/partial data.', settledResult.reason);
continue;
}
@@
successfulRefreshes.push({
network: settledResult.value.network,
statuses: Array.from(statusByKey.values()),
});
}
+
+ if (successfulRefreshes.length === 0 && MORPHO_SUPPORTED_NETWORKS.length > 0) {
+ throw new Error('[WhitelistStatus] Failed to refresh whitelist statuses for every Morpho network.');
+ }
return successfulRefreshes;🤖 Prompt for AI Agents |
||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Offset calculation uses item count instead of page size.
If the first page returns fewer items than
MORPHO_WHITELIST_PAGE_SIZE(e.g., 450 instead of 500), the loop starts at 450 and increments by 500. This skips items 450-499.Use fixed page size for offset calculation:
Proposed fix
🤖 Prompt for AI Agents