merge-queue: embarking main (11baba5) and [#5932 + #5926 + #5892 + #5874 + #5931] together

.github/workflows/continous-delivery.yml

@@ -99,6 +99,10 @@ jobs:
     if: ${{ !cancelled() && !failure() && ((github.event_name == 'push' && github.ref_name == 'main') || github.event_name == 'release') }}
 
     steps:
+      - uses: actions/[email protected]
+        with:
+          persist-credentials: false
+
       - name: Inject slug/short variables
         uses: rlespinasse/github-slug-action@v4
         with:
@@ -189,6 +193,10 @@ jobs:
     if: github.event_name == 'workflow_dispatch'
 
     steps:
+      - uses: actions/[email protected]
+        with:
+          persist-credentials: false
+
       - name: Inject slug/short variables
         uses: rlespinasse/github-slug-action@v4
         with:
@@ -217,8 +225,9 @@ jobs:
           --container-stdin \
           --container-tty \
           --container-image ${{ env.GAR_BASE }}/zebrad@${{ needs.build.outputs.image_digest }} \
-          --create-disk=name=auto-delete=yes,size=300GB,type=pd-ssd \
-          --container-mount-disk=mount-path='/zebrad-cache' \
+          --create-disk=auto-delete=yes,size=300GB,type=pd-ssd \
+          --create-disk=name=zebrad-cache-${{ env.GITHUB_SHA_SHORT }},auto-delete=yes,size=300GB,type=pd-ssd \
+          --container-mount-disk=mount-path='/zebrad-cache',name=zebrad-cache-${{ env.GITHUB_SHA_SHORT }} \
           --machine-type ${{ env.MACHINE_TYPE }} \
           --zone ${{ env.ZONE }} \
           --labels=app=zebrad,environment=qa,network=${NETWORK},github_ref=${{ env.GITHUB_REF_SLUG_URL }} \

.github/workflows/lint.yml

@@ -37,7 +37,7 @@ jobs:
 
       - name: Rust files
         id: changed-files-rust
-        uses: tj-actions/changed-files@v35.3.1
+        uses: tj-actions/changed-files@v35.4.0
         with:
           files: |
             **/*.rs
@@ -49,7 +49,7 @@ jobs:
 
       - name: Workflow files
         id: changed-files-workflows
-        uses: tj-actions/changed-files@v35.3.1
+        uses: tj-actions/changed-files@v35.4.0
         with:
           files: |
             .github/workflows/*.yml

book/book.toml

@@ -14,3 +14,4 @@ command = "mdbook-mermaid"
 
 [output.html]
 additional-js = ["mermaid.min.js", "mermaid-init.js"]
+additional-css = ["theme/css/custom.css"]

book/src/dev/overview.md

@@ -1,6 +1,6 @@
 # Design Overview
 
-This document sketches the future design for Zebra.
+This document sketches the design for Zebra.
 
 ## Desiderata
 
@@ -34,6 +34,46 @@ The following are general desiderata for Zebra:
   lightweight applications like light wallets. Those applications
   should use a light client protocol.
 
+## Notable Blog Posts
+- [A New Network Stack For Zcash](https://www.zfnd.org/blog/a-new-network-stack-for-zcash)
+- [Composable Futures-based Batch Verification](https://www.zfnd.org/blog/futures-batch-verification)
+- [Decoding Bitcoin Messages with Tokio Codecs](https://www.zfnd.org/blog/decoding-bitcoin-messages-with-tokio-codecs)
+
+## Service Dependencies
+
+Note: dotted lines are for "getblocktemplate-rpcs" feature
+
+<div id="service-dep-diagram">
+{{#include diagrams/service-dependencies.svg}}
+</div>
+
+<!-- 
+Service dependencies diagram source:
+
+digraph services {
+    transaction_verifier -> state
+    mempool -> state
+    inbound -> state
+    rpc_server -> state
+    mempool -> transaction_verifier
+    chain_verifier -> checkpoint_verifier
+    inbound -> mempool
+    rpc_server -> mempool
+    inbound -> chain_verifier
+    syncer -> chain_verifier
+    rpc_server -> chain_verifier [style=dotted]
+    syncer -> peer_set
+    mempool -> peer_set
+    block_verifier -> state
+    checkpoint_verifier -> state
+    block_verifier -> transaction_verifier
+    chain_verifier -> block_verifier
+    rpc_server -> inbound [style=invis] // for layout of the diagram
+}
+
+Render here: https://dreampuf.github.io/GraphvizOnline
+ -->
+
 ## Architecture
 
 Unlike `zcashd`, which originated as a Bitcoin Core fork and inherited its
@@ -278,7 +318,8 @@ verify blocks or transactions, and add them to the relevant state.
 #### Internal Dependencies
 
 - `zebra-chain` for data structure definitions
-- `zebra-network` possibly? for definitions of network messages?
+- `zebra-node-services` for shared request type definitions
+- `zebra-utils` for developer and power user tools
 
 #### Responsible for
 

book/src/dev/rfcs/0001-pipelinable-block-lookup.md

@@ -1,7 +1,7 @@
 - Feature Name: Pipelinable Block Syncing and Lookup
 - Start Date: 2020-07-02
-- Design PR: [rust-lang/rfcs#0000](https://github.com/rust-lang/rfcs/pull/0000)
-- Rust Issue: [rust-lang/rust#0000](https://github.com/rust-lang/rust/issues/0000)
+- Design PR: [ZcashFoundation/zebra#583](https://github.com/ZcashFoundation/zebra/pull/583)
+- Zebra Issue: [ZcashFoundation/zebra#504](https://github.com/ZcashFoundation/zebra/issues/504)
 
 # Summary
 [summary]: #summary

book/theme/css/custom.css

@@ -0,0 +1,15 @@
+#service-dep-diagram {
+    display: block;
+    margin: 0px auto;
+}
+
+#service-dep-diagram a:hover {
+    text-decoration: none;
+    opacity: 0.65;
+}
+
+html.navy #service-dep-diagram, 
+html.ayu #service-dep-diagram, 
+html.coal #service-dep-diagram {
+    filter: invert(1);
+}

zebra-network/Cargo.toml

@@ -26,7 +26,7 @@ ordered-map = "0.4.2"
 pin-project = "1.0.12"
 rand = { version = "0.8.5", package = "rand" }
 rayon = "1.6.1"
-regex = "1.7.0"
+regex = "1.7.1"
 serde = { version = "1.0.152", features = ["serde_derive"] }
 thiserror = "1.0.38"