From 4f91e0925c61bf227b5affea079098f1a1c61b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Eckel?= Date: Fri, 22 Dec 2023 09:16:32 +0100 Subject: [PATCH] * fixed the cause for different results by different keepers during the processing of the distribution rewards. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Eckel --- x/dao/keeper/msg_server_distribution_request.go | 5 +++-- x/dao/keeper/msg_server_distribution_result.go | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/x/dao/keeper/msg_server_distribution_request.go b/x/dao/keeper/msg_server_distribution_request.go index 7d68c77..476f5c3 100644 --- a/x/dao/keeper/msg_server_distribution_request.go +++ b/x/dao/keeper/msg_server_distribution_request.go @@ -21,6 +21,9 @@ func (k msgServer) DistributionRequest(goCtx context.Context, msg *types.MsgDist 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) if validResult && msg.Distribution.GetProposer() == validatorIdentity { 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 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 } diff --git a/x/dao/keeper/msg_server_distribution_result.go b/x/dao/keeper/msg_server_distribution_result.go index d2efd04..6561f16 100644 --- a/x/dao/keeper/msg_server_distribution_result.go +++ b/x/dao/keeper/msg_server_distribution_result.go @@ -4,7 +4,6 @@ import ( "context" "strconv" - errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/planetmint/planetmint-go/config" "github.com/planetmint/planetmint-go/util" @@ -21,11 +20,13 @@ func (k msgServer) DistributionResult(goCtx context.Context, msg *types.MsgDistr distribution.InvestorTxID = msg.InvestorTxID err := k.resolveStagedClaims(ctx, distribution.FirstPop, distribution.LastPop) 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) } 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