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

Tobias Andersen · web-flow · commit 8bb56e9919ec · 2023-01-18T04:02:26.000+01:00
move version map register to begin block
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

-Original file line number
+Diff line change
 # Build
 bin
 -build
 +_build
 vendor
 .vendor-new
 build
Original file line number	Diff line number	Diff line change
`@@ -626,6 +626,11 @@ func (app *TerraApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) a`
`626`	`626`	`}`
`627`	`627`	`}`
`628`	`628`
	`629`	`+ // trigger SetModuleVersionMap in upgrade keeper at the VersionMapEnableHeight`
	`630`	`+ if ctx.BlockHeight() == core.VersionMapEnableHeight {`
	`631`	`+ app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap())`
	`632`	`+ }`
	`633`	`+`
`629`	`634`	`return app.mm.BeginBlock(ctx, req)`
`630`	`635`	`}`
`631`	`636`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ const (`
`40`	`40`	`BombayChainID = "bombay-12"`
`41`	`41`	`SwapDisableForkHeight = fork.SwapDisableForkHeight`
`42`	`42`	`SwapEnableForkHeight = fork.SwapEnableForkHeight`
	`43`	`+ VersionMapEnableHeight = fork.VersionMapEnableHeight`
`43`	`44`	`)`
`44`	`45`
`45`	`46`	`// functions aliases`