From 5a3cbdb5f5d0f508798f220b49443852fab7bc1b Mon Sep 17 00:00:00 2001
From: Lukasz Klimek <842586+lklimek@users.noreply.github.com>
Date: Thu, 29 Aug 2024 12:25:04 +0200
Subject: [PATCH 1/2] chore(release): update changelog and version to
 1.2.1-dev.1

---
 CHANGELOG.md       | 23 ++++++++++++++++-------
 version/version.go |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee852f4b8..acb8e3e9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,15 @@
-## [1.3.0-dev.1] - 2024-08-15
+## [1.2.1-dev.1] - 2024-08-29
+
+### Bug Fixes
+
+- Genesis.json not loaded on restart before genesis block is mined
+- Panic when loading invalid node key file (#888)
+
+### Build
+
+- Bump git-cliff to 2.4 and remove history before 1.0 (#882)
+
+## [1.2.0] - 2024-08-15
 
 ### Bug Fixes
 
@@ -8,12 +19,14 @@
 
 - Configuration of deadlock detection (#880)
 
+### Miscellaneous Tasks
+
+- Update changelog and version to 1.2.0
+
 ## [1.2.0-dev.3] - 2024-08-12
 
 ### Bug Fixes
 
-- Proposal not generated after waiting for last block time to pass (#849)
-- Build of dev releases fails due to invalid tags (#859)
 - Msg queue is too small for mainnet (#863)
 - Non-active validators can't verify evidence signatures (#865)
 
@@ -45,14 +58,10 @@
 ### Miscellaneous Tasks
 
 - Update changelog and version to 1.2.0-dev.1 (#858)
-- Update changelog and version to 1.2.0-dev.2 (#861)
-- Improve logs (#866)
-- Update changelog and version to 1.2.0-dev.3 (#868)
 
 ### Build
 
 - Add signed binaries to releases (#854)
-- E2e tests fail due to lack of docker-compose command (#860)
 
 ## [1.1.0] - 2024-07-29
 
diff --git a/version/version.go b/version/version.go
index 97062bbfe..f38b0fbe5 100644
--- a/version/version.go
+++ b/version/version.go
@@ -9,7 +9,7 @@ var (
 const (
 	// TMVersionDefault is the used as the fallback version for Tenderdash
 	// when not using git describe. It is formatted with semantic versioning.
-	TMVersionDefault = "1.2.0"
+	TMVersionDefault = "1.2.1-dev.1"
 	// ABCISemVer is the semantic version of the ABCI library
 	ABCISemVer = "1.1.0"
 

From f42bd3986e0264a0405f92df2f3572e2f964a63a Mon Sep 17 00:00:00 2001
From: Lukasz Klimek <842586+lklimek@users.noreply.github.com>
Date: Thu, 29 Aug 2024 20:20:10 +0200
Subject: [PATCH 2/2] chore(release): update changelog and version to 1.2.1

---
 CHANGELOG.md       | 64 +++++++++++++---------------------------------
 version/version.go |  2 +-
 2 files changed, 19 insertions(+), 47 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acb8e3e9d..962a98d08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,14 @@
-## [1.2.1-dev.1] - 2024-08-29
+## [1.2.1] - 2024-08-29
 
 ### Bug Fixes
 
 - Genesis.json not loaded on restart before genesis block is mined
 - Panic when loading invalid node key file (#888)
 
+### Miscellaneous Tasks
+
+- Update changelog and version to 1.2.1-dev.1
+
 ### Build
 
 - Bump git-cliff to 2.4 and remove history before 1.0 (#882)
@@ -13,6 +17,10 @@
 
 ### Bug Fixes
 
+- Proposal not generated after waiting for last block time to pass (#849)
+- Build of dev releases fails due to invalid tags (#859)
+- Msg queue is too small for mainnet (#863)
+- Non-active validators can't verify evidence signatures (#865)
 - Vote extensions verified multiple times (#867)
 
 ### Features
@@ -21,47 +29,16 @@
 
 ### Miscellaneous Tasks
 
-- Update changelog and version to 1.2.0
-
-## [1.2.0-dev.3] - 2024-08-12
-
-### Bug Fixes
-
-- Msg queue is too small for mainnet (#863)
-- Non-active validators can't verify evidence signatures (#865)
-
-### Miscellaneous Tasks
-
+- Update changelog and version to 1.2.0-dev.1 (#858)
+- Update changelog and version to 1.2.0-dev.2 (#861)
 - Improve logs (#866)
 - Update changelog and version to 1.2.0-dev.3 (#868)
-
-## [1.2.0-dev.2] - 2024-08-05
-
-### Bug Fixes
-
-- Build of dev releases fails due to invalid tags (#859)
-
-### Miscellaneous Tasks
-
-- Update changelog and version to 1.2.0-dev.2 (#861)
-
-### Build
-
-- E2e tests fail due to lack of docker-compose command (#860)
-
-## [1.2.0-dev.1] - 2024-08-05
-
-### Bug Fixes
-
-- Proposal not generated after waiting for last block time to pass (#849)
-
-### Miscellaneous Tasks
-
-- Update changelog and version to 1.2.0-dev.1 (#858)
+- Update changelog and version to 1.2.0
 
 ### Build
 
 - Add signed binaries to releases (#854)
+- E2e tests fail due to lack of docker-compose command (#860)
 
 ## [1.1.0] - 2024-07-29
 
@@ -90,16 +67,6 @@
 
 ## [1.0.0] - 2024-07-01
 
-### Miscellaneous Tasks
-
-- Update changelog and version to 1.0.0
-
-### Build
-
-- Bump github.com/stretchr/testify from 1.8.2 to 1.9.0 (#817)
-
-## [1.0.0-dev.2] - 2024-06-26
-
 ### Bug Fixes
 
 - Ineffective PROXY_APP and ABCI env in entrypoint (#805)
@@ -107,4 +74,9 @@
 ### Miscellaneous Tasks
 
 - Update changelog and version to 1.0.0-dev.2 (#806)
+- Update changelog and version to 1.0.0
+
+### Build
+
+- Bump github.com/stretchr/testify from 1.8.2 to 1.9.0 (#817)
 
diff --git a/version/version.go b/version/version.go
index f38b0fbe5..9a488a262 100644
--- a/version/version.go
+++ b/version/version.go
@@ -9,7 +9,7 @@ var (
 const (
 	// TMVersionDefault is the used as the fallback version for Tenderdash
 	// when not using git describe. It is formatted with semantic versioning.
-	TMVersionDefault = "1.2.1-dev.1"
+	TMVersionDefault = "1.2.1"
 	// ABCISemVer is the semantic version of the ABCI library
 	ABCISemVer = "1.1.0"