cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

add upgrade height where SDR is required

Browse Source
This commit is contained in:
Steven Allen 2020-11-05 18:33:39 -08:00 committed by Łukasz Magiera
parent 4d8327c29a
commit 948ee53080
5 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/params_2k.go
View File

@ -23,6 +23,7 @@ var UpgradeLiftoffHeight = abi.ChainEpoch(-5)
const UpgradeKumquatHeight = 15 const UpgradeKumquatHeight = 15
const UpgradeCalicoHeight = 20 const UpgradeCalicoHeight = 20
const UpgradePersianHeight = 25
var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet, 0: DrandMainnet,

1
build/params_mainnet.go
View File

@ -40,6 +40,7 @@ const UpgradeKumquatHeight = 170000
// TODO: Height?? // TODO: Height??
const UpgradeCalicoHeight = 999999 const UpgradeCalicoHeight = 999999
const UpgradePersianHeight = UpgradeCalicoHeight + (builtin2.EpochsInDay * 2)
func init() { func init() {
policy.SetConsensusMinerMinPower(abi.NewStoragePower(10 << 40)) policy.SetConsensusMinerMinPower(abi.NewStoragePower(10 << 40))

2
build/params_shared_vals.go
View File

@ -25,7 +25,7 @@ const UnixfsLinksPerLevel = 1024
// Consensus / Network // Consensus / Network
const AllowableClockDriftSecs = uint64(1) const AllowableClockDriftSecs = uint64(1)
const NewestNetworkVersion = network.Version6 const NewestNetworkVersion = network.Version8
const ActorUpgradeNetworkVersion = network.Version4 const ActorUpgradeNetworkVersion = network.Version4
// Epochs // Epochs

3
build/params_testground.go
View File

@ -89,12 +89,13 @@ var (
UpgradeLiftoffHeight abi.ChainEpoch = -5 UpgradeLiftoffHeight abi.ChainEpoch = -5
UpgradeKumquatHeight abi.ChainEpoch = -6 UpgradeKumquatHeight abi.ChainEpoch = -6
UpgradeCalicoHeight abi.ChainEpoch = -7 UpgradeCalicoHeight abi.ChainEpoch = -7
UpgradePersianHeight abi.ChainEpoch = -8
DrandSchedule = map[abi.ChainEpoch]DrandEnum{ DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet, 0: DrandMainnet,
} }
NewestNetworkVersion = network.Version5 NewestNetworkVersion = network.Version8
ActorUpgradeNetworkVersion = network.Version4 ActorUpgradeNetworkVersion = network.Version4
Devnet = true Devnet = true

4
chain/stmgr/forks.go
View File

@ -97,6 +97,10 @@ func DefaultUpgradeSchedule() UpgradeSchedule {
Height: build.UpgradeCalicoHeight, Height: build.UpgradeCalicoHeight,
Network: network.Version7, Network: network.Version7,
Migration: UpgradeCalico, Migration: UpgradeCalico,
}, {
Height: build.UpgradePersianHeight,
Network: network.Version8,
Migration: nil,
}} }}
if build.UpgradeActorsV2Height == math.MaxInt64 { // disable actors upgrade if build.UpgradeActorsV2Height == math.MaxInt64 { // disable actors upgrade