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.

Sign up for GitHub

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

Jump to bottom

merge queue: embarking main (887d4a2) and #8383 together #8415

Closed
wants to merge 37 commits into from
Closed

merge queue: embarking main (887d4a2) and #8383 together #8415

wants to merge 37 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 18, 2024 •
edited
Loading

❌ This pull request has failed checks. #8383 will be removed from the queue. ❌

Branch main (887d4a2) and #8383 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #8383.
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:

  • any of [🛡 GitHub branch protection]:
    • check-neutral=Test stable on ubuntu-latest
    • check-skipped=Test stable on ubuntu-latest
    • check-success=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]
  • 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=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 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 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=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=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-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=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=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=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=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=Check for unused dependencies
    • check-neutral=Check for unused dependencies
    • check-skipped=Check for unused dependencies
  • any of [🛡 GitHub branch protection]:
    • check-success=Check if cached state disks exist for Mainnet / Check if cached state disks exist
    • check-neutral=Check if cached state disks exist for Mainnet / Check if cached state disks exist
    • check-skipped=Check if cached state disks exist for Mainnet / Check if cached state disks exist
  • any of [🛡 GitHub branch protection]:
    • check-success=Check crates matrix
    • check-neutral=Check crates matrix
    • check-skipped=Check crates matrix
  • any of [🛡 GitHub branch protection]:
    • check-success=Generate crates matrix
    • check-neutral=Generate crates matrix
    • check-skipped=Generate crates matrix
  • any of [🛡 GitHub branch protection]:
    • check-success=Build tower-batch-control crate
    • check-neutral=Build tower-batch-control crate
    • check-skipped=Build tower-batch-control crate
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml bans --features default-release-binaries
    • check-neutral=Check deny.toml bans --features default-release-binaries
    • check-skipped=Check deny.toml bans --features default-release-binaries
  • any of [🛡 GitHub branch protection]:
    • check-success=Check deny.toml sources --features default-release-binaries
    • check-neutral=Check deny.toml sources --features default-release-binaries
    • check-skipped=Check deny.toml sources --features default-release-binaries
  • any of [🛡 GitHub branch protection]:
    • check-success=Check crate release dry run
    • check-neutral=Check crate release dry run
    • check-skipped=Check crate release dry run
  • any of [🛡 GitHub branch protection]:
    • check-success=Build CD Docker / Build images
    • check-neutral=Build CD Docker / Build images
    • check-skipped=Build CD Docker / Build images
  • 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=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-skipped=Build and Deploy Zebra Book Docs
    • check-neutral=Build and Deploy Zebra Book Docs
    • check-success=Build and Deploy Zebra Book Docs
  • any of [🛡 GitHub branch protection]:
    • check-skipped=Build and Deploy Zebra Internal Docs
    • check-neutral=Build and Deploy Zebra Internal Docs
    • check-success=Build and Deploy Zebra Internal Docs
  • 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=Generate checkpoints mainnet / Run checkpoints-mainnet test
    • check-neutral=Generate checkpoints mainnet / Run checkpoints-mainnet test
    • check-skipped=Generate checkpoints mainnet / Run checkpoints-mainnet test
  • any of [🛡 GitHub branch protection]:
    • check-success=Test CD custom Docker config file / Test custom-conf in Docker
    • check-neutral=Test CD custom Docker config file / Test custom-conf in Docker
    • check-skipped=Test CD custom Docker config file / Test custom-conf in Docker
  • any of [🛡 GitHub branch protection]:
    • check-success=Test CD default Docker config file / Test default-conf in Docker
    • check-neutral=Test CD default Docker config file / Test default-conf in Docker
    • check-skipped=Test CD default Docker config file / Test default-conf in Docker
  • any of [🛡 GitHub branch protection]:
    • check-success=Test CI custom Docker config file / Test custom-conf in Docker
    • check-neutral=Test CI custom Docker config file / Test custom-conf in Docker
    • check-skipped=Test CI custom Docker config file / Test custom-conf in Docker
  • any of [🛡 GitHub branch protection]:
    • check-success=Test CI default Docker config file / Test default-conf in Docker
    • check-neutral=Test CI default Docker config file / Test default-conf in Docker
    • check-skipped=Test CI default Docker config file / Test default-conf in Docker
  • 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=Build zebra-scan crate
    • check-neutral=Build zebra-scan crate
    • check-skipped=Build zebra-scan crate

Required conditions to stay in the queue:

---
previous_failed_batches: []
pull_requests:
  - number: 8383
...

arya2 and others added 30 commits April 1, 2024 21:45
@arya2
minor cleanup and rename
9db4762
@arya2
Adds an empty NetworkParameters struct to Network::Testnet variant, u…
4b86bd6 
…pdates production code.
@arya2
Updates tests
7533e2f
@arya2
Adds NetworkKind and uses it instead of Network in `HistoryTreePa…
06cf947 
…rts` and `transparent::Address`
@arya2
Adds a [network.testnet_parameters] section to the config, uses `Netw…
4900a20 
…orkKind` as zebra_network::Config::network field type, and converts 'Network' to `NetworkKind` before serializing
@arya2
Applies some suggestions from code review
cb8726b
@arya2
Applies suggestions from code review
d5a807a
@arya2
returns b58 prefix constants directly to remove From<NetworkKind> imp…
d108ec6 
…l for zcash_primitives::consensus::Network
@arya2
Applies more suggestions from code review.
574b1f9
@arya2
moves conversions to zcash_primitives::consensus::Network to where th…
05e41a2 
…ey're used.
@arya2 @upbqdn
Apply suggestions from code review
fd3d505 
Co-authored-by: Marek <[email protected]>
@arya2
rename network variables and method names typed as NetworkKind to `…
f04b94b 
…network_kind`
@arya2
use only test block heights for the network associated with them
ea2d001
@arya2
Applies more suggestions from code review.
86cd919
@arya2
Rename NetworkParameters to Parameters and move it a new `testnet…
365b58e 
…` module
@arya2
Merge branch 'main' into network-params
eca7f6b
@arya2
adds activation heights field
60248e3
@arya2
updates stored test config, adds a quicker test for checking that sto…
b9bdf05 
…red configs can be parsed, adds an intermediate representation of activation heights
@arya2
implement Parameters for Network
ad4e7dc
@arya2
Passes &Network directly instead of converting to zp_consensus::Netwo…
4347a80 
…rk where there were conversions
@arya2
fixes a bad merge (removes a network conversion in zcash_note_encrypt…
080affd 
…ion)
@arya2
Adds a test for the Parameters impl for zebra_chain::Network
2493e7e
@arya2
fixes doc links
997e265
@arya2
- Makes the activation_heights config field optional by adding a #[…
93c7a58 
…serde(default)]

- Panics if a non-zero activation height is provided for the `Genesis` network upgrade
- Always sets the `Genesis` and `BeforeOverwinter` network upgrade activation heights to 0 and 1, `BeforeOverwinter` could be overwritten by a later network upgrade
- Makes the `activation_heights` field on `Parameters` private, adds/uses an accessor method instead, and adds a builder struct and `build()` method
@arya2
small refactor of activation_heights() method
0fd4158
@arya2
check that activation heights are in the right order
3952caa
@arya2
Updates NetworkUpgrade::activation_height() to return the height of…
e697d36 
… the next NetworkUpgrade if it doesn't find the activation height of `&self`
@arya2
checks that the miner address is of TestnetKind on Regtest and update…
325a6c6 
… assertion message
@arya2
Adds a DNetworkUpgradeActivationHeights struct for better control ove…
f724c01 
…r how activation heights can be configured
@arya2
moves all ordered network upgrades to a constant, adds a no_duplicate…
a37510a 
…s test, moves struct with activation heights outside deserialization impl and accepts it in `ParametersBuilder::activation_heights()` instead of a Vec
@mergify mergify bot closed this Apr 19, 2024
@mergify mergify bot deleted the mergify/merge-queue/830deb63c7 branch April 19, 2024 00:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@arya2