small fixes

Author: apexearth

src/shared/post-processors/exchange-rates/price-routing-mainnet.ts

@@ -1,29 +1,27 @@
-import { memoize } from 'lodash'
+import { memoize } from 'lodash';
 
-import * as balancerMetaStablePoolAbi from '@abi/balancer-meta-stable-pool'
-import * as balancerRateProvider from '@abi/balancer-rate-provider'
-import * as chainlinkFeedRegistry from '@abi/chainlink-feed-registry'
-import * as curveLpToken from '@abi/curve-lp-token'
-import * as diaOracleAbi from '@abi/dia-oracle'
-import * as eacAggregatorProxy from '@abi/eac-aggregator-proxy'
-import * as frxEthFraxOracle from '@abi/frx-eth-frax-oracle'
-import * as oethOracleRouter from '@abi/oeth-oracle-router'
-import * as stakedFraxEth from '@abi/sfrx-eth'
-import * as uniswapV3 from '@abi/uniswap-v3'
-import * as woethAbi from '@abi/woeth'
-import { Block, Context } from '@originprotocol/squid-utils'
-import { getPriceFromSqrtPriceX96N } from '@templates/aerodrome/prices'
-import { CURVE_ETH_OETH_POOL_ADDRESS, STETH_ADDRESS } from '@utils/addresses'
 
-import { ousdDailyPrices } from './data/coingecko-ousd.json'
-import {
-  CurrencySymbol,
-  MainnetCurrency,
-  MainnetCurrencyAddress,
-  MainnetCurrencySymbol,
-  mainnetCurrencies,
-  mainnetCurrenciesByAddress,
-} from './mainnetCurrencies'
+
+import * as balancerMetaStablePoolAbi from '@abi/balancer-meta-stable-pool';
+import * as balancerRateProvider from '@abi/balancer-rate-provider';
+import * as chainlinkFeedRegistry from '@abi/chainlink-feed-registry';
+import * as curveLpToken from '@abi/curve-lp-token';
+import * as diaOracleAbi from '@abi/dia-oracle';
+import * as eacAggregatorProxy from '@abi/eac-aggregator-proxy';
+import * as frxEthFraxOracle from '@abi/frx-eth-frax-oracle';
+import * as oethOracleRouter from '@abi/oeth-oracle-router';
+import * as stakedFraxEth from '@abi/sfrx-eth';
+import * as uniswapV3 from '@abi/uniswap-v3';
+import * as woethAbi from '@abi/woeth';
+import { Block, Context } from '@originprotocol/squid-utils';
+import { getPriceFromSqrtPriceX96N } from '@templates/aerodrome/prices';
+import { CURVE_ETH_OETH_POOL_ADDRESS, STETH_ADDRESS } from '@utils/addresses';
+
+
+
+import { ousdDailyPrices } from './data/coingecko-ousd.json';
+import { CurrencySymbol, MainnetCurrency, MainnetCurrencyAddress, MainnetCurrencySymbol, mainnetCurrencies, mainnetCurrenciesByAddress } from './mainnetCurrencies';
+
 
 const createChainlinkPriceFeed = (address: string, decimals: bigint) => {
   return async (ctx: Context, height: number) => {
@@ -341,6 +339,15 @@ export const priceMap: Partial<
     ],
     18,
   ),
+  ...derived(
+    'CRV',
+    'OUSD',
+    [
+      { base: 'CRV', quote: 'ETH' },
+      { base: 'ETH', quote: 'OUSD' },
+    ],
+    18,
+  ),
   ...twoWay('USDC', 'ETH', (ctx, block) => getChainlinkPrice(ctx, block.height, 'USDC', 'ETH')),
   ...twoWay('USDT', 'ETH', (ctx, block) => getChainlinkPrice(ctx, block.height, 'USDT', 'ETH')),
   ...twoWay('CRV', 'WETH', (ctx, block) => getChainlinkPrice(ctx, block.height, 'CRV', 'ETH')),
@@ -351,4 +358,4 @@ export const priceMap: Partial<
   ...twoWay('CVX', 'DAI', (ctx, block) => getChainlinkPrice(ctx, block.height, 'CVX', 'USD')),
   ...twoWay('CRV', 'DAI', (ctx, block) => getChainlinkPrice(ctx, block.height, 'CRV', 'USD')),
   ...twoWay('COMP', 'DAI', (ctx, block) => getChainlinkPrice(ctx, block.height, 'COMP', 'USD')),
-}
+}

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

@@ -1,15 +1,18 @@
-import * as curvePool from '@abi/curve-lp-token'
-import * as erc20 from '@abi/erc20'
-import * as abstractStrategyAbi from '@abi/initializable-abstract-strategy'
-import { StrategyBalance } from '@model'
-import { Block, Context, EvmBatchProcessor, blockFrequencyUpdater } from '@originprotocol/squid-utils'
-import { convertRate } from '@shared/post-processors/exchange-rates'
-import { CurrencyAddress } from '@shared/post-processors/exchange-rates/mainnetCurrencies'
-import { ETH_ADDRESS, WETH_ADDRESS } from '@utils/addresses'
-import { addressToSymbol } from '@utils/symbols'
-
-import { IStrategyData } from './index'
-import { processStrategyEarnings, setupStrategyEarnings } from './strategy-earnings'
+import * as curvePool from '@abi/curve-lp-token';
+import * as erc20 from '@abi/erc20';
+import * as abstractStrategyAbi from '@abi/initializable-abstract-strategy';
+import { StrategyBalance } from '@model';
+import { Block, Context, EvmBatchProcessor, blockFrequencyUpdater } from '@originprotocol/squid-utils';
+import { convertRate } from '@shared/post-processors/exchange-rates';
+import { CurrencyAddress } from '@shared/post-processors/exchange-rates/mainnetCurrencies';
+import { ETH_ADDRESS, WETH_ADDRESS } from '@utils/addresses';
+import { addressToSymbol } from '@utils/symbols';
+
+
+
+import { IStrategyData } from './index';
+import { processStrategyEarnings, setupStrategyEarnings } from './strategy-earnings';
+
 
 export const setup = (processor: EvmBatchProcessor, strategyData: IStrategyData) => {
   processor.includeAllBlocks({ from: strategyData.from })
@@ -58,8 +61,8 @@ 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) {
+  // Use gauge-based balance calculation if gaugeAddress is provided & no rewardsPoolAddress is provided
+  if (strategyData.curvePoolInfo?.gaugeAddress && !strategyData.curvePoolInfo.rewardsPoolAddress) {
     return getCurveGaugeBalances(ctx, block, strategyData)
   }
   return await Promise.all(
@@ -154,4 +157,4 @@ export const getConvexEthMetaStrategyBalances = async (
     const balance = (totalStrategyLPBalance * poolAssetSplit) / eth1
     return { address, asset, balance }
   })
-}
+}