Mirroristas/planetmint-go
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint-go.git synced 2025-11-24 06:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add validator PoP reward calculation between distributions

Browse Source 
Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>
This commit is contained in:
Lorenz Herzberger 2024-07-01 21:25:15 +02:00
parent 390aefa002
commit 4f80793fcd
No known key found for this signature in database
GPG Key ID: FA5EE906EB55316A
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
x/dao/keeper/distribution.go
View File

@ -49,7 +49,10 @@ func (k Keeper) ComputeDistribution(ctx sdk.Context, lastReissuance int64, block
distribution.PopAddr = k.GetParams(ctx).DistributionAddressPop distribution.PopAddr = k.GetParams(ctx).DistributionAddressPop
// PoP rewards subtracted from DaoAmount and added to PoPAmount for later distribution // PoP rewards subtracted from DaoAmount and added to PoPAmount for later distribution
validatorPoPRewards := k.GetValidatorPoPReward(ctx) validatorPoPRewards, err := k.accumulateValidatorPoPRewardsForDistribution(ctx, lastReissuance, blockHeight)
if err != nil {
util.GetAppLogger().Error(ctx, "error calculating Validator PoP rewards from height %v to %v", lastReissuance, blockHeight)
}
distribution.DaoAmount = util.UintValueToRDDLTokenString(uint64(float64(amount)*types.PercentageDao) - validatorPoPRewards) distribution.DaoAmount = util.UintValueToRDDLTokenString(uint64(float64(amount)*types.PercentageDao) - validatorPoPRewards)
distribution.EarlyInvAmount = util.UintValueToRDDLTokenString(uint64(float64(amount) * types.PercentageEarlyInvestor)) distribution.EarlyInvAmount = util.UintValueToRDDLTokenString(uint64(float64(amount) * types.PercentageEarlyInvestor))
@ -60,6 +63,20 @@ func (k Keeper) ComputeDistribution(ctx sdk.Context, lastReissuance int64, block
return distribution return distribution
} }
func (k Keeper) accumulateValidatorPoPRewardsForDistribution(ctx sdk.Context, firstPop int64, lastPop int64) (amount uint64, err error) {
challenges, err := k.GetChallengeRange(ctx, firstPop, lastPop)
if err != nil {
return 0, err
}
for _, challenge := range challenges {
reward, found := k.getChallengeInitiatorReward(ctx, challenge.GetHeight())
if found {
amount += reward
}
}
return amount, nil
}
func getUint64FromTxString(ctx sdk.Context, tx string) (amount uint64, err error) { func getUint64FromTxString(ctx sdk.Context, tx string) (amount uint64, err error) {
subStrings := strings.Split(tx, " ") subStrings := strings.Split(tx, " ")
if len(subStrings) < 3 { if len(subStrings) < 3 {