Added block height guards for the version map update

classic-terra · Jan 17, 2023 · 6bf1a7e · 6bf1a7e
1 parent 24eb873
commit 6bf1a7e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/app.go b/app/app.go
@@ -626,9 +626,8 @@ func (app *TerraApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) a
 		}
 	}
 
-	// check if version map in upgrade keeper is nil
-	vm := app.UpgradeKeeper.GetModuleVersionMap(ctx)
-	if len(vm) == 0 {
+	// trigger SetModuleVersionMap in upgrade keeper at the VersionMapEnableHeight
+	if ctx.BlockHeight() == core.VersionMapEnableHeight {
 		app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap())
 	}
 

diff --git a/types/alias.go b/types/alias.go
@@ -40,6 +40,7 @@ const (
 	BombayChainID         = "bombay-12"
 	SwapDisableForkHeight = fork.SwapDisableForkHeight
 	SwapEnableForkHeight  = fork.SwapEnableForkHeight
+	VersionMapEnableHeight  = fork.VersionMapEnableHeight
 )
 
 // functions aliases

diff --git a/types/fork/height.go b/types/fork/height.go
@@ -4,3 +4,5 @@ package fork
 const SwapDisableForkHeight = 7607790
 // SwapEnableForkHeight - renable IBC only, block height is approximately December 5th, 2022
 const SwapEnableForkHeight = 10542500
+// VersionMapEnableHeight - set the version map to enable software upgrades, approximately February 14, 2023
+const VersionMapEnableHeight = 11543150