Merge pull request #44 from classic-terra/v1.0.5-vm-fix

move version map register to begin block
classic-terra · Jan 18, 2023 · 8bb56e9 · 8bb56e9
2 parents 7fe4468 + 6bf1a7e
commit 8bb56e9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,7 @@
 
 # Build
 bin
-build
+_build
 vendor
 .vendor-new
 build

diff --git a/app/app.go b/app/app.go
@@ -626,6 +626,11 @@ func (app *TerraApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) a
 		}
 	}
 
+	// trigger SetModuleVersionMap in upgrade keeper at the VersionMapEnableHeight
+	if ctx.BlockHeight() == core.VersionMapEnableHeight {
+		app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap())
+	}
+
 	return app.mm.BeginBlock(ctx, req)
 }
 

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