merge-queue: embarking main (69751e9) and [#4864 + #4865 + #4843 + #4817] together

README.md

@@ -1,17 +1,26 @@
 ![Zebra logotype](https://zfnd.org/wp-content/uploads/2022/03/zebra-logotype.png)
 
 ---
+[![CI Docker](https://github.com/ZcashFoundation/zebra/actions/workflows/continous-integration-docker.yml/badge.svg)](https://github.com/ZcashFoundation/zebra/actions/workflows/continous-integration-docker.yml) [![CI OSes](https://github.com/ZcashFoundation/zebra/actions/workflows/continous-integration-os.yml/badge.svg)](https://github.com/ZcashFoundation/zebra/actions/workflows/continous-integration-os.yml) [![Continuous Delivery](https://github.com/ZcashFoundation/zebra/actions/workflows/continous-delivery.yml/badge.svg)](https://github.com/ZcashFoundation/zebra/actions/workflows/continous-delivery.yml) [![Coverage](https://github.com/ZcashFoundation/zebra/actions/workflows/coverage.yml/badge.svg)](https://github.com/ZcashFoundation/zebra/actions/workflows/coverage.yml) [![codecov](https://codecov.io/gh/ZcashFoundation/zebra/branch/main/graph/badge.svg)](https://codecov.io/gh/ZcashFoundation/zebra) [![Build docs](https://github.com/ZcashFoundation/zebra/actions/workflows/docs.yml/badge.svg)](https://github.com/ZcashFoundation/zebra/actions/workflows/docs.yml) [![Build lightwalletd](https://github.com/ZcashFoundation/zebra/actions/workflows/zcash-lightwalletd.yml/badge.svg)](https://github.com/ZcashFoundation/zebra/actions/workflows/zcash-lightwalletd.yml) [![Build Zcash Params](https://github.com/ZcashFoundation/zebra/actions/workflows/zcash-params.yml/badge.svg)](https://github.com/ZcashFoundation/zebra/actions/workflows/zcash-params.yml)
 
-[![](https://github.com/ZcashFoundation/zebra/workflows/CI/badge.svg?branch=main)](https://github.com/ZcashFoundation/zebra/actions?query=workflow%3ACI+branch%3Amain)
-[![codecov](https://codecov.io/gh/ZcashFoundation/zebra/branch/main/graph/badge.svg)](https://codecov.io/gh/ZcashFoundation/zebra)
 ![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)
 
 ## Contents
 
 - [Contents](#contents)
 - [About](#about)
+  - [Using Zebra](#using-zebra)
 - [Beta Releases](#beta-releases)
 - [Getting Started](#getting-started)
+  - [Build and Run Instructions](#build-and-run-instructions)
+  - [Optional Features](#optional-features)
+  - [System Requirements](#system-requirements)
+    - [Memory Troubleshooting](#memory-troubleshooting)
+    - [macOS Test Troubleshooting](#macos-test-troubleshooting)
+  - [Network Ports and Data Usage](#network-ports-and-data-usage)
+    - [Network Troubleshooting](#network-troubleshooting)
+  - [Disk Usage](#disk-usage)
+    - [Disk Troubleshooting](#disk-troubleshooting)
 - [Known Issues](#known-issues)
 - [Future Work](#future-work)
 - [Documentation](#documentation)

tower-batch/Cargo.toml

@@ -10,7 +10,7 @@ futures = "0.3.21"
 futures-core = "0.3.21"
 pin-project = "1.0.10"
 rayon = "1.5.3"
-tokio = { version = "1.20.0", features = ["time", "sync", "tracing", "macros"] }
+tokio = { version = "1.20.1", features = ["time", "sync", "tracing", "macros"] }
 tokio-util = "0.7.3"
 tower = { version = "0.4.13", features = ["util", "buffer"] }
 tracing = "0.1.31"
@@ -21,7 +21,7 @@ color-eyre = "0.6.1"
 ed25519-zebra = "3.0.0"
 rand = { version = "0.8.5", package = "rand" }
 
-tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
 tokio-test = "0.4.2"
 tower-fallback = { path = "../tower-fallback/" }
 tower-test = "0.4.0"

tower-fallback/Cargo.toml

@@ -12,6 +12,6 @@ futures-core = "0.3.21"
 tracing = "0.1.31"
 
 [dev-dependencies]
-tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
 
 zebra-test = { path = "../zebra-test/" }

zebra-chain/Cargo.toml

@@ -60,7 +60,7 @@ tracing = "0.1.31"
 
 # Serialization
 hex = { version = "0.4.3", features = ["serde"] }
-serde = { version = "1.0.137", features = ["serde_derive", "rc"] }
+serde = { version = "1.0.141", features = ["serde_derive", "rc"] }
 serde_with = "2.0.0"
 serde-big-array = "0.4.1"
 
@@ -80,7 +80,7 @@ proptest-derive = { version = "0.3.0", optional = true }
 rand = { version = "0.8.5", optional = true, package = "rand" }
 rand_chacha = { version = "0.3.1", optional = true }
 
-tokio = { version = "1.20.0", features = ["tracing"], optional = true }
+tokio = { version = "1.20.1", features = ["tracing"], optional = true }
 
 zebra-test = { path = "../zebra-test/", optional = true }
 
@@ -101,7 +101,7 @@ proptest-derive = "0.3.0"
 rand = { version = "0.8.5", package = "rand" }
 rand_chacha = "0.3.1"
 
-tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
 
 zebra-test = { path = "../zebra-test/" }
 

zebra-consensus/Cargo.toml

@@ -23,13 +23,13 @@ dirs = "4.0.0"
 displaydoc = "0.2.3"
 lazy_static = "1.4.0"
 once_cell = "1.13.0"
-serde = { version = "1.0.137", features = ["serde_derive"] }
+serde = { version = "1.0.141", features = ["serde_derive"] }
 
 futures = "0.3.21"
 futures-util = "0.3.21"
 metrics = "0.18.1"
 thiserror = "1.0.31"
-tokio = { version = "1.20.0", features = ["time", "sync", "tracing", "rt-multi-thread"] }
+tokio = { version = "1.20.1", features = ["time", "sync", "tracing", "rt-multi-thread"] }
 tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] }
 tracing = "0.1.31"
 tracing-futures = "0.2.5"
@@ -58,7 +58,7 @@ proptest-derive = "0.3.0"
 rand07 = { package = "rand", version = "0.7" }
 spandoc = "0.2.2"
 
-tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
 tracing-error = "0.2.0"
 tracing-subscriber = "0.3.11"
 

zebra-network/Cargo.toml

@@ -15,7 +15,7 @@ proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl"]
 [dependencies]
 bitflags = "1.3.2"
 byteorder = "1.4.3"
-bytes = "1.1.0"
+bytes = "1.2.1"
 chrono = "0.4.19"
 hex = "0.4.3"
 humantime-serde = "1.1.1"
@@ -26,11 +26,11 @@ pin-project = "1.0.10"
 rand = { version = "0.8.5", package = "rand" }
 rayon = "1.5.3"
 regex = "1.6.0"
-serde = { version = "1.0.137", features = ["serde_derive"] }
+serde = { version = "1.0.141", features = ["serde_derive"] }
 thiserror = "1.0.31"
 
 futures = "0.3.21"
-tokio = { version = "1.20.0", features = ["net", "time", "tracing", "macros", "rt-multi-thread"] }
+tokio = { version = "1.20.1", features = ["net", "time", "tracing", "macros", "rt-multi-thread"] }
 tokio-stream = { version = "0.1.9", features = ["sync", "time"] }
 tokio-util = { version = "0.7.3", features = ["codec"] }
 tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] }
@@ -55,7 +55,7 @@ proptest = "0.10.1"
 proptest-derive = "0.3.0"
 
 static_assertions = "1.1.0"
-tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
 toml = "0.5.9"
 
 zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }

zebra-rpc/Cargo.toml

@@ -30,14 +30,14 @@ jsonrpc-http-server = "18.0.0"
 serde_json = { version = "1.0.82", features = ["preserve_order"] }
 indexmap = { version = "1.9.1", features = ["serde"] }
 
-tokio = { version = "1.20.0", features = ["time", "rt-multi-thread", "macros", "tracing"] }
+tokio = { version = "1.20.1", features = ["time", "rt-multi-thread", "macros", "tracing"] }
 tower = "0.4.13"
 
 tracing = "0.1.31"
 tracing-futures = "0.2.5"
 
 hex = { version = "0.4.3", features = ["serde"] }
-serde = { version = "1.0.137", features = ["serde_derive"] }
+serde = { version = "1.0.141", features = ["serde_derive"] }
 
 proptest = { version = "0.10.1", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
@@ -49,7 +49,7 @@ proptest-derive = "0.3.0"
 serde_json = "1.0.82"
 thiserror = "1.0.31"
 
-tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
 
 zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
 zebra-state = { path = "../zebra-state", features = ["proptest-impl"] }

zebra-state/Cargo.toml

@@ -22,12 +22,12 @@ mset = "0.1.0"
 regex = "1.6.0"
 rlimit = "0.8.3"
 rocksdb = { version = "0.18.0", default_features = false, features = ["lz4"] }
-serde = { version = "1.0.137", features = ["serde_derive"] }
+serde = { version = "1.0.141", features = ["serde_derive"] }
 tempfile = "3.3.0"
 thiserror = "1.0.31"
 
 rayon = "1.5.3"
-tokio = { version = "1.20.0", features = ["sync", "tracing"] }
+tokio = { version = "1.20.1", features = ["sync", "tracing"] }
 tower = { version = "0.4.13", features = ["buffer", "util"] }
 tracing = "0.1.31"
 
@@ -51,7 +51,7 @@ proptest-derive = "0.3.0"
 halo2 = { package = "halo2_proofs", version = "0.2.0" }
 jubjub = "0.9.0"
 
-tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
 
 zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
 zebra-test = { path = "../zebra-test/" }

zebra-test/Cargo.toml

@@ -17,7 +17,7 @@ once_cell = "1.13.0"
 rand = { version = "0.8.5", package = "rand" }
 regex = "1.6.0"
 
-tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
 tower = { version = "0.4.13", features = ["util"] }
 futures = "0.3.21"
 

zebrad/Cargo.toml

@@ -82,12 +82,12 @@ humantime = "2.1.0"
 humantime-serde = "1.1.1"
 indexmap = "1.9.1"
 lazy_static = "1.4.0"
-serde = { version = "1.0.137", features = ["serde_derive"] }
+serde = { version = "1.0.141", features = ["serde_derive"] }
 toml = "0.5.9"
 
 futures = "0.3.21"
 rayon = "1.5.3"
-tokio = { version = "1.20.0", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] }
+tokio = { version = "1.20.1", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] }
 tower = { version = "0.4.13", features = ["hedge", "limit"] }
 pin-project = "1.0.10"
 
@@ -157,7 +157,7 @@ tempfile = "3.3.0"
 hyper = { version = "0.14.20", features = ["http1", "http2", "server"]}
 reqwest = "0.11.11"
 
-tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
 tokio-stream = "0.1.9"
 
 # test feature lightwalletd-grpc-tests