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.

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

Merge 1.28.2 to master #12317

Merged
merged 19 commits into from
Jul 29, 2024
Merged

Merge 1.28.2 to master #12317

merged 19 commits into from
Jul 29, 2024

Conversation

rvagg
Copy link
Member

@rvagg rvagg commented Jul 29, 2024

Replacement of #12306 but with current master; let's get this done before anything else moves into master so we can just have the one merge commit and nothing else.

It's a bit different to #12306, but the differences are mostly non-overlapping with master, i.e. this is basically master but with what's in #12306 overlaid.

$ git diff --stat origin/jen/v1.28.1releasetomaster
 .github/workflows/docker.yml                 |  28 ++++++++++---------
 .github/workflows/release.yml                | 360 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------
 .gitignore                                   |   6 ++++
 .goreleaser.yaml                             | 113 --------------------------------------------------------------------------
 CHANGELOG.md                                 |   1 +
 blockstore/badger/blockstore.go              |  69 ++--------------------------------------------
 build/bootstrap.go                           |   9 ++++++
 cli/wallet.go                                |   2 +-
 cmd/release/README.md                        |  42 ++++++++++++++++++++++++++++
 cmd/release/main.go                          | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 documentation/en/cli-lotus.md                |   2 +-
 documentation/misc/RELEASE_ISSUE_TEMPLATE.md |  37 ++++++++++++-------------
 go.mod                                       |   4 +--
 node/modules/lp2p/host.go                    |  20 ++++++++++++--
 scripts/publish-checksums.sh                 |  87 ---------------------------------------------------------
 scripts/version-check.sh                     |  39 --------------------------
 16 files changed, 562 insertions(+), 429 deletions(-)

$ git diff --stat origin/master 
 CHANGELOG.md                                |  23 ++++++++++++++++-------
 build/bootstrap/butterflynet.pi             |   4 ++--
 build/genesis/butterflynet.car              | Bin 8768237 -> 8768236 bytes
 build/openrpc/full.json                     |   6 +++---
 build/openrpc/gateway.json                  |   2 +-
 build/openrpc/miner.json                    |   2 +-
 build/openrpc/worker.json                   |   2 +-
 build/version.go                            |   4 ++--
 chain/lf3/ec.go                             |   2 +-
 documentation/en/api-v1-unstable-methods.md |   4 ++--
 documentation/en/cli-lotus-miner.md         |   2 +-
 documentation/en/cli-lotus-worker.md        |   2 +-
 documentation/en/cli-lotus.md               |   2 +-
 go.mod                                      |   4 +++-
 go.sum                                      |   4 ++--
 15 files changed, 37 insertions(+), 26 deletions(-)

Diff in this PR should make it clear that it's all pretty minimal, the CHANGELOG.md gets updated with what's in 1.28.1, go-f3 gets bumped and the internal version is bumped to 1.28.2-dev. It leaves filecoin-ffi on master as d041c9ab85e68cfb which is the latest release.

LexLuthr and others added 18 commits July 25, 2024 01:46
* remove provecommit1

* add changelog

* update precommit and commit params

* fix lint error

* fix commit params
* Update go-f3 to 0.0.6

Signed-off-by: Jakub Sztandera <[email protected]>

* Enable F3 in passive configuration in mainnet config

Signed-off-by: Jakub Sztandera <[email protected]>

* Add changelog

Signed-off-by: Jakub Sztandera <[email protected]>

* add new butterfly assets

---------

Signed-off-by: Jakub Sztandera <[email protected]>
Co-authored-by: Jennifer Wang <[email protected]>
We now use the same one in GPBFT.
Co-authored-by: Steven Allen <[email protected]>
Co-authored-by: Rod Vagg <[email protected]>
Co-authored-by: Rod Vagg <[email protected]>

**This release sets the Mainnet to upgrade at epoch 4154640, corresponding to 2024-08-06T12:00:00Z.**
This is the MANDATORY Lotus v1.28.1 release, which will deliver the Filecoin network version 23, codenamed Waffle 🧇. v1.28.1 is also the minimal version that supports nv23.
**This release sets the Mainnet to upgrade at epoch 4154640, corresponding to 2024-08-06T12:00:00Z.**
Copy link
Contributor

Choose a reason for hiding this comment

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

@jennijuju do we want to push this out by a week to give more time for SPs to drop the old ProveCommit flow?

Copy link
Member Author

Choose a reason for hiding this comment

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

bit late for that I think, we've pushed people to run v1.28.1, any change is going to require a 1.28.2 and a lot of coercive effort to get people to upgrade before the 8th to prevent forky fork fork

go.mod Outdated Show resolved Hide resolved
@rvagg rvagg enabled auto-merge (rebase) July 29, 2024 07:08
auto-merge was automatically disabled July 29, 2024 07:23

Rebase failed

@rvagg rvagg merged commit 792eecc into master Jul 29, 2024
84 checks passed
@rvagg rvagg deleted the rvagg/1.28.2-to-master branch July 29, 2024 07:23
@rjan90 rjan90 mentioned this pull request Jul 29, 2024
55 tasks
@rvagg rvagg mentioned this pull request Aug 30, 2024
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants