Merge commit 'b9a5eecfe9f6735af5e0a213219ba4f7684877a4'

Author: apexearth

commands.json

@@ -76,11 +76,6 @@
       "deps": ["build"],
       "cmd": ["node", "--require=dotenv/config", "--require=tsconfig-paths/register", "lib/main-os.js"]
     },
-    "process:plume": {
-      "description": "Load .env and start the squid processor",
-      "deps": ["build"],
-      "cmd": ["node", "--require=dotenv/config", "--require=tsconfig-paths/register", "lib/main-plume.js"]
-    },
     "process:oeth": {
       "description": "Load .env and start the squid processor",
       "deps": ["build"],
@@ -135,12 +130,6 @@
       "cmd": ["node", "--require=tsconfig-paths/register", "lib/main-os.js"],
       "hidden": true
     },
-    "process:plume:prod": {
-      "description": "Start the squid processor",
-      "deps": ["migration:apply"],
-      "cmd": ["node", "--require=tsconfig-paths/register", "lib/main-plume.js"],
-      "hidden": true
-    },
     "process:oeth:prod": {
       "description": "Start the squid processor",
       "deps": ["migration:apply"],

package.json

@@ -22,7 +22,6 @@
     "process:oethb": "sqd process:oethb",
     "process:ousd": "sqd process:ousd",
     "process:ogv": "sqd process:ogv",
-    "process:plume": "sqd process:plume",
     "process:mainnet": "sqd process:mainnet",
     "process:test": "sqd process:test",
     "process": "sqd process",

scripts/create-db-dump.ts

@@ -18,7 +18,6 @@ type ProcessorName =
   | 'oethb-processor'
   | 'sonic-processor'
   | 'os-processor'
-  | 'plume-processor'
 
 function parseArgs() {
   const args = process.argv.slice(2)
@@ -61,8 +60,6 @@ function getRpcEndpointEnvName(processorName: ProcessorName): string {
     case 'sonic-processor':
     case 'os-processor':
       return process.env['RPC_SONIC_ENV']!
-    case 'plume-processor':
-      return process.env['RPC_PLUME_ENV']!
     // mainnet family
     case 'mainnet-processor':
     case 'oeth-processor':

squid.yaml

@@ -24,8 +24,6 @@ deploy:
     - RPC_ARBITRUM_ENV
     - RPC_SONIC_ENDPOINT
     - RPC_SONIC_ENV
-    - RPC_PLUME_ENDPOINT
-    - RPC_PLUME_ENV
     - NOTION_SECRET
     - AWS_ACCESS_KEY_ID
     - AWS_SECRET_ACCESS_KEY
@@ -143,19 +141,6 @@ deploy:
       #   # RPC_SONIC_ENDPOINT: https://virtual.base.rpc.tenderly.co/103020a8-b59a-4d51-9f8b-b156564e9fb8
       #   ### Time Travel Fix
       #   # BLOCK_FROM: 20919091
-    ########## PLUME NETWORK ##########
-    - name: plume-processor
-      cmd: ['sqd', 'process:plume:prod']
-      # env:
-      #   ### Fork Setup Stage 1
-      #   ARCHIVE_ONLY: 'true'
-      #   BLOCK_TO: 21527081
-      #   ### Fork Setup Stage 2
-      #   # DISABLE_ARCHIVE: 'true'
-      #   # RPC_SONIC_ENV: RPC_SONIC_ENDPOINT
-      #   # RPC_SONIC_ENDPOINT: https://virtual.base.rpc.tenderly.co/103020a8-b59a-4d51-9f8b-b156564e9fb8
-      #   ### Time Travel Fix
-      #   # BLOCK_FROM: 20919091
   api:
     cmd:
       - npx

src/main-plume.ts

@@ -9,7 +9,6 @@ import oeth from './main-oeth'
 import oethb from './main-oethb'
 import ogv from './main-ogv'
 import ousd from './main-ousd'
-import plume from './main-plume'
 import sonic from './main-sonic'
 
 Promise.all([
@@ -22,7 +21,6 @@ Promise.all([
   initProcessorFromDump(ogv),
   initProcessorFromDump(ousd),
   initProcessorFromDump(sonic),
-  initProcessorFromDump(plume),
 ]).catch((err) => {
   throw err
 })

src/main.ts

@@ -19,7 +19,6 @@ import {
 } from '@originprotocol/squid-utils'
 import { getLatestExchangeRateForDate } from '@shared/post-processors/exchange-rates/exchange-rates'
 import { baseAddresses } from '@utils/addresses-base'
-import { plumeAddresses } from '@utils/addresses-plume'
 import { ProductName, armProducts, otokenProducts } from '@utils/products'
 
 const startDate = '2022-01-01'
@@ -52,7 +51,7 @@ export const protocolProcessor = defineProcessor({
     const superTokenUpdatedDates = uniq([
       ...otherOTokenDetailsArrays
         .flat()
-        .filter((d) => d.product === 'superOETHb' || d.product === 'superOETHp')
+        .filter((d) => d.product === 'superOETHb')
         .map((d) => d.date),
     ])
 
@@ -173,13 +172,11 @@ const getOTokenDetails = async (
   const last = await getLatestProtocolDailyStatDetail(ctx, product)
 
   const lastDates = [last?.date ?? startDate]
-  if (product === 'OETH' || product === 'superOETHb' || product === 'superOETHp') {
+  if (product === 'OETH' || product === 'superOETHb') {
     const lastOETH = await getLatestProtocolDailyStatDetail(ctx, 'OETH')
     const lastSuperOETHb = await getLatestProtocolDailyStatDetail(ctx, 'superOETHb')
-    const lastSuperOETHp = await getLatestProtocolDailyStatDetail(ctx, 'superOETHp')
     lastDates.push(lastOETH?.date ?? startDate)
     lastDates.push(lastSuperOETHb?.date ?? startDate)
-    lastDates.push(lastSuperOETHp?.date ?? startDate)
   }
 
   // For OETH variants, use the minimum date to ensure all interdependent records are recalculated
@@ -288,21 +285,6 @@ const calculateOTokenBasicStats = async (
     if (oethTvl !== 0n) {
       detail.revenue += (oethRevenue * woethBalance) / oethTvl
     }
-  } else if (detail.product === 'superOETHp') {
-    // Prefer in-memory OETH data computed earlier in this run to avoid races
-    const detailOETH = opts?.oethCacheByDate?.[date] ?? (await getProtocolDailyStatDetail(ctx, date, 'OETH'))
-    const superOETHpWrappedOETH = await getLatestStrategyBalance(
-      ctx,
-      plumeAddresses.superOETHp.strategies.bridgedWOETH,
-      date,
-    )
-    const woethBalance = superOETHpWrappedOETH?.balanceETH ?? 0n
-    detail.bridgedTvl = woethBalance
-    const oethTvl = detailOETH?.tvl ?? 0n
-    const oethRevenue = detailOETH?.revenue ?? 0n
-    if (oethTvl !== 0n) {
-      detail.revenue += (oethRevenue * woethBalance) / oethTvl
-    }
   }
 }
 
@@ -312,16 +294,11 @@ const calculateOETHInheritedStats = async (ctx: Context, detail: ProtocolDailySt
     baseAddresses.superOETHb.strategies.bridgedWOETH,
     date,
   )
-  const superOETHpWrappedOETH = await getLatestStrategyBalance(
-    ctx,
-    plumeAddresses.superOETHp.strategies.bridgedWOETH,
-    date,
-  )
 
-  detail.inheritedTvl = (superOETHbWrappedOETH?.balanceETH ?? 0n) + (superOETHpWrappedOETH?.balanceETH ?? 0n)
+  detail.inheritedTvl = superOETHbWrappedOETH?.balanceETH ?? 0n
   detail.inheritedYield = detail.earningTvl !== 0n ? (detail.yield * detail.inheritedTvl) / detail.earningTvl : 0n
   detail.inheritedRevenue = detail.earningTvl !== 0n ? (detail.revenue * detail.inheritedTvl) / detail.earningTvl : 0n
-  detail.bridgedTvl = (superOETHbWrappedOETH?.balanceETH ?? 0n) + (superOETHpWrappedOETH?.balanceETH ?? 0n)
+  detail.bridgedTvl = superOETHbWrappedOETH?.balanceETH ?? 0n
 }
 
 const calculateForDates = async (