LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

refactor(x/auth/tx): Provide DefaultTxDecoder (#23318)

Browse Source
This commit is contained in:
Matt Kocubinski 2025-01-10 05:50:05 -06:00 committed by GitHub
parent 8cc13ed2e2
commit a6b0924ff5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
x/auth/tx/config.go
View File

@ -189,16 +189,15 @@ func NewTxConfigWithOptions(protoCodec codec.Codec, configOptions ConfigOptions)
}
}
txConfig.txDecoder, err = txdecode.NewDecoder(txdecode.Options{
SigningContext: configOptions.SigningContext,
ProtoCodec: protoCodec,
})
if err != nil {
return nil, err
}
if configOptions.ProtoDecoder == nil {
dec, err := txdecode.NewDecoder(txdecode.Options{
SigningContext: configOptions.SigningContext,
ProtoCodec: protoCodec,
})
if err != nil {
return nil, err
}
txConfig.decoder = txV2toInterface(configOptions.SigningOptions.AddressCodec, protoCodec, dec)
txConfig.txDecoder = dec
txConfig.decoder = DefaultTxDecoder(configOptions.SigningOptions.AddressCodec, protoCodec, txConfig.txDecoder)
}
if configOptions.ProtoEncoder == nil {
txConfig.encoder = DefaultTxEncoder()
@ -262,13 +261,3 @@ func (g config) TxJSONDecoder() sdk.TxDecoder {
func (g config) SigningContext() *txsigning.Context {
return g.signingContext
}
func txV2toInterface(addrCodec address.Codec, cdc codec.BinaryCodec, decoder *txdecode.Decoder) func([]byte) (sdk.Tx, error) {
return func(txBytes []byte) (sdk.Tx, error) {
decodedTx, err := decoder.Decode(txBytes)
if err != nil {
return nil, err
}
return newWrapperFromDecodedTx(addrCodec, cdc, decodedTx)
}
}

11
x/auth/tx/decoder.go
View File

@ -14,6 +14,17 @@ import (
"github.com/cosmos/cosmos-sdk/types/tx"
)
// DefaultTxDecoder returns a default protobuf TxDecoder.
func DefaultTxDecoder(addrCodec address.Codec, cdc codec.BinaryCodec, decoder *decode.Decoder) func([]byte) (sdk.Tx, error) {
return func(txBytes []byte) (sdk.Tx, error) {
decodedTx, err := decoder.Decode(txBytes)
if err != nil {
return nil, err
}
return newWrapperFromDecodedTx(addrCodec, cdc, decodedTx)
}
}
// DefaultJSONTxDecoder returns a default protobuf JSON TxDecoder using the provided Marshaler.
func DefaultJSONTxDecoder(addrCodec address.Codec, cdc codec.Codec, decoder *decode.Decoder) sdk.TxDecoder {
return func(txBytes []byte) (sdk.Tx, error) {