Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Quick butterfly upgrade to sanity check #10660

Merged
merged 6 commits into from
Apr 12, 2023
Merged

Quick butterfly upgrade to sanity check #10660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4384807
Quick butterfly upgrade to sanity check
ZenGround0 Apr 12, 2023
8aa3bf1
Update butterfly artifacts
ZenGround0 Apr 12, 2023
64b8597
Revert fake fix
ZenGround0 Apr 12, 2023
5756d8e
Give butterfly net correct genesis
ZenGround0 Apr 12, 2023
e05db4d
Butterfly artifacts
ZenGround0 Apr 12, 2023
91cd86b
Give time before upgrade
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/12D3KooWMQBVoPirSWwrNr9QBj6RhGa48NGAeyr4cZvMMAzSEUZW
/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWQ2Q1yhD799kSDcbjeb5mr4ZSCK2PsGa4gyBZemfgx1uT
/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWF31bhPqjeAxNSCvWTLGq84iuMhKvbgK31rgTXfRjgByn
/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWEY2LteCs2tYLmAWZ6U9eHzgnvmVsd5pSrKLg8nn3A6nh
Binary file modified build/genesis/butterflynet.car
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions build/params_2k.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var NetworkBundle = "devnet"
var BundleOverrides map[actorstypes.Version]string
var ActorDebugging = true

const GenesisNetworkVersion = network.Version17
const GenesisNetworkVersion = network.Version18

var UpgradeBreezeHeight = abi.ChainEpoch(-1)

Expand Down Expand Up @@ -61,9 +61,9 @@ var UpgradeSharkHeight = abi.ChainEpoch(-20)

var UpgradeHyggeHeight = abi.ChainEpoch(-21)

var UpgradeLightningHeight = 30
var UpgradeLightningHeight = abi.ChainEpoch(30)

var UpgradeThunderHeight = 1000
var UpgradeThunderHeight = abi.ChainEpoch(1000)

var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet,
Expand Down
10 changes: 5 additions & 5 deletions build/params_butterfly.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet,
}

const GenesisNetworkVersion = network.Version17
const GenesisNetworkVersion = network.Version18

var NetworkBundle = "butterflynet"
var BundleOverrides map[actorstypes.Version]string
Expand Down Expand Up @@ -50,12 +50,12 @@ const UpgradeHyperdriveHeight = -16
const UpgradeChocolateHeight = -17
const UpgradeOhSnapHeight = -18
const UpgradeSkyrHeight = -19
const UpgradeSharkHeight = abi.ChainEpoch(-20)
const UpgradeHyggeHeight = abi.ChainEpoch(-21)
const UpgradeSharkHeight = -20
const UpgradeHyggeHeight = -21

const UpgradeLightningHeight = 600
const UpgradeLightningHeight = 360

const UpgradeThunderHeight = UpgradeLightningHeight + 1440
const UpgradeThunderHeight = UpgradeLightningHeight + 360

var SupportedProofTypes = []abi.RegisteredSealProof{
abi.RegisteredSealProof_StackedDrg512MiBV1,
Expand Down
6 changes: 3 additions & 3 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.StateTreeVersion4 {
if stateRoot.Version != types.StateTreeVersion5 {
return cid.Undef, xerrors.Errorf(
"expected state root version 4 for actors v11 upgrade, got %d",
"expected state root version 5 for actors v11 upgrade, got %d",
stateRoot.Version,
)
}
Expand All @@ -1794,7 +1794,7 @@ func upgradeActorsV11Common(
newHamtRoot, err := nv19.MigrateStateTree(ctx, adtStore, manifest, stateRoot.Actors, epoch, config,
migrationLogger{}, cache)
if err != nil {
return cid.Undef, xerrors.Errorf("upgrading to actors v10: %w", err)
return cid.Undef, xerrors.Errorf("upgrading to actors v11: %w", err)
}

// Persist the result.
Expand Down