more intelligent curve OUSD/USDC amo tracking

Author: apexearth

src/ousd/processors/strategies/const.ts

@@ -1,4 +1,4 @@
-import { USDS_ADDRESS } from '@utils/addresses'
+import { OUSD_ADDRESS, USDS_ADDRESS } from '@utils/addresses'
 
 export const DAI = {
   address: '0x6b175474e89094c44da98b954eedeac495271d0f',
@@ -16,3 +16,7 @@ export const USDS = {
   address: USDS_ADDRESS,
   decimals: 18,
 }
+export const OUSD = {
+  address: OUSD_ADDRESS,
+  decimals: 18,
+}

src/ousd/processors/strategies/strategies.ts

@@ -6,7 +6,7 @@ import * as mainnetAddresses from '@utils/addresses'
 import { USDS_ADDRESS } from '@utils/addresses'
 
 import { aaveStrategy } from './aave-strategy'
-import { USDC, USDT } from './const'
+import { OUSD, USDC, USDT } from './const'
 import { convexMetaStrategy } from './convex-meta-strategy'
 import { fluxStrategy } from './flux-strategy'
 import { makerDsrStrategy } from './maker-dsr-strategy'
@@ -62,12 +62,16 @@ export const ousdStrategies: readonly IStrategyData[] = [
     chainId: 1,
     from: 22224255,
     oTokenAddress: mainnetAddresses.OUSD_ADDRESS,
-    kind: 'Generic',
+    kind: 'CurveAMO',
     name: 'OUSD Curve AMO',
     contractName: 'CurveAMOStrategy',
     address: mainnetAddresses.strategies.ousd.CurveUSDCAMOStrategy,
     base: { address: mainnetCurrencies.USD, decimals: 18 },
-    assets: [USDC],
+    assets: [OUSD, USDC],
+    curvePoolInfo: {
+      poolAddress: '0x6d18e1a7faeb1f0467a77c0d293872ab685426dc',
+      gaugeAddress: '0x1ef8b6ea6434e722c916314caf8bf16c81caf2f9',
+    },
     earnings: { passiveByDepositWithdrawal: true, rewardTokenCollected: true },
   },
   {

src/templates/strategy/strategy-curve-amo.ts

@@ -58,6 +58,10 @@ const getCurveAMOStrategyHoldings = async (
 }
 
 export const getStrategyBalances = async (ctx: Context, block: { height: number }, strategyData: IStrategyData) => {
+  // Use gauge-based balance calculation if gaugeAddress is provided
+  if (strategyData.curvePoolInfo?.gaugeAddress) {
+    return getCurveGaugeBalances(ctx, block, strategyData)
+  }
   return await Promise.all(
     strategyData.assets
       .filter((asset) => asset.checkBalance !== false)
@@ -69,6 +73,37 @@ export const getStrategyBalances = async (ctx: Context, block: { height: number
   )
 }
 
+export const getCurveGaugeBalances = async (
+  ctx: Context,
+  block: { height: number },
+  strategyData: IStrategyData,
+) => {
+  const { address, curvePoolInfo } = strategyData
+  const { poolAddress, gaugeAddress } = curvePoolInfo!
+
+  const pool = new curvePool.Contract(ctx, block, poolAddress)
+  const gauge = new erc20.Contract(ctx, block, gaugeAddress!)
+
+  // Get pool state in parallel - use balances(i) instead of get_balances() for compatibility
+  const [poolBalance0, poolBalance1, totalSupply, strategyLpBalance, coin0, coin1] = await Promise.all([
+    pool.balances(0n),
+    pool.balances(1n),
+    pool.totalSupply(),
+    gauge.balanceOf(address),
+    pool.coins(0n),
+    pool.coins(1n),
+  ])
+
+  // Calculate strategy's share of each coin
+  const eth1 = 1000000000000000000n
+  const share = totalSupply > 0n ? (strategyLpBalance * eth1) / totalSupply : 0n
+
+  return [
+    { address, asset: coin0.toLowerCase(), balance: (poolBalance0 * share) / eth1 },
+    { address, asset: coin1.toLowerCase(), balance: (poolBalance1 * share) / eth1 },
+  ]
+}
+
 export const getConvexEthMetaStrategyBalances = async (
   ctx: Context,
   block: { height: number },
@@ -78,7 +113,7 @@ export const getConvexEthMetaStrategyBalances = async (
   const { poolAddress, rewardsPoolAddress } = curvePoolInfo!
 
   const pool = new curvePool.Contract(ctx, block, poolAddress)
-  const rewardsPool = new erc20.Contract(ctx, block, rewardsPoolAddress)
+  const rewardsPool = new erc20.Contract(ctx, block, rewardsPoolAddress!)
   const strategy = new abstractStrategyAbi.Contract(ctx, block, address)
 
   const lpPrice = await pool.get_virtual_price()

src/templates/strategy/strategy-earnings.ts

@@ -44,7 +44,7 @@ const depositWithdrawalFilter = (strategyData: IStrategyData) =>
 
 const curvePoolFilter = (strategyData: IStrategyData) =>
   logFilter({
-    address: [strategyData.curvePoolInfo!.rewardsPoolAddress],
+    address: [strategyData.curvePoolInfo!.rewardsPoolAddress!],
     topic0: [baseRewardPool.events.Staked.topic, baseRewardPool.events.Withdrawn.topic],
     topic1: [strategyData.address],
     range: { from: strategyData.from },
@@ -124,7 +124,7 @@ export const setupStrategyEarnings = (processor: EvmBatchProcessor, strategyData
 
     // Detect Staked/Withdrawn events
     // The curve incident caused us to fully withdraw from our pool and these logs contain that.
-    if (strategyData.kind === 'CurveAMO') {
+    if (strategyData.kind === 'CurveAMO' && strategyData.curvePoolInfo?.rewardsPoolAddress) {
       balanceUpdateFilters.push(curvePoolFilter(strategyData))
     }
   }

src/templates/strategy/strategy.ts

@@ -20,7 +20,7 @@ export type IBalancerPoolInfo = {
 export type ICurveAMOInfo = {
   poolAddress: string
   gaugeAddress?: string
-  rewardsPoolAddress: string
+  rewardsPoolAddress?: string
 }
 
 export type IStrategyData = {