Unify how we check for Jorvik height

maticnetwork · Jan 7, 2025 · 37daf72 · 37daf72
1 parent 5c353b1
commit 37daf72
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bor/keeper.go b/bor/keeper.go
@@ -265,7 +265,7 @@ func (k *Keeper) FreezeSet(ctx sdk.Context, id uint64, startBlock uint64, endBlo
 
 // SelectNextProducers selects producers for next span
 func (k *Keeper) SelectNextProducers(ctx sdk.Context, seed common.Hash, prevVals []hmTypes.Validator) (vals []hmTypes.Validator, err error) {
-	if ctx.BlockHeader().Height < helper.GetJorvikHeight() {
+	if ctx.BlockHeight() < helper.GetJorvikHeight() {
 		prevVals = nil
 	}
 
@@ -358,7 +358,7 @@ func (k *Keeper) GetNextSpanSeed(ctx sdk.Context, id uint64) (common.Hash, commo
 		author      *common.Address
 	)
 
-	if ctx.BlockHeader().Height < helper.GetJorvikHeight() {
+	if ctx.BlockHeight() < helper.GetJorvikHeight() {
 		lastEthBlock := k.GetLastEthBlock(ctx)
 		// increment last processed header block number
 		newEthBlock := lastEthBlock.Add(lastEthBlock, big.NewInt(1))

diff --git a/bor/side_handler.go b/bor/side_handler.go
@@ -188,7 +188,7 @@ func PostHandleMsgEventSpan(ctx sdk.Context, k Keeper, msg sdk.Msg, sideTxResult
 		"seed", proposeMsg.Seed.String(),
 	)
 
-	if ctx.BlockHeader().Height >= helper.GetJorvikHeight() {
+	if ctx.BlockHeight() >= helper.GetJorvikHeight() {
 		var seedSpanID uint64
 		if proposeMsg.ID < 2 {
 			seedSpanID = proposeMsg.ID - 1