From 4096fb803b62719d3def33b766257a0a0c0cd4d5 Mon Sep 17 00:00:00 2001 From: Hieu Vu <72878483+hieuvubk@users.noreply.github.com> Date: Fri, 30 Aug 2024 04:23:26 +0700 Subject: [PATCH] refactor(simapp): Audit simapp (#21311) --- .github/workflows/test.yml | 2 +- server/v2/cometbft/commands.go | 52 ++++++++---------- server/v2/cometbft/config.go | 1 + server/v2/cometbft/server.go | 17 +++--- simapp/CHANGELOG.md | 2 +- simapp/app.go | 1 - simapp/app_config.go | 2 +- simapp/app_di.go | 2 +- simapp/export.go | 20 +++---- simapp/genesis_account.go | 2 +- simapp/simd/cmd/commands.go | 5 +- simapp/simd/cmd/config.go | 2 +- simapp/simd/cmd/testnet.go | 6 +-- simapp/v2/app_config.go | 9 ++++ simapp/v2/app_di.go | 4 +- simapp/v2/genesis_account.go | 2 +- simapp/v2/genesis_account_test.go | 89 +++++++++++++++++++++++++++++++ simapp/v2/go.mod | 3 +- simapp/v2/go.sum | 2 - simapp/v2/simdv2/cmd/commands.go | 3 -- simapp/v2/simdv2/cmd/testnet.go | 14 +---- 21 files changed, 151 insertions(+), 89 deletions(-) create mode 100644 simapp/v2/genesis_account_test.go diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 99b3d1c1b1..ed4f6e2189 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -605,7 +605,7 @@ jobs: simdv2 start & SIMD_PID=$! cnt=0 - while ! simdv2 query block --type=height 5; do + while ! simdv2 query comet block --type=height 5; do cnt=$((cnt + 1)) if [ $cnt -gt 30 ]; then kill -9 "$SIMD_PID" diff --git a/server/v2/cometbft/commands.go b/server/v2/cometbft/commands.go index ed8329731a..49be1c969a 100644 --- a/server/v2/cometbft/commands.go +++ b/server/v2/cometbft/commands.go @@ -13,7 +13,6 @@ import ( "github.com/cometbft/cometbft/p2p" pvm "github.com/cometbft/cometbft/privval" rpchttp "github.com/cometbft/cometbft/rpc/client/http" - "github.com/cometbft/cometbft/rpc/client/local" cmtversion "github.com/cometbft/cometbft/version" "github.com/spf13/cobra" "google.golang.org/protobuf/encoding/protojson" @@ -28,35 +27,25 @@ import ( "github.com/cosmos/cosmos-sdk/version" ) -func (s *CometBFTServer[T]) rpcClient(cmd *cobra.Command) (rpc.CometRPC, error) { - if s.config.AppTomlConfig.Standalone { - client, err := rpchttp.New(client.GetConfigFromCmd(cmd).RPC.ListenAddress) - if err != nil { - return nil, err - } - return client, nil +func rpcClient(cmd *cobra.Command) (rpc.CometRPC, error) { + rpcURI, err := cmd.Flags().GetString(FlagNode) + if err != nil { + return nil, err + } + if rpcURI == "" { + return nil, fmt.Errorf("rpc URI is empty") } - if s.Node == nil || cmd.Flags().Changed(FlagNode) { - rpcURI, err := cmd.Flags().GetString(FlagNode) - if err != nil { - return nil, err - } - if rpcURI != "" { - return rpchttp.New(rpcURI) - } - } - - return local.New(s.Node), nil + return rpchttp.New(rpcURI) } // StatusCommand returns the command to return the status of the network. -func (s *CometBFTServer[T]) StatusCommand() *cobra.Command { +func StatusCommand() *cobra.Command { cmd := &cobra.Command{ Use: "status", Short: "Query remote node for status", RunE: func(cmd *cobra.Command, _ []string) error { - rpcclient, err := s.rpcClient(cmd) + rpcclient, err := rpcClient(cmd) if err != nil { return err } @@ -82,7 +71,7 @@ func (s *CometBFTServer[T]) StatusCommand() *cobra.Command { } // ShowNodeIDCmd - ported from CometBFT, dump node ID to stdout -func (s *CometBFTServer[T]) ShowNodeIDCmd() *cobra.Command { +func ShowNodeIDCmd() *cobra.Command { return &cobra.Command{ Use: "show-node-id", Short: "Show this node's ID", @@ -100,7 +89,7 @@ func (s *CometBFTServer[T]) ShowNodeIDCmd() *cobra.Command { } // ShowValidatorCmd - ported from CometBFT, show this node's validator info -func (s *CometBFTServer[T]) ShowValidatorCmd() *cobra.Command { +func ShowValidatorCmd() *cobra.Command { cmd := cobra.Command{ Use: "show-validator", Short: "Show this node's CometBFT validator info", @@ -134,7 +123,7 @@ func (s *CometBFTServer[T]) ShowValidatorCmd() *cobra.Command { } // ShowAddressCmd - show this node's validator address -func (s *CometBFTServer[T]) ShowAddressCmd() *cobra.Command { +func ShowAddressCmd() *cobra.Command { cmd := &cobra.Command{ Use: "show-address", Short: "Shows this node's CometBFT validator consensus address", @@ -153,7 +142,7 @@ func (s *CometBFTServer[T]) ShowAddressCmd() *cobra.Command { } // VersionCmd prints CometBFT and ABCI version numbers. -func (s *CometBFTServer[T]) VersionCmd() *cobra.Command { +func VersionCmd() *cobra.Command { return &cobra.Command{ Use: "version", Short: "Print CometBFT libraries' version", @@ -181,7 +170,7 @@ func (s *CometBFTServer[T]) VersionCmd() *cobra.Command { } // QueryBlocksCmd returns a command to search through blocks by events. -func (s *CometBFTServer[T]) QueryBlocksCmd() *cobra.Command { +func QueryBlocksCmd() *cobra.Command { cmd := &cobra.Command{ Use: "blocks", Short: "Query for paginated blocks that match a set of events", @@ -196,7 +185,7 @@ for. Each module documents its respective events under 'xx_events.md'. version.AppName, ), RunE: func(cmd *cobra.Command, args []string) error { - rpcclient, err := s.rpcClient(cmd) + rpcclient, err := rpcClient(cmd) if err != nil { return err } @@ -231,7 +220,7 @@ for. Each module documents its respective events under 'xx_events.md'. } // QueryBlockCmd implements the default command for a Block query. -func (s *CometBFTServer[T]) QueryBlockCmd() *cobra.Command { +func QueryBlockCmd() *cobra.Command { cmd := &cobra.Command{ Use: "block --type={height|hash} ", Short: "Query for a committed block by height, hash, or event(s)", @@ -246,7 +235,8 @@ $ %s query block --%s=%s RunE: func(cmd *cobra.Command, args []string) error { typ, _ := cmd.Flags().GetString(FlagType) - rpcclient, err := s.rpcClient(cmd) + rpcclient, err := rpcClient(cmd) + fmt.Println("rpcclient", rpcclient, err) if err != nil { return err } @@ -318,14 +308,14 @@ $ %s query block --%s=%s } // QueryBlockResultsCmd implements the default command for a BlockResults query. -func (s *CometBFTServer[T]) QueryBlockResultsCmd() *cobra.Command { +func QueryBlockResultsCmd() *cobra.Command { cmd := &cobra.Command{ Use: "block-results [height]", Short: "Query for a committed block's results by height", Long: "Query for a specific committed block's results using the CometBFT RPC `block_results` method", Args: cobra.RangeArgs(0, 1), RunE: func(cmd *cobra.Command, args []string) error { - node, err := s.rpcClient(cmd) + node, err := rpcClient(cmd) if err != nil { return err } diff --git a/server/v2/cometbft/config.go b/server/v2/cometbft/config.go index 56860a78dd..7cdc8bd082 100644 --- a/server/v2/cometbft/config.go +++ b/server/v2/cometbft/config.go @@ -64,3 +64,4 @@ func getConfigTomlFromViper(v *viper.Viper) *cmtcfg.Config { return conf.SetRoot(rootDir) } + diff --git a/server/v2/cometbft/server.go b/server/v2/cometbft/server.go index c06c56c9be..c1b547928c 100644 --- a/server/v2/cometbft/server.go +++ b/server/v2/cometbft/server.go @@ -233,18 +233,19 @@ func (s *CometBFTServer[T]) StartCmdFlags() *pflag.FlagSet { func (s *CometBFTServer[T]) CLICommands() serverv2.CLIConfig { return serverv2.CLIConfig{ Commands: []*cobra.Command{ - s.StatusCommand(), - s.ShowNodeIDCmd(), - s.ShowValidatorCmd(), - s.ShowAddressCmd(), - s.VersionCmd(), + StatusCommand(), + ShowNodeIDCmd(), + ShowValidatorCmd(), + ShowAddressCmd(), + VersionCmd(), + s.BootstrapStateCmd(), cmtcmd.ResetAllCmd, cmtcmd.ResetStateCmd, }, Queries: []*cobra.Command{ - s.QueryBlockCmd(), - s.QueryBlocksCmd(), - s.QueryBlockResultsCmd(), + QueryBlockCmd(), + QueryBlocksCmd(), + QueryBlockResultsCmd(), }, } } diff --git a/simapp/CHANGELOG.md b/simapp/CHANGELOG.md index 3c46633c70..b2b2ee639c 100644 --- a/simapp/CHANGELOG.md +++ b/simapp/CHANGELOG.md @@ -24,7 +24,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog `SimApp` is an application built using the Cosmos SDK for testing and educational purposes. -It won't be tagged or intented to be imported in an application. +It won't be tagged or intended to be imported in an application. This changelog is aimed to help developers understand the wiring changes between SDK versions. It is an exautive list of changes that completes the SimApp section in the [UPGRADING.md](https://github.com/cosmos/cosmos-sdk/blob/main/UPGRADING.md#simapp) diff --git a/simapp/app.go b/simapp/app.go index 1e64e65dee..eff341e424 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -518,7 +518,6 @@ func NewSimApp( group.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, - consensustypes.ModuleName, circuittypes.ModuleName, pooltypes.ModuleName, epochstypes.ModuleName, diff --git a/simapp/app_config.go b/simapp/app_config.go index a1d45ff021..8d2172e44b 100644 --- a/simapp/app_config.go +++ b/simapp/app_config.go @@ -284,7 +284,7 @@ var ( Name: epochstypes.ModuleName, Config: appconfig.WrapAny(&epochsmodulev1.Module{}), }, - // This module is used for testing the depinject gogo x pulsar module registration. + // This module is only used for testing the depinject gogo x pulsar module registration. { Name: countertypes.ModuleName, Config: appconfig.WrapAny(&countertypes.Module{}), diff --git a/simapp/app_di.go b/simapp/app_di.go index 390d28d9ee..dfd95e19a9 100644 --- a/simapp/app_di.go +++ b/simapp/app_di.go @@ -287,7 +287,7 @@ func NewSimApp( return app } -// overwrite default ante handlers with custom ante handlers +// setCustomAnteHandler overwrites default ante handlers with custom ante handlers // set SkipAnteHandler to true in app config and set custom ante handler on baseapp func (app *SimApp) setCustomAnteHandler() { anteHandler, err := NewAnteHandler( diff --git a/simapp/export.go b/simapp/export.go index 2c1d401ba5..6b278cf9fe 100644 --- a/simapp/export.go +++ b/simapp/export.go @@ -3,7 +3,6 @@ package simapp import ( "encoding/json" "fmt" - "log" cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" @@ -50,7 +49,7 @@ func (app *SimApp) ExportAppStateAndValidators(forZeroHeight bool, jailAllowedAd }, err } -// prepare for fresh start at zero height +// prepForZeroHeightGenesis prepares for fresh start at zero height // NOTE zero height genesis is a temporary feature which will be deprecated // // in favor of export at a block height @@ -67,7 +66,7 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [] for _, addr := range jailAllowedAddrs { _, err := sdk.ValAddressFromBech32(addr) if err != nil { - log.Fatal(err) + panic(err) } allowedAddrsMap[addr] = true } @@ -94,11 +93,7 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [] } for _, delegation := range dels { - valAddr, err := sdk.ValAddressFromBech32(delegation.ValidatorAddress) - if err != nil { - panic(err) - } - + valAddr:= sdk.MustValAddressFromBech32(delegation.ValidatorAddress) delAddr := sdk.MustAccAddressFromBech32(delegation.DelegatorAddress) _, _ = app.DistrKeeper.WithdrawDelegationRewards(ctx, delAddr, valAddr) @@ -151,10 +146,7 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [] // reinitialize all delegations for _, del := range dels { - valAddr, err := sdk.ValAddressFromBech32(del.ValidatorAddress) - if err != nil { - panic(err) - } + valAddr := sdk.MustValAddressFromBech32(del.ValidatorAddress) delAddr := sdk.MustAccAddressFromBech32(del.DelegatorAddress) if err := app.DistrKeeper.Hooks().BeforeDelegationCreated(ctx, delAddr, valAddr); err != nil { @@ -192,7 +184,7 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [] err = app.StakingKeeper.UnbondingDelegations.Walk( ctx, nil, - func(key collections.Pair[[]byte, []byte], ubd stakingtypes.UnbondingDelegation) (stop bool, err error) { + func(_ collections.Pair[[]byte, []byte], ubd stakingtypes.UnbondingDelegation) (stop bool, err error) { for i := range ubd.Entries { ubd.Entries[i].CreationHeight = 0 } @@ -237,7 +229,7 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs [] _, err = app.StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx) if err != nil { - log.Fatal(err) + panic(err) } /* Handle slashing state. */ diff --git a/simapp/genesis_account.go b/simapp/genesis_account.go index d242ba5706..61a8f6942f 100644 --- a/simapp/genesis_account.go +++ b/simapp/genesis_account.go @@ -31,7 +31,7 @@ type SimGenesisAccount struct { func (sga SimGenesisAccount) Validate() error { if !sga.OriginalVesting.IsZero() { if sga.StartTime >= sga.EndTime { - return errors.New("vesting start-time cannot be before end-time") + return errors.New("vesting start-time cannot be after end-time") } } diff --git a/simapp/simd/cmd/commands.go b/simapp/simd/cmd/commands.go index 67175d3ee3..b43ef6a743 100644 --- a/simapp/simd/cmd/commands.go +++ b/simapp/simd/cmd/commands.go @@ -146,17 +146,16 @@ func appExport( // 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) + simApp = simapp.NewSimApp(logger, db, traceStore, false, viperAppOpts) if err := simApp.LoadHeight(height); err != nil { return servertypes.ExportedApp{}, err } } else { - simApp = simapp.NewSimApp(logger, db, traceStore, true, appOpts) + simApp = simapp.NewSimApp(logger, db, traceStore, true, viperAppOpts) } return simApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) diff --git a/simapp/simd/cmd/config.go b/simapp/simd/cmd/config.go index b74d0c5698..a87875836f 100644 --- a/simapp/simd/cmd/config.go +++ b/simapp/simd/cmd/config.go @@ -15,7 +15,7 @@ import ( func initCometBFTConfig() *cmtcfg.Config { cfg := cmtcfg.DefaultConfig() - // only display only error logs by default except for p2p and state + // display only error logs by default except for p2p and state cfg.LogLevel = "*:error,p2p:info,state:info" // these values put a higher strain on node memory diff --git a/simapp/simd/cmd/testnet.go b/simapp/simd/cmd/testnet.go index 3368dcba38..62c86403ac 100644 --- a/simapp/simd/cmd/testnet.go +++ b/simapp/simd/cmd/testnet.go @@ -544,11 +544,7 @@ func writeFile(name, dir string, contents []byte) error { return fmt.Errorf("could not create directory %q: %w", dir, err) } - if err := os.WriteFile(file, contents, 0o600); err != nil { - return err - } - - return nil + return os.WriteFile(file, contents, 0o600) } // startTestnet starts an in-process testnet diff --git a/simapp/v2/app_config.go b/simapp/v2/app_config.go index 4930d0cd21..c126d1dcfa 100644 --- a/simapp/v2/app_config.go +++ b/simapp/v2/app_config.go @@ -15,6 +15,7 @@ import ( circuitmodulev1 "cosmossdk.io/api/cosmos/circuit/module/v1" consensusmodulev1 "cosmossdk.io/api/cosmos/consensus/module/v1" distrmodulev1 "cosmossdk.io/api/cosmos/distribution/module/v1" + epochsmodulev1 "cosmossdk.io/api/cosmos/epochs/module/v1" evidencemodulev1 "cosmossdk.io/api/cosmos/evidence/module/v1" feegrantmodulev1 "cosmossdk.io/api/cosmos/feegrant/module/v1" genutilmodulev1 "cosmossdk.io/api/cosmos/genutil/module/v1" @@ -45,6 +46,8 @@ import ( consensustypes "cosmossdk.io/x/consensus/types" _ "cosmossdk.io/x/distribution" // import for side-effects distrtypes "cosmossdk.io/x/distribution/types" + _ "cosmossdk.io/x/epochs" // import for side-effects + epochstypes "cosmossdk.io/x/epochs/types" _ "cosmossdk.io/x/evidence" // import for side-effects evidencetypes "cosmossdk.io/x/evidence/types" "cosmossdk.io/x/feegrant" @@ -121,6 +124,7 @@ var ( evidencetypes.ModuleName, stakingtypes.ModuleName, authz.ModuleName, + epochstypes.ModuleName, }, EndBlockers: []string{ govtypes.ModuleName, @@ -158,6 +162,7 @@ var ( vestingtypes.ModuleName, circuittypes.ModuleName, pooltypes.ModuleName, + epochstypes.ModuleName, }, // When ExportGenesis is not specified, the export genesis module order // is equal to the init genesis order @@ -270,6 +275,10 @@ var ( Name: pooltypes.ModuleName, Config: appconfig.WrapAny(&poolmodulev1.Module{}), }, + { + Name: epochstypes.ModuleName, + Config: appconfig.WrapAny(&epochsmodulev1.Module{}), + }, }, }) ) diff --git a/simapp/v2/app_di.go b/simapp/v2/app_di.go index 839cfb1ac3..19796803af 100644 --- a/simapp/v2/app_di.go +++ b/simapp/v2/app_di.go @@ -19,6 +19,7 @@ import ( circuitkeeper "cosmossdk.io/x/circuit/keeper" consensuskeeper "cosmossdk.io/x/consensus/keeper" distrkeeper "cosmossdk.io/x/distribution/keeper" + epochskeeper "cosmossdk.io/x/epochs/keeper" evidencekeeper "cosmossdk.io/x/evidence/keeper" feegrantkeeper "cosmossdk.io/x/feegrant/keeper" govkeeper "cosmossdk.io/x/gov/keeper" @@ -69,6 +70,7 @@ type SimApp[T transaction.Tx] struct { ConsensusParamsKeeper consensuskeeper.Keeper CircuitBreakerKeeper circuitkeeper.Keeper PoolKeeper poolkeeper.Keeper + EpochsKeeper *epochskeeper.Keeper } func init() { @@ -177,6 +179,7 @@ func NewSimApp[T transaction.Tx]( &app.ConsensusParamsKeeper, &app.CircuitBreakerKeeper, &app.PoolKeeper, + &app.EpochsKeeper, ); err != nil { panic(err) } @@ -194,7 +197,6 @@ func NewSimApp[T transaction.Tx]( // TODO (here or in runtime/v2) // wire simulation manager - // wire snapshot manager // wire unordered tx manager if err := app.LoadLatest(); err != nil { diff --git a/simapp/v2/genesis_account.go b/simapp/v2/genesis_account.go index d242ba5706..61a8f6942f 100644 --- a/simapp/v2/genesis_account.go +++ b/simapp/v2/genesis_account.go @@ -31,7 +31,7 @@ type SimGenesisAccount struct { func (sga SimGenesisAccount) Validate() error { if !sga.OriginalVesting.IsZero() { if sga.StartTime >= sga.EndTime { - return errors.New("vesting start-time cannot be before end-time") + return errors.New("vesting start-time cannot be after end-time") } } diff --git a/simapp/v2/genesis_account_test.go b/simapp/v2/genesis_account_test.go new file mode 100644 index 0000000000..9c21dc8a38 --- /dev/null +++ b/simapp/v2/genesis_account_test.go @@ -0,0 +1,89 @@ +package simapp_test + +import ( + "testing" + "time" + + "github.com/cometbft/cometbft/crypto" + "github.com/stretchr/testify/require" + + "cosmossdk.io/simapp/v2" + authtypes "cosmossdk.io/x/auth/types" + + "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +func TestSimGenesisAccountValidate(t *testing.T) { + pubkey := secp256k1.GenPrivKey().PubKey() + addr := sdk.AccAddress(pubkey.Address()) + + vestingStart := time.Now().UTC() + + coins := sdk.NewCoins(sdk.NewInt64Coin("test", 1000)) + baseAcc := authtypes.NewBaseAccount(addr, pubkey, 0, 0) + + testCases := []struct { + name string + sga simapp.SimGenesisAccount + wantErr bool + }{ + { + "valid basic account", + simapp.SimGenesisAccount{ + BaseAccount: baseAcc, + }, + false, + }, + { + "invalid basic account with mismatching address/pubkey", + simapp.SimGenesisAccount{ + BaseAccount: authtypes.NewBaseAccount(addr, secp256k1.GenPrivKey().PubKey(), 0, 0), + }, + true, + }, + { + "valid basic account with module name", + simapp.SimGenesisAccount{ + BaseAccount: authtypes.NewBaseAccount(sdk.AccAddress(crypto.AddressHash([]byte("testmod"))), nil, 0, 0), + ModuleName: "testmod", + }, + false, + }, + { + "valid basic account with invalid module name/pubkey pair", + simapp.SimGenesisAccount{ + BaseAccount: baseAcc, + ModuleName: "testmod", + }, + true, + }, + { + "valid basic account with valid vesting attributes", + simapp.SimGenesisAccount{ + BaseAccount: baseAcc, + OriginalVesting: coins, + StartTime: vestingStart.Unix(), + EndTime: vestingStart.Add(1 * time.Hour).Unix(), + }, + false, + }, + { + "valid basic account with invalid vesting end time", + simapp.SimGenesisAccount{ + BaseAccount: baseAcc, + OriginalVesting: coins, + StartTime: vestingStart.Add(2 * time.Hour).Unix(), + EndTime: vestingStart.Add(1 * time.Hour).Unix(), + }, + true, + }, + } + + for _, tc := range testCases { + tc := tc + t.Run(tc.name, func(t *testing.T) { + require.Equal(t, tc.wantErr, tc.sga.Validate() != nil) + }) + } +} diff --git a/simapp/v2/go.mod b/simapp/v2/go.mod index 9f3bac080f..cdb8c9f42b 100644 --- a/simapp/v2/go.mod +++ b/simapp/v2/go.mod @@ -21,6 +21,7 @@ require ( cosmossdk.io/x/circuit v0.0.0-20230613133644-0a778132a60f cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000 cosmossdk.io/x/distribution v0.0.0-20230925135524-a1bc045b3190 + cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337 cosmossdk.io/x/evidence v0.0.0-20230613133644-0a778132a60f cosmossdk.io/x/feegrant v0.0.0-20230613133644-0a778132a60f cosmossdk.io/x/gov v0.0.0-20231113122742-912390d5fc4a @@ -61,7 +62,6 @@ require ( cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc // indirect cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5 // indirect cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000 // indirect - cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337 // indirect cosmossdk.io/x/tx v0.13.4 // indirect filippo.io/edwards25519 v1.1.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect @@ -260,6 +260,7 @@ replace ( cosmossdk.io/x/circuit => ../../x/circuit cosmossdk.io/x/consensus => ../../x/consensus cosmossdk.io/x/distribution => ../../x/distribution + cosmossdk.io/x/epochs => ../../x/epochs cosmossdk.io/x/evidence => ../../x/evidence cosmossdk.io/x/feegrant => ../../x/feegrant cosmossdk.io/x/gov => ../../x/gov diff --git a/simapp/v2/go.sum b/simapp/v2/go.sum index 0d3135f2ed..144645722d 100644 --- a/simapp/v2/go.sum +++ b/simapp/v2/go.sum @@ -204,8 +204,6 @@ cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= cosmossdk.io/schema v0.1.1 h1:I0M6pgI7R10nq+/HCQfbO6BsGBZA8sQy+duR1Y3aKcA= cosmossdk.io/schema v0.1.1/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= -cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337 h1:GuBrfHsK3RD5vlD4DuBz3DXslR6VlnzrYmHOC3L679Q= -cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337/go.mod h1:PhLn1pMBilyRC4GfRkoYhm+XVAYhF4adVrzut8AdpJI= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= diff --git a/simapp/v2/simdv2/cmd/commands.go b/simapp/v2/simdv2/cmd/commands.go index d9fa1fa549..41565ccc4a 100644 --- a/simapp/v2/simdv2/cmd/commands.go +++ b/simapp/v2/simdv2/cmd/commands.go @@ -110,11 +110,8 @@ func queryCommand() *cobra.Command { cmd.AddCommand( rpc.QueryEventForTxCmd(), - server.QueryBlockCmd(), authcmd.QueryTxsByEventsCmd(), - server.QueryBlocksCmd(), authcmd.QueryTxCmd(), - server.QueryBlockResultsCmd(), ) return cmd diff --git a/simapp/v2/simdv2/cmd/testnet.go b/simapp/v2/simdv2/cmd/testnet.go index 5ec7823890..129fbafc6b 100644 --- a/simapp/v2/simdv2/cmd/testnet.go +++ b/simapp/v2/simdv2/cmd/testnet.go @@ -175,14 +175,6 @@ func initTestnetFiles[T transaction.Tx]( nodeIDs := make([]string, args.numValidators) valPubKeys := make([]cryptotypes.PubKey, args.numValidators) - // appConfig := srvconfig.DefaultConfig() - // appConfig.MinGasPrices = args.minGasPrices - // appConfig.API.Enable = true - // appConfig.Telemetry.Enabled = true - // appConfig.Telemetry.PrometheusRetentionTime = 60 - // appConfig.Telemetry.EnableHostnameLabel = false - // appConfig.Telemetry.GlobalLabels = [][]string{{"chain_id", args.chainID}} - var ( genAccounts []authtypes.GenesisAccount genBalances []banktypes.Balance @@ -506,9 +498,5 @@ func writeFile(name, dir string, contents []byte) error { return fmt.Errorf("could not create directory %q: %w", dir, err) } - if err := os.WriteFile(file, contents, 0o600); err != nil { - return err - } - - return nil + return os.WriteFile(file, contents, 0o600) }