merge-queue: embarking main (413f7fb) and [#3870 + #3889] together #3890
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
…zed state" This reverts commit 8870944.
This avoids deadlocks, by holding the read lock for as short a time as possible.
This reduces memory usage.
Check that the mandatory checkpoint height is after the ZIP-212 grace period for both mainnet and testnet, because Zebra is currently unable to fully validate the blocks during that grace period.
Require it to be after the ZIP-212 grace period so that the blocks during the grace period are validated by the checkpoints because Zebra can't currently fully validate blocks during that period.
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.
🎉 This combination of pull requests has been checked successfully 🎉
Branch main (413f7fb) and [#3870 + #3889] are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of [#3870 + #3889].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue
urgentfor merge:check-success=Clippycheck-neutral=Clippycheck-skipped=Clippycheck-success=Rustfmtcheck-neutral=Rustfmtcheck-skipped=Rustfmtcheck-success=Test stable on macOS-latestcheck-neutral=Test stable on macOS-latestcheck-skipped=Test stable on macOS-latestcheck-success=Test stable on ubuntu-latestcheck-neutral=Test stable on ubuntu-latestcheck-skipped=Test stable on ubuntu-latest#approved-reviews-by>=1[🛡 GitHub branch protection]#changes-requested-reviews-by=0[🛡 GitHub branch protection]#review-threads-unresolved=0[🛡 GitHub branch protection]check-success=Test allcheck-success=Test with fake activation heightscheck-success=Test full validation sync from cached statecheck-success=Test stable zebra-state with fake activation heights on ubuntu-latestcheck-success=Test stable on ubuntu-latestcheck-success=Test stable on macOS-latestcheck-success=Clippycheck-success=RustfmtMore informations about Mergify merge queue can be found in the documentation.
Mergify commands
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the queue rulesAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com