Merge branch 'master' into staging

OriginProtocol · Aug 25, 2023 · 48fb3f7 · 48fb3f7
2 parents 0459433 + dc66718
commit 48fb3f7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/eagleproject/core/blockchain/harvest/transaction_history.py b/eagleproject/core/blockchain/harvest/transaction_history.py
@@ -68,6 +68,7 @@
     chunks,
 )
 from core.blockchain.harvest.snapshots import (
+    ensure_asset,
     ensure_supply_snapshot,
     calculate_ousd_snapshot_data,
     calculate_oeth_snapshot_data,
@@ -1618,8 +1619,8 @@ def _daily_rows(steps, latest_block_number, project, start_at=0):
             s.apr = (
                 Decimal(100) * change * (Decimal(365) * BLOCKS_PER_DAY) / blocks
             )
-            s.apy = to_apy(s.apr, 1)
-            amo_supply = OUSDMetaStrategy.get_underlying_balance().get("OUSD", Decimal(0)) if project == OriginTokens.OUSD else OETHCurveAMOStrategy.get_underlying_balance().get("OETH", Decimal(0))
+            otoken = ensure_asset("OUSD" if project == OriginTokens.OUSD else "OETH", s.block_number, project)
+            amo_supply = otoken.get_strat_holdings("ousd_metastrat" if project == OriginTokens.OUSD else "oeth_curve_amo")
             try:
                 s.unboosted = to_apy(
                     (s.computed_supply - s.non_rebasing_supply)