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

merge queue: embarking main (58bd898) and [#6590 + #6556 + #6588] together #6593

Closed
wants to merge 23 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 1, 2023

🎉 This combination of pull requests has been checked successfully and will be merged. 🎉

Branch main (58bd898) and [#6590 + #6556 + #6588] are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of [#6590 + #6556 + #6588].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue batched for merge:

  • #approved-reviews-by>=1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
  • #review-threads-unresolved=0 [🛡 GitHub branch protection]
  • base=main
  • any of [🛡 GitHub branch protection]:
    • check-success=Rustfmt
    • check-neutral=Rustfmt
    • check-skipped=Rustfmt
  • any of [🛡 GitHub branch protection]:
    • check-success=mergefreeze
    • check-neutral=mergefreeze
    • check-skipped=mergefreeze
  • any of [🛡 GitHub branch protection]:
    • check-success=Test integration with lightwalletd
    • check-neutral=Test integration with lightwalletd
    • check-skipped=Test integration with lightwalletd
  • any of [🛡 GitHub branch protection]:
    • check-success=Clippy
    • check-neutral=Clippy
    • check-skipped=Clippy
  • any of [🛡 GitHub branch protection]:
    • check-success=Test with fake activation heights
    • check-neutral=Test with fake activation heights
    • check-skipped=Test with fake activation heights
  • any of [🛡 GitHub branch protection]:
    • check-success=Test all
    • check-neutral=Test all
    • check-skipped=Test all
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml bans
    • check-neutral=Check deny.toml bans
    • check-skipped=Check deny.toml bans
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml bans --all-features
    • check-neutral=Check deny.toml bans --all-features
    • check-skipped=Check deny.toml bans --all-features
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml bans --no-default-features
    • check-neutral=Check deny.toml bans --no-default-features
    • check-skipped=Check deny.toml bans --no-default-features
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml sources
    • check-neutral=Check deny.toml sources
    • check-skipped=Check deny.toml sources
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml sources --all-features
    • check-neutral=Check deny.toml sources --all-features
    • check-skipped=Check deny.toml sources --all-features
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml sources --no-default-features
    • check-neutral=Check deny.toml sources --no-default-features
    • check-skipped=Check deny.toml sources --no-default-features
  • any of [🛡 GitHub branch protection]:
    • check-success=Check Cargo.lock is up to date
    • check-neutral=Check Cargo.lock is up to date
    • check-skipped=Check Cargo.lock is up to date
  • any of [🛡 GitHub branch protection]:
    • check-success=Find available cached state disks
    • check-neutral=Find available cached state disks
    • check-skipped=Find available cached state disks
  • any of [🛡 GitHub branch protection]:
    • check-success=Install zebrad from lockfile without cache on ubuntu-latest
    • check-neutral=Install zebrad from lockfile without cache on ubuntu-latest
    • check-skipped=Install zebrad from lockfile without cache on ubuntu-latest
  • any of [🛡 GitHub branch protection]:
    • check-success=Test checkpoint sync from empty state
    • check-neutral=Test checkpoint sync from empty state
    • check-skipped=Test checkpoint sync from empty state
  • any of [🛡 GitHub branch protection]:
    • check-success=Zebra checkpoint update / Run sync-past-checkpoint test
    • check-neutral=Zebra checkpoint update / Run sync-past-checkpoint test
    • check-skipped=Zebra checkpoint update / Run sync-past-checkpoint test
  • any of [🛡 GitHub branch protection]:
    • check-success=Zebra tip JSON-RPC / Run fully-synced-rpc test
    • check-neutral=Zebra tip JSON-RPC / Run fully-synced-rpc test
    • check-skipped=Zebra tip JSON-RPC / Run fully-synced-rpc test
  • any of [🛡 GitHub branch protection]:
    • check-success=Zebra checkpoint / Run sync-to-checkpoint test
    • check-neutral=Zebra checkpoint / Run sync-to-checkpoint test
    • check-skipped=Zebra checkpoint / Run sync-to-checkpoint test
  • any of [🛡 GitHub branch protection]:
    • check-success=Coverage on stable
    • check-neutral=Coverage on stable
    • check-skipped=Coverage on stable
  • any of [🛡 GitHub branch protection]:
    • check-success=Rust doc
    • check-neutral=Rust doc
    • check-skipped=Rust doc
  • any of [🛡 GitHub branch protection]:
    • check-success=Build tower-batch crate
    • check-neutral=Build tower-batch crate
    • check-skipped=Build tower-batch crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build tower-fallback crate
    • check-neutral=Build tower-fallback crate
    • check-skipped=Build tower-fallback crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-chain crate
    • check-neutral=Build zebra-chain crate
    • check-skipped=Build zebra-chain crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-client crate
    • check-neutral=Build zebra-client crate
    • check-skipped=Build zebra-client crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-consensus crate
    • check-neutral=Build zebra-consensus crate
    • check-skipped=Build zebra-consensus crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-network crate
    • check-neutral=Build zebra-network crate
    • check-skipped=Build zebra-network crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-node-services crate
    • check-neutral=Build zebra-node-services crate
    • check-skipped=Build zebra-node-services crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-rpc crate
    • check-neutral=Build zebra-rpc crate
    • check-skipped=Build zebra-rpc crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-script crate
    • check-neutral=Build zebra-script crate
    • check-skipped=Build zebra-script crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-state crate
    • check-neutral=Build zebra-state crate
    • check-skipped=Build zebra-state crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-test crate
    • check-neutral=Build zebra-test crate
    • check-skipped=Build zebra-test crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebra-utils crate
    • check-neutral=Build zebra-utils crate
    • check-skipped=Build zebra-utils crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Build zebrad crate
    • check-neutral=Build zebrad crate
    • check-skipped=Build zebrad crate
  • any of [🛡 GitHub branch protection]:
    • check-success=check-matrix
    • check-neutral=check-matrix
    • check-skipped=check-matrix
  • any of [🛡 GitHub branch protection]:
    • check-success=Zebra tip / Run full-sync-to-tip test
    • check-neutral=Zebra tip / Run full-sync-to-tip test
    • check-skipped=Zebra tip / Run full-sync-to-tip test
  • any of [🛡 GitHub branch protection]:
    • check-success=lightwalletd GRPC tests / Run lwd-grpc-wallet test
    • check-neutral=lightwalletd GRPC tests / Run lwd-grpc-wallet test
    • check-skipped=lightwalletd GRPC tests / Run lwd-grpc-wallet test
  • any of [🛡 GitHub branch protection]:
    • check-success=lightwalletd tip send / Run lwd-send-transactions test
    • check-neutral=lightwalletd tip send / Run lwd-send-transactions test
    • check-skipped=lightwalletd tip send / Run lwd-send-transactions test
  • any of [🛡 GitHub branch protection]:
    • check-success=lightwalletd tip update / Run lwd-update-sync test
    • check-neutral=lightwalletd tip update / Run lwd-update-sync test
    • check-skipped=lightwalletd tip update / Run lwd-update-sync test
  • any of [🛡 GitHub branch protection]:
    • check-success=Zebra tip update / Run update-to-tip test
    • check-neutral=Zebra tip update / Run update-to-tip test
    • check-skipped=Zebra tip update / Run update-to-tip test
  • any of [🛡 GitHub branch protection]:
    • check-success=lightwalletd tip / Run lwd-full-sync test
    • check-neutral=lightwalletd tip / Run lwd-full-sync test
    • check-skipped=lightwalletd tip / Run lwd-full-sync test
  • any of [🛡 GitHub branch protection]:
    • check-success=Test all with getblocktemplate-rpcs feature
    • check-neutral=Test all with getblocktemplate-rpcs feature
    • check-skipped=Test all with getblocktemplate-rpcs feature
  • any of [🛡 GitHub branch protection]:
    • check-success=Test beta on ubuntu-latest
    • check-neutral=Test beta on ubuntu-latest
    • check-skipped=Test beta on ubuntu-latest
  • any of [🛡 GitHub branch protection]:
    • check-success=Test stable on macos-latest
    • check-neutral=Test stable on macos-latest
    • check-skipped=Test stable on macos-latest
  • any of [🛡 GitHub branch protection]:
    • check-success=Test stable on ubuntu-latest
    • check-neutral=Test stable on ubuntu-latest
    • check-skipped=Test stable on ubuntu-latest
  • any of [🛡 GitHub branch protection]:
    • check-success=Build CI Docker / Build images
    • check-neutral=Build CI Docker / Build images
    • check-skipped=Build CI Docker / Build images
  • any of [🛡 GitHub branch protection]:
    • check-success=Build lightwalletd Docker
    • check-neutral=Build lightwalletd Docker
    • check-skipped=Build lightwalletd Docker
  • any of [🛡 GitHub branch protection]:
    • check-success=Test beta on ubuntu-latest --features getblocktemplate-rpcs
    • check-neutral=Test beta on ubuntu-latest --features getblocktemplate-rpcs
    • check-skipped=Test beta on ubuntu-latest --features getblocktemplate-rpcs
  • any of [🛡 GitHub branch protection]:
    • check-success=Test stable on ubuntu-latest --features getblocktemplate-rpcs
    • check-neutral=Test stable on ubuntu-latest --features getblocktemplate-rpcs
    • check-skipped=Test stable on ubuntu-latest --features getblocktemplate-rpcs
  • any of [🛡 GitHub branch protection]:
    • check-success=submit block / Run submit-block test
    • check-neutral=submit block / Run submit-block test
    • check-skipped=submit block / Run submit-block test
  • any of [🛡 GitHub branch protection]:
    • check-success=get block template / Run get-block-template test
    • check-neutral=get block template / Run get-block-template test
    • check-skipped=get block template / Run get-block-template test
  • any of [🛡 GitHub branch protection]:
    • check-success=Test Zebra custom Docker config file
    • check-neutral=Test Zebra custom Docker config file
    • check-skipped=Test Zebra custom Docker config file
  • any of [🛡 GitHub branch protection]:
    • check-success=Test Zebra default Docker config file
    • check-neutral=Test Zebra default Docker config file
    • check-skipped=Test Zebra default Docker config file
  • any of [🛡 GitHub branch protection]:
    • check-success=Check for unused dependencies
    • check-neutral=Check for unused dependencies
    • check-skipped=Check for unused dependencies
  • any of [🛡 GitHub branch protection]:
    • check-success=Generate checkpoints mainnet / Run generate-checkpoints-mainnet test
    • check-neutral=Generate checkpoints mainnet / Run generate-checkpoints-mainnet test
    • check-skipped=Generate checkpoints mainnet / Run generate-checkpoints-mainnet test

More 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 refresh will re-evaluate the queue rules

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

---
pull_requests:
  - number: 6590
  - number: 6556
  - number: 6588
...

oxarbitrage and others added 23 commits April 22, 2023 17:19
… use usize (#6585)

* Refactor the minimum fee rate calculation to use usize

* Check for overflow if constants change
Bumps [serde_with](https://github.com/jonasbb/serde_with) from 2.3.2 to 2.3.3.
- [Release notes](https://github.com/jonasbb/serde_with/releases)
- [Commits](jonasbb/serde_with@v2.3.2...v2.3.3)

---
updated-dependencies:
- dependency-name: serde_with
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 35.9.0 to 35.9.2.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](tj-actions/changed-files@v35.9.0...v35.9.2)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@github-actions github-actions bot added the C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG label May 1, 2023
@mergify mergify bot closed this May 2, 2023
@mergify mergify bot deleted the mergify/merge-queue/d8b9d91fa4 branch May 2, 2023 00:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-trivial Category: A trivial change that is not worth mentioning in the CHANGELOG
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants