Mirroristas/planetmint-go
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint-go.git synced 2025-07-06 12:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dao): challenger and challengee can be empty (#480)

Browse Source 
* put validator rewards into else case to protect the claim object against bogus values

Signed-off-by: Julian Strobl <jmastr@mailbox.org>
Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>
This commit is contained in:
Julian Strobl 2024-11-20 10:45:21 +01:00 committed by GitHub
parent 190f24a10b
commit 94706c8f99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x/dao/keeper/msg_server_distribution_result.go
View File

@ -73,7 +73,13 @@ func (k msgServer) clearUnresolvedClaims(ctx sdk.Context, start int64) (err erro
totalAmounts := make(map[string]uint64) totalAmounts := make(map[string]uint64)
for participantAddress := range currentAmounts { for participantAddress := range currentAmounts {
stagedBalance := k.bankKeeper.GetBalance(ctx, sdk.MustAccAddressFromBech32(participantAddress), k.GetParams(ctx).StagedDenom) // the challenger and challengee can be empty
participantAddressHex, err := sdk.AccAddressFromBech32(participantAddress)
if err != nil {
// try to convert as many claims as possible
continue
}
stagedBalance := k.bankKeeper.GetBalance(ctx, participantAddressHex, k.GetParams(ctx).StagedDenom)
totalAmounts[participantAddress] = stagedBalance.Amount.Uint64() totalAmounts[participantAddress] = stagedBalance.Amount.Uint64()
} }
@ -118,12 +124,13 @@ func (k msgServer) getClaims(ctx sdk.Context, start int64, end int64) (claims Cl
initiatorAddr, err := sdk.AccAddressFromBech32(challenge.Initiator) initiatorAddr, err := sdk.AccAddressFromBech32(challenge.Initiator)
if err != nil { if err != nil {
util.GetAppLogger().Error(ctx, "error converting initiator address") util.GetAppLogger().Error(ctx, "error converting initiator address")
} } else {
validatorPopReward, found := k.getChallengeInitiatorReward(ctx, challenge.GetHeight()) validatorPopReward, found := k.getChallengeInitiatorReward(ctx, challenge.GetHeight())
if !found { if !found {
util.GetAppLogger().Error(ctx, "No PoP initiator reward found for height %v", challenge.GetHeight()) util.GetAppLogger().Error(ctx, "No PoP initiator reward found for height %v", challenge.GetHeight())
} }
claims.initiator[initiatorAddr.String()] += validatorPopReward claims.initiator[initiatorAddr.String()] += validatorPopReward
}
// if challenge not finished only initiator has claims // if challenge not finished only initiator has claims
if !challenge.GetFinished() { if !challenge.GetFinished() {
@ -150,7 +157,8 @@ func (k msgServer) convertOrderedClaim(ctx sdk.Context, claims map[string]uint64
for _, accountAddress := range keys { for _, accountAddress := range keys {
err = k.convertAccountClaim(ctx, accountAddress, claims[accountAddress]) err = k.convertAccountClaim(ctx, accountAddress, claims[accountAddress])
if err != nil { if err != nil {
return err // try to convert as many claims as possible
continue
} }
} }