From 2367360e0e01d37d917d017f33b71f15370b7a6c Mon Sep 17 00:00:00 2001 From: Nick Poulden Date: Thu, 26 Oct 2023 12:55:46 -0600 Subject: [PATCH 1/3] Daily stats fix --- .../daily-stats/daily-stats.ts | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/src/oeth/post-processors/daily-stats/daily-stats.ts b/src/oeth/post-processors/daily-stats/daily-stats.ts index 92ea2f8c..2f6b8ea9 100644 --- a/src/oeth/post-processors/daily-stats/daily-stats.ts +++ b/src/oeth/post-processors/daily-stats/daily-stats.ts @@ -109,8 +109,19 @@ async function updateDailyStats(ctx: Context, date: Date) { ]) // Do we have any useful data yet? - const allEntities = [lastApy, lastOeth] - if (!allEntities.every((entity) => !!entity)) { + const allEntities = [ + lastApy, + lastOeth, + lastCurve, + lastVault, + lastBalancer, + lastFrax, + lastMorpho, + lastDripper, + lastRethRate, + lastSfrxEthRate, + ] + if (![lastApy, lastOeth].every((entity) => !!entity)) { return null } @@ -122,8 +133,6 @@ async function updateDailyStats(ctx: Context, date: Date) { // lastBalancer, // lastFrax, // lastMorpho, - // lastRethExchangeRate, - // lastSfrxEthExchangeRate, // }) const entityManager = ( @@ -229,8 +238,8 @@ async function updateDailyStats(ctx: Context, date: Date) { id: `${id}-CURVE`, name: 'CURVE', dailyStatId: id as unknown as OETHDailyStat, - tvl: lastCurve?.ethOwned || 0n, - total: lastCurve?.ethOwned || 0n, + tvl: lastCurve?.totalSupply || 0n, + total: lastCurve?.totalSupplyOwned || 0n, }), new OETHStrategyDailyStat({ id: `${id}-VAULT`, @@ -267,8 +276,15 @@ async function updateDailyStats(ctx: Context, date: Date) { id: `${id}-CURVE-ETH`, strategyDailyStatId: `${id}-CURVE` as unknown as OETHStrategyDailyStat, symbol: 'ETH', - amount: lastCurve?.eth || 0n, - value: lastCurve?.eth || 0n, + amount: lastCurve?.ethOwned || 0n, + value: lastCurve?.ethOwned || 0n, + }), + new OETHStrategyHoldingDailyStat({ + id: `${id}-CURVE-OETH`, + strategyDailyStatId: `${id}-CURVE` as unknown as OETHStrategyDailyStat, + symbol: 'OETH', + amount: lastCurve?.oethOwned || 0n, + value: lastCurve?.oethOwned || 0n, }), new OETHStrategyHoldingDailyStat({ id: `${id}-VAULT-WETH`, From 40050a50a0c7e8fd966f9e641a26921402200070 Mon Sep 17 00:00:00 2001 From: Nick Poulden Date: Thu, 26 Oct 2023 13:14:48 -0600 Subject: [PATCH 2/3] Yield stats fix --- src/oeth/post-processors/daily-stats/daily-stats.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/oeth/post-processors/daily-stats/daily-stats.ts b/src/oeth/post-processors/daily-stats/daily-stats.ts index 2f6b8ea9..1ce80c7b 100644 --- a/src/oeth/post-processors/daily-stats/daily-stats.ts +++ b/src/oeth/post-processors/daily-stats/daily-stats.ts @@ -416,21 +416,21 @@ function getStartOfDays(startTimestamp: number, endTimestamp: number): Date[] { const yieldStatsQuery = ` -- Results for 1 day -SELECT '1 day' as period, SUM(fee) as total_fees, SUM(yield) as total_yield, SUM(yield - fee) as total_revenue +SELECT '1 day' as period, SUM(fee) as total_fees, SUM(yield - fee) as total_yield, SUM(yield) as total_revenue FROM oeth_rebase WHERE timestamp BETWEEN ($1::timestamp - interval '1 day') AND $1::timestamp UNION ALL -- Results for 7 days -SELECT '7 days' as period, SUM(fee) as total_fees, SUM(yield) as total_yield, SUM(yield - fee) as total_revenue +SELECT '7 days' as period, SUM(fee) as total_fees, SUM(yield - fee) as total_yield, SUM(yield) as total_revenue FROM oeth_rebase WHERE timestamp BETWEEN ($1::timestamp - interval '7 days') AND $1::timestamp UNION ALL -- Results for all time up to the end date -SELECT 'all time' as period, SUM(fee) as total_fees, SUM(yield) as total_yield, SUM(yield - fee) as total_revenue +SELECT 'all time' as period, SUM(fee) as total_fees, SUM(yield - fee) as total_yield, SUM(yield) as total_revenue FROM oeth_rebase WHERE timestamp <= $1::timestamp ` From 088913b770968045dfacadc80a884ef73929244a Mon Sep 17 00:00:00 2001 From: Nick Poulden Date: Thu, 26 Oct 2023 14:20:41 -0600 Subject: [PATCH 3/3] More daily stat fixes --- .../post-processors/daily-stats/daily-stats.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/oeth/post-processors/daily-stats/daily-stats.ts b/src/oeth/post-processors/daily-stats/daily-stats.ts index 1ce80c7b..1196bf77 100644 --- a/src/oeth/post-processors/daily-stats/daily-stats.ts +++ b/src/oeth/post-processors/daily-stats/daily-stats.ts @@ -238,7 +238,7 @@ async function updateDailyStats(ctx: Context, date: Date) { id: `${id}-CURVE`, name: 'CURVE', dailyStatId: id as unknown as OETHDailyStat, - tvl: lastCurve?.totalSupply || 0n, + tvl: lastCurve?.totalSupplyOwned || 0n, total: lastCurve?.totalSupplyOwned || 0n, }), new OETHStrategyDailyStat({ @@ -259,8 +259,8 @@ async function updateDailyStats(ctx: Context, date: Date) { id: `${id}-FRAX`, name: 'FRAX', dailyStatId: id as unknown as OETHDailyStat, - tvl: lastFrax?.sfrxETH || 0n, - total: frxETH, + tvl: convertedSfrxEth, + total: sfrxETH, }), new OETHStrategyDailyStat({ id: `${id}-MORPHO`, @@ -333,7 +333,7 @@ async function updateDailyStats(ctx: Context, date: Date) { strategyDailyStatId: `${id}-FRAX` as unknown as OETHStrategyDailyStat, symbol: 'SFRXETH', amount: lastFrax?.sfrxETH || 0n, - value: (sfrxETH * sfrxEthExchangeRate) / 1000000000000000000n, + value: convertedSfrxEth, }), new OETHStrategyHoldingDailyStat({ id: `${id}-MORPHO-WETH`, @@ -373,9 +373,9 @@ async function updateDailyStats(ctx: Context, date: Date) { id: `${id}-RETH`, dailyStatId: id as unknown as OETHDailyStat, symbol: 'RETH', - amount: rETH, + amount: rETHRaw, price: rethRate, - value: (rETH * rethRate) / 1000000000000000000n, + value: rETH, }), new OETHCollateralDailyStat({ id: `${id}-FRXETH`, @@ -383,7 +383,7 @@ async function updateDailyStats(ctx: Context, date: Date) { symbol: 'FRXETH', amount: sfrxETH, price: 1n, - value: sfrxETH, + value: convertedSfrxEth, }), ]