## Description We decided to remove middlewares, and revert to antehandlers (exactly like in v045) for this release. A better middleware solution will be implemented after v046. ref: #11955 Because this refactor is big, so I decided to cut it into two. This PR is part 1 of 2: - part 1: Revert baseapp and middlewares to v0.45.4 - part 2: Add posthandler, tips, priority --- Suggestion for reviewers: This PR might still be hard to review though. I think it's easier to actually review the diff between v0.45.4 and this PR: - `git difftool -d v0.45.4..am/revert-045-baseapp baseapp` - most important parts to review: runTx, runMsgs - `git difftool -d v0.45.4..am/revert-045-baseapp x/auth/ante` - only cosmetic changes - `git difftool -d v0.45.4..am/revert-045-baseapp simapp` --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
78 lines
2.4 KiB
Go
78 lines
2.4 KiB
Go
package baseapp
|
|
|
|
import (
|
|
"fmt"
|
|
"runtime/debug"
|
|
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
|
|
)
|
|
|
|
// RecoveryHandler handles recovery() object.
|
|
// Return a non-nil error if recoveryObj was processed.
|
|
// Return nil if recoveryObj was not processed.
|
|
type RecoveryHandler func(recoveryObj interface{}) error
|
|
|
|
// recoveryMiddleware is wrapper for RecoveryHandler to create chained recovery handling.
|
|
// returns (recoveryMiddleware, nil) if recoveryObj was not processed and should be passed to the next middleware in chain.
|
|
// returns (nil, error) if recoveryObj was processed and middleware chain processing should be stopped.
|
|
type recoveryMiddleware func(recoveryObj interface{}) (recoveryMiddleware, error)
|
|
|
|
// processRecovery processes recoveryMiddleware chain for recovery() object.
|
|
// Chain processing stops on non-nil error or when chain is processed.
|
|
func processRecovery(recoveryObj interface{}, middleware recoveryMiddleware) error {
|
|
if middleware == nil {
|
|
return nil
|
|
}
|
|
|
|
next, err := middleware(recoveryObj)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return processRecovery(recoveryObj, next)
|
|
}
|
|
|
|
// newRecoveryMiddleware creates a RecoveryHandler middleware.
|
|
func newRecoveryMiddleware(handler RecoveryHandler, next recoveryMiddleware) recoveryMiddleware {
|
|
return func(recoveryObj interface{}) (recoveryMiddleware, error) {
|
|
if err := handler(recoveryObj); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return next, nil
|
|
}
|
|
}
|
|
|
|
// newOutOfGasRecoveryMiddleware creates a standard OutOfGas recovery middleware for app.runTx method.
|
|
func newOutOfGasRecoveryMiddleware(gasWanted uint64, ctx sdk.Context, next recoveryMiddleware) recoveryMiddleware {
|
|
handler := func(recoveryObj interface{}) error {
|
|
err, ok := recoveryObj.(sdk.ErrorOutOfGas)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
|
|
return sdkerrors.Wrap(
|
|
sdkerrors.ErrOutOfGas, fmt.Sprintf(
|
|
"out of gas in location: %v; gasWanted: %d, gasUsed: %d",
|
|
err.Descriptor, gasWanted, ctx.GasMeter().GasConsumed(),
|
|
),
|
|
)
|
|
}
|
|
|
|
return newRecoveryMiddleware(handler, next)
|
|
}
|
|
|
|
// newDefaultRecoveryMiddleware creates a default (last in chain) recovery middleware for app.runTx method.
|
|
func newDefaultRecoveryMiddleware() recoveryMiddleware {
|
|
handler := func(recoveryObj interface{}) error {
|
|
return sdkerrors.Wrap(
|
|
sdkerrors.ErrPanic, fmt.Sprintf(
|
|
"recovered: %v\nstack:\n%v", recoveryObj, string(debug.Stack()),
|
|
),
|
|
)
|
|
}
|
|
|
|
return newRecoveryMiddleware(handler, nil)
|
|
}
|