merge queue: embarking main (a6f8a9b) and #8304 together #8313
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}
We have deprecated the RFC process
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 pull request has been checked successfully and will be merged soon. 🎉
Branch main (a6f8a9b) and #8304 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #8304.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue
batchedfor merge:#approved-reviews-by>=1[🛡 GitHub branch protection]CONTRIBUTING.md#8304#changes-requested-reviews-by=0[🛡 GitHub branch protection]CONTRIBUTING.md#8304#review-threads-unresolved=0[🛡 GitHub branch protection]CONTRIBUTING.md#8304base=maincheck-skipped=Rustfmtcheck-neutral=Rustfmtcheck-success=Rustfmtcheck-success=mergefreezecheck-neutral=mergefreezecheck-skipped=mergefreezecheck-skipped=Clippycheck-neutral=Clippycheck-success=Clippycheck-success=Test with fake activation heightscheck-neutral=Test with fake activation heightscheck-skipped=Test with fake activation heightscheck-success=Test allcheck-neutral=Test allcheck-skipped=Test allcheck-success=Check deny.toml banscheck-neutral=Check deny.toml banscheck-skipped=Check deny.toml banscheck-success=Check deny.toml bans --all-featurescheck-neutral=Check deny.toml bans --all-featurescheck-skipped=Check deny.toml bans --all-featurescheck-success=Check deny.toml sourcescheck-neutral=Check deny.toml sourcescheck-skipped=Check deny.toml sourcescheck-success=Check deny.toml sources --all-featurescheck-neutral=Check deny.toml sources --all-featurescheck-skipped=Check deny.toml sources --all-featurescheck-success=Check Cargo.lock is up to datecheck-neutral=Check Cargo.lock is up to datecheck-skipped=Check Cargo.lock is up to datecheck-success=Install zebrad from lockfile without cache on ubuntu-latestcheck-neutral=Install zebrad from lockfile without cache on ubuntu-latestcheck-skipped=Install zebrad from lockfile without cache on ubuntu-latestcheck-success=Test checkpoint sync from empty statecheck-neutral=Test checkpoint sync from empty statecheck-skipped=Test checkpoint sync from empty statecheck-success=Zebra checkpoint update / Run sync-past-checkpoint testcheck-neutral=Zebra checkpoint update / Run sync-past-checkpoint testcheck-skipped=Zebra checkpoint update / Run sync-past-checkpoint testcheck-success=Zebra tip JSON-RPC / Run fully-synced-rpc testcheck-neutral=Zebra tip JSON-RPC / Run fully-synced-rpc testcheck-skipped=Zebra tip JSON-RPC / Run fully-synced-rpc testcheck-success=Build tower-fallback cratecheck-neutral=Build tower-fallback cratecheck-skipped=Build tower-fallback cratecheck-success=Build zebra-chain cratecheck-neutral=Build zebra-chain cratecheck-skipped=Build zebra-chain cratecheck-success=Build zebra-consensus cratecheck-neutral=Build zebra-consensus cratecheck-skipped=Build zebra-consensus cratecheck-success=Build zebra-network cratecheck-neutral=Build zebra-network cratecheck-skipped=Build zebra-network cratecheck-success=Build zebra-node-services cratecheck-neutral=Build zebra-node-services cratecheck-skipped=Build zebra-node-services cratecheck-success=Build zebra-rpc cratecheck-neutral=Build zebra-rpc cratecheck-skipped=Build zebra-rpc cratecheck-success=Build zebra-script cratecheck-neutral=Build zebra-script cratecheck-skipped=Build zebra-script cratecheck-success=Build zebra-state cratecheck-neutral=Build zebra-state cratecheck-skipped=Build zebra-state cratecheck-success=Build zebra-test cratecheck-neutral=Build zebra-test cratecheck-skipped=Build zebra-test cratecheck-success=Build zebra-utils cratecheck-neutral=Build zebra-utils cratecheck-skipped=Build zebra-utils cratecheck-success=Build zebrad cratecheck-neutral=Build zebrad cratecheck-skipped=Build zebrad cratecheck-success=Zebra tip update / Run update-to-tip testcheck-neutral=Zebra tip update / Run update-to-tip testcheck-skipped=Zebra tip update / Run update-to-tip testcheck-success=Test beta on ubuntu-latestcheck-neutral=Test beta on ubuntu-latestcheck-skipped=Test beta on ubuntu-latestcheck-success=Test stable on ubuntu-latestcheck-neutral=Test stable on ubuntu-latestcheck-skipped=Test stable on ubuntu-latestcheck-success=Build CI Docker / Build imagescheck-neutral=Build CI Docker / Build imagescheck-skipped=Build CI Docker / Build imagescheck-success=Build lightwalletd Dockercheck-neutral=Build lightwalletd Dockercheck-skipped=Build lightwalletd Dockercheck-skipped=submit block / Run submit-block testcheck-neutral=submit block / Run submit-block testcheck-success=submit block / Run submit-block testcheck-success=get block template / Run get-block-template testcheck-neutral=get block template / Run get-block-template testcheck-skipped=get block template / Run get-block-template testcheck-success=Check for unused dependenciescheck-neutral=Check for unused dependenciescheck-skipped=Check for unused dependenciescheck-success=Check if cached state disks exist for Mainnet / Check if cached state disks existcheck-neutral=Check if cached state disks exist for Mainnet / Check if cached state disks existcheck-skipped=Check if cached state disks exist for Mainnet / Check if cached state disks existcheck-success=Check crates matrixcheck-neutral=Check crates matrixcheck-skipped=Check crates matrixcheck-success=Generate crates matrixcheck-neutral=Generate crates matrixcheck-skipped=Generate crates matrixcheck-success=Build tower-batch-control cratecheck-neutral=Build tower-batch-control cratecheck-skipped=Build tower-batch-control cratecheck-success=Check deny.toml bans --features default-release-binariescheck-neutral=Check deny.toml bans --features default-release-binariescheck-skipped=Check deny.toml bans --features default-release-binariescheck-success=Check deny.toml sources --features default-release-binariescheck-neutral=Check deny.toml sources --features default-release-binariescheck-skipped=Check deny.toml sources --features default-release-binariescheck-success=Check crate release dry runcheck-neutral=Check crate release dry runcheck-skipped=Check crate release dry runcheck-success=Build CD Docker / Build imagescheck-neutral=Build CD Docker / Build imagescheck-skipped=Build CD Docker / Build imagescheck-success=Test integration with lightwalletdcheck-neutral=Test integration with lightwalletdcheck-skipped=Test integration with lightwalletdcheck-skipped=lightwalletd GRPC tests / Run lwd-grpc-wallet testcheck-neutral=lightwalletd GRPC tests / Run lwd-grpc-wallet testcheck-success=lightwalletd GRPC tests / Run lwd-grpc-wallet testcheck-success=lightwalletd tip send / Run lwd-send-transactions testcheck-neutral=lightwalletd tip send / Run lwd-send-transactions testcheck-skipped=lightwalletd tip send / Run lwd-send-transactions testcheck-success=Build and Deploy Zebra Book Docscheck-neutral=Build and Deploy Zebra Book Docscheck-skipped=Build and Deploy Zebra Book Docscheck-success=Build and Deploy Zebra Internal Docscheck-neutral=Build and Deploy Zebra Internal Docscheck-skipped=Build and Deploy Zebra Internal Docscheck-skipped=lightwalletd tip update / Run lwd-update-sync testcheck-neutral=lightwalletd tip update / Run lwd-update-sync testcheck-success=lightwalletd tip update / Run lwd-update-sync testcheck-success=Generate checkpoints mainnet / Run checkpoints-mainnet testcheck-neutral=Generate checkpoints mainnet / Run checkpoints-mainnet testcheck-skipped=Generate checkpoints mainnet / Run checkpoints-mainnet testcheck-success=Test CD custom Docker config file / Test custom-conf in Dockercheck-neutral=Test CD custom Docker config file / Test custom-conf in Dockercheck-skipped=Test CD custom Docker config file / Test custom-conf in Dockercheck-success=Test CD default Docker config file / Test default-conf in Dockercheck-neutral=Test CD default Docker config file / Test default-conf in Dockercheck-skipped=Test CD default Docker config file / Test default-conf in Dockercheck-success=Test CI custom Docker config file / Test custom-conf in Dockercheck-neutral=Test CI custom Docker config file / Test custom-conf in Dockercheck-skipped=Test CI custom Docker config file / Test custom-conf in Dockercheck-success=Test CI default Docker config file / Test default-conf in Dockercheck-neutral=Test CI default Docker config file / Test default-conf in Dockercheck-skipped=Test CI default Docker config file / Test default-conf in Dockercheck-success=Test stable on macos-latestcheck-neutral=Test stable on macos-latestcheck-skipped=Test stable on macos-latestcheck-success=Build zebra-scan cratecheck-neutral=Build zebra-scan cratecheck-skipped=Build zebra-scan crateRequired conditions to stay in the queue:
#approved-reviews-by>=1[🛡 GitHub branch protection]CONTRIBUTING.md#8304#changes-requested-reviews-by=0[🛡 GitHub branch protection]CONTRIBUTING.md#8304#review-threads-unresolved=0[🛡 GitHub branch protection]CONTRIBUTING.md#8304check-skipped=RustfmtCONTRIBUTING.md#8304check-neutral=RustfmtCONTRIBUTING.md#8304check-success=RustfmtCONTRIBUTING.md#8304check-success=mergefreezeCONTRIBUTING.md#8304check-neutral=mergefreezeCONTRIBUTING.md#8304check-skipped=mergefreezeCONTRIBUTING.md#8304check-skipped=ClippyCONTRIBUTING.md#8304check-neutral=ClippyCONTRIBUTING.md#8304check-success=ClippyCONTRIBUTING.md#8304check-success=Test with fake activation heightsCONTRIBUTING.md#8304check-neutral=Test with fake activation heightsCONTRIBUTING.md#8304check-skipped=Test with fake activation heightsCONTRIBUTING.md#8304check-success=Test allCONTRIBUTING.md#8304check-neutral=Test allCONTRIBUTING.md#8304check-skipped=Test allCONTRIBUTING.md#8304check-success=Check deny.toml bansCONTRIBUTING.md#8304check-neutral=Check deny.toml bansCONTRIBUTING.md#8304check-skipped=Check deny.toml bansCONTRIBUTING.md#8304check-success=Check deny.toml bans --all-featuresCONTRIBUTING.md#8304check-neutral=Check deny.toml bans --all-featuresCONTRIBUTING.md#8304check-skipped=Check deny.toml bans --all-featuresCONTRIBUTING.md#8304check-success=Check deny.toml sourcesCONTRIBUTING.md#8304check-neutral=Check deny.toml sourcesCONTRIBUTING.md#8304check-skipped=Check deny.toml sourcesCONTRIBUTING.md#8304check-success=Check deny.toml sources --all-featuresCONTRIBUTING.md#8304check-neutral=Check deny.toml sources --all-featuresCONTRIBUTING.md#8304check-skipped=Check deny.toml sources --all-featuresCONTRIBUTING.md#8304check-success=Check Cargo.lock is up to dateCONTRIBUTING.md#8304check-neutral=Check Cargo.lock is up to dateCONTRIBUTING.md#8304check-skipped=Check Cargo.lock is up to dateCONTRIBUTING.md#8304check-success=Install zebrad from lockfile without cache on ubuntu-latestCONTRIBUTING.md#8304check-neutral=Install zebrad from lockfile without cache on ubuntu-latestCONTRIBUTING.md#8304check-skipped=Install zebrad from lockfile without cache on ubuntu-latestCONTRIBUTING.md#8304check-success=Test checkpoint sync from empty stateCONTRIBUTING.md#8304check-neutral=Test checkpoint sync from empty stateCONTRIBUTING.md#8304check-skipped=Test checkpoint sync from empty stateCONTRIBUTING.md#8304check-skipped=Zebra checkpoint update / Run sync-past-checkpoint testCONTRIBUTING.md#8304check-neutral=Zebra checkpoint update / Run sync-past-checkpoint testCONTRIBUTING.md#8304check-success=Zebra checkpoint update / Run sync-past-checkpoint testCONTRIBUTING.md#8304check-success=Zebra tip JSON-RPC / Run fully-synced-rpc testCONTRIBUTING.md#8304check-neutral=Zebra tip JSON-RPC / Run fully-synced-rpc testCONTRIBUTING.md#8304check-skipped=Zebra tip JSON-RPC / Run fully-synced-rpc testCONTRIBUTING.md#8304check-success=Build tower-fallback crateCONTRIBUTING.md#8304check-neutral=Build tower-fallback crateCONTRIBUTING.md#8304check-skipped=Build tower-fallback crateCONTRIBUTING.md#8304check-success=Build zebra-chain crateCONTRIBUTING.md#8304check-neutral=Build zebra-chain crateCONTRIBUTING.md#8304check-skipped=Build zebra-chain crateCONTRIBUTING.md#8304check-success=Build zebra-consensus crateCONTRIBUTING.md#8304check-neutral=Build zebra-consensus crateCONTRIBUTING.md#8304check-skipped=Build zebra-consensus crateCONTRIBUTING.md#8304check-success=Build zebra-network crateCONTRIBUTING.md#8304check-neutral=Build zebra-network crateCONTRIBUTING.md#8304check-skipped=Build zebra-network crateCONTRIBUTING.md#8304check-success=Build zebra-node-services crateCONTRIBUTING.md#8304check-neutral=Build zebra-node-services crateCONTRIBUTING.md#8304check-skipped=Build zebra-node-services crateCONTRIBUTING.md#8304check-success=Build zebra-rpc crateCONTRIBUTING.md#8304check-neutral=Build zebra-rpc crateCONTRIBUTING.md#8304check-skipped=Build zebra-rpc crateCONTRIBUTING.md#8304check-success=Build zebra-script crateCONTRIBUTING.md#8304check-neutral=Build zebra-script crateCONTRIBUTING.md#8304check-skipped=Build zebra-script crateCONTRIBUTING.md#8304check-success=Build zebra-state crateCONTRIBUTING.md#8304check-neutral=Build zebra-state crateCONTRIBUTING.md#8304check-skipped=Build zebra-state crateCONTRIBUTING.md#8304check-success=Build zebra-test crateCONTRIBUTING.md#8304check-neutral=Build zebra-test crateCONTRIBUTING.md#8304check-skipped=Build zebra-test crateCONTRIBUTING.md#8304check-success=Build zebra-utils crateCONTRIBUTING.md#8304check-neutral=Build zebra-utils crateCONTRIBUTING.md#8304check-skipped=Build zebra-utils crateCONTRIBUTING.md#8304check-success=Build zebrad crateCONTRIBUTING.md#8304check-neutral=Build zebrad crateCONTRIBUTING.md#8304check-skipped=Build zebrad crateCONTRIBUTING.md#8304check-success=Zebra tip update / Run update-to-tip testCONTRIBUTING.md#8304check-neutral=Zebra tip update / Run update-to-tip testCONTRIBUTING.md#8304check-skipped=Zebra tip update / Run update-to-tip testCONTRIBUTING.md#8304check-success=Test beta on ubuntu-latestCONTRIBUTING.md#8304check-neutral=Test beta on ubuntu-latestCONTRIBUTING.md#8304check-skipped=Test beta on ubuntu-latestCONTRIBUTING.md#8304check-success=Test stable on ubuntu-latestCONTRIBUTING.md#8304check-neutral=Test stable on ubuntu-latestCONTRIBUTING.md#8304check-skipped=Test stable on ubuntu-latestCONTRIBUTING.md#8304check-success=Build CI Docker / Build imagesCONTRIBUTING.md#8304check-neutral=Build CI Docker / Build imagesCONTRIBUTING.md#8304check-skipped=Build CI Docker / Build imagesCONTRIBUTING.md#8304check-success=Build lightwalletd DockerCONTRIBUTING.md#8304check-neutral=Build lightwalletd DockerCONTRIBUTING.md#8304check-skipped=Build lightwalletd DockerCONTRIBUTING.md#8304check-success=submit block / Run submit-block testCONTRIBUTING.md#8304check-neutral=submit block / Run submit-block testCONTRIBUTING.md#8304check-skipped=submit block / Run submit-block testCONTRIBUTING.md#8304check-success=get block template / Run get-block-template testCONTRIBUTING.md#8304check-neutral=get block template / Run get-block-template testCONTRIBUTING.md#8304check-skipped=get block template / Run get-block-template testCONTRIBUTING.md#8304check-success=Check for unused dependenciesCONTRIBUTING.md#8304check-neutral=Check for unused dependenciesCONTRIBUTING.md#8304check-skipped=Check for unused dependenciesCONTRIBUTING.md#8304check-success=Check if cached state disks exist for Mainnet / Check if cached state disks existCONTRIBUTING.md#8304check-neutral=Check if cached state disks exist for Mainnet / Check if cached state disks existCONTRIBUTING.md#8304check-skipped=Check if cached state disks exist for Mainnet / Check if cached state disks existCONTRIBUTING.md#8304check-success=Check crates matrixCONTRIBUTING.md#8304check-neutral=Check crates matrixCONTRIBUTING.md#8304check-skipped=Check crates matrixCONTRIBUTING.md#8304check-success=Generate crates matrixCONTRIBUTING.md#8304check-neutral=Generate crates matrixCONTRIBUTING.md#8304check-skipped=Generate crates matrixCONTRIBUTING.md#8304check-success=Build tower-batch-control crateCONTRIBUTING.md#8304check-neutral=Build tower-batch-control crateCONTRIBUTING.md#8304check-skipped=Build tower-batch-control crateCONTRIBUTING.md#8304check-success=Check deny.toml bans --features default-release-binariesCONTRIBUTING.md#8304check-neutral=Check deny.toml bans --features default-release-binariesCONTRIBUTING.md#8304check-skipped=Check deny.toml bans --features default-release-binariesCONTRIBUTING.md#8304check-success=Check deny.toml sources --features default-release-binariesCONTRIBUTING.md#8304check-neutral=Check deny.toml sources --features default-release-binariesCONTRIBUTING.md#8304check-skipped=Check deny.toml sources --features default-release-binariesCONTRIBUTING.md#8304check-success=Check crate release dry runCONTRIBUTING.md#8304check-neutral=Check crate release dry runCONTRIBUTING.md#8304check-skipped=Check crate release dry runCONTRIBUTING.md#8304check-success=Build CD Docker / Build imagesCONTRIBUTING.md#8304check-neutral=Build CD Docker / Build imagesCONTRIBUTING.md#8304check-skipped=Build CD Docker / Build imagesCONTRIBUTING.md#8304check-success=Test integration with lightwalletdCONTRIBUTING.md#8304check-neutral=Test integration with lightwalletdCONTRIBUTING.md#8304check-skipped=Test integration with lightwalletdCONTRIBUTING.md#8304check-skipped=lightwalletd GRPC tests / Run lwd-grpc-wallet testCONTRIBUTING.md#8304check-neutral=lightwalletd GRPC tests / Run lwd-grpc-wallet testCONTRIBUTING.md#8304check-success=lightwalletd GRPC tests / Run lwd-grpc-wallet testCONTRIBUTING.md#8304check-success=lightwalletd tip send / Run lwd-send-transactions testCONTRIBUTING.md#8304check-neutral=lightwalletd tip send / Run lwd-send-transactions testCONTRIBUTING.md#8304check-skipped=lightwalletd tip send / Run lwd-send-transactions testCONTRIBUTING.md#8304check-success=Build and Deploy Zebra Book DocsCONTRIBUTING.md#8304check-neutral=Build and Deploy Zebra Book DocsCONTRIBUTING.md#8304check-skipped=Build and Deploy Zebra Book DocsCONTRIBUTING.md#8304check-success=Build and Deploy Zebra Internal DocsCONTRIBUTING.md#8304check-neutral=Build and Deploy Zebra Internal DocsCONTRIBUTING.md#8304check-skipped=Build and Deploy Zebra Internal DocsCONTRIBUTING.md#8304check-success=lightwalletd tip update / Run lwd-update-sync testCONTRIBUTING.md#8304check-neutral=lightwalletd tip update / Run lwd-update-sync testCONTRIBUTING.md#8304check-skipped=lightwalletd tip update / Run lwd-update-sync testCONTRIBUTING.md#8304check-success=Generate checkpoints mainnet / Run checkpoints-mainnet testCONTRIBUTING.md#8304check-neutral=Generate checkpoints mainnet / Run checkpoints-mainnet testCONTRIBUTING.md#8304check-skipped=Generate checkpoints mainnet / Run checkpoints-mainnet testCONTRIBUTING.md#8304check-success=Test CD custom Docker config file / Test custom-conf in DockerCONTRIBUTING.md#8304check-neutral=Test CD custom Docker config file / Test custom-conf in DockerCONTRIBUTING.md#8304check-skipped=Test CD custom Docker config file / Test custom-conf in DockerCONTRIBUTING.md#8304check-success=Test CD default Docker config file / Test default-conf in DockerCONTRIBUTING.md#8304check-neutral=Test CD default Docker config file / Test default-conf in DockerCONTRIBUTING.md#8304check-skipped=Test CD default Docker config file / Test default-conf in DockerCONTRIBUTING.md#8304check-success=Test CI custom Docker config file / Test custom-conf in DockerCONTRIBUTING.md#8304check-neutral=Test CI custom Docker config file / Test custom-conf in DockerCONTRIBUTING.md#8304check-skipped=Test CI custom Docker config file / Test custom-conf in DockerCONTRIBUTING.md#8304check-success=Test CI default Docker config file / Test default-conf in DockerCONTRIBUTING.md#8304check-neutral=Test CI default Docker config file / Test default-conf in DockerCONTRIBUTING.md#8304check-skipped=Test CI default Docker config file / Test default-conf in DockerCONTRIBUTING.md#8304check-success=Test stable on macos-latestCONTRIBUTING.md#8304check-neutral=Test stable on macos-latestCONTRIBUTING.md#8304check-skipped=Test stable on macos-latestCONTRIBUTING.md#8304check-success=Build zebra-scan crateCONTRIBUTING.md#8304check-neutral=Build zebra-scan crateCONTRIBUTING.md#8304check-skipped=Build zebra-scan crateCONTRIBUTING.md#8304Visit the Mergify Dashboard to check the state of the queue
batched.