diff --git a/build/bootstrap/butterflynet.pi b/build/bootstrap/butterflynet.pi index fbfa1e92c78..1972adc5ad0 100644 --- a/build/bootstrap/butterflynet.pi +++ b/build/bootstrap/butterflynet.pi @@ -1,2 +1,2 @@ -/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWBzv5sf4eTyo8cjJGfGnpxo6QkEPkRShG9GqjE2A5QaW5 -/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWBo9TSD4XXRFtu6snv6QNYvXgRaSaVb116YiYEsDWgKtq +/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWBdRCBLUeKvoy22u5DcXs61adFn31v8WWCZgmBjDCjbsC +/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWDUQJBA18njjXnG9RtLxoN3muvdU7PEy55QorUEsdAqdy diff --git a/build/genesis/butterflynet.car b/build/genesis/butterflynet.car index cb840104262..c79eab38eb9 100644 Binary files a/build/genesis/butterflynet.car and b/build/genesis/butterflynet.car differ diff --git a/build/params_2k.go b/build/params_2k.go index 6c0918c513e..0c31ce5ce81 100644 --- a/build/params_2k.go +++ b/build/params_2k.go @@ -47,7 +47,7 @@ var UpgradeHyperdriveHeight = abi.ChainEpoch(-16) var UpgradeChocolateHeight = abi.ChainEpoch(-17) -var UpgradeSnapDealsHeight = abi.ChainEpoch(-18) +var UpgradeOhSnapHeight = abi.ChainEpoch(-18) var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandMainnet, diff --git a/build/params_butterfly.go b/build/params_butterfly.go index e26fd78fa8f..776a31714cb 100644 --- a/build/params_butterfly.go +++ b/build/params_butterfly.go @@ -16,7 +16,7 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandMainnet, } -const GenesisNetworkVersion = network.Version13 +const GenesisNetworkVersion = network.Version14 const BootstrappersFile = "butterflynet.pi" const GenesisFile = "butterflynet.car" @@ -40,13 +40,17 @@ const UpgradeTrustHeight = -13 const UpgradeNorwegianHeight = -14 const UpgradeTurboHeight = -15 const UpgradeHyperdriveHeight = -16 -const UpgradeChocolateHeight = 6360 -const UpgradeSnapDealsHeight = 99999999 +const UpgradeChocolateHeight = -17 + +// 2022-01-17T19:00:00Z +const UpgradeOhSnapHeight = 30262 func init() { policy.SetConsensusMinerMinPower(abi.NewStoragePower(2 << 30)) policy.SetSupportedProofTypes( abi.RegisteredSealProof_StackedDrg512MiBV1, + abi.RegisteredSealProof_StackedDrg32GiBV1, + abi.RegisteredSealProof_StackedDrg64GiBV1, ) SetAddressNetwork(address.Testnet) diff --git a/build/params_calibnet.go b/build/params_calibnet.go index 16d77c7e6fa..4da2269ee52 100644 --- a/build/params_calibnet.go +++ b/build/params_calibnet.go @@ -54,7 +54,7 @@ const UpgradeHyperdriveHeight = 420 const UpgradeChocolateHeight = 312746 -const UpgradeSnapDealsHeight = 99999999 +const UpgradeOhSnapHeight = 99999999 func init() { policy.SetConsensusMinerMinPower(abi.NewStoragePower(32 << 30)) diff --git a/build/params_interop.go b/build/params_interop.go index 66033937cc3..a483e7188d5 100644 --- a/build/params_interop.go +++ b/build/params_interop.go @@ -47,7 +47,7 @@ var UpgradeTurboHeight = abi.ChainEpoch(-15) var UpgradeHyperdriveHeight = abi.ChainEpoch(-16) var UpgradeChocolateHeight = abi.ChainEpoch(-17) -var UpgradeSnapDealsHeight = abi.ChainEpoch(-18) +var UpgradeOhSnapHeight = abi.ChainEpoch(-18) var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandMainnet, diff --git a/build/params_mainnet.go b/build/params_mainnet.go index a4781f1ff1d..6efc6d62ff4 100644 --- a/build/params_mainnet.go +++ b/build/params_mainnet.go @@ -67,7 +67,7 @@ const UpgradeHyperdriveHeight = 892800 // 2021-10-26T13:30:00Z const UpgradeChocolateHeight = 1231620 -var UpgradeSnapDealsHeight = abi.ChainEpoch(999999999999) +var UpgradeOhSnapHeight = abi.ChainEpoch(999999999999) func init() { if os.Getenv("LOTUS_USE_TEST_ADDRESSES") != "1" { @@ -75,7 +75,7 @@ func init() { } if os.Getenv("LOTUS_DISABLE_SNAPDEALS") == "1" { - UpgradeSnapDealsHeight = math.MaxInt64 + UpgradeOhSnapHeight = math.MaxInt64 } Devnet = false diff --git a/build/params_testground.go b/build/params_testground.go index 539e06b4541..41c46d41edf 100644 --- a/build/params_testground.go +++ b/build/params_testground.go @@ -99,7 +99,7 @@ var ( UpgradeTurboHeight abi.ChainEpoch = -14 UpgradeHyperdriveHeight abi.ChainEpoch = -15 UpgradeChocolateHeight abi.ChainEpoch = -16 - UpgradeSnapDealsHeight abi.ChainEpoch = -17 + UpgradeOhSnapHeight abi.ChainEpoch = -17 DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandMainnet, @@ -107,8 +107,8 @@ var ( GenesisNetworkVersion = network.Version0 - NewestNetworkVersion = network.Version14 - ActorUpgradeNetworkVersion = network.Version4 + NewestNetworkVersion = network.Version15 + ActorUpgradeNetworkVersion = network.Version15 Devnet = true ZeroAddress = MustParseAddress("f3yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaby2smx7a") diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go index a21bdb05e23..2fa020d3db4 100644 --- a/chain/consensus/filcns/upgrades.go +++ b/chain/consensus/filcns/upgrades.go @@ -160,7 +160,7 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule { }}, Expensive: true, }, { - Height: build.UpgradeSnapDealsHeight, + Height: build.UpgradeOhSnapHeight, Network: network.Version15, Migration: UpgradeActorsV7, PreMigrations: []stmgr.PreMigration{{ diff --git a/cmd/lotus-miner/sectors.go b/cmd/lotus-miner/sectors.go index 6c4f5e16b30..cc5668334fe 100644 --- a/cmd/lotus-miner/sectors.go +++ b/cmd/lotus-miner/sectors.go @@ -1557,7 +1557,7 @@ var sectorsMarkForUpgradeCmd = &cli.Command{ return xerrors.Errorf("failed to get chain head: %w", err) } twoDays := abi.ChainEpoch(2 * builtin.EpochsInDay) - if head.Height() > (build.UpgradeSnapDealsHeight - twoDays) { + if head.Height() > (build.UpgradeOhSnapHeight - twoDays) { return xerrors.Errorf("OhSnap is coming soon, " + "please use `snap-up` to upgrade your cc sectors after the network v15 upgrade!") }