Cherry pick 1s commit timeout change

Author: philipsu522

app/upgrades.go

@@ -6,10 +6,16 @@ import (
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
+// NOTE: When performing upgrades, make sure to keep / register the handlers
+// for both the current (n) and the previous (n-1) upgrade name. There is a bug
+// in a missing value in a log statement for which the fix is not released
 const UpgradeNameOracleModule = "create-oracle-mod"
 const UpgradeOracleStaleIndicator = "upgrade-oracle-stale-indicator"
 const UpgradeIgniteCliRemoval = "ignite-cli-removal-upgrade"
+
+// 1.0.2beta upgrades
 const Upgrade102 = "1.0.2beta"
+const Upgrade102CommitTimeout = "1.0.2beta-commit-timeout"
 
 func (app App) RegisterUpgradeHandlers() {
 	app.UpgradeKeeper.SetUpgradeHandler(UpgradeNameOracleModule, func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
@@ -24,4 +30,7 @@ func (app App) RegisterUpgradeHandlers() {
 	app.UpgradeKeeper.SetUpgradeHandler(Upgrade102, func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
 		return app.mm.RunMigrations(ctx, app.configurator, fromVM)
 	})
+	app.UpgradeKeeper.SetUpgradeHandler(Upgrade102CommitTimeout, func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		return app.mm.RunMigrations(ctx, app.configurator, fromVM)
+	})
 }

cmd/seid/cmd/init.go

@@ -88,6 +88,7 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command {
 			config.Mempool.Size = 500
 			config.StateSync.TrustPeriod = 168 * time.Hour
 			config.FastSync.Version = "v0"
+			config.Consensus.TimeoutCommit = 1 * time.Second
 
 			config.SetRoot(clientCtx.HomeDir)