Improve network versioning logic

build/params_shared_funcs.go

@@ -36,3 +36,11 @@ func MessagesTopic(netName dtypes.NetworkName) string { return "/fil/msgs/" + st
 func DhtProtocolName(netName dtypes.NetworkName) protocol.ID {
 	return protocol.ID("/fil/kad/" + string(netName))
 }
+
+func UseNewestNetwork() bool {
+	// TODO: Put these in a container we can iterate over
+	if UpgradeBreezeHeight <= 0 && UpgradeSmokeHeight <= 0 {
+		return true
+	}
+	return false
+}

build/params_shared_vals.go

@@ -5,6 +5,8 @@ package build
 import (
 	"math/big"
 
+	"github.com/filecoin-project/go-state-types/network"
+
 	"github.com/filecoin-project/go-state-types/abi"
 	"github.com/filecoin-project/specs-actors/actors/builtin"
 	"github.com/filecoin-project/specs-actors/actors/builtin/miner"
@@ -20,6 +22,7 @@ const UnixfsLinksPerLevel = 1024
 // Consensus / Network
 
 const AllowableClockDriftSecs = uint64(1)
+const NewestNetworkVersion = network.Version2
 
 // Epochs
 const ForkLengthThreshold = Finality

chain/stmgr/stmgr.go

@@ -1125,13 +1125,17 @@ func (sm *StateManager) GetCirculatingSupply(ctx context.Context, height abi.Cha
 }
 
 func (sm *StateManager) GetNtwkVersion(ctx context.Context, height abi.ChainEpoch) network.Version {
-	if build.UpgradeBreezeHeight == 0 {
+	if build.UseNewestNetwork() {
-		return network.Version1
+		return build.NewestNetworkVersion
 	}
 
 	if height <= build.UpgradeBreezeHeight {
 		return network.Version0
 	}
 
+	if height <= build.UpgradeSmokeHeight {
 		return network.Version1
 	}
+
+	return build.NewestNetworkVersion
+}