Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore:release:update butterfly artifacts and set calibration upgrade heights #10657

Merged
merged 4 commits into from
Apr 12, 2023
Merged

chore:release:update butterfly artifacts and set calibration upgrade heights #10657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65b23b8
Butterfly artifacts
ZenGround0 Apr 12, 2023
4497954
Set calibration net upgrade height
ZenGround0 Apr 12, 2023
24da8bd
Review Response
ZenGround0 Apr 12, 2023
4443ac6
Fix state tree version assert
ZenGround0 Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/bootstrap/butterflynet.pi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Binary file modified build/genesis/butterflynet.car
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions build/params_calibnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Someone please check this, I just added 782880 since this is exactly 8 weeks after the last upgrade, I might be off here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is correct, yes.

const UpgradeLightningHeight = 483634

// ??????????????????
const UpgradeThunderHeight = UpgradeLightningHeight + 1
// 2023-04-20T16:30:00Z
const UpgradeThunderHeight = UpgradeLightningHeight + 5760

var SupportedProofTypes = []abi.RegisteredSealProof{
abi.RegisteredSealProof_StackedDrg32GiBV1,
Expand Down
4 changes: 2 additions & 2 deletions chain/consensus/filcns/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
}
Expand Down