fees should be included in yield number, however they're removed from daily stat yield number

Author: apexearth

src/templates/otoken/otoken.ts

@@ -30,7 +30,6 @@ import { ADDRESS_ZERO, OETH_ADDRESS, OUSD_ADDRESS } from '@utils/addresses'
 import { baseAddresses } from '@utils/addresses-base'
 import { blockFrequencyUpdater } from '@utils/blockFrequencyUpdater'
 import { DECIMALS_18 } from '@utils/constants'
-import { jsonify } from '@utils/jsonify'
 import { multicall } from '@utils/multicall'
 import { getLatestEntity } from '@utils/utils'
 
@@ -274,7 +273,7 @@ export const createOTokenProcessor = (params: {
         })),
       )
       entity.fees = rebases.reduce((sum, current) => sum + current.fee, 0n)
-      entity.yield = rebases.reduce((sum, current) => sum + current.yield, 0n)
+      entity.yield = rebases.reduce((sum, current) => sum + current.yield - current.fee, 0n)
 
       const getDripperAvailableFunds = async () => {
         if (!params.dripper || params.dripper.from > block.header.height) return 0n

src/templates/otoken/utils.ts

@@ -82,6 +82,7 @@ export async function createRebaseAPY(
         (rebaseEvent.rebasingCredits * 10n ** 18n) / rebaseEvent.rebasingCreditsPerToken -
         (rebaseEvent.rebasingCredits * 10n ** 18n) / lastRebase.rebasingCreditsPerToken
       _fee = (_yield * 25n) / 100n
+      _yield += _fee // YieldDistributionEvent yield includes the fee so let's add that here.
     }
   }