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

build: release: v1.16.0-rc1 #8851

Merged
merged 16 commits into from
Jun 14, 2022
Merged

build: release: v1.16.0-rc1 #8851

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
869f6ab
Use tagged version of specs-storage
arajasek May 30, 2022
130ef04
Merge pull request #8764 from filecoin-project/asr/storage
jennijuju May 31, 2022
cec9425
prep lotus v1.15.3
jennijuju May 30, 2022
c095d10
Update CHANGELOG.md
jennijuju Jun 1, 2022
a7e8f5a
Merge pull request #8761 from filecoin-project/jen/1153prep
jennijuju Jun 1, 2022
2f6a383
Merge pull request #8781 from filecoin-project/release/v1.15.3
jennijuju Jun 2, 2022
2b8aaf7
update calib v16 skyr upgrade
jennijuju Jun 14, 2022
cda2154
chore: update butterfly for reset of v16
jennijuju Jun 14, 2022
4b7f141
fix: build: make the build/actors/pack.sh script work on macos
Stebalien Jun 14, 2022
14e37ad
fix: build: add calibrationnet to the actors bundle
jennijuju Jun 14, 2022
3579168
upgrade to 8.0.0-rc.1 bundle & manifest
jennijuju Jun 14, 2022
b3adf6f
docsgen
jennijuju Jun 14, 2022
ca3282c
Merge branch 'releases' into jen/v1160
jennijuju Jun 14, 2022
9254085
correct the upgrade time comment
jennijuju Jun 14, 2022
b0c8dd5
remove wrongly added whiteblock cid
jennijuju Jun 14, 2022
82ead26
go mod tidy
jennijuju Jun 14, 2022
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
6 changes: 3 additions & 3 deletions build/actors/pack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ fi

VERSION="$1" # actors version
RELEASE="$2" # actors release name
NETWORKS=(devnet mainnet caterpillarnet butterflynet testing testing-fake-proofs)
NETWORKS=(devnet mainnet caterpillarnet butterflynet testing testing-fake-proofs calibrationnet)

echo "Downloading bundles for actors version ${VERSION}, release ${RELEASE}"

TARGET_FILE="$(pwd)/${VERSION}.tar.zst"
WORKDIR=$(mktemp --tmpdir -d "actor-bundles-${VERSION}.XXXXXXXXXX")
WORKDIR=$(mktemp -d -t "actor-bundles-${VERSION}.XXXXXXXXXX")
trap 'rm -rf -- "$WORKDIR"' EXIT

pushd "${WORKDIR}"
Expand All @@ -31,7 +31,7 @@ sha256sum -c -- *.sha256
echo "Packing..."

rm -f -- "$TARGET_FILE"
tar -cf "$TARGET_FILE" -I "zstd -19" -- *.car
tar -cf "$TARGET_FILE" --use-compress-program "zstd -19" -- *.car
popd

echo "Generating metadata..."
Expand Down
Binary file modified build/actors/v8.tar.zst
View file
Open in desktop
Binary file not shown.
161 changes: 89 additions & 72 deletions build/builtin_actors_gen.go
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified build/openrpc/full.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/openrpc/miner.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/openrpc/worker.json.gz
View file
Open in desktop
Binary file not shown.
10 changes: 4 additions & 6 deletions build/params_butterfly.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@ import (
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/policy"
builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
"github.com/ipfs/go-cid"
)

var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
0: DrandMainnet,
}

const GenesisNetworkVersion = network.Version14
const GenesisNetworkVersion = network.Version15

var NetworkBundle = "butterflynet"
var BundleOverrides map[actors.Version]string
Expand Down Expand Up @@ -46,10 +45,9 @@ const UpgradeTurboHeight = -15
const UpgradeHyperdriveHeight = -16
const UpgradeChocolateHeight = -17

const UpgradeOhSnapHeight = 240
const UpgradeOhSnapHeight = -18

// 2022-05-31T14:32:00Z
const UpgradeSkyrHeight = abi.ChainEpoch(333258)
const UpgradeSkyrHeight = abi.ChainEpoch(50)

var SupportedProofTypes = []abi.RegisteredSealProof{
abi.RegisteredSealProof_StackedDrg512MiBV1,
Expand Down Expand Up @@ -80,4 +78,4 @@ const PropagationDelaySecs = uint64(6)
// BootstrapPeerThreshold is the minimum number peers we need to track for a sync worker to start
const BootstrapPeerThreshold = 2

var WhitelistedBlock = cid.Undef
var WhitelistedBlock = MustParseCid("bafy2bzaced6uuyvoidi5gmqk6wsx7hlchpjfvzrkqlbnto2p5tvzcnaf6gmey")
Copy link
Contributor

Choose a reason for hiding this comment

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

This shouldn't be here -- only needed for mainnet

6 changes: 3 additions & 3 deletions build/params_calibnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/policy"
builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
"github.com/ipfs/go-cid"
)

var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
Expand Down Expand Up @@ -61,7 +60,8 @@ const UpgradeChocolateHeight = 312746
// 2022-02-10T19:23:00Z
const UpgradeOhSnapHeight = 682006

var UpgradeSkyrHeight = abi.ChainEpoch(99999999999999)
// 2022-06-16T17:30:00Z
const UpgradeSkyrHeight = 1044780

var SupportedProofTypes = []abi.RegisteredSealProof{
abi.RegisteredSealProof_StackedDrg32GiBV1,
Expand Down Expand Up @@ -92,4 +92,4 @@ const PropagationDelaySecs = uint64(6)
// BootstrapPeerThreshold is the minimum number peers we need to track for a sync worker to start
const BootstrapPeerThreshold = 4

var WhitelistedBlock = cid.Undef
var WhitelistedBlock = MustParseCid("bafy2bzacedrdn6z3z7xz7lx4wll3tlgktirhllzqxb766dxpaqp3ukxsjfsba")
3 changes: 1 addition & 2 deletions build/params_interop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/policy"
builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin"
"github.com/ipfs/go-cid"
)

var NetworkBundle = "caterpillarnet"
Expand Down Expand Up @@ -119,4 +118,4 @@ const PropagationDelaySecs = uint64(6)
// BootstrapPeerThreshold is the minimum number peers we need to track for a sync worker to start
const BootstrapPeerThreshold = 2

var WhitelistedBlock = cid.Undef
var WhitelistedBlock = MustParseCid("bafy2bzacebitcr6geekzzkiggl35gi7f32zph46ufgz5lxkd7pqccqgzvpqyc")
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove

2 changes: 1 addition & 1 deletion build/params_mainnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ const PropagationDelaySecs = uint64(6)
const BootstrapPeerThreshold = 4

// we skip checks on message validity in this block to sidestep the zero-bls signature
var WhitelistedBlock = MustParseCid("bafy2bzaceapyg2uyzk7vueh3xccxkuwbz3nxewjyguoxvhx77malc2lzn2ybi")
var WhitelistedBlock = MustParseCid("bafy2bzaceclwsaafb4h7nofp64v7ctxq5cs75545mylvw3hwaxdign6xk5kka")
Copy link
Contributor

Choose a reason for hiding this comment

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

Drop this change

2 changes: 1 addition & 1 deletion build/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func BuildTypeString() string {
}

// BuildVersion is the local build version
const BuildVersion = "1.16.0-dev"
const BuildVersion = "1.16.0-rc1"

func UserVersion() string {
if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {
Expand Down
2 changes: 1 addition & 1 deletion documentation/en/cli-lotus-miner.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ USAGE:
lotus-miner [global options] command [command options] [arguments...]

VERSION:
1.16.0-dev
1.16.0-rc1

COMMANDS:
init Initialize a lotus miner repo
Expand Down
2 changes: 1 addition & 1 deletion documentation/en/cli-lotus-worker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ USAGE:
lotus-worker [global options] command [command options] [arguments...]

VERSION:
1.16.0-dev
1.16.0-rc1

COMMANDS:
run Start lotus worker
Expand Down
2 changes: 1 addition & 1 deletion documentation/en/cli-lotus.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ USAGE:
lotus [global options] command [command options] [arguments...]

VERSION:
1.16.0-dev
1.16.0-rc1

COMMANDS:
daemon Start a lotus daemon process
Expand Down