5d86db3ce5
<!-- The default pull request template is for types feat, fix, or refactor. For other templates, add one of the following parameters to the url: - template=docs.md - template=other.md --> ## Description Closes: #10484 This PR makes the following big changes: ### 1. Change the tx.Handler interface ```diff - CheckTx(ctx context.Context, tx sdk.Tx, req abci.RequestCheckTx) (abci.ResponseCheckTx, error) + CheckTx(ctx context.Context, req tx.Request, checkReq tx.RequestCheckTx) (tx.Response, tx.ResponseCheckTx, error) // same for Deliver and Simulate ``` where: ```go type Response struct { GasWanted uint64 GasUsed uint64 // MsgResponses is an array containing each Msg service handler's response // type, packed in an Any. This will get proto-serialized into the `Data` field // in the ABCI Check/DeliverTx responses. MsgResponses []*codectypes.Any Log string Events []abci.Event } ``` ### 2. Change what gets passed into the ABCI Check/DeliverTx `Data` field Before, we were passing the concatenation of MsgResponse bytes into the `Data`. Now we are passing the proto-serialiazation of this struct: ```proto message TxMsgData { repeated google.protobuf.Any msg_responses = 2; } ``` <!-- Add a description of the changes that this PR introduces and the files that are the most critical to review. --> --- ### 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/master/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/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/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)
70 lines
2.1 KiB
Go
70 lines
2.1 KiB
Go
package middleware
|
|
|
|
import (
|
|
"context"
|
|
|
|
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
|
|
"github.com/cosmos/cosmos-sdk/types/tx"
|
|
)
|
|
|
|
type HasExtensionOptionsTx interface {
|
|
GetExtensionOptions() []*codectypes.Any
|
|
GetNonCriticalExtensionOptions() []*codectypes.Any
|
|
}
|
|
|
|
type rejectExtensionOptionsTxHandler struct {
|
|
next tx.Handler
|
|
}
|
|
|
|
// RejectExtensionOptionsMiddleware creates a new rejectExtensionOptionsMiddleware.
|
|
// rejectExtensionOptionsMiddleware is a middleware that rejects all extension
|
|
// options which can optionally be included in protobuf transactions. Users that
|
|
// need extension options should create a custom middleware chain that handles
|
|
// needed extension options properly and rejects unknown ones.
|
|
func RejectExtensionOptionsMiddleware(txh tx.Handler) tx.Handler {
|
|
return rejectExtensionOptionsTxHandler{
|
|
next: txh,
|
|
}
|
|
}
|
|
|
|
var _ tx.Handler = rejectExtensionOptionsTxHandler{}
|
|
|
|
func checkExtOpts(tx sdk.Tx) error {
|
|
if hasExtOptsTx, ok := tx.(HasExtensionOptionsTx); ok {
|
|
if len(hasExtOptsTx.GetExtensionOptions()) != 0 {
|
|
return sdkerrors.ErrUnknownExtensionOptions
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// CheckTx implements tx.Handler.CheckTx.
|
|
func (txh rejectExtensionOptionsTxHandler) CheckTx(ctx context.Context, req tx.Request, checkReq tx.RequestCheckTx) (tx.Response, tx.ResponseCheckTx, error) {
|
|
if err := checkExtOpts(req.Tx); err != nil {
|
|
return tx.Response{}, tx.ResponseCheckTx{}, err
|
|
}
|
|
|
|
return txh.next.CheckTx(ctx, req, checkReq)
|
|
}
|
|
|
|
// DeliverTx implements tx.Handler.DeliverTx.
|
|
func (txh rejectExtensionOptionsTxHandler) DeliverTx(ctx context.Context, req tx.Request) (tx.Response, error) {
|
|
if err := checkExtOpts(req.Tx); err != nil {
|
|
return tx.Response{}, err
|
|
}
|
|
|
|
return txh.next.DeliverTx(ctx, req)
|
|
}
|
|
|
|
// SimulateTx implements tx.Handler.SimulateTx method.
|
|
func (txh rejectExtensionOptionsTxHandler) SimulateTx(ctx context.Context, req tx.Request) (tx.Response, error) {
|
|
if err := checkExtOpts(req.Tx); err != nil {
|
|
return tx.Response{}, err
|
|
}
|
|
|
|
return txh.next.SimulateTx(ctx, req)
|
|
}
|