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

merge queue: embarking main (c885de4) and [#7219 + #7218 + #7241 + #7226 + #7222 + #7238 + #7229] together #7243

Closed
wants to merge 34 commits into from
Closed

merge queue: embarking main (c885de4) and [#7219 + #7218 + #7241 + #7226 + #7222 + #7238 + #7229] together #7243

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
2812dba
Remove duplicate asserts
upbqdn Jul 15, 2023
5c061d9
Remove workarounds for inserting trees into NFS
upbqdn Jul 15, 2023
7868e71
Use correct height for constructing new chain
upbqdn Jul 15, 2023
60a287f
Don't push the 0th block into a chain
upbqdn Jul 15, 2023
0fd231c
Don't commit two blocks at the same height
upbqdn Jul 15, 2023
b4bf35c
Fix typo
teor2345 Jul 16, 2023
f6b8176
Add an async-error feature and an initial module structure
teor2345 Jul 11, 2023
ee78f36
Implement checking for panics in OS threads and async tasks
teor2345 Jul 12, 2023
74ce0d3
Implement waiting for panics in OS threads and async tasks
teor2345 Jul 13, 2023
a59b04e
Add a TODO to simplify some state request error handling
teor2345 Jul 13, 2023
35cdec5
Use the new panic-checking methods in zebra-state
teor2345 Jul 13, 2023
4b59bdd
Use new panic-checking methods in zebra-network
teor2345 Jul 17, 2023
9ddf377
fixup! Implement waiting for panics in OS threads and async tasks
teor2345 Jul 17, 2023
93ecfc5
Replace existing async code with generic panic-checking methods
teor2345 Jul 17, 2023
7c31404
Simplify trait to a single method
teor2345 Jul 17, 2023
22b0c5b
Move thread panic code into generic trait impls
teor2345 Jul 17, 2023
b54da8b
Generate chains with at least two blocks
upbqdn Jul 17, 2023
6c2eaa4
Merge branch 'fix-height-in-tests' of github.com:ZcashFoundation/zebr…
upbqdn Jul 17, 2023
389a2ba
build(deps): bump the cli group with 1 update
dependabot[bot] Jul 17, 2023
6910116
Simplify option handling
teor2345 Jul 17, 2023
0e65540
Fix comment
teor2345 Jul 17, 2023
b6a4f63
Add missing track_caller
teor2345 Jul 17, 2023
e6687b2
build(deps): bump insta from 1.30.0 to 1.31.0
dependabot[bot] Jul 17, 2023
6c3cf02
build(deps): bump the crypto group with 1 update
dependabot[bot] Jul 17, 2023
d4896be
Bumps sha2/secp256k1, updates deny.toml
arya2 Jul 17, 2023
deea124
removes unused import, updates method calls
arya2 Jul 17, 2023
a358127
Change dependabot.yml Actions schedule and fix groups
teor2345 Jul 18, 2023
2e248b8
Merge of #7219
mergify[bot] Jul 18, 2023
859acaf
Merge of #7218
mergify[bot] Jul 18, 2023
772aa04
Merge of #7241
mergify[bot] Jul 18, 2023
220277a
Merge of #7226
mergify[bot] Jul 18, 2023
3c3e64a
Merge of #7222
mergify[bot] Jul 18, 2023
4da828f
Merge of #7238
mergify[bot] Jul 18, 2023
e504245
Merge of #7229
mergify[bot] Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies = [
"arc-swap",
"backtrace",
"canonical-path",
"clap 4.3.11",
"clap 4.3.14",
"color-eyre",
"fs-err",
"once_cell",
Expand Down Expand Up @@ -753,9 +753,9 @@ dependencies = [

[[package]]
name = "clap"
version = "4.3.11"
version = "4.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d"
checksum = "98330784c494e49850cb23b8e2afcca13587d2500b2e3f1f78ae20248059c9be"
dependencies = [
"clap_builder",
"clap_derive",
Expand All @@ -764,9 +764,9 @@ dependencies = [

[[package]]
name = "clap_builder"
version = "4.3.11"
version = "4.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b"
checksum = "e182eb5f2562a67dda37e2c57af64d720a9e010c5e860ed87c056586aeafa52e"
dependencies = [
"anstream",
"anstyle",
Expand All @@ -777,9 +777,9 @@ dependencies = [

[[package]]
name = "clap_derive"
version = "4.3.2"
version = "4.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
dependencies = [
"heck 0.4.1",
"proc-macro2 1.0.63",
Expand Down Expand Up @@ -935,7 +935,7 @@ dependencies = [
"anes",
"cast",
"ciborium",
"clap 4.3.11",
"clap 4.3.14",
"criterion-plot",
"is-terminal",
"itertools 0.10.5",
Expand Down Expand Up @@ -5935,7 +5935,7 @@ dependencies = [
"abscissa_core",
"atty",
"chrono",
"clap 4.3.11",
"clap 4.3.14",
"color-eyre",
"console-subscriber",
"dirs",
Expand Down
2 changes: 1 addition & 1 deletion zebrad/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ zebra-state = { path = "../zebra-state", version = "1.0.0-beta.27" }
zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.27", optional = true }

abscissa_core = "0.7.0"
clap = { version = "4.3.11", features = ["cargo"] }
clap = { version = "4.3.14", features = ["cargo"] }
chrono = { version = "0.4.26", default-features = false, features = ["clock", "std"] }
humantime-serde = "1.1.1"
indexmap = "2.0.0"
Expand Down