move away from urates in favor of a single peg field

Author: apexearth

db/migrations/1771628425597-Data.js db/migrations/1772051944284-Data.jsdb/migrations/1771628425597-Data.js renamed to db/migrations/1772051944284-Data.js

@@ -527,11 +527,10 @@ type OTokenDailyStat @entity {
   apy14: Float!
   apy30: Float!
 
+  peg: BigInt!
   rateUSD: BigInt!
   rateETH: BigInt!
   rateNative: BigInt!
-  urateUSD: BigInt!
-  urateETH: BigInt!
 
   totalSupply: BigInt!
   rebasingSupply: BigInt!

schema.graphql

@@ -181,6 +181,7 @@ async function waitForDbReady({
 type RunCmdOptions = { env?: NodeJS.ProcessEnv; capture?: boolean }
 
 async function runCmd(cmd: string, opts: RunCmdOptions = {}) {
+  console.log(`Running command: ${cmd}`)
   const { env, capture = false } = opts
   return await new Promise<{ stdout: string }>((resolve, reject) => {
     const child = spawn(cmd, {
@@ -321,7 +322,6 @@ async function main() {
     await runCmd(`${awsCmd}`)
 
     console.log('Done.')
-  } finally {
     if (startedCompose) {
       console.log('Shutting down docker compose project...')
       try {
@@ -332,6 +332,14 @@ async function main() {
     } else {
       console.log('Leaving existing docker compose project running.')
     }
+  } catch (err) {
+    console.error('Error during processing/upload:', err)
+    if (startedCompose) {
+      console.warn(`\nDocker compose project "${composeProject}" left running to preserve data.`)
+      console.warn(`Re-run with --continue to retry, or manually tear down with:`)
+      console.warn(`  DB_PORT=${DB_PORT} docker-compose -p ${composeProject} down --volumes`)
+    }
+    throw err
   }
 }
 

scripts/create-db-dump.ts

@@ -36,12 +36,12 @@ const upsertProtocolDailyStatDetails = async (ctx: Context, fromDate: string) =>
         o.date,
         '${product.product}' as product,
         (o.date::date + interval '1 day' - interval '1 second')::timestamp as timestamp,
-        COALESCE(o.urate_usd, 0) as rate_usd,
-        COALESCE(o.rebasing_supply * o.urate_eth / 1e18, 0) as earning_tvl,
-        COALESCE((o.total_supply - COALESCE(o.amo_supply, 0)) * o.urate_eth / 1e18, 0) as tvl,
-        COALESCE(o.total_supply * o.urate_eth / 1e18, 0) as supply,
-        COALESCE((o.yield + o.fees) * o.urate_eth / 1e18, 0) as yield,
-        COALESCE(o.fees * o.urate_eth / 1e18, 0) as revenue,
+        COALESCE(o.rate_usd, 0) as rate_usd,
+        COALESCE(o.rebasing_supply * o.rate_eth / 1e18, 0) as earning_tvl,
+        COALESCE((o.total_supply - COALESCE(o.amo_supply, 0)) * o.rate_eth / 1e18, 0) as tvl,
+        COALESCE(o.total_supply * o.rate_eth / 1e18, 0) as supply,
+        COALESCE((o.yield + o.fees) * o.rate_eth / 1e18, 0) as yield,
+        COALESCE(o.fees * o.rate_eth / 1e18, 0) as revenue,
         COALESCE(o.apy, 0) as apy,
         0 as inherited_tvl,
         0 as inherited_yield, 

src/mainnet/processors/protocol/protocol-sql-simple.ts

@@ -44,6 +44,9 @@ export class OTokenDailyStat {
     @FloatColumn_({nullable: false})
     apy30!: number
 
+    @BigIntColumn_({nullable: false})
+    peg!: bigint
+
     @BigIntColumn_({nullable: false})
     rateUSD!: bigint
 
@@ -53,12 +56,6 @@ export class OTokenDailyStat {
     @BigIntColumn_({nullable: false})
     rateNative!: bigint
 
-    @BigIntColumn_({nullable: false})
-    urateUSD!: bigint
-
-    @BigIntColumn_({nullable: false})
-    urateETH!: bigint
-
     @BigIntColumn_({nullable: false})
     totalSupply!: bigint
 

src/model/generated/oTokenDailyStat.model.ts

@@ -99,15 +99,14 @@ export const processOTokenDailyStats = async (
       otokenObject,
       apy,
       rebases,
+      peg,
       rateETH,
       rateUSD,
+      rateNative,
       dripperWETH,
       amoSupply,
       wrappedSupply,
       wrappedRate,
-      rateNative,
-      urateETH,
-      urateUSD,
     ] = await Promise.all([
       (async () => {
         let otokenObject = findLast(params.otokens, (o) => o.timestamp <= blockDate)
@@ -150,28 +149,37 @@ export const processOTokenDailyStats = async (
         )
         return rebases
       })(),
-      ensureExchangeRate(ctx, block, params.otokenAddress as CurrencyAddress, 'ETH').then((a) => a?.rate ?? 0n),
-      ensureExchangeRate(ctx, block, params.otokenAddress as CurrencyAddress, 'USD').then((a) => a?.rate ?? 0n),
-      getDripperAvailableFunds(),
-      params.getAmoSupply(ctx, block.header.height),
-      wotokenContract ? wotokenContract.totalSupply() : 0n,
-      wotokenContract ? wotokenContract.previewRedeem(10n ** 18n) : 0n,
+      // peg: OToken → underlying (e.g., OETH→ETH, OUSD→USD, OS→S)
       ensureExchangeRate(
         ctx,
         block,
         params.otokenAddress as CurrencyAddress,
-        ctx.chain.nativeCurrency.symbol as Currency,
+        (underlyingSymbol === 'ETH' || underlyingSymbol === 'USD')
+          ? underlyingSymbol as Currency
+          : ctx.chain.nativeCurrency.symbol as Currency,
       ).then((a) => a?.rate ?? 0n),
+      // rateETH: underlying → ETH
       underlyingSymbol === 'ETH'
         ? 10n ** 18n
         : ensureExchangeRate(ctx, block, underlyingSymbol as CurrencyAddress, 'ETH').then(
             (a) => (a ? a.rate * 10n ** BigInt(18 - a.decimals) : 0n),
           ),
+      // rateUSD: underlying → USD
       underlyingSymbol === 'USD'
         ? 10n ** 18n
         : ensureExchangeRate(ctx, block, underlyingSymbol as CurrencyAddress, 'USD').then(
             (a) => (a ? a.rate * 10n ** BigInt(18 - a.decimals) : 0n),
           ),
+      // rateNative: underlying → chain native currency
+      underlyingSymbol === ctx.chain.nativeCurrency.symbol
+        ? 10n ** 18n
+        : ensureExchangeRate(ctx, block, underlyingSymbol as CurrencyAddress, ctx.chain.nativeCurrency.symbol as Currency).then(
+            (a) => (a ? a.rate * 10n ** BigInt(18 - a.decimals) : 0n),
+          ),
+      getDripperAvailableFunds(),
+      params.getAmoSupply(ctx, block.header.height),
+      wotokenContract ? wotokenContract.totalSupply() : 0n,
+      wotokenContract ? wotokenContract.previewRedeem(10n ** 18n) : 0n,
     ])
     if (process.env.DEBUG_PERF === 'true') {
       ctx.log.info(`getOTokenDailyStat async calls took ${Date.now() - asyncStartTime}ms`)
@@ -218,11 +226,10 @@ export const processOTokenDailyStats = async (
     entity.cumulativeYield = (last?.cumulativeYield ?? 0n) + entity.yield
     entity.cumulativeFees = (last?.cumulativeFees ?? 0n) + entity.fees
 
+    entity.peg = peg
     entity.rateETH = rateETH
     entity.rateUSD = rateUSD
     entity.rateNative = rateNative
-    entity.urateETH = urateETH
-    entity.urateUSD = urateUSD
     entity.amoSupply = amoSupply
 
     entity.dripperWETH = dripperWETH
@@ -263,11 +270,10 @@ export const getOTokenDailyStat = async (
       apy14: 0,
       apy30: 0,
 
+      peg: 0n,
       rateUSD: 0n,
       rateETH: 0n,
       rateNative: 0n,
-      urateUSD: 0n,
-      urateETH: 0n,
 
       totalSupply: 0n,
       rebasingSupply: 0n,

src/templates/otoken/otoken-daily-stats.ts

@@ -175,11 +175,10 @@ type OTokenDailyStat @entity {
   apy14: Float!
   apy30: Float!
 
+  peg: BigInt!
   rateUSD: BigInt!
   rateETH: BigInt!
   rateNative: BigInt!
-  urateUSD: BigInt!
-  urateETH: BigInt!
 
   totalSupply: BigInt!
   rebasingSupply: BigInt!

src/templates/otoken/otoken.graphql

@@ -61,6 +61,7 @@ export const createMockOTokenDailyStat = (overrides: Partial<OTokenDailyStat> =
     otoken: OETH_ADDRESS,
     timestamp: new Date('2023-10-01T23:59:59Z'),
     blockNumber: 18000000,
+    peg: BigInt(10 ** 18), // 1:1 peg to underlying
     rateETH: BigInt(10 ** 18), // 1:1 rate
     rateUSD: BigInt(1800 * 10 ** 18), // $1800 ETH
     totalSupply: BigInt(100000 * 10 ** 18), // 100k tokens