-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(server): properly parse multiple gas config (#18537)
(cherry picked from commit 875a71c) # Conflicts: # simapp/simd/cmd/commands.go # tools/confix/data/v0.47-app.toml # tools/confix/data/v0.50-app.toml
- Loading branch information
1 parent
58b0cdd
commit 6d1d23a
Showing
8 changed files
with
691 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "errors" | ||
| "io" | ||
| "os" | ||
|
|
||
| dbm "github.com/cosmos/cosmos-db" | ||
| "github.com/spf13/cobra" | ||
| "github.com/spf13/viper" | ||
|
|
||
| "cosmossdk.io/log" | ||
| "cosmossdk.io/simapp" | ||
| confixcmd "cosmossdk.io/tools/confix/cmd" | ||
| authcmd "cosmossdk.io/x/auth/client/cli" | ||
| banktypes "cosmossdk.io/x/bank/types" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/client" | ||
| "github.com/cosmos/cosmos-sdk/client/debug" | ||
| "github.com/cosmos/cosmos-sdk/client/flags" | ||
| "github.com/cosmos/cosmos-sdk/client/keys" | ||
| "github.com/cosmos/cosmos-sdk/client/pruning" | ||
| "github.com/cosmos/cosmos-sdk/client/rpc" | ||
| "github.com/cosmos/cosmos-sdk/client/snapshot" | ||
| "github.com/cosmos/cosmos-sdk/codec" | ||
| codectypes "github.com/cosmos/cosmos-sdk/codec/types" | ||
| "github.com/cosmos/cosmos-sdk/server" | ||
| servertypes "github.com/cosmos/cosmos-sdk/server/types" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| "github.com/cosmos/cosmos-sdk/types/module" | ||
| genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" | ||
| ) | ||
|
|
||
| func initRootCmd( | ||
| rootCmd *cobra.Command, | ||
| txConfig client.TxConfig, | ||
| interfaceRegistry codectypes.InterfaceRegistry, | ||
| appCodec codec.Codec, | ||
| basicManager module.BasicManager, | ||
| ) { | ||
| cfg := sdk.GetConfig() | ||
| cfg.Seal() | ||
|
|
||
| rootCmd.AddCommand( | ||
| genutilcli.InitCmd(basicManager), | ||
| NewTestnetCmd(basicManager, banktypes.GenesisBalancesIterator{}), | ||
| debug.Cmd(), | ||
| confixcmd.ConfigCommand(), | ||
| pruning.Cmd(newApp), | ||
| snapshot.Cmd(newApp), | ||
| ) | ||
|
|
||
| server.AddCommands(rootCmd, newApp, func(startCmd *cobra.Command) {}) | ||
|
|
||
| // add keybase, auxiliary RPC, query, genesis, and tx child commands | ||
| rootCmd.AddCommand( | ||
| server.StatusCommand(), | ||
| genesisCommand(txConfig, basicManager, appExport), | ||
| queryCommand(), | ||
| txCommand(), | ||
| keys.Commands(), | ||
| ) | ||
| } | ||
|
|
||
| // genesisCommand builds genesis-related `simd genesis` command. Users may provide application specific commands as a parameter | ||
| func genesisCommand(txConfig client.TxConfig, basicManager module.BasicManager, appExport servertypes.AppExporter, cmds ...*cobra.Command) *cobra.Command { | ||
| cmd := genutilcli.Commands(txConfig, basicManager, appExport) | ||
|
|
||
| for _, subCmd := range cmds { | ||
| cmd.AddCommand(subCmd) | ||
| } | ||
| return cmd | ||
| } | ||
|
|
||
| func queryCommand() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "query", | ||
| Aliases: []string{"q"}, | ||
| Short: "Querying subcommands", | ||
| DisableFlagParsing: false, | ||
| SuggestionsMinimumDistance: 2, | ||
| RunE: client.ValidateCmd, | ||
| } | ||
|
|
||
| cmd.AddCommand( | ||
| rpc.QueryEventForTxCmd(), | ||
| server.QueryBlockCmd(), | ||
| authcmd.QueryTxsByEventsCmd(), | ||
| server.QueryBlocksCmd(), | ||
| authcmd.QueryTxCmd(), | ||
| server.QueryBlockResultsCmd(), | ||
| ) | ||
|
|
||
| return cmd | ||
| } | ||
|
|
||
| func txCommand() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "tx", | ||
| Short: "Transactions subcommands", | ||
| DisableFlagParsing: false, | ||
| SuggestionsMinimumDistance: 2, | ||
| RunE: client.ValidateCmd, | ||
| } | ||
|
|
||
| cmd.AddCommand( | ||
| authcmd.GetSignCommand(), | ||
| authcmd.GetSignBatchCommand(), | ||
| authcmd.GetMultiSignCommand(), | ||
| authcmd.GetMultiSignBatchCmd(), | ||
| authcmd.GetValidateSignaturesCommand(), | ||
| authcmd.GetBroadcastCommand(), | ||
| authcmd.GetEncodeCommand(), | ||
| authcmd.GetDecodeCommand(), | ||
| authcmd.GetSimulateCmd(), | ||
| ) | ||
|
|
||
| return cmd | ||
| } | ||
|
|
||
| // newApp creates the application | ||
| func newApp( | ||
| logger log.Logger, | ||
| db dbm.DB, | ||
| traceStore io.Writer, | ||
| appOpts servertypes.AppOptions, | ||
| ) servertypes.Application { | ||
| baseappOptions := server.DefaultBaseappOptions(appOpts) | ||
| return simapp.NewSimApp( | ||
| logger, db, traceStore, true, | ||
| appOpts, | ||
| baseappOptions..., | ||
| ) | ||
| } | ||
|
|
||
| // appExport creates a new simapp (optionally at a given height) and exports state. | ||
| func appExport( | ||
| logger log.Logger, | ||
| db dbm.DB, | ||
| traceStore io.Writer, | ||
| height int64, | ||
| forZeroHeight bool, | ||
| jailAllowedAddrs []string, | ||
| appOpts servertypes.AppOptions, | ||
| modulesToExport []string, | ||
| ) (servertypes.ExportedApp, error) { | ||
| // this check is necessary as we use the flag in x/upgrade. | ||
| // we can exit more gracefully by checking the flag here. | ||
| homePath, ok := appOpts.Get(flags.FlagHome).(string) | ||
| if !ok || homePath == "" { | ||
| return servertypes.ExportedApp{}, errors.New("application home not set") | ||
| } | ||
|
|
||
| viperAppOpts, ok := appOpts.(*viper.Viper) | ||
| if !ok { | ||
| return servertypes.ExportedApp{}, errors.New("appOpts is not viper.Viper") | ||
| } | ||
|
|
||
| // overwrite the FlagInvCheckPeriod | ||
| viperAppOpts.Set(server.FlagInvCheckPeriod, 1) | ||
| appOpts = viperAppOpts | ||
|
|
||
| var simApp *simapp.SimApp | ||
| if height != -1 { | ||
| simApp = simapp.NewSimApp(logger, db, traceStore, false, appOpts) | ||
|
|
||
| if err := simApp.LoadHeight(height); err != nil { | ||
| return servertypes.ExportedApp{}, err | ||
| } | ||
| } else { | ||
| simApp = simapp.NewSimApp(logger, db, traceStore, true, appOpts) | ||
| } | ||
|
|
||
| return simApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) | ||
| } | ||
|
|
||
| var tempDir = func() string { | ||
| dir, err := os.MkdirTemp("", "simapp") | ||
| if err != nil { | ||
| dir = simapp.DefaultNodeHome | ||
| } | ||
| defer os.RemoveAll(dir) | ||
|
|
||
| return dir | ||
| } |
Oops, something went wrong.