Skip to content

Commit 3baf4d3

Browse files
committed
Add a bunch of logging.
1 parent 0896884 commit 3baf4d3

File tree

1 file changed

+39
-0
lines changed

1 file changed

+39
-0
lines changed

baseapp/baseapp.go

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,29 @@ const (
5656
execModeFinalize // Finalize a block proposal
5757
)
5858

59+
func (e execMode) String() string {
60+
switch e {
61+
case execModeCheck:
62+
return "Check"
63+
case execModeReCheck:
64+
return "ReCheck"
65+
case execModeSimulate:
66+
return "Simulate"
67+
case execModePrepareProposal:
68+
return "PrepareProposal"
69+
case execModeProcessProposal:
70+
return "ProcessProposal"
71+
case execModeVoteExtension:
72+
return "VoteExtension"
73+
case execModeVerifyVoteExtension:
74+
return "VerifyVoteExtension"
75+
case execModeFinalize:
76+
return "Finalize"
77+
default:
78+
return fmt.Sprintf("execMode(%d)", e)
79+
}
80+
}
81+
5982
var _ servertypes.ABCI = (*BaseApp)(nil)
6083

6184
// BaseApp reflects the ABCI application implementation.
@@ -842,6 +865,15 @@ func (app *BaseApp) runTxProv(mode execMode, txBytes []byte) (gInfo sdk.GasInfo,
842865

843866
ctx = app.getContextForTx(mode, txBytes)
844867
ms := ctx.MultiStore()
868+
logger := ctx.Logger().With("mode", mode.String(), "func", "runTxProv")
869+
logger.Debug("Starting.")
870+
defer func() {
871+
if err != nil {
872+
logger.Error("Returning with error.", "error", err)
873+
} else {
874+
logger.Debug("Ending.")
875+
}
876+
}()
845877

846878
// only run the tx if there is block gas remaining
847879
if mode == execModeFinalize && ctx.BlockGasMeter().IsOutOfGas() {
@@ -930,10 +962,12 @@ func (app *BaseApp) runTxProv(mode execMode, txBytes []byte) (gInfo sdk.GasInfo,
930962

931963
// GasMeter expected to be set in AnteHandler
932964
gasWanted = ctx.GasMeter().Limit()
965+
logger.Debug("Antehandler run.", "error", err, "gas limit", gasWanted, "events", len(events))
933966

934967
if err != nil {
935968
if mode == execModeReCheck {
936969
// if the ante handler fails on recheck, we want to remove the tx from the mempool
970+
logger.Debug("Removing tx from mempool due to antehandler error.", "error", err)
937971
if mempoolErr := app.mempool.Remove(tx); mempoolErr != nil {
938972
return gInfo, nil, anteEvents, ctx, errors.Join(err, mempoolErr)
939973
}
@@ -947,11 +981,13 @@ func (app *BaseApp) runTxProv(mode execMode, txBytes []byte) (gInfo sdk.GasInfo,
947981

948982
if mode == execModeCheck {
949983
err = app.mempool.Insert(ctx, tx)
984+
logger.Debug("Adding tx to mempool.", "error", err)
950985
if err != nil {
951986
return gInfo, nil, anteEvents, ctx, err
952987
}
953988
} else if mode == execModeFinalize {
954989
err = app.mempool.Remove(tx)
990+
logger.Debug("Removing tx from mempool.", "error", err)
955991
if err != nil && !errors.Is(err, mempool.ErrTxNotFound) {
956992
return gInfo, nil, anteEvents, ctx,
957993
fmt.Errorf("failed to remove tx from mempool: %w", err)
@@ -968,7 +1004,9 @@ func (app *BaseApp) runTxProv(mode execMode, txBytes []byte) (gInfo sdk.GasInfo,
9681004
// Result if any single message fails or does not have a registered Handler.
9691005
msgsV2, err := tx.GetMsgsV2()
9701006
if err == nil {
1007+
logger.Debug("Running Msgs.", "count", len(msgs))
9711008
result, err = app.runMsgs(runMsgCtx, msgs, msgsV2, mode)
1009+
logger.Debug("Done Running Msgs.", "count", len(msgs), "error", err)
9721010
}
9731011

9741012
// Run optional postHandlers (should run regardless of the execution result).
@@ -980,6 +1018,7 @@ func (app *BaseApp) runTxProv(mode execMode, txBytes []byte) (gInfo sdk.GasInfo,
9801018
// Note that the state is still preserved.
9811019
postCtx := runMsgCtx.WithEventManager(sdk.NewEventManager())
9821020

1021+
logger.Debug("Calling post handler.", "error", err)
9831022
newCtx, errPostHandler := app.postHandler(postCtx, tx, mode == execModeSimulate, err == nil)
9841023
if errPostHandler != nil {
9851024
// The result of errors.Join breaks the response code stuff, resulting in code 1 (logic error) always.

0 commit comments

Comments
 (0)