From 48d116d99ca42c3847106748a8a6744cd20d6478 Mon Sep 17 00:00:00 2001
From: Barry <122767193+BarryTong65@users.noreply.github.com>
Date: Mon, 27 May 2024 17:54:54 +0930
Subject: [PATCH 1/2] feat: set up hardfork height and add CHANGELOG.md  (#449)

* release: veld upgrade

* release: release v1.8.0
---
 CHANGELOG.md                      |  3 +++
 types/upgrade.go                  |  3 +++
 x/upgrade/types/upgrade_config.go | 11 +++++++++++
 3 files changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd25cc4a6..141ef422c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## V1.8.0
+This release introduces the Veld upgrade
+
 ## V1.7.0
 This release introduces the Erdos upgrade
 
diff --git a/types/upgrade.go b/types/upgrade.go
index 64f93d082..efb18d1b5 100644
--- a/types/upgrade.go
+++ b/types/upgrade.go
@@ -29,4 +29,7 @@ const (
 
 	// Erdos is the upgrade name for Erdos upgrade
 	Erdos = "Erdos"
+
+	// Veld is the upgrade name for Veld upgrade
+	Veld = "Veld"
 )
diff --git a/x/upgrade/types/upgrade_config.go b/x/upgrade/types/upgrade_config.go
index 76096230a..ee95f55c4 100644
--- a/x/upgrade/types/upgrade_config.go
+++ b/x/upgrade/types/upgrade_config.go
@@ -35,6 +35,9 @@ const (
 
 	// Erdos is the upgrade name for Erdos upgrade
 	Erdos = types.Erdos
+
+	// Veld is the upgrade name for Veld upgrade
+	Veld = types.Veld
 )
 
 // The default upgrade config for networks
@@ -76,6 +79,10 @@ var (
 		Name:   Erdos,
 		Height: 7861456,
 		Info:   "Erdos hardfork",
+	}).SetPlan(&Plan{
+		Name:   Veld,
+		Height: 9030588,
+		Info:   "Veld hardfork",
 	})
 
 	TestnetChainID = "greenfield_5600-1"
@@ -115,6 +122,10 @@ var (
 		Name:   Erdos,
 		Height: 8116724,
 		Info:   "Erdos hardfork",
+	}).SetPlan(&Plan{
+		Name:   Veld,
+		Height: 9379516,
+		Info:   "Veld hardfork",
 	})
 )
 

From 729b8f1e6b85980355d315461d4bd040967e69b9 Mon Sep 17 00:00:00 2001
From: Barry <122767193+BarryTong65@users.noreply.github.com>
Date: Tue, 11 Jun 2024 19:06:33 +0930
Subject: [PATCH 2/2] feat: update the block height for veld (#450)

---
 x/upgrade/types/upgrade_config.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x/upgrade/types/upgrade_config.go b/x/upgrade/types/upgrade_config.go
index ee95f55c4..c4ac2ce31 100644
--- a/x/upgrade/types/upgrade_config.go
+++ b/x/upgrade/types/upgrade_config.go
@@ -81,7 +81,7 @@ var (
 		Info:   "Erdos hardfork",
 	}).SetPlan(&Plan{
 		Name:   Veld,
-		Height: 9030588,
+		Height: 9269910,
 		Info:   "Veld hardfork",
 	})
 
@@ -124,7 +124,7 @@ var (
 		Info:   "Erdos hardfork",
 	}).SetPlan(&Plan{
 		Name:   Veld,
-		Height: 9379516,
+		Height: 9581218,
 		Info:   "Veld hardfork",
 	})
 )