From a11a07ff5859fb6095e669921718835bb770cb19 Mon Sep 17 00:00:00 2001
From: Blake <104744707+r3v4s@users.noreply.github.com>
Date: Thu, 13 Jul 2023 19:19:49 +0900
Subject: [PATCH] chore: regular block creation time (5s) (#969)

---
 gno.land/cmd/gnoland/start.go                         | 4 ++--
 misc/deployments/staging.gno.land/overlay/config.toml | 4 ++--
 tm2/pkg/bft/consensus/config/config.go                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gno.land/cmd/gnoland/start.go b/gno.land/cmd/gnoland/start.go
index c2a03c7b046..4bcd2742627 100644
--- a/gno.land/cmd/gnoland/start.go
+++ b/gno.land/cmd/gnoland/start.go
@@ -123,8 +123,8 @@ func execStart(c *startCfg, args []string, io *commands.IO) error {
 	rootDir := c.rootDir
 
 	cfg := config.LoadOrMakeConfigWithOptions(rootDir, func(cfg *config.Config) {
-		cfg.Consensus.CreateEmptyBlocks = false
-		cfg.Consensus.CreateEmptyBlocksInterval = 60 * time.Second
+		cfg.Consensus.CreateEmptyBlocks = true
+		cfg.Consensus.CreateEmptyBlocksInterval = 0 * time.Second
 	})
 
 	// create priv validator first.
diff --git a/misc/deployments/staging.gno.land/overlay/config.toml b/misc/deployments/staging.gno.land/overlay/config.toml
index 6b5c4282760..a580ed7db7f 100644
--- a/misc/deployments/staging.gno.land/overlay/config.toml
+++ b/misc/deployments/staging.gno.land/overlay/config.toml
@@ -222,14 +222,14 @@ timeout_prevote = "1s"
 timeout_prevote_delta = "500ms"
 timeout_precommit = "1s"
 timeout_precommit_delta = "500ms"
-timeout_commit = "1s"
+timeout_commit = "5s"
 
 # Make progress as soon as we have all the precommits (as if TimeoutCommit = 0)
 skip_timeout_commit = false
 
 # EmptyBlocks mode and possible interval between empty blocks
 create_empty_blocks = true
-create_empty_blocks_interval = "1m0s"
+create_empty_blocks_interval = "0s"
 
 # Reactor sleep duration parameters
 peer_gossip_sleep_duration = "100ms"
diff --git a/tm2/pkg/bft/consensus/config/config.go b/tm2/pkg/bft/consensus/config/config.go
index 67ed2c05504..234def843e9 100644
--- a/tm2/pkg/bft/consensus/config/config.go
+++ b/tm2/pkg/bft/consensus/config/config.go
@@ -50,7 +50,7 @@ func DefaultConsensusConfig() *ConsensusConfig {
 		TimeoutPrevoteDelta:         500 * time.Millisecond,
 		TimeoutPrecommit:            1000 * time.Millisecond,
 		TimeoutPrecommitDelta:       500 * time.Millisecond,
-		TimeoutCommit:               1000 * time.Millisecond,
+		TimeoutCommit:               5000 * time.Millisecond,
 		SkipTimeoutCommit:           false,
 		CreateEmptyBlocks:           true,
 		CreateEmptyBlocksInterval:   0 * time.Second,