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

chore: releases: merge releases branch to master #11578

Merged
merged 56 commits into from
Jan 17, 2024

Conversation

rjan90
Copy link
Contributor

@rjan90 rjan90 commented Jan 15, 2024

Related Issues

Closes #11476

Proposed Changes

Last step of the release-flow for v1.25.2, merging the releases branch into master with conflicts resolved.

Checklist

Before you mark the PR ready for review, please make sure that:

  • Commits have a clear commit message.
  • PR title is in the form of of <PR type>: <area>: <change being made>
    • example: fix: mempool: Introduce a cache for valid signatures
    • PR type: fix, feat, build, chore, ci, docs, perf, refactor, revert, style, test
    • area, e.g. api, chain, state, market, mempool, multisig, networking, paych, proving, sealing, wallet, deps
  • If the PR affects users (e.g., new feature, bug fix, system requirements change), update the CHANGELOG.md and add details to the UNRELEASED section.
  • New features have usage guidelines and / or documentation updates in
  • Tests exist for new functionality or change in behavior
  • CI is green

rjan90 and others added 30 commits December 5, 2023 10:09
Initial draft changelog
Update changelog
Add sub-bullets to new features
chore: backport: lotus-provider msg sending fix
Fix changelog
Add backports to changelog
Also explicitly limit how many bytes we're willing to read in one go
such that we're capable of reading a worst-case tipset (like, really,
never going to happen worst-case). Previously, this wasn't an issue.
However, we've bumped the max number of messages from 8,192 to 150,000
and need to limit allocations somewhere else.
Also explicitly limit how many bytes we're willing to read in one go
such that we're capable of reading a worst-case tipset (like, really,
never going to happen worst-case). Previously, this wasn't an issue.
However, we've bumped the max number of messages from 8,192 to 150,000
and need to limit allocations somewhere else.
It's not a const for the testground build, and needs to be an int 99%
of the time. So we might as well just cast here.
It's not a const for the testground build, and needs to be an int 99%
of the time. So we might as well just cast here.
fix: lotus-provider: show addresses in log
fix: lotus-provider: Wait for the correct taskID
fix: lotus-provider: Fix log output format in wdPostTaskCmd
snadrus and others added 20 commits December 18, 2023 07:39
backports: lotus-provider: fixes caught in rc1-testing
feat: syncer: optimize syncFork for one-epoch forks
…post-err

fix: wdpost: fix vanilla proof indexes
chore: backports to `release/v1.25.2`
fix: docs: Modify generate-lotus-cli.py to ignoring aliases.
Bump version and changelog
Update changelog
Update changelog
feat: exchange: change GetBlocks to always fetch the requested number of tipsets
Update changelog with sync-fix-backport
Change date for release in changelog
chore: release: update changelog with latests backports
chore: merge `release/v1.25.2` into `releases`
@rjan90 rjan90 requested a review from a team as a code owner January 15, 2024 10:30
- feat: metric: export Mpool message count ([filecoin-project/lotus#11361](https://github.com/filecoin-project/lotus/pull/11361))
- feat: sealing: load SectorsSummary from sealing SectorStats instead of calling API each time ([filecoin-project/lotus#11353](https://github.com/filecoin-project/lotus/pull/11353))
Copy link
Contributor

Choose a reason for hiding this comment

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

why is this removed ?

Copy link
Contributor Author

@rjan90 rjan90 Jan 17, 2024

Choose a reason for hiding this comment

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

This has been moved to the improvements section under v1.25.2:

- feat: sealing: load SectorsSummary from sealing SectorStats instead of calling API each time ([filecoin-project/lotus#11353](https://github.com/filecoin-project/lotus/pull/11353))

All the PRs that was previously in the Unreleased section has been removed from this section, and been moved to somewhere in the v1.25.2 changelog, as they are now no longer unreleased.


## Improvements
- fix: Add time slicing to splitstore purging step during compaction to reduce lock congestion [filecoin-project/lotus#11269](https://github.com/filecoin-project/lotus/pull/11269)
- feat: Added instructions on how to setup Prometheus/Grafana for monitoring a local Lotus node [filecoin-project/lotus#11276](https://github.com/filecoin-project/lotus/pull/11276)
Copy link
Contributor

Choose a reason for hiding this comment

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

did you mean to remove all this ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, these has now been moved to the v1.25.2 changelog, as these PRs are not Unreleased anymore. You can see these PRs here:
https://github.com/filecoin-project/lotus/blob/330afff2e917d23c1ef57bf5681508b695f7364d/CHANGELOG.md?plain=1#L72C1-L74

CHANGELOG.md Outdated
- fix: ensure that the Ethereum API never returns "empty" addresses for native messages. When a "to" address cannot be resolved to a 0x-style address, it will be re-written to `0xff0000000000000000000000ffffffffffffffff`. This can only happen when the native transaction _reverted_ (failing to create an account at the specified "to" address).
- fix: exchange: allow up to 10k messages per block ([filecoin-project/lotus#11506](https://github.com/filecoin-project/lotus/pull/11506))

>>>>>>> releases
Copy link
Contributor

Choose a reason for hiding this comment

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

is this from resolving a merge conflict ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, that looks like an artefact from a merge conflict. Pushed a fix to remove it here: 73d830e

Remove merge conflict artefact
@rjan90 rjan90 merged commit 2cd6aea into master Jan 17, 2024
88 checks passed
@rjan90 rjan90 deleted the merge-releases-into-master branch January 17, 2024 14:56
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.

[WIP] Lotus Release v1.25.2
7 participants