refactor(client/v2,simapp): align and simplify sign mode wiring (#19216)

(cherry picked from commit bff1d82)

# Conflicts:
#	client/v2/autocli/builder.go
#	client/v2/autocli/msg.go
#	simapp/simd/cmd/root.go

client/v2/CHANGELOG.md

@@ -39,7 +39,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Improvements
 
 * [#19060](https://github.com/cosmos/cosmos-sdk/pull/19060) Use client context from root (or enhanced) command in autocli commands.
-  * Note, the given command must have a `client.Context` in its context.
+    * Note, the given command must have a `client.Context` in its context.
+* [#19216](https://github.com/cosmos/cosmos-sdk/pull/19216) Do not overwrite TxConfig, use directly the one provided in context. TxConfig should always be set in the `client.Context` in `root.go` of an app.
 
 ### Bug Fixes
 

client/v2/autocli/app.go

@@ -48,9 +48,6 @@ type AppOptions struct {
 
 	// ClientCtx contains the necessary information needed to execute the commands.
 	ClientCtx client.Context
-
-	// TxConfigOptions are the transactions config options.
-	TxConfigOpts tx.ConfigOptions
 }
 
 // EnhanceRootCommand enhances the provided root command with autocli AppOptions,
@@ -78,7 +75,6 @@ func (appOptions AppOptions) EnhanceRootCommand(rootCmd *cobra.Command) error {
 			ConsensusAddressCodec: appOptions.ConsensusAddressCodec,
 			Keyring:               appOptions.Keyring,
 		},
-		TxConfigOpts: appOptions.TxConfigOpts,
 		GetClientConn: func(cmd *cobra.Command) (grpc.ClientConnInterface, error) {
 			return client.GetClientQueryContext(cmd)
 		},

client/v2/autocli/builder.go

@@ -5,8 +5,11 @@ import (
 	"google.golang.org/grpc"
 
 	"cosmossdk.io/client/v2/autocli/flag"
+<<<<<<< HEAD
 
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
+=======
+>>>>>>> bff1d823f (refactor(client/v2,simapp): align and simplify sign mode wiring (#19216))
 )
 
 // Builder manages options for building CLI commands.
@@ -18,9 +21,6 @@ type Builder struct {
 	// from a given context.
 	GetClientConn func(*cobra.Command) (grpc.ClientConnInterface, error)
 
-	// TxConfigOptions is required to support sign mode textual
-	TxConfigOpts authtx.ConfigOptions
-
 	// AddQueryConnFlags and AddTxConnFlags are functions that add flags to query and transaction commands
 	AddQueryConnFlags func(*cobra.Command)
 	AddTxConnFlags    func(*cobra.Command)

client/v2/autocli/msg.go

@@ -13,13 +13,26 @@ import (
 	autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
 	"cosmossdk.io/client/v2/autocli/flag"
 	"cosmossdk.io/client/v2/internal/util"
+<<<<<<< HEAD
 
 	"github.com/cosmos/cosmos-sdk/client"
 	clienttx "github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	authtxconfig "github.com/cosmos/cosmos-sdk/x/auth/tx/config"
+=======
+	addresscodec "cosmossdk.io/core/address"
+
+	// the following will be extracted to a separate module
+	// https://github.com/cosmos/cosmos-sdk/issues/14403
+	authtypes "cosmossdk.io/x/auth/types"
+	govcli "cosmossdk.io/x/gov/client/cli"
+	govtypes "cosmossdk.io/x/gov/types"
+
+	"github.com/cosmos/cosmos-sdk/client"
+	clienttx "github.com/cosmos/cosmos-sdk/client/tx"
+>>>>>>> bff1d823f (refactor(client/v2,simapp): align and simplify sign mode wiring (#19216))
 )
 
 // BuildMsgCommand builds the msg commands for all the provided modules. If a custom command is provided for a
@@ -121,6 +134,7 @@ func (b *Builder) BuildMsgMethodCommand(descriptor protoreflect.MethodDescriptor
 		clientCtx = clientCtx.WithCmdContext(cmd.Context())
 		clientCtx = clientCtx.WithOutput(cmd.OutOrStdout())
 
+<<<<<<< HEAD
 		// enable sign mode textual
 		// the config is always overwritten as we need to have set the flags to the client context
 		// this ensures that the context has the correct client.
@@ -137,6 +151,15 @@ func (b *Builder) BuildMsgMethodCommand(descriptor protoreflect.MethodDescriptor
 			}
 
 			clientCtx = clientCtx.WithTxConfig(txConfig)
+=======
+		fd := input.Descriptor().Fields().ByName(protoreflect.Name(flag.GetSignerFieldName(input.Descriptor())))
+		addressCodec := b.Builder.AddressCodec
+
+		// handle gov proposals commands
+		skipProposal, _ := cmd.Flags().GetBool(flags.FlagNoProposal)
+		if options.GovProposal && !skipProposal {
+			return b.handleGovProposal(options, cmd, input, clientCtx, addressCodec, fd)
+>>>>>>> bff1d823f (refactor(client/v2,simapp): align and simplify sign mode wiring (#19216))
 		}
 
 		// set signer to signer field if empty

simapp/simd/cmd/root.go

@@ -8,8 +8,14 @@ import (
 	"cosmossdk.io/log"
 	"cosmossdk.io/simapp"
 	"cosmossdk.io/simapp/params"
+<<<<<<< HEAD
 	dbm "github.com/cosmos/cosmos-db"
 	"github.com/spf13/cobra"
+=======
+	"cosmossdk.io/x/auth/tx"
+	authtxconfig "cosmossdk.io/x/auth/tx/config"
+	"cosmossdk.io/x/auth/types"
+>>>>>>> bff1d823f (refactor(client/v2,simapp): align and simplify sign mode wiring (#19216))
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/config"
@@ -72,7 +78,7 @@ func NewRootCmd() *cobra.Command {
 				enabledSignModes := append(tx.DefaultSignModes, signing.SignMode_SIGN_MODE_TEXTUAL)
 				txConfigOpts := tx.ConfigOptions{
 					EnabledSignModes:           enabledSignModes,
-					TextualCoinMetadataQueryFn: txmodule.NewGRPCCoinMetadataQueryFn(initClientCtx),
+					TextualCoinMetadataQueryFn: authtxconfig.NewGRPCCoinMetadataQueryFn(initClientCtx),
 				}
 				txConfig, err := tx.NewTxConfigWithOptions(
 					initClientCtx.Codec,

simapp/simd/cmd/root_v2.go

@@ -111,7 +111,7 @@ func ProvideClientContext(
 	// Read the config again to overwrite the default values with the values from the config file
 	clientCtx, _ = config.ReadFromClientConfig(clientCtx)
 
-	// re-create the tx config grpc instead of bank keeper
+	// textual is enabled by default, we need to re-create the tx config grpc instead of bank keeper.
 	txConfigOpts.TextualCoinMetadataQueryFn = authtxconfig.NewGRPCCoinMetadataQueryFn(clientCtx)
 	txConfig, err := tx.NewTxConfigWithOptions(clientCtx.Codec, txConfigOpts)
 	if err != nil {