From ee7065f66443914f06636dff59dea48dce756fc0 Mon Sep 17 00:00:00 2001
From: ylsGit <bzwdyls@163.com>
Date: Thu, 11 Jul 2024 16:05:32 +0800
Subject: [PATCH] add VENUS8

---
 Makefile                           |  7 ++-----
 app/app.go                         |  4 ++++
 libs/tendermint/types/milestone.go | 29 ++++++++++++++---------------
 x/staking/handler.go               |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index a492ef7a6d..b731c63519 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,6 @@ Venus4Height=0
 Venus5Height=0
 EarthHeight=0
 MarsHeight=0
-JupiterHeight=0
 
 LINK_STATICALLY = false
 cgo_flags=
@@ -54,7 +53,6 @@ ifeq ($(MAKECMDGOALS),mainnet)
    Venus3Height=15277000
    Venus5Height=17849000
    EarthHeight=18735000
-   JupiterHeight=0
 	
    WITH_ROCKSDB=true
 else ifeq ($(MAKECMDGOALS),testnet)
@@ -67,7 +65,6 @@ else ifeq ($(MAKECMDGOALS),testnet)
    EarthHeight=17364500
    Venus4Height=17531500
    Venus5Height=18861500
-   JupiterHeight=0
 
    WITH_ROCKSDB=true
 endif
@@ -123,8 +120,8 @@ ldflags = -X $(GithubTop)/okex/exchain/libs/cosmos-sdk/version.Version=$(Version
   -X $(GithubTop)/okex/exchain/libs/tendermint/types.MILESTONE_VENUS4_HEIGHT=$(Venus4Height) \
   -X $(GithubTop)/okex/exchain/libs/tendermint/types.MILESTONE_VENUS5_HEIGHT=$(Venus5Height) \
   -X $(GithubTop)/okex/exchain/libs/tendermint/types.MILESTONE_EARTH_HEIGHT=$(EarthHeight) \
-  -X $(GithubTop)/okex/exchain/libs/tendermint/types.MILESTONE_MARS_HEIGHT=$(MarsHeight) \
-  -X $(GithubTop)/okex/exchain/libs/tendermint/types.MILESTONE_JUPITER_NAME=$(JupiterHeight)
+  -X $(GithubTop)/okex/exchain/libs/tendermint/types.MILESTONE_MARS_HEIGHT=$(MarsHeight)
+
 
 
 ifeq ($(WITH_ROCKSDB),true)
diff --git a/app/app.go b/app/app.go
index c9c0f5e893..b7b9f4ed8f 100644
--- a/app/app.go
+++ b/app/app.go
@@ -810,6 +810,10 @@ func (app *OKExChainApp) InitUpgrade(ctx sdk.Context) {
 		app.WasmKeeper.UpdateMilestone(ctx, "wasm_v1", info.EffectiveHeight)
 	})
 
+	app.ParamsKeeper.ClaimReadyForUpgrade(tmtypes.MILESTONE_VENUS8_NAME, func(info paramstypes.UpgradeInfo) {
+		tmtypes.InitMilestoneVenus8Height(int64(info.EffectiveHeight))
+	})
+
 	if err := app.ParamsKeeper.ApplyEffectiveUpgrade(ctx); err != nil {
 		tmos.Exit(fmt.Sprintf("failed apply effective upgrade height info: %s", err))
 	}
diff --git a/libs/tendermint/types/milestone.go b/libs/tendermint/types/milestone.go
index 096c62089a..009136d30c 100644
--- a/libs/tendermint/types/milestone.go
+++ b/libs/tendermint/types/milestone.go
@@ -48,8 +48,8 @@ var (
 	MILESTONE_VENUS7_NAME       = "venus7"
 	milestoneVenus7Height int64 = 0
 
-	MILESTONE_JUPITER_NAME string
-	milestoneJupiterHeight int64
+	MILESTONE_VENUS8_NAME       = "venus8"
+	milestoneVenus8Height int64 = 0
 
 	// note: it stores the earlies height of the node,and it is used by cli
 	nodePruneHeight int64
@@ -91,7 +91,6 @@ func init() {
 		milestoneEarthHeight = string2number(MILESTONE_EARTH_HEIGHT)
 		milestoneVenus4Height = string2number(MILESTONE_VENUS4_HEIGHT)
 		milestoneVenus5Height = string2number(MILESTONE_VENUS5_HEIGHT)
-		milestoneJupiterHeight = string2number(MILESTONE_JUPITER_NAME)
 	})
 }
 
@@ -146,18 +145,6 @@ func HigherThanMars(height int64) bool {
 	return height > milestoneMarsHeight
 }
 
-// change val's pubkey
-func HigherThanJupiter(height int64) bool {
-	if milestoneJupiterHeight == 0 {
-		return false
-	}
-	return height > milestoneJupiterHeight
-}
-
-func GetJupiterHeight() int64 {
-	return milestoneJupiterHeight
-}
-
 // GetMilestoneVenusHeight returns milestoneVenusHeight
 func GetMilestoneVenusHeight() int64 {
 	return milestoneVenusHeight
@@ -370,3 +357,15 @@ func GetVenus7Height() int64 {
 
 // =========== Venus7 ===============
 // ==================================
+
+// change val's pubkey
+func HigherThanVenus8(h int64) bool {
+	if milestoneVenus8Height == 0 {
+		return false
+	}
+	return h > milestoneVenus8Height
+}
+
+func InitMilestoneVenus8Height(h int64) {
+	milestoneVenus8Height = h
+}
diff --git a/x/staking/handler.go b/x/staking/handler.go
index 88c8e899bd..83b59b4b8e 100644
--- a/x/staking/handler.go
+++ b/x/staking/handler.go
@@ -166,7 +166,7 @@ func handleMsgEditValidator(ctx sdk.Context, msg types.MsgEditValidator, k keepe
 	}
 
 	pk, err := types.GetConsPubKeyBech32(msg.Details)
-	if err == nil && tmtypes.HigherThanJupiter(ctx.BlockHeight()) {
+	if err == nil && tmtypes.HigherThanVenus8(ctx.BlockHeight()) {
 		if validator.ConsPubKey.Equals(pk) {
 			return nil, ErrPubkeyEqual(pk.Address().String())
 		}