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

Quick butterfly upgrade to sanity check (#10660)

Browse Source 
* Quick butterfly upgrade to sanity check

* Update butterfly artifacts

* Revert fake fix

* Give butterfly net correct genesis

* Butterfly artifacts

* Give time before upgrade

---------

Co-authored-by: zenground0 <ZenGround0@users.noreply.github.com>
This commit is contained in:
ZenGround0 2023-04-12 16:33:06 -04:00 committed by GitHub
parent 981a3485eb
commit 766bdedd29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/bootstrap/butterflynet.pi
View File

@ -1,2 +1,2 @@
/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWMQBVoPirSWwrNr9QBj6RhGa48NGAeyr4cZvMMAzSEUZW /dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWF31bhPqjeAxNSCvWTLGq84iuMhKvbgK31rgTXfRjgByn
/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWQ2Q1yhD799kSDcbjeb5mr4ZSCK2PsGa4gyBZemfgx1uT /dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWEY2LteCs2tYLmAWZ6U9eHzgnvmVsd5pSrKLg8nn3A6nh

BIN
build/genesis/butterflynet.car
View File

Binary file not shown.

6
build/params_2k.go
View File

@ -23,7 +23,7 @@ var NetworkBundle = "devnet"
var BundleOverrides map[actorstypes.Version]string var BundleOverrides map[actorstypes.Version]string
var ActorDebugging = true var ActorDebugging = true
const GenesisNetworkVersion = network.Version17 const GenesisNetworkVersion = network.Version18
var UpgradeBreezeHeight = abi.ChainEpoch(-1) var UpgradeBreezeHeight = abi.ChainEpoch(-1)
@ -61,9 +61,9 @@ var UpgradeSharkHeight = abi.ChainEpoch(-20)
var UpgradeHyggeHeight = abi.ChainEpoch(-21) 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{ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet, 0: DrandMainnet,

10
build/params_butterfly.go
View File

@ -19,7 +19,7 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet, 0: DrandMainnet,
} }
const GenesisNetworkVersion = network.Version17 const GenesisNetworkVersion = network.Version18
var NetworkBundle = "butterflynet" var NetworkBundle = "butterflynet"
var BundleOverrides map[actorstypes.Version]string var BundleOverrides map[actorstypes.Version]string
@ -50,12 +50,12 @@ const UpgradeHyperdriveHeight = -16
const UpgradeChocolateHeight = -17 const UpgradeChocolateHeight = -17
const UpgradeOhSnapHeight = -18 const UpgradeOhSnapHeight = -18
const UpgradeSkyrHeight = -19 const UpgradeSkyrHeight = -19
const UpgradeSharkHeight = abi.ChainEpoch(-20) const UpgradeSharkHeight = -20
const UpgradeHyggeHeight = abi.ChainEpoch(-21) const UpgradeHyggeHeight = -21
const UpgradeLightningHeight = 600 const UpgradeLightningHeight = 360
const UpgradeThunderHeight = UpgradeLightningHeight + 1440 const UpgradeThunderHeight = UpgradeLightningHeight + 360
var SupportedProofTypes = []abi.RegisteredSealProof{ var SupportedProofTypes = []abi.RegisteredSealProof{
abi.RegisteredSealProof_StackedDrg512MiBV1, abi.RegisteredSealProof_StackedDrg512MiBV1,

6
chain/consensus/filcns/upgrades.go
View File

@ -1778,9 +1778,9 @@ func upgradeActorsV11Common(
return cid.Undef, xerrors.Errorf("failed to decode state root: %w", err) 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( 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, stateRoot.Version,
) )
} }
@ -1794,7 +1794,7 @@ func upgradeActorsV11Common(
newHamtRoot, err := nv19.MigrateStateTree(ctx, adtStore, manifest, stateRoot.Actors, epoch, config, newHamtRoot, err := nv19.MigrateStateTree(ctx, adtStore, manifest, stateRoot.Actors, epoch, config,
migrationLogger{}, cache) migrationLogger{}, cache)
if err != nil { 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. // Persist the result.