Merge branch 'main' into alex/sims2_v2_dev_tests

cosmos · Jan 10, 2025 · c29ec4d · c29ec4d
2 parents 71c45a7 + a6b0924
commit c29ec4d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/x/auth/tx/config.go b/x/auth/tx/config.go
@@ -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)
-	}
-}
diff --git a/x/auth/tx/decoder.go b/x/auth/tx/decoder.go
@@ -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) {