smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2024-12-24 23:35:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: set interest last updated to previous accrual time, not block time (#829)

Browse Source
This commit is contained in:
Kevin Davis 2021-02-16 07:43:21 -07:00 committed by GitHub
parent e8d3d877aa
commit ad6ef76979
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x/cdp/keeper/interest.go
View File

@ -116,24 +116,23 @@ func (k Keeper) SynchronizeInterest(ctx sdk.Context, cdp types.CDP) types.CDP {
} }
accumulatedInterest := k.CalculateNewInterest(ctx, cdp) accumulatedInterest := k.CalculateNewInterest(ctx, cdp)
if accumulatedInterest.IsZero() {
// accumulated interest is zero if apy is zero or are if the total fees for all cdps round to zero
prevAccrualTime, found := k.GetPreviousAccrualTime(ctx, cdp.Type) prevAccrualTime, found := k.GetPreviousAccrualTime(ctx, cdp.Type)
if !found { if !found {
return cdp return cdp
} }
if accumulatedInterest.IsZero() {
// accumulated interest is zero if apy is zero or are if the total fees for all cdps round to zero
if cdp.FeesUpdated.Equal(prevAccrualTime) { if cdp.FeesUpdated.Equal(prevAccrualTime) {
// if all fees are rounding to zero, don't update FeesUpdated // if all fees are rounding to zero, don't update FeesUpdated
return cdp return cdp
} }
// if apy is zero, we need to update FeesUpdated // if apy is zero, we need to update FeesUpdated
cdp.FeesUpdated = ctx.BlockTime() cdp.FeesUpdated = prevAccrualTime
k.SetCDP(ctx, cdp) k.SetCDP(ctx, cdp)
} }
cdp.AccumulatedFees = cdp.AccumulatedFees.Add(accumulatedInterest) cdp.AccumulatedFees = cdp.AccumulatedFees.Add(accumulatedInterest)
cdp.FeesUpdated = ctx.BlockTime() cdp.FeesUpdated = prevAccrualTime
cdp.InterestFactor = globalInterestFactor cdp.InterestFactor = globalInterestFactor
collateralToDebtRatio := k.CalculateCollateralToDebtRatio(ctx, cdp.Collateral, cdp.Type, cdp.GetTotalPrincipal()) collateralToDebtRatio := k.CalculateCollateralToDebtRatio(ctx, cdp.Collateral, cdp.Type, cdp.GetTotalPrincipal())
k.UpdateCdpAndCollateralRatioIndex(ctx, cdp, collateralToDebtRatio) k.UpdateCdpAndCollateralRatioIndex(ctx, cdp, collateralToDebtRatio)