Skip to content

Commit

Permalink
Upgrade dependencies (#3625)
Browse files Browse the repository at this point in the history
* Upgrade some dependencies

* Upgrade some dependencies

* Upgrade dependencies for zebrad

* Upgrade tracing dependencies

* Revert `tor` & `arti`

* Upgrade `criterion` & `pin-project` in `deny.toml`

* Remove some dependencies from `skip-tree` in `deny.toml`

* Revert some the versions of dependencies because of duplicates

* Revert proptest regressions

* Upgrade dependencies, then ignore some more duplicates (#3716)

* feat(actions)!: add full sync test (#3582)

* add(tests): full sync test

* fix(test): add build

* fix(deploy): escape double dashes '--' correctly

* fix(test): remove unexpected --no-capture arg

error: Found argument '--nocapture' which wasn't expected, or isn't valid in this context

* refactor(docker): use default executable as entrypoint

* refactor(startup): add a custom entrypoint

* fix(test): add missing TEST_FULL_SYNC variable

* test(timeout): use the biggest machine

* fix

* fix(deploy): use latest successful image

* typo

* refactor(docker): generate config file at startup

* revert(build): changes were made to docker

* fix(docker): send variables correctly to the entrypoint

* test different conf file approach

* fix(env): add RUN_TEST env variable

* ref: use previous approach

* fix(color): use environment variable

* fix(resources): use our normal machine size

* fix(ci): double CPU and RAM for full sync test

* fix(test): check for zebrad test output in the correct order

The mempool is only activated once, so we must check for that log first.
After mempool activation, the stop regex is logged at least once.
(It might be logged before as well, but we can't rely on that.)

When checking that the mempool didn't activate,
wait for the `zebrad` command to exit,
then check the entire log.

* fix(ci): run full sync test with full compiler optimisations

* fix(tests): reintroduce tests and run full sync on approval

* fix(tests): reduce the changelog

Co-authored-by: teor <teor@riseup.net>

* fix(ci): update CI job path triggers (#3692)

* ci(test): re-run tests when snapshot data changes

* fix(ci): rebuild state when disk format changes

* fix(ci): rebuild rust docs when code or dependencies change

* doc(ci): explain why we run jobs when files change

Co-authored-by: Gustavo Valverde <gustavo@iterativo.do>

* fix(build): use the right multistage target (#3700)

* fix(review): only assign one reviewer to general Rust reviews (#3708)

If we assign two teams, GitHub assigns two reviewers.

* fix(ci): change the color-eyre ignore to a tracing-subscriber ignore

* fix(ci): ignore duplicate darling dependencies

* doc(ci): remove an alternative resolution doc

Co-authored-by: Gustavo Valverde <gustavo@iterativo.do>

Co-authored-by: teor <teor@riseup.net>
Co-authored-by: Gustavo Valverde <gustavo@iterativo.do>
  • Loading branch information
3 people authored Mar 7, 2022
1 parent 699c062 commit 2cc7e15
Show file tree
Hide file tree
Showing 13 changed files with 811 additions and 862 deletions.
1,450 changes: 703 additions & 747 deletions Cargo.lock

Large diffs are not rendered by default.

19 changes: 6 additions & 13 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ skip = [
# by default infinite
skip-tree = [
# ticket #2983: criterion dependencies
{ name = "criterion", version = "=0.3.4" },
{ name = "criterion", version = "=0.3.5" },

# ticket #3000: tower-fallback dependencies
{ name = "pin-project", version = "=0.4.28" },
{ name = "pin-project", version = "=0.4.29" },

# ticket #3063: redjubjub dependencies
{ name = "redjubjub", version = "=0.4.0" },
Expand All @@ -46,34 +46,27 @@ skip-tree = [
# ticket #2984: owo-colors dependencies
{ name = "color-eyre", version = "=0.5.11" },

# ticket #3061: reqwest and minreq dependencies
{ name = "webpki-roots", version = "=0.18.0" },

# ticket #2980: inferno and orchard/cryptographic dependencies
{ name = "orchard", version = "=0.0.0" },

# upgrade orchard from deprecated `bigint` to `uint`: https://github.com/zcash/orchard/issues/219
# alternative: downgrade Zebra to `bigint`
{ name = "bigint", version = "=4.4.3" },

# upgrade sentry, metrics-exporter-prometheus, reqwest, hyper,
# which needs #2953: upgrade tracing to the latest major version
#
# also wait for tower-test and tokio-test to upgrade
{ name = "tokio-util", version = "=0.6.9" },
{ name = "tracing-subscriber", version = "=0.1.6" },

# upgrade abscissa and arti
{ name = "darling", version = "=0.10.2" },

# recent major version bumps
# we should re-check these dependencies in February 2022

# wait for lots of crates in the cryptographic ecosystem to upgrade
{ name = "rand", version = "=0.7.3" },
{ name = "rustls", version = "=0.19.1" },

# wait for lots of crates in the tokio ecosystem to upgrade
{ name = "socket2", version = "=0.3.16" },

# wait for arti to stabilise
{ name = "arti-client" },
]

# This section is considered when running `cargo deny check sources`.
Expand Down
16 changes: 8 additions & 8 deletions tower-batch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ edition = "2021"

[dependencies]
futures = "0.3.21"
futures-core = "0.3.19"
pin-project = "1.0.7"
tokio = { version = "1.16.1", features = ["time", "sync", "tracing", "macros"] }
futures-core = "0.3.21"
pin-project = "1.0.10"
tokio = { version = "1.17.0", features = ["time", "sync", "tracing", "macros"] }
tower = { version = "0.4.12", features = ["util", "buffer"] }
tracing = "0.1.29"
tracing = "0.1.31"
tracing-futures = "0.2.5"

[dev-dependencies]
color-eyre = "0.5.11"
color-eyre = "0.6.0"
ed25519-zebra = "3.0.0"
rand = "0.8"
tokio = { version = "1.16.1", features = ["full"]}
rand = { version = "0.8.5", package = "rand" }
tokio = { version = "1.17.0", features = ["full"] }
tokio-test = "0.4.2"
tower-fallback = { path = "../tower-fallback/" }
tower-test = "0.4.0"
tracing = "0.1.29"
tracing = "0.1.31"
zebra-test = { path = "../zebra-test/" }
10 changes: 5 additions & 5 deletions tower-fallback/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ license = "MIT"
edition = "2021"

[dependencies]
tower = "0.4"
futures-core = "0.3.19"
pin-project = "0.4.27"
tracing = "0.1"
pin-project = "0.4.29"
tower = "0.4.12"
futures-core = "0.3.21"
tracing = "0.1.31"

[dev-dependencies]
zebra-test = { path = "../zebra-test/" }
tokio = { version = "1.16.1", features = ["full"]}
tokio = { version = "1.17.0", features = ["full"] }
46 changes: 23 additions & 23 deletions zebra-chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,33 @@ bench = ["zebra-test"]
aes = "0.7.5"
bech32 = "0.8.1"
bigint = "4.4.3"
bitflags = "1.2.1"
bitvec = "0.22"
blake2b_simd = "0.5.11"
bitflags = "1.3.2"
blake2b_simd = "1.0.0"
blake2s_simd = "0.5.11"
bls12_381 = "0.6.0"
bs58 = { version = "0.4", features = ["check"] }
byteorder = "1.4"
chrono = { version = "0.4", features = ["serde"] }
displaydoc = "0.2.2"
bs58 = { version = "0.4.0", features = ["check"] }
byteorder = "1.4.3"
chrono = { version = "0.4.19", features = ["serde"] }
displaydoc = "0.2.3"
fpe = "0.5.1"
futures = "0.3"
futures = "0.3.21"
group = "0.11.0"
halo2 = "=0.1.0-beta.1"
hex = "0.4"
incrementalmerkletree = "0.1.0"
hex = "0.4.3"
incrementalmerkletree = "0.2.0"
itertools = "0.10.3"
jubjub = "0.8.0"
lazy_static = "1.4.0"
rand_core = "0.6"
rand_core = "0.6.3"
ripemd160 = "0.9"
serde = { version = "1.0.136", features = ["serde_derive", "rc"] }
secp256k1 = { version = "0.21.3", features = ["serde"] }
serde = { version = "1", features = ["serde_derive", "rc"] }
serde-big-array = "0.3.2"
sha2 = { version = "0.9.9", features=["compress"] }
static_assertions = "1.1.0"
subtle = "2.4"
thiserror = "1"
subtle = "2.4.1"
thiserror = "1.0.30"
uint = "0.9.3"
x25519-dalek = { version = "1.2.0", features = ["serde"] }

Expand All @@ -58,9 +58,9 @@ zcash_history = { git = "https://github.com/ZcashFoundation/librustzcash.git", t
proptest = { version = "0.10.1", optional = true }
proptest-derive = { version = "0.3.0", optional = true }

rand = { version = "0.8", optional = true }
rand_chacha = { version = "0.3", optional = true }
tokio = { version = "1.16.1", optional = true }
rand = { version = "0.8.5", optional = true, package = "rand" }
rand_chacha = { version = "0.3.1", optional = true }
tokio = { version = "1.17.0", optional = true }

# ZF deps
ed25519-zebra = "3.0.0"
Expand All @@ -70,18 +70,18 @@ redjubjub = { git = "https://github.com/ZcashFoundation/redjubjub.git", rev = "a
zebra-test = { path = "../zebra-test/", optional = true }

[dev-dependencies]
color-eyre = "0.5.11"
criterion = { version = "0.3", features = ["html_reports"] }
color-eyre = "0.6.0"
criterion = { version = "0.3.5", features = ["html_reports"] }
itertools = "0.10.3"
spandoc = "0.2"
tracing = "0.1.29"
spandoc = "0.2.1"
tracing = "0.1.31"

proptest = "0.10.1"
proptest-derive = "0.3.0"
rand = "0.8"
rand_chacha = "0.3"
rand = { version = "0.8.5", package = "rand" }
rand_chacha = "0.3.1"

tokio = "1.16.1"
tokio = "1.17.0"

zebra-test = { path = "../zebra-test/" }

Expand Down
22 changes: 11 additions & 11 deletions zebra-consensus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,28 @@ default = []
proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl"]

[dependencies]
blake2b_simd = "0.5.11"
blake2b_simd = "1.0.0"
bellman = "0.11.1"
bls12_381 = "0.6.0"
jubjub = "0.8.0"
rand = "0.8"
rand = { version = "0.8.5", package = "rand" }

halo2 = "=0.1.0-beta.1"

chrono = "0.4.19"
dirs = "4.0.0"
displaydoc = "0.2.2"
displaydoc = "0.2.3"
lazy_static = "1.4.0"
once_cell = "1.9"
serde = { version = "1", features = ["serde_derive"] }
once_cell = "1.9.0"
serde = { version = "1.0.136", features = ["serde_derive"] }

futures = "0.3.21"
futures-util = "0.3.19"
futures-util = "0.3.21"
metrics = "0.17.1"
thiserror = "1.0.30"
tokio = { version = "1.16.1", features = ["time", "sync", "tracing"] }
tokio = { version = "1.17.0", features = ["time", "sync", "tracing"] }
tower = { version = "0.4.12", features = ["timeout", "util", "buffer"] }
tracing = "0.1.29"
tracing = "0.1.31"
tracing-futures = "0.2.5"

# TODO: replace with upstream orchard (#3056)
Expand All @@ -51,13 +51,13 @@ proptest = { version = "0.10.1", optional = true }
proptest-derive = { version = "0.3.0", optional = true }

[dev-dependencies]
color-eyre = "0.5.11"
color-eyre = "0.6.0"
hex = "0.4.3"
proptest = "0.10.1"
proptest-derive = "0.3.0"
rand07 = { package = "rand", version = "0.7" }
spandoc = "0.2"
tokio = { version = "1.16.1", features = ["full"] }
spandoc = "0.2.1"
tokio = { version = "1.17.0", features = ["full"] }
tracing-error = "0.1.2"
tracing-subscriber = "0.2.25"

Expand Down
34 changes: 17 additions & 17 deletions zebra-network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,29 @@ tor = ["arti-client", "tor-rtcompat"]
proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl"]

[dependencies]
bitflags = "1.2"
byteorder = "1.4"
bitflags = "1.3.2"
byteorder = "1.4.3"
bytes = "1.1.0"
chrono = "0.4"
hex = "0.4"
chrono = "0.4.19"
hex = "0.4.3"
lazy_static = "1.4.0"
ordered-map = "0.4.2"
pin-project = "1.0.7"
rand = "0.8"
regex = "1"
serde = { version = "1", features = ["serde_derive"] }
thiserror = "1"

futures = "0.3"
tokio = { version = "1.16.1", features = ["net", "time", "tracing", "macros", "rt-multi-thread"] }
tokio-stream = { version = "0.1.7", features = ["sync", "time"] }
pin-project = "1.0.10"
rand = { version = "0.8.5", package = "rand" }
regex = "1.5.4"
serde = { version = "1.0.136", features = ["serde_derive"] }
thiserror = "1.0.30"

futures = "0.3.21"
tokio = { version = "1.17.0", features = ["net", "time", "tracing", "macros", "rt-multi-thread"] }
tokio-stream = { version = "0.1.8", features = ["sync", "time"] }
tokio-util = { version = "0.7.0", features = ["codec"] }
tower = { version = "0.4.12", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] }

metrics = "0.17.1"
tracing = "0.1"
tracing-futures = "0.2"
tracing-futures = "0.2.5"
tracing-error = { version = "0.1.2", features = ["traced-error"] }
tracing = "0.1.31"

# tor dependencies
arti-client = { version = "0.0.2", optional = true }
Expand All @@ -52,8 +52,8 @@ proptest = "0.10.1"
proptest-derive = "0.3.0"

static_assertions = "1.1.0"
tokio = { version = "1.16.1", features = ["test-util"] }
toml = "0.5"
tokio = { version = "1.17.0", features = ["test-util"] }
toml = "0.5.8"

zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
zebra-test = { path = "../zebra-test/" }
10 changes: 5 additions & 5 deletions zebra-rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ zebra-node-services = { path = "../zebra-node-services" }

zebra-network = { path = "../zebra-network" }

futures = "0.3"
futures = "0.3.21"

# lightwalletd sends JSON-RPC requests over HTTP 1.1
hyper = { version = "0.14.17", features = ["http1", "server"] }
Expand All @@ -22,14 +22,14 @@ jsonrpc-core = "18.0.0"
jsonrpc-derive = "18.0.0"
jsonrpc-http-server = "18.0.0"

tokio = { version = "1.16.1", features = ["time", "rt-multi-thread", "macros", "tracing"] }
tokio = { version = "1.17.0", features = ["time", "rt-multi-thread", "macros", "tracing"] }
tower = "0.4.12"

tracing = "0.1"
tracing-futures = "0.2"
tracing = "0.1.31"
tracing-futures = "0.2.5"

serde = { version = "1.0.136", features = ["serde_derive"] }
hex = "0.4.3"
serde = { version = "1", features = ["serde_derive"] }

[dev-dependencies]
proptest = "0.10.1"
Expand Down
2 changes: 1 addition & 1 deletion zebra-script/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ zcash_script = { git = "https://github.com/ZcashFoundation/zcash_script.git", re
zebra-chain = { path = "../zebra-chain" }

thiserror = "1.0.30"
displaydoc = "0.2.2"
displaydoc = "0.2.3"

[dev-dependencies]
hex = "0.4.3"
Expand Down
22 changes: 11 additions & 11 deletions zebra-state/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,45 +9,45 @@ edition = "2021"
proptest-impl = ["proptest", "proptest-derive", "zebra-test"]

[dependencies]
bincode = "1"
bincode = "1.3.3"
chrono = "0.4.19"
dirs = "4.0.0"
displaydoc = "0.2.2"
displaydoc = "0.2.3"
futures = "0.3.21"
hex = "0.4.3"
lazy_static = "1.4.0"
metrics = "0.17.1"
mset = "0.1.0"
proptest = { version = "0.10.1", optional = true }
proptest-derive = { version = "0.3.0", optional = true }
regex = "1"
regex = "1.5.4"
rlimit = "0.7.0"
rocksdb = "0.17.0"
serde = { version = "1", features = ["serde_derive"] }
rocksdb = "0.18.0"
serde = { version = "1.0.136", features = ["serde_derive"] }
tempfile = "3.3.0"
thiserror = "1.0.30"
tokio = { version = "1.16.1", features = ["sync"] }
tokio = { version = "1.17.0", features = ["sync"] }
tower = { version = "0.4.12", features = ["buffer", "util"] }
tracing = "0.1"
tracing = "0.1.31"

zebra-chain = { path = "../zebra-chain" }
zebra-test = { path = "../zebra-test/", optional = true }

[dev-dependencies]
color-eyre = "0.5.11"
once_cell = "1.9"
color-eyre = "0.6.0"
once_cell = "1.9.0"
insta = { version = "1.12.0", features = ["ron"] }
itertools = "0.10.3"
proptest = "0.10.1"
proptest-derive = "0.3.0"
spandoc = "0.2"
spandoc = "0.2.1"

# TODO: replace w/ crate version when released: https://github.com/ZcashFoundation/zebra/issues/2083
# Note: if updating this, also update the workspace Cargo.toml to match.
halo2 = "=0.1.0-beta.1"
jubjub = "0.8.0"

tokio = { version = "1.16.1", features = ["full"] }
tokio = { version = "1.17.0", features = ["full"] }

zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
zebra-test = { path = "../zebra-test/" }
Loading

0 comments on commit 2cc7e15

Please sign in to comment.