chore: move IsNearUpgrade helper to buildconstants

filecoin-project · Jul 16, 2024 · 1f743ef · 1f743ef
1 parent 8dd52c2
commit 1f743ef
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/build/buildconstants/shared_funcs.go b/build/buildconstants/shared_funcs.go
@@ -4,6 +4,9 @@ import (
 	logging "github.com/ipfs/go-log/v2"
 
 	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/go-state-types/abi"
+
+	"github.com/filecoin-project/lotus/chain/actors/policy"
 )
 
 // moved from now-defunct build/paramfetch.go
@@ -21,3 +24,10 @@ func MustParseAddress(addr string) address.Address {
 
 	return ret
 }
+
+func IsNearUpgrade(epoch, upgradeEpoch abi.ChainEpoch) bool {
+	if upgradeEpoch < 0 {
+		return false
+	}
+	return epoch > upgradeEpoch-policy.ChainFinality && epoch < upgradeEpoch+policy.ChainFinality
+}
diff --git a/build/isnearupgrade.go b/build/isnearupgrade.go
diff --git a/build/parameters.go b/build/parameters.go
@@ -22,6 +22,8 @@ var GenesisFile = buildconstants.GenesisFile // Deprecated: Use buildconstants.G
 var NetworkBundle = buildconstants.NetworkBundle   // Deprecated: Use buildconstants.NetworkBundle instead
 var ActorDebugging = buildconstants.ActorDebugging // Deprecated: Use buildconstants.ActorDebugging instead
 
+var IsNearUpgrade = buildconstants.IsNearUpgrade // Deprecated: Use buildconstants.IsNearUpgrade instead
+
 var GenesisNetworkVersion = buildconstants.GenesisNetworkVersion // Deprecated: Use buildconstants.GenesisNetworkVersion instead
 
 var UpgradeBreezeHeight abi.ChainEpoch = buildconstants.UpgradeBreezeHeight // Deprecated: Use buildconstants.UpgradeBreezeHeight instead

diff --git a/chain/vm/fvm.go b/chain/vm/fvm.go
@@ -28,6 +28,7 @@ import (
 
 	"github.com/filecoin-project/lotus/blockstore"
 	"github.com/filecoin-project/lotus/build"
+	"github.com/filecoin-project/lotus/build/buildconstants"
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/actors/aerrors"
@@ -94,10 +95,10 @@ func (x *FvmExtern) VerifyConsensusFault(ctx context.Context, a, b, extra []byte
 	}
 
 	// workaround chain halt
-	if build.IsNearUpgrade(blockA.Height, build.UpgradeWatermelonFixHeight) {
+	if buildconstants.IsNearUpgrade(blockA.Height, build.UpgradeWatermelonFixHeight) {
 		return ret, totalGas
 	}
-	if build.IsNearUpgrade(blockB.Height, build.UpgradeWatermelonFixHeight) {
+	if buildconstants.IsNearUpgrade(blockB.Height, build.UpgradeWatermelonFixHeight) {
 		return ret, totalGas
 	}
 

diff --git a/chain/vm/syscalls.go b/chain/vm/syscalls.go
@@ -21,6 +21,7 @@ import (
 	proof7 "github.com/filecoin-project/specs-actors/v7/actors/runtime/proof"
 
 	"github.com/filecoin-project/lotus/build"
+	"github.com/filecoin-project/lotus/build/buildconstants"
 	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/actors/policy"
@@ -115,10 +116,10 @@ func (ss *syscallShim) VerifyConsensusFault(a, b, extra []byte) (*runtime7.Conse
 	}
 
 	// workaround chain halt
-	if build.IsNearUpgrade(blockA.Height, build.UpgradeOrangeHeight) {
+	if buildconstants.IsNearUpgrade(blockA.Height, build.UpgradeOrangeHeight) {
 		return nil, xerrors.Errorf("consensus reporting disabled around Upgrade Orange")
 	}
-	if build.IsNearUpgrade(blockB.Height, build.UpgradeOrangeHeight) {
+	if buildconstants.IsNearUpgrade(blockB.Height, build.UpgradeOrangeHeight) {
 		return nil, xerrors.Errorf("consensus reporting disabled around Upgrade Orange")
 	}