diff --git a/build/bootstrap/butterflynet.pi b/build/bootstrap/butterflynet.pi index 5b10e2bc4..ce71427d5 100644 --- a/build/bootstrap/butterflynet.pi +++ b/build/bootstrap/butterflynet.pi @@ -1,2 +1,2 @@ -/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWCa1wgMMBB9JjA2kYqaN1v5uh7xvcsc2gQJBHzPp7G57H -/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWD6fCvo1dyci6wsjTLyv7eJK73pCVz6RCQjbtPvbc8LYw +/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWMQBVoPirSWwrNr9QBj6RhGa48NGAeyr4cZvMMAzSEUZW +/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWQ2Q1yhD799kSDcbjeb5mr4ZSCK2PsGa4gyBZemfgx1uT diff --git a/build/genesis/butterflynet.car b/build/genesis/butterflynet.car index 589e5ab75..dcc70f511 100644 Binary files a/build/genesis/butterflynet.car and b/build/genesis/butterflynet.car differ diff --git a/build/params_calibnet.go b/build/params_calibnet.go index a48fa5fda..3a206b1a7 100644 --- a/build/params_calibnet.go +++ b/build/params_calibnet.go @@ -73,11 +73,11 @@ const UpgradeSharkHeight = 16800 // 6 days after genesis // 2023-02-21T16:30:00Z const UpgradeHyggeHeight = 322354 -// ?????????? -const UpgradeLightningHeight = 999999999999999 +// 2023-04-18T16:30:00Z +const UpgradeLightningHeight = 483634 -// ?????????????????? -const UpgradeThunderHeight = UpgradeLightningHeight + 1 +// 2023-04-20T16:30:00Z +const UpgradeThunderHeight = UpgradeLightningHeight + 5760 var SupportedProofTypes = []abi.RegisteredSealProof{ abi.RegisteredSealProof_StackedDrg32GiBV1, diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go index 5754c4bea..c82ad6a5c 100644 --- a/chain/consensus/filcns/upgrades.go +++ b/chain/consensus/filcns/upgrades.go @@ -1778,9 +1778,9 @@ func upgradeActorsV11Common( return cid.Undef, xerrors.Errorf("failed to decode state root: %w", err) } - if stateRoot.Version != types.StateTreeVersion5 { + if stateRoot.Version != types.StateTreeVersion4 { return cid.Undef, xerrors.Errorf( - "expected state root version 4 for actors v10 upgrade, got %d", + "expected state root version 4 for actors v11 upgrade, got %d", stateRoot.Version, ) }