merge-queue: embarking main (f534243) and [#4796 + #4786] together

docker/Dockerfile

@@ -9,7 +9,7 @@
 # This stage implements cargo-chef for docker layer caching
 FROM rust:bullseye as chef
 RUN cargo install cargo-chef --locked
-WORKDIR /app
+WORKDIR /opt/zebrad
 
 # Analyze the current project to determine the minimum subset of files
 # (Cargo.lock and Cargo.toml manifests) required to build it and cache dependencies
@@ -25,7 +25,7 @@ RUN cargo chef prepare --recipe-path recipe.json
 # We set defaults for the arguments, in case the build does not include this information.
 FROM chef AS deps
 SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
-COPY --from=planner /app/recipe.json recipe.json
+COPY --from=planner /opt/zebrad/recipe.json recipe.json
 
 # Install zebra build deps
 RUN apt-get -qq update && \
@@ -82,7 +82,7 @@ ENV CHECKPOINT_SYNC ${CHECKPOINT_SYNC:-true}
 ARG NETWORK
 ENV NETWORK ${NETWORK:-Mainnet}
 
-ENV CARGO_HOME /app/.cargo/
+ENV CARGO_HOME /opt/zebrad/.cargo/
 
 # In this stage we build tests (without running then)
 #
@@ -129,7 +129,7 @@ RUN cargo build --locked --release --features sentry --package zebrad --bin zebr
 # To save space, this step starts from scratch using debian, and only adds the resulting
 # binary from the `release` stage, and the Zcash Sprout & Sapling parameters from ZCash
 FROM debian:bullseye-slim AS runtime
-COPY --from=release /app/target/release/zebrad /usr/local/bin
+COPY --from=release /opt/zebrad/target/release/zebrad /usr/local/bin
 COPY --from=us-docker.pkg.dev/zealous-zebra/zebra/zcash-params /root/.zcash-params /root/.zcash-params
 
 RUN apt-get update && \

docker/zcash-lightwalletd/Dockerfile

@@ -24,7 +24,7 @@ RUN go mod download
 COPY . ./
 
 # Build and install the binary.
-RUN go build -v -o /lightwalletd
+RUN go build -v -o /opt/lightwalletd
 
 ARG ZCASHD_CONF_PATH
 
@@ -51,7 +51,7 @@ ARG LWD_HTTP_PORT
 
 WORKDIR /
 
-COPY --from=build /lightwalletd /usr/local/bin
+COPY --from=build /opt/lightwalletd /usr/local/bin
 COPY --from=build $ZCASHD_CONF_PATH ./
 
 EXPOSE 9067

docker/zcash-params/Dockerfile

@@ -2,14 +2,14 @@
 # This image is for caching Zcash Sprout and Sapling parameters
 FROM rust:bullseye as chef
 RUN cargo install cargo-chef --locked
-WORKDIR /app
+WORKDIR /opt/zebrad
 
 FROM chef AS planner
 COPY . .
 RUN cargo chef prepare --recipe-path recipe.json
 
 FROM chef AS release
-COPY --from=planner /app/recipe.json recipe.json
+COPY --from=planner /opt/zebrad/recipe.json recipe.json
 
 # Install zebra build deps
 RUN apt-get -qq update && \
@@ -21,7 +21,7 @@ RUN apt-get -qq update && \
     ; \
     rm -rf /var/lib/apt/lists/* /tmp/*
 
-ENV CARGO_HOME /app/.cargo/
+ENV CARGO_HOME /opt/zebrad/.cargo/
 # Build dependencies - this is the caching Docker layer!
 RUN cargo chef cook --release --features sentry --package zebrad --recipe-path recipe.json
 

tower-batch/Cargo.toml

@@ -18,6 +18,10 @@ tracing-futures = "0.2.5"
 
 [dev-dependencies]
 color-eyre = "0.6.1"
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
+
 ed25519-zebra = "3.0.0"
 rand = { version = "0.8.5", package = "rand" }
 

zebra-chain/Cargo.toml

@@ -85,12 +85,14 @@ tokio = { version = "1.20.1", features = ["tracing"], optional = true }
 zebra-test = { path = "../zebra-test/", optional = true }
 
 [dev-dependencies]
-
 # Benchmarks
 criterion = { version = "0.3.5", features = ["html_reports"] }
 
 # Error Handling & Formatting
 color-eyre = "0.6.1"
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
 spandoc = "0.2.2"
 tracing = "0.1.31"
 

zebra-consensus/Cargo.toml

@@ -52,6 +52,10 @@ proptest-derive = { version = "0.3.0", optional = true }
 
 [dev-dependencies]
 color-eyre = "0.6.1"
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
+
 hex = "0.4.3"
 proptest = "0.10.1"
 proptest-derive = "0.3.0"

zebra-state/Cargo.toml

@@ -39,6 +39,10 @@ proptest-derive = { version = "0.3.0", optional = true }
 
 [dev-dependencies]
 color-eyre = "0.6.1"
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
+
 once_cell = "1.13.0"
 spandoc = "0.2.2"
 

zebra-test/Cargo.toml

@@ -22,6 +22,10 @@ tower = { version = "0.4.13", features = ["util"] }
 futures = "0.3.21"
 
 color-eyre = "0.6.1"
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
+
 owo-colors = "3.4.0"
 spandoc = "0.2.2"
 thiserror = "1.0.31"

zebra-utils/Cargo.toml

@@ -8,8 +8,12 @@ edition = "2021"
 publish = false
 
 [dependencies]
-structopt = "0.3.26"
 color-eyre = "0.6.1"
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
+
+structopt = "0.3.26"
 hex = "0.4.3"
 serde_json = "1.0.83"
 tracing-error = "0.2.0"

zebrad/Cargo.toml

@@ -92,6 +92,10 @@ tower = { version = "0.4.13", features = ["hedge", "limit"] }
 pin-project = "1.0.10"
 
 color-eyre = { version = "0.6.1", default_features = false, features = ["issue-url"] }
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
+
 thiserror = "1.0.31"
 
 tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }