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

Merge pull request #10657 from filecoin-project/chore/polish-v1.22-release

Browse Source 
chore:release:update butterfly artifacts and set calibration upgrade heights
This commit is contained in:
Aayush Rajasekaran 2023-04-12 10:24:02 -04:00 committed by GitHub
commit 981a3485eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 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/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

BIN
build/genesis/butterflynet.car
View File

Binary file not shown.

8
build/params_calibnet.go
View File

@ -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,

4
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)
}
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,
)
}