diff --git a/Makefile b/Makefile index 8829980..69133b7 100644 --- a/Makefile +++ b/Makefile @@ -20,13 +20,13 @@ macos_query_port_pid \ query_endpoints_full_tests_all -bun_create_migrations: +create_migrations: bun run generate -bun_build: +build: bun run build --verbose -bun_clean_cache: +clean_cache: bun pm cache rm docker_build: diff --git a/src/redis/resources/MainnetProviderEstimatedRewards/MainnetGenLavaLatestProviderRewards.ts b/src/redis/resources/MainnetProviderEstimatedRewards/MainnetGenLavaLatestProviderRewards.ts index 75241fc..7b7287e 100644 --- a/src/redis/resources/MainnetProviderEstimatedRewards/MainnetGenLavaLatestProviderRewards.ts +++ b/src/redis/resources/MainnetProviderEstimatedRewards/MainnetGenLavaLatestProviderRewards.ts @@ -17,19 +17,19 @@ interface MainnetActiveProvidersResponse { providers: string[]; } -interface ProcessedInfoItem { +export interface ProcessedInfoItem { source: string; amount: ProcessedTokenArray; } -interface BlockMetadata { +export interface BlockMetadata { height: number; time: string; seconds_off: number; date: string; } -interface ProviderRewardsData { +export interface ProviderRewardsData { providers: Array<{ address: string; rewards_by_block: { @@ -192,7 +192,7 @@ async function processRewardsResponse(rewards: EstimatedRewardsResponse): Promis }; } -async function GenLavaLatestProviderRewards(): Promise { +export async function GenLavaLatestProviderRewards(): Promise { // logger.info('Generating latest provider rewards...'); const latestBlock = await getMainnetLatestBlock(); @@ -289,8 +289,3 @@ async function GenLavaLatestProviderRewards(): Promise { } }; } - -export { - GenLavaLatestProviderRewards, - ProviderRewardsData -}; \ No newline at end of file diff --git a/src/redis/resources/MainnetProviderEstimatedRewards/MainnetProviderEstimatedRewardsGetResource.ts b/src/redis/resources/MainnetProviderEstimatedRewards/MainnetProviderEstimatedRewardsGetResource.ts index 841c03d..d911562 100644 --- a/src/redis/resources/MainnetProviderEstimatedRewards/MainnetProviderEstimatedRewardsGetResource.ts +++ b/src/redis/resources/MainnetProviderEstimatedRewards/MainnetProviderEstimatedRewardsGetResource.ts @@ -1,6 +1,11 @@ import { logger } from '@jsinfo/utils/logger'; import { RedisResourceBase } from '@jsinfo/redis/classes/RedisResourceBase'; -import { BlockMetadata, GenLavaLatestProviderRewards, ProcessedInfoItem, ProviderRewardsData } from './MainnetGenLavaLatestProviderRewards'; +import { + BlockMetadata, + GenLavaLatestProviderRewards, + ProcessedInfoItem, + ProviderRewardsData +} from './MainnetGenLavaLatestProviderRewards'; import * as fs from 'fs'; import * as path from 'path'; diff --git a/src/redis/resources/MainnetProviderEstimatedRewards/MainnetProviderEstimatedRewardsSpecFilterResource.ts b/src/redis/resources/MainnetProviderEstimatedRewards/MainnetProviderEstimatedRewardsSpecFilterResource.ts index fa5bf7d..dd8a280 100644 --- a/src/redis/resources/MainnetProviderEstimatedRewards/MainnetProviderEstimatedRewardsSpecFilterResource.ts +++ b/src/redis/resources/MainnetProviderEstimatedRewards/MainnetProviderEstimatedRewardsSpecFilterResource.ts @@ -118,7 +118,7 @@ class MainnetProviderEstimatedRewardsSpecFilterResource extends RedisResourceBas } acc[normalizedSource].push(info.amount.tokens); return acc; - }, {} as Record>>) + }, {} as Record>) ).map(([source, tokenArrays]) => ({ source, rewards: this.sumTokens(tokenArrays.flat())