From c1b9b42458f08056b36af59bae55680c23838149 Mon Sep 17 00:00:00 2001
From: ghost <paddymchale@hotmail.com>
Date: Wed, 24 Jul 2024 17:22:16 +0100
Subject: [PATCH 1/2] feat: reduce commit timeout to 200ms to enable faster
 blocks

---
 cmd/osmosisd/cmd/root.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/osmosisd/cmd/root.go b/cmd/osmosisd/cmd/root.go
index d435ba4b4dd..d28d48b6576 100644
--- a/cmd/osmosisd/cmd/root.go
+++ b/cmd/osmosisd/cmd/root.go
@@ -144,7 +144,7 @@ var (
 		{
 			Section: "consensus",
 			Key:     "timeout_commit",
-			Value:   "600ms",
+			Value:   "200ms",
 		},
 		{
 			Section: "consensus",

From 6fe74c9d09a18808f8ed34ece621a045faeef0f1 Mon Sep 17 00:00:00 2001
From: ghost <paddymchale@hotmail.com>
Date: Thu, 25 Jul 2024 10:44:00 +0100
Subject: [PATCH 2/2] feat: reduce commit timeout to 500ms and propose timeout
 to 1.8s

---
 CHANGELOG.md             | 1 +
 cmd/osmosisd/cmd/root.go | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b22ff70ce93..ed616f70db7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### State Compatible
 * [#8494](https://github.com/osmosis-labs/osmosis/pull/8494) Add additional events in x/lockup, x/superfluid, x/concentratedliquidity
+* [#8546](https://github.com/osmosis-labs/osmosis/pull/8546) feat: reduce commit timeout to 500ms to enable faster blocks, and timeout propose to 1.8s
 
 ## v25.2.0
 
diff --git a/cmd/osmosisd/cmd/root.go b/cmd/osmosisd/cmd/root.go
index d28d48b6576..fb0786dd430 100644
--- a/cmd/osmosisd/cmd/root.go
+++ b/cmd/osmosisd/cmd/root.go
@@ -144,12 +144,12 @@ var (
 		{
 			Section: "consensus",
 			Key:     "timeout_commit",
-			Value:   "200ms",
+			Value:   "500ms",
 		},
 		{
 			Section: "consensus",
 			Key:     "timeout_propose",
-			Value:   "2s",
+			Value:   "1.8s",
 		},
 		{
 			Section: "consensus",