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

* fixed the cause for different results by different keepers during the processing of the distribution rewards.

Browse Source 
Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>
This commit is contained in:
Jürgen Eckel 2023-12-22 09:16:32 +01:00
parent 00aba3115f
commit 4f91e0925c
No known key found for this signature in database
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x/dao/keeper/msg_server_distribution_request.go
View File

@ -21,6 +21,9 @@ func (k msgServer) DistributionRequest(goCtx context.Context, msg *types.MsgDist
return nil, errorsmod.Wrap(types.ErrReissuanceTxIDMissing, "for last reissuance height") return nil, errorsmod.Wrap(types.ErrReissuanceTxIDMissing, "for last reissuance height")
} }
util.GetAppLogger().Info(ctx, "distribution request: storing distribution")
k.StoreDistributionOrder(ctx, *msg.GetDistribution())
validatorIdentity, validResult := util.GetValidatorCometBFTIdentity(ctx) validatorIdentity, validResult := util.GetValidatorCometBFTIdentity(ctx)
if validResult && msg.Distribution.GetProposer() == validatorIdentity { if validResult && msg.Distribution.GetProposer() == validatorIdentity {
util.GetAppLogger().Info(ctx, "distribution request: Entering Asset Distribution Mode") util.GetAppLogger().Info(ctx, "distribution request: Entering Asset Distribution Mode")
@ -43,8 +46,6 @@ func (k msgServer) DistributionRequest(goCtx context.Context, msg *types.MsgDist
msg.Distribution.DaoTxID = daoTx msg.Distribution.DaoTxID = daoTx
util.SendDistributionResult(goCtx, msg.Distribution.LastPop, daoTx, investorTx, popTx) util.SendDistributionResult(goCtx, msg.Distribution.LastPop, daoTx, investorTx, popTx)
} }
util.GetAppLogger().Info(ctx, "distribution request: storing distribution")
k.StoreDistributionOrder(ctx, *msg.GetDistribution())
return &types.MsgDistributionRequestResponse{}, nil return &types.MsgDistributionRequestResponse{}, nil
} }

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

@ -4,7 +4,6 @@ import (
"context" "context"
"strconv" "strconv"
errorsmod "cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/planetmint/planetmint-go/config" "github.com/planetmint/planetmint-go/config"
"github.com/planetmint/planetmint-go/util" "github.com/planetmint/planetmint-go/util"
@ -21,11 +20,13 @@ func (k msgServer) DistributionResult(goCtx context.Context, msg *types.MsgDistr
distribution.InvestorTxID = msg.InvestorTxID distribution.InvestorTxID = msg.InvestorTxID
err := k.resolveStagedClaims(ctx, distribution.FirstPop, distribution.LastPop) err := k.resolveStagedClaims(ctx, distribution.FirstPop, distribution.LastPop)
if err != nil { if err != nil {
return nil, errorsmod.Wrapf(types.ErrResolvingStagedClaims, " for provided PoP heights: %d %d", distribution.FirstPop, distribution.LastPop) util.GetAppLogger().Error(ctx, "%s for provided PoP heights: %d %d", types.ErrResolvingStagedClaims.Error(), distribution.FirstPop, distribution.LastPop)
} else {
util.GetAppLogger().Info(ctx, "staged claims successfully for provided PoP heights: %d %d", distribution.FirstPop, distribution.LastPop)
} }
k.StoreDistributionOrder(ctx, distribution) k.StoreDistributionOrder(ctx, distribution)
} else { } else {
return nil, errorsmod.Wrapf(types.ErrDistributionNotFound, " for provided block height %s", strconv.FormatInt(msg.GetLastPop(), 10)) util.GetAppLogger().Error(ctx, "%s for provided block height %s", types.ErrDistributionNotFound.Error(), strconv.FormatInt(msg.GetLastPop(), 10))
} }
return &types.MsgDistributionResultResponse{}, nil return &types.MsgDistributionResultResponse{}, nil