merge queue: embarking main (b1ffc89) and #8949 together #8959
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}
…n `subsidy_is_valid()` about using the network slow start interval parameters when PoW is disabled.
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 (b1ffc89) and #8949 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #8949.
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]#approved-reviews-by >= 1[🛡 GitHub repository ruleset rule]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub repository ruleset rule]#review-threads-unresolved = 0[🛡 GitHub repository ruleset rule]base=maincheck-success = Test stable on ubuntu-latestcheck-neutral = Test stable on ubuntu-latestcheck-skipped = Test stable on ubuntu-latestcheck-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 = Rustfmtcheck-neutral = Rustfmtcheck-skipped = Rustfmtcheck-success = mergefreezecheck-neutral = mergefreezecheck-skipped = mergefreezecheck-success = Clippycheck-neutral = Clippycheck-skipped = 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 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 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 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 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-batch-control cratecheck-neutral = Build tower-batch-control cratecheck-skipped = Build tower-batch-control 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-grpc cratecheck-neutral = Build zebra-grpc cratecheck-skipped = Build zebra-grpc 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-scan cratecheck-neutral = Build zebra-scan cratecheck-skipped = Build zebra-scan cratecheck-success = Build zebra-script cratecheck-neutral = Build zebra-script cratecheck-skipped = Build zebra-script cratecheck-success = Build tower-fallback cratecheck-neutral = Build tower-fallback cratecheck-skipped = Build tower-fallback 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 = 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-skipped = Build CI Docker / Build imagescheck-neutral = Build CI Docker / Build imagescheck-success = Build CI Docker / Build imagescheck-success = submit block / Run submit-block testcheck-neutral = submit block / Run submit-block testcheck-skipped = 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 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 = Test integration with lightwalletdcheck-neutral = Test integration with lightwalletdcheck-skipped = Test integration with lightwalletdcheck-success = lightwalletd GRPC tests / Run lwd-grpc-wallet testcheck-neutral = lightwalletd GRPC tests / Run lwd-grpc-wallet testcheck-skipped = 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 = lightwalletd tip update / Run lwd-update-sync testcheck-neutral = lightwalletd tip update / Run lwd-update-sync testcheck-skipped = lightwalletd tip update / Run lwd-update-sync 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 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-success = Check crate release dry runcheck-neutral = Check crate release dry runcheck-skipped = Check crate release dry runRequired conditions to stay in the queue:
#approved-reviews-by >= 1[🛡 GitHub branch protection]#approved-reviews-by >= 1[🛡 GitHub repository ruleset rule]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub repository ruleset rule]#review-threads-unresolved = 0[🛡 GitHub repository ruleset rule]check-success = Test stable on ubuntu-latestcheck-neutral = Test stable on ubuntu-latestcheck-skipped = Test stable on ubuntu-latestcheck-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 = Rustfmtcheck-neutral = Rustfmtcheck-skipped = Rustfmtcheck-success = mergefreezecheck-neutral = mergefreezecheck-skipped = mergefreezecheck-success = Clippycheck-neutral = Clippycheck-skipped = 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 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 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 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 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-batch-control cratecheck-neutral = Build tower-batch-control cratecheck-skipped = Build tower-batch-control 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-grpc cratecheck-neutral = Build zebra-grpc cratecheck-skipped = Build zebra-grpc 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-scan cratecheck-neutral = Build zebra-scan cratecheck-skipped = Build zebra-scan cratecheck-success = Build zebra-script cratecheck-neutral = Build zebra-script cratecheck-skipped = Build zebra-script cratecheck-success = Build tower-fallback cratecheck-neutral = Build tower-fallback cratecheck-skipped = Build tower-fallback 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 = 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-skipped = Build CI Docker / Build imagescheck-neutral = Build CI Docker / Build imagescheck-success = Build CI Docker / Build imagescheck-success = submit block / Run submit-block testcheck-neutral = submit block / Run submit-block testcheck-skipped = 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 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 = Test integration with lightwalletdcheck-neutral = Test integration with lightwalletdcheck-skipped = Test integration with lightwalletdcheck-success = lightwalletd GRPC tests / Run lwd-grpc-wallet testcheck-neutral = lightwalletd GRPC tests / Run lwd-grpc-wallet testcheck-skipped = 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 = lightwalletd tip update / Run lwd-update-sync testcheck-neutral = lightwalletd tip update / Run lwd-update-sync testcheck-skipped = lightwalletd tip update / Run lwd-update-sync 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-skipped = Build and Deploy Zebra Book Docscheck-neutral = Build and Deploy Zebra Book Docscheck-success = Build and Deploy Zebra Book Docscheck-skipped = Build and Deploy Zebra Internal Docscheck-neutral = Build and Deploy Zebra Internal Docscheck-success = Build and Deploy Zebra Internal Docscheck-success = Check crate release dry runcheck-neutral = Check crate release dry runcheck-skipped = Check crate release dry run