Merge/rebased v23 into v22 #10701
Closed
Merge/rebased v23 into v22 #10701
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chore: update ffi to increase execution parallelism
Don't enforce walking receipt tree during compaction
fix: build: drop drand incentinet servers
Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
chore: release lotus v1.20.4
chore: merge release/v1.20.4 into releases
Update to go-state-types v0.11.0-alpha-1 Introduce dummy v11 actor bundles Make new actors adapters Add upgrade to Upgrade Schedules make jen Update to go-state-types v0.11.0-alpha-2
This is now "FVM" native. Changes include: 1. Don't treat "trace" messages like off-chain messages. E.g., don't include CIDs, versions, etc. 2. Include IPLD codecs where applicable. 3. Remove fields that aren't filled by the FVM (timing, some errors, code locations, etc.).
chore: backport 10372 onto release/v1.22.0
feat: implement FIP-0061
chore:deps:Integrate actors v11
- Keep current expiration defaults on creation, extension some tests - Update ffi
- Open splitstore in migration shed tool - Update state root version
Co-authored-by: zenground0 <ZenGround0@users.noreply.github.com>
* 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>
* Update butterfly artifacts * register actors v11 * Update calibration upgrade time * State inspection shed cmds * Fix * make gen * Fix swallowed errors * Lint fixup --------- Co-authored-by: zenground0 <ZenGround0@users.noreply.github.com>
* Update go-state-types * Modify upgrade schedule and params * Revert fip 0052 * Update gst * docsgen * fast butterfly migration to validate migration * Correct epoch to match specified date * Update actors v11 * Update changelog build version * Update butterfly artifacts * Fix lotus-miner init to work after upgrade --------- Co-authored-by: zenground0 <ZenGround0@users.noreply.github.com>
|
I'm concerned that the rebase may cause merge issues. Did you consider:
|
|
We should bump the version in build/version.go (to 1.23.0-rc1), and run the |
|
The diff there is also significantly easier to review. |
I don't have branch permissions or the ability to set them and I woke up to this branch set at 1.22. If you have branch permissions and can do hard reset to 1.21 I'll do this.
The rebase was a recovery from a deadend. I originally wanted to just force reset 1.23 to the rebased 1.22 on top of 1.21. I can merge 1.21 into the 1.22 base branch here instead of the rebase if you don't have merge permissions to reset to 1.21. |
ZenGround0
force-pushed
the
release/v1.23.0
branch
from
ff2258f
to
c6968f8
Compare
|
should we close this? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related Issues
Proposed Changes
The branch being merged here started its life == release/v1.22.0
Then I rebased this branch on top of release/v1.21.0
Then I merged it back into release/v1.22.0
Additional Info
Checklist
Before you mark the PR ready for review, please make sure that:
<PR type>: <area>: <change being made>fix: mempool: Introduce a cache for valid signaturesPR type: fix, feat, build, chore, ci, docs, perf, refactor, revert, style, testarea, e.g. api, chain, state, market, mempool, multisig, networking, paych, proving, sealing, wallet, deps