diff --git a/zcash-wallet-dag.svg b/zcash-wallet-dag.svg
index 17f7a4ac..2db01d99 100644
--- a/zcash-wallet-dag.svg
+++ b/zcash-wallet-dag.svg
@@ -4,10 +4,10 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Pages: 1 -->
-<svg width="824pt" height="721pt"
- viewBox="0.00 0.00 824.00 721.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 717)">
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-717 820,-717 820,4 -4,4"/>
+<svg width="824pt" height="642pt"
+ viewBox="0.00 0.00 824.00 642.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 638)">
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-638 820,-638 820,4 -4,4"/>
 <!-- zcash/librustzcash#226 -->
 <g id="node1" class="node">
 <title>zcash/librustzcash#226</title>
@@ -177,42 +177,14 @@
 <path fill="none" stroke="#000000" d="M278.1,-536.5C286.49,-536.5 294.96,-536.5 303.4,-536.5"/>
 <polygon fill="#000000" stroke="#000000" points="303.67,-540.0001 313.67,-536.5 303.67,-533.0001 303.67,-540.0001"/>
 </g>
-<!-- zcash/ZcashLightClientKit#305 -->
-<g id="node13" class="node">
-<title>zcash/ZcashLightClientKit#305</title>
-<g id="a_node13"><a xlink:href="https://github.com/zcash/ZcashLightClientKit/issues/305" xlink:title="zcash/ZcashLightClientKit#305&#10;Clear Swiftlint warnings" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="262,-641.5 16,-641.5 16,-603.5 262,-603.5 262,-641.5"/>
-<text text-anchor="middle" x="139" y="-626.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/ZcashLightClientKit#305</text>
-<text text-anchor="middle" x="139" y="-611.3" font-family="Times,serif" font-size="14.00" fill="#000000">Clear Swiftlint warnings</text>
-</a>
-</g>
-</g>
-<!-- zcash/ZcashLightClientKit#306 -->
-<g id="node14" class="node">
-<title>zcash/ZcashLightClientKit#306</title>
-<g id="a_node14"><a xlink:href="https://github.com/zcash/ZcashLightClientKit/issues/306" xlink:title="zcash/ZcashLightClientKit#306&#10;Enable SwiftLint in&#10;ZcashLightClientKitTests&#10;folder" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="576,-656.5 330,-656.5 330,-588.5 576,-588.5 576,-656.5"/>
-<text text-anchor="middle" x="453" y="-641.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/ZcashLightClientKit#306</text>
-<text text-anchor="middle" x="453" y="-626.3" font-family="Times,serif" font-size="14.00" fill="#000000">Enable SwiftLint in</text>
-<text text-anchor="middle" x="453" y="-611.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashLightClientKitTests</text>
-<text text-anchor="middle" x="453" y="-596.3" font-family="Times,serif" font-size="14.00" fill="#000000">folder</text>
-</a>
-</g>
-</g>
-<!-- zcash/ZcashLightClientKit#305&#45;&gt;zcash/ZcashLightClientKit#306 -->
-<g id="edge6" class="edge">
-<title>zcash/ZcashLightClientKit#305&#45;&gt;zcash/ZcashLightClientKit#306</title>
-<path fill="none" stroke="#000000" d="M262.2,-622.5C281.06,-622.5 300.6,-622.5 319.67,-622.5"/>
-<polygon fill="#000000" stroke="#000000" points="319.9,-626.0001 329.9,-622.5 319.9,-619.0001 319.9,-626.0001"/>
-</g>
 <!-- zcash/zcash&#45;android&#45;wallet#49 -->
-<g id="node15" class="node">
+<g id="node13" class="node">
 <title>zcash/zcash&#45;android&#45;wallet#49</title>
-<g id="a_node15"><a xlink:href="https://github.com/zcash/zcash-android-wallet/issues/49" xlink:title="zcash/zcash&#45;android&#45;wallet#49&#10;Android: Send: Press and&#10;Hold UX" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="258.5,-713 19.5,-713 19.5,-660 258.5,-660 258.5,-713"/>
-<text text-anchor="middle" x="139" y="-697.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;android&#45;wallet#49</text>
-<text text-anchor="middle" x="139" y="-682.8" font-family="Times,serif" font-size="14.00" fill="#000000">Android: Send: Press and</text>
-<text text-anchor="middle" x="139" y="-667.8" font-family="Times,serif" font-size="14.00" fill="#000000">Hold UX</text>
+<g id="a_node13"><a xlink:href="https://github.com/zcash/zcash-android-wallet/issues/49" xlink:title="zcash/zcash&#45;android&#45;wallet#49&#10;Android: Send: Press and&#10;Hold UX" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="258.5,-634 19.5,-634 19.5,-581 258.5,-581 258.5,-634"/>
+<text text-anchor="middle" x="139" y="-618.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;android&#45;wallet#49</text>
+<text text-anchor="middle" x="139" y="-603.8" font-family="Times,serif" font-size="14.00" fill="#000000">Android: Send: Press and</text>
+<text text-anchor="middle" x="139" y="-588.8" font-family="Times,serif" font-size="14.00" fill="#000000">Hold UX</text>
 </a>
 </g>
 </g>
diff --git a/zcash-zf-dag.svg b/zcash-zf-dag.svg
index 5dd4b1f7..24923062 100644
--- a/zcash-zf-dag.svg
+++ b/zcash-zf-dag.svg
@@ -4,10 +4,10 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Pages: 1 -->
-<svg width="1076pt" height="5222pt"
- viewBox="0.00 0.00 1076.00 5221.50" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 5217.5)">
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-5217.5 1072,-5217.5 1072,4 -4,4"/>
+<svg width="1076pt" height="5128pt"
+ viewBox="0.00 0.00 1076.00 5127.50" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 5123.5)">
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-5123.5 1072,-5123.5 1072,4 -4,4"/>
 <!-- ZcashFoundation/zebra#1135 -->
 <g id="node1" class="node">
 <title>ZcashFoundation/zebra#1135</title>
@@ -500,82 +500,63 @@
 </a>
 </g>
 </g>
-<!-- ZcashFoundation/zebra#2682 -->
-<g id="node33" class="node">
-<title>ZcashFoundation/zebra#2682</title>
-<g id="a_node33"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2682" xlink:title="ZcashFoundation/zebra#2682&#10;Reject duplicate UTXO&#10;spends and nullifier&#10;reveals across mempool&#10;transactions" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1790.5 16,-1790.5 16,-1707.5 248,-1707.5 248,-1790.5"/>
-<text text-anchor="middle" x="132" y="-1775.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2682</text>
-<text text-anchor="middle" x="132" y="-1760.3" font-family="Times,serif" font-size="14.00" fill="#000000">Reject duplicate UTXO</text>
-<text text-anchor="middle" x="132" y="-1745.3" font-family="Times,serif" font-size="14.00" fill="#000000">spends and nullifier</text>
-<text text-anchor="middle" x="132" y="-1730.3" font-family="Times,serif" font-size="14.00" fill="#000000">reveals across mempool</text>
-<text text-anchor="middle" x="132" y="-1715.3" font-family="Times,serif" font-size="14.00" fill="#000000">transactions</text>
-</a>
-</g>
-</g>
 <!-- ZcashFoundation/zebra#2631 -->
-<g id="node34" class="node">
+<g id="node33" class="node">
 <title>ZcashFoundation/zebra#2631</title>
-<g id="a_node34"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2631" xlink:title="ZcashFoundation/zebra#2631&#10;Send committed spent&#10;OutPoints &amp; nullifiers to&#10;the mempool for rejection" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-1783 300,-1783 300,-1715 532,-1715 532,-1783"/>
-<text text-anchor="middle" x="416" y="-1767.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2631</text>
-<text text-anchor="middle" x="416" y="-1752.8" font-family="Times,serif" font-size="14.00" fill="#000000">Send committed spent</text>
-<text text-anchor="middle" x="416" y="-1737.8" font-family="Times,serif" font-size="14.00" fill="#000000">OutPoints &amp; nullifiers to</text>
-<text text-anchor="middle" x="416" y="-1722.8" font-family="Times,serif" font-size="14.00" fill="#000000">the mempool for rejection</text>
+<g id="a_node33"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2631" xlink:title="ZcashFoundation/zebra#2631&#10;Send committed spent&#10;OutPoints &amp; nullifiers to&#10;the mempool for rejection" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1696 16,-1696 16,-1628 248,-1628 248,-1696"/>
+<text text-anchor="middle" x="132" y="-1680.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2631</text>
+<text text-anchor="middle" x="132" y="-1665.8" font-family="Times,serif" font-size="14.00" fill="#000000">Send committed spent</text>
+<text text-anchor="middle" x="132" y="-1650.8" font-family="Times,serif" font-size="14.00" fill="#000000">OutPoints &amp; nullifiers to</text>
+<text text-anchor="middle" x="132" y="-1635.8" font-family="Times,serif" font-size="14.00" fill="#000000">the mempool for rejection</text>
 </a>
 </g>
 </g>
-<!-- ZcashFoundation/zebra#2682&#45;&gt;ZcashFoundation/zebra#2631 -->
-<g id="edge21" class="edge">
-<title>ZcashFoundation/zebra#2682&#45;&gt;ZcashFoundation/zebra#2631</title>
-<path fill="none" stroke="#000000" d="M248.33,-1749C262.02,-1749 276.03,-1749 289.84,-1749"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-1752.5001 299.85,-1749 289.85,-1745.5001 289.85,-1752.5001"/>
-</g>
 <!-- ZcashFoundation/zebra#2690 -->
-<g id="node35" class="node">
+<g id="node34" class="node">
 <title>ZcashFoundation/zebra#2690</title>
-<g id="a_node35"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2690" xlink:title="ZcashFoundation/zebra#2690&#10;Add debug configs for&#10;mempool acceptance tests" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1861.5 16,-1861.5 16,-1808.5 248,-1808.5 248,-1861.5"/>
-<text text-anchor="middle" x="132" y="-1846.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2690</text>
-<text text-anchor="middle" x="132" y="-1831.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add debug configs for</text>
-<text text-anchor="middle" x="132" y="-1816.3" font-family="Times,serif" font-size="14.00" fill="#000000">mempool acceptance tests</text>
+<g id="a_node34"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2690" xlink:title="ZcashFoundation/zebra#2690&#10;Add debug configs for&#10;mempool acceptance tests" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1767.5 16,-1767.5 16,-1714.5 248,-1714.5 248,-1767.5"/>
+<text text-anchor="middle" x="132" y="-1752.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2690</text>
+<text text-anchor="middle" x="132" y="-1737.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add debug configs for</text>
+<text text-anchor="middle" x="132" y="-1722.3" font-family="Times,serif" font-size="14.00" fill="#000000">mempool acceptance tests</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2691 -->
-<g id="node36" class="node">
+<g id="node35" class="node">
 <title>ZcashFoundation/zebra#2691</title>
-<g id="a_node36"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2691" xlink:title="ZcashFoundation/zebra#2691&#10;Add `zebrad` acceptance&#10;tests for the mempool" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-1861.5 300,-1861.5 300,-1808.5 532,-1808.5 532,-1861.5"/>
-<text text-anchor="middle" x="416" y="-1846.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2691</text>
-<text text-anchor="middle" x="416" y="-1831.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add `zebrad` acceptance</text>
-<text text-anchor="middle" x="416" y="-1816.3" font-family="Times,serif" font-size="14.00" fill="#000000">tests for the mempool</text>
+<g id="a_node35"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2691" xlink:title="ZcashFoundation/zebra#2691&#10;Add `zebrad` acceptance&#10;tests for the mempool" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-1767.5 300,-1767.5 300,-1714.5 532,-1714.5 532,-1767.5"/>
+<text text-anchor="middle" x="416" y="-1752.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2691</text>
+<text text-anchor="middle" x="416" y="-1737.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add `zebrad` acceptance</text>
+<text text-anchor="middle" x="416" y="-1722.3" font-family="Times,serif" font-size="14.00" fill="#000000">tests for the mempool</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2690&#45;&gt;ZcashFoundation/zebra#2691 -->
-<g id="edge22" class="edge">
+<g id="edge21" class="edge">
 <title>ZcashFoundation/zebra#2690&#45;&gt;ZcashFoundation/zebra#2691</title>
-<path fill="none" stroke="#000000" d="M248.33,-1835C262.02,-1835 276.03,-1835 289.84,-1835"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-1838.5001 299.85,-1835 289.85,-1831.5001 289.85,-1838.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-1741C262.02,-1741 276.03,-1741 289.84,-1741"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-1744.5001 299.85,-1741 289.85,-1737.5001 289.85,-1744.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2729 -->
-<g id="node37" class="node">
+<g id="node36" class="node">
 <title>ZcashFoundation/zebra#2729</title>
-<g id="a_node37"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/2729" xlink:title="ZcashFoundation/zebra#2729&#10;Gossip recently verified&#10;block hashes to peers" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1932.5 16,-1932.5 16,-1928.5 12,-1928.5 12,-1924.5 16,-1924.5 16,-1887.5 12,-1887.5 12,-1883.5 16,-1883.5 16,-1879.5 248,-1879.5 248,-1932.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-1928.5 20,-1928.5 20,-1924.5 16,-1924.5 "/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-1887.5 20,-1887.5 20,-1883.5 16,-1883.5 "/>
-<text text-anchor="middle" x="132" y="-1917.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2729</text>
-<text text-anchor="middle" x="132" y="-1902.3" font-family="Times,serif" font-size="14.00" fill="#000000">Gossip recently verified</text>
-<text text-anchor="middle" x="132" y="-1887.3" font-family="Times,serif" font-size="14.00" fill="#000000">block hashes to peers</text>
+<g id="a_node36"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/2729" xlink:title="ZcashFoundation/zebra#2729&#10;Gossip recently verified&#10;block hashes to peers" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1838.5 16,-1838.5 16,-1834.5 12,-1834.5 12,-1830.5 16,-1830.5 16,-1793.5 12,-1793.5 12,-1789.5 16,-1789.5 16,-1785.5 248,-1785.5 248,-1838.5"/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-1834.5 20,-1834.5 20,-1830.5 16,-1830.5 "/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-1793.5 20,-1793.5 20,-1789.5 16,-1789.5 "/>
+<text text-anchor="middle" x="132" y="-1823.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2729</text>
+<text text-anchor="middle" x="132" y="-1808.3" font-family="Times,serif" font-size="14.00" fill="#000000">Gossip recently verified</text>
+<text text-anchor="middle" x="132" y="-1793.3" font-family="Times,serif" font-size="14.00" fill="#000000">block hashes to peers</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1086 -->
-<g id="node38" class="node">
+<g id="node37" class="node">
 <title>ZcashFoundation/zebra#1086</title>
-<g id="a_node38"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1086" xlink:title="ZcashFoundation/zebra#1086&#10;Remove git dependencies&#10;on Hyper, Metrics, Tower,&#10;ed25519&#45;zebra, lexical&#45;&#10;core" target="_blank">
+<g id="a_node37"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1086" xlink:title="ZcashFoundation/zebra#1086&#10;Remove git dependencies&#10;on Hyper, Metrics, Tower,&#10;ed25519&#45;zebra, lexical&#45;&#10;core" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1132.5 16,-1132.5 16,-1049.5 248,-1049.5 248,-1132.5"/>
 <text text-anchor="middle" x="132" y="-1117.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1086</text>
 <text text-anchor="middle" x="132" y="-1102.3" font-family="Times,serif" font-size="14.00" fill="#000000">Remove git dependencies</text>
@@ -586,15 +567,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1086&#45;&gt;ZcashFoundation/zebra#2200 -->
-<g id="edge23" class="edge">
+<g id="edge22" class="edge">
 <title>ZcashFoundation/zebra#1086&#45;&gt;ZcashFoundation/zebra#2200</title>
 <path fill="none" stroke="#000000" d="M232.13,-1132.6C275.23,-1150.5 323.98,-1170.8 360.45,-1185.9"/>
 <polygon fill="#000000" stroke="#000000" points="359.3462,-1189.2331 369.92,-1189.9 362.0699,-1182.7847 359.3462,-1189.2331"/>
 </g>
 <!-- ZcashFoundation/zebra#1686 -->
-<g id="node39" class="node">
+<g id="node38" class="node">
 <title>ZcashFoundation/zebra#1686</title>
-<g id="a_node39"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1686" xlink:title="ZcashFoundation/zebra#1686&#10;Delete isolated::Wrapper" target="_blank">
+<g id="a_node38"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1686" xlink:title="ZcashFoundation/zebra#1686&#10;Delete isolated::Wrapper" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="532,-1110 300,-1110 300,-1072 532,-1072 532,-1110"/>
 <text text-anchor="middle" x="416" y="-1094.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1686</text>
 <text text-anchor="middle" x="416" y="-1079.8" font-family="Times,serif" font-size="14.00" fill="#000000">Delete isolated::Wrapper</text>
@@ -602,15 +583,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1086&#45;&gt;ZcashFoundation/zebra#1686 -->
-<g id="edge24" class="edge">
+<g id="edge23" class="edge">
 <title>ZcashFoundation/zebra#1086&#45;&gt;ZcashFoundation/zebra#1686</title>
 <path fill="none" stroke="#000000" d="M248.33,-1091C262.02,-1091 276.03,-1091 289.84,-1091"/>
 <polygon fill="#000000" stroke="#000000" points="289.85,-1094.5001 299.85,-1091 289.85,-1087.5001 289.85,-1094.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2112 -->
-<g id="node40" class="node">
+<g id="node39" class="node">
 <title>ZcashFoundation/zebra#2112</title>
-<g id="a_node40"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2112" xlink:title="ZcashFoundation/zebra#2112&#10;Integrate&#10;TurboWish/tokio&#45;console" target="_blank">
+<g id="a_node39"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2112" xlink:title="ZcashFoundation/zebra#2112&#10;Integrate&#10;TurboWish/tokio&#45;console" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="532,-1022.5 300,-1022.5 300,-969.5 532,-969.5 532,-1022.5"/>
 <text text-anchor="middle" x="416" y="-1007.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2112</text>
 <text text-anchor="middle" x="416" y="-992.3" font-family="Times,serif" font-size="14.00" fill="#000000">Integrate</text>
@@ -619,15 +600,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1086&#45;&gt;ZcashFoundation/zebra#2112 -->
-<g id="edge25" class="edge">
+<g id="edge24" class="edge">
 <title>ZcashFoundation/zebra#1086&#45;&gt;ZcashFoundation/zebra#2112</title>
 <path fill="none" stroke="#000000" d="M248.33,-1052.1C274.57,-1043.3 302.01,-1034.1 326.92,-1025.8"/>
 <polygon fill="#000000" stroke="#000000" points="328.3439,-1029.0135 336.7,-1022.5 326.1058,-1022.3809 328.3439,-1029.0135"/>
 </g>
 <!-- ZcashFoundation/zebra#2193 -->
-<g id="node41" class="node">
+<g id="node40" class="node">
 <title>ZcashFoundation/zebra#2193</title>
-<g id="a_node41"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2193" xlink:title="ZcashFoundation/zebra#2193&#10;Redesign zebra&#45;network so&#10;it&#39;s less sensitive to&#10;message order, timing,&#10;buffer size" target="_blank">
+<g id="a_node40"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2193" xlink:title="ZcashFoundation/zebra#2193&#10;Redesign zebra&#45;network so&#10;it&#39;s less sensitive to&#10;message order, timing,&#10;buffer size" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="800,-1021.5 568,-1021.5 568,-938.5 800,-938.5 800,-1021.5"/>
 <text text-anchor="middle" x="684" y="-1006.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2193</text>
 <text text-anchor="middle" x="684" y="-991.3" font-family="Times,serif" font-size="14.00" fill="#000000">Redesign zebra&#45;network so</text>
@@ -638,63 +619,63 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2112&#45;&gt;ZcashFoundation/zebra#2193 -->
-<g id="edge26" class="edge">
+<g id="edge25" class="edge">
 <title>ZcashFoundation/zebra#2112&#45;&gt;ZcashFoundation/zebra#2193</title>
 <path fill="none" stroke="#000000" d="M532.38,-989.05C540.71,-988.55 549.14,-988.05 557.53,-987.55"/>
 <polygon fill="#000000" stroke="#000000" points="557.9666,-991.0303 567.74,-986.94 557.549,-984.0427 557.9666,-991.0303"/>
 </g>
 <!-- ZcashFoundation/zebra#2622 -->
-<g id="node42" class="node">
+<g id="node41" class="node">
 <title>ZcashFoundation/zebra#2622</title>
-<g id="a_node42"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2622" xlink:title="ZcashFoundation/zebra#2622&#10;Flush expired&#10;transactions from mempool" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2003.5 16,-2003.5 16,-1950.5 248,-1950.5 248,-2003.5"/>
-<text text-anchor="middle" x="132" y="-1988.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2622</text>
-<text text-anchor="middle" x="132" y="-1973.3" font-family="Times,serif" font-size="14.00" fill="#000000">Flush expired</text>
-<text text-anchor="middle" x="132" y="-1958.3" font-family="Times,serif" font-size="14.00" fill="#000000">transactions from mempool</text>
+<g id="a_node41"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2622" xlink:title="ZcashFoundation/zebra#2622&#10;Flush expired&#10;transactions from mempool" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1909.5 16,-1909.5 16,-1856.5 248,-1856.5 248,-1909.5"/>
+<text text-anchor="middle" x="132" y="-1894.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2622</text>
+<text text-anchor="middle" x="132" y="-1879.3" font-family="Times,serif" font-size="14.00" fill="#000000">Flush expired</text>
+<text text-anchor="middle" x="132" y="-1864.3" font-family="Times,serif" font-size="14.00" fill="#000000">transactions from mempool</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2764 -->
-<g id="node43" class="node">
+<g id="node42" class="node">
 <title>ZcashFoundation/zebra#2764</title>
-<g id="a_node43"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/2764" xlink:title="ZcashFoundation/zebra#2764&#10;Cancel download and&#10;verify tasks when the&#10;mempool is deactivated" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2090 16,-2090 16,-2086 12,-2086 12,-2082 16,-2082 16,-2030 12,-2030 12,-2026 16,-2026 16,-2022 248,-2022 248,-2090"/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-2086 20,-2086 20,-2082 16,-2082 "/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-2030 20,-2030 20,-2026 16,-2026 "/>
-<text text-anchor="middle" x="132" y="-2074.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2764</text>
-<text text-anchor="middle" x="132" y="-2059.8" font-family="Times,serif" font-size="14.00" fill="#000000">Cancel download and</text>
-<text text-anchor="middle" x="132" y="-2044.8" font-family="Times,serif" font-size="14.00" fill="#000000">verify tasks when the</text>
-<text text-anchor="middle" x="132" y="-2029.8" font-family="Times,serif" font-size="14.00" fill="#000000">mempool is deactivated</text>
+<g id="a_node42"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/2764" xlink:title="ZcashFoundation/zebra#2764&#10;Cancel download and&#10;verify tasks when the&#10;mempool is deactivated" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1996 16,-1996 16,-1992 12,-1992 12,-1988 16,-1988 16,-1936 12,-1936 12,-1932 16,-1932 16,-1928 248,-1928 248,-1996"/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-1992 20,-1992 20,-1988 16,-1988 "/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-1936 20,-1936 20,-1932 16,-1932 "/>
+<text text-anchor="middle" x="132" y="-1980.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2764</text>
+<text text-anchor="middle" x="132" y="-1965.8" font-family="Times,serif" font-size="14.00" fill="#000000">Cancel download and</text>
+<text text-anchor="middle" x="132" y="-1950.8" font-family="Times,serif" font-size="14.00" fill="#000000">verify tasks when the</text>
+<text text-anchor="middle" x="132" y="-1935.8" font-family="Times,serif" font-size="14.00" fill="#000000">mempool is deactivated</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#950 -->
-<g id="node44" class="node">
+<g id="node43" class="node">
 <title>ZcashFoundation/zebra#950</title>
-<g id="a_node44"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/950" xlink:title="ZcashFoundation/zebra#950&#10;Demo: compare zcashd vs&#10;zebrad ludicrous speed on&#10;syncing" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="243.5,-2176 20.5,-2176 20.5,-2108 243.5,-2108 243.5,-2176"/>
-<text text-anchor="middle" x="132" y="-2160.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#950</text>
-<text text-anchor="middle" x="132" y="-2145.8" font-family="Times,serif" font-size="14.00" fill="#000000">Demo: compare zcashd vs</text>
-<text text-anchor="middle" x="132" y="-2130.8" font-family="Times,serif" font-size="14.00" fill="#000000">zebrad ludicrous speed on</text>
-<text text-anchor="middle" x="132" y="-2115.8" font-family="Times,serif" font-size="14.00" fill="#000000">syncing</text>
+<g id="a_node43"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/950" xlink:title="ZcashFoundation/zebra#950&#10;Demo: compare zcashd vs&#10;zebrad ludicrous speed on&#10;syncing" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="243.5,-2082 20.5,-2082 20.5,-2014 243.5,-2014 243.5,-2082"/>
+<text text-anchor="middle" x="132" y="-2066.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#950</text>
+<text text-anchor="middle" x="132" y="-2051.8" font-family="Times,serif" font-size="14.00" fill="#000000">Demo: compare zcashd vs</text>
+<text text-anchor="middle" x="132" y="-2036.8" font-family="Times,serif" font-size="14.00" fill="#000000">zebrad ludicrous speed on</text>
+<text text-anchor="middle" x="132" y="-2021.8" font-family="Times,serif" font-size="14.00" fill="#000000">syncing</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#692 -->
-<g id="node45" class="node">
+<g id="node44" class="node">
 <title>ZcashFoundation/zebra#692</title>
-<g id="a_node45"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/692" xlink:title="ZcashFoundation/zebra#692&#10;Use git metadata and&#10;platform info in Zebra" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="243.5,-2247.5 20.5,-2247.5 20.5,-2194.5 243.5,-2194.5 243.5,-2247.5"/>
-<text text-anchor="middle" x="132" y="-2232.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#692</text>
-<text text-anchor="middle" x="132" y="-2217.3" font-family="Times,serif" font-size="14.00" fill="#000000">Use git metadata and</text>
-<text text-anchor="middle" x="132" y="-2202.3" font-family="Times,serif" font-size="14.00" fill="#000000">platform info in Zebra</text>
+<g id="a_node44"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/692" xlink:title="ZcashFoundation/zebra#692&#10;Use git metadata and&#10;platform info in Zebra" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="243.5,-2153.5 20.5,-2153.5 20.5,-2100.5 243.5,-2100.5 243.5,-2153.5"/>
+<text text-anchor="middle" x="132" y="-2138.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#692</text>
+<text text-anchor="middle" x="132" y="-2123.3" font-family="Times,serif" font-size="14.00" fill="#000000">Use git metadata and</text>
+<text text-anchor="middle" x="132" y="-2108.3" font-family="Times,serif" font-size="14.00" fill="#000000">platform info in Zebra</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2440 -->
-<g id="node46" class="node">
+<g id="node45" class="node">
 <title>ZcashFoundation/zebra#2440</title>
-<g id="a_node46"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2440" xlink:title="ZcashFoundation/zebra#2440&#10;Look up the UTXOs in the&#10;transaction verifier,&#10;then pass them to `verify&#10;_transparent_inputs_and_o&#10;utputs`" target="_blank">
+<g id="a_node45"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2440" xlink:title="ZcashFoundation/zebra#2440&#10;Look up the UTXOs in the&#10;transaction verifier,&#10;then pass them to `verify&#10;_transparent_inputs_and_o&#10;utputs`" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1610 16,-1610 16,-1512 248,-1512 248,-1610"/>
 <text text-anchor="middle" x="132" y="-1594.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2440</text>
 <text text-anchor="middle" x="132" y="-1579.8" font-family="Times,serif" font-size="14.00" fill="#000000">Look up the UTXOs in the</text>
@@ -706,9 +687,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2779 -->
-<g id="node47" class="node">
+<g id="node46" class="node">
 <title>ZcashFoundation/zebra#2779</title>
-<g id="a_node47"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2779" xlink:title="ZcashFoundation/zebra#2779&#10;Return the transaction&#10;fee in the &#160;mempool&#10;response" target="_blank">
+<g id="a_node46"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2779" xlink:title="ZcashFoundation/zebra#2779&#10;Return the transaction&#10;fee in the &#160;mempool&#10;response" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="532,-1595 300,-1595 300,-1527 532,-1527 532,-1595"/>
 <text text-anchor="middle" x="416" y="-1579.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2779</text>
 <text text-anchor="middle" x="416" y="-1564.8" font-family="Times,serif" font-size="14.00" fill="#000000">Return the transaction</text>
@@ -718,15 +699,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2440&#45;&gt;ZcashFoundation/zebra#2779 -->
-<g id="edge27" class="edge">
+<g id="edge26" class="edge">
 <title>ZcashFoundation/zebra#2440&#45;&gt;ZcashFoundation/zebra#2779</title>
 <path fill="none" stroke="#000000" d="M248.33,-1561C262.02,-1561 276.03,-1561 289.84,-1561"/>
 <polygon fill="#000000" stroke="#000000" points="289.85,-1564.5001 299.85,-1561 289.85,-1557.5001 289.85,-1564.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2780 -->
-<g id="node48" class="node">
+<g id="node47" class="node">
 <title>ZcashFoundation/zebra#2780</title>
-<g id="a_node48"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2780" xlink:title="ZcashFoundation/zebra#2780&#10;Randomly evict mempool&#10;transactions based on&#10;their eviction weights" target="_blank">
+<g id="a_node47"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2780" xlink:title="ZcashFoundation/zebra#2780&#10;Randomly evict mempool&#10;transactions based on&#10;their eviction weights" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="800,-1595 568,-1595 568,-1527 800,-1527 800,-1595"/>
 <text text-anchor="middle" x="684" y="-1579.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2780</text>
 <text text-anchor="middle" x="684" y="-1564.8" font-family="Times,serif" font-size="14.00" fill="#000000">Randomly evict mempool</text>
@@ -736,15 +717,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2779&#45;&gt;ZcashFoundation/zebra#2780 -->
-<g id="edge28" class="edge">
+<g id="edge27" class="edge">
 <title>ZcashFoundation/zebra#2779&#45;&gt;ZcashFoundation/zebra#2780</title>
 <path fill="none" stroke="#000000" d="M532.38,-1561C540.71,-1561 549.14,-1561 557.53,-1561"/>
 <polygon fill="#000000" stroke="#000000" points="557.74,-1564.5001 567.74,-1561 557.74,-1557.5001 557.74,-1564.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2744 -->
-<g id="node49" class="node">
+<g id="node48" class="node">
 <title>ZcashFoundation/zebra#2744</title>
-<g id="a_node49"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2744" xlink:title="ZcashFoundation/zebra#2744&#10;Make Mempool eviction&#10;compliant with ZIP&#45;401" target="_blank">
+<g id="a_node48"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2744" xlink:title="ZcashFoundation/zebra#2744&#10;Make Mempool eviction&#10;compliant with ZIP&#45;401" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="1068,-1587.5 836,-1587.5 836,-1534.5 1068,-1534.5 1068,-1587.5"/>
 <text text-anchor="middle" x="952" y="-1572.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2744</text>
 <text text-anchor="middle" x="952" y="-1557.3" font-family="Times,serif" font-size="14.00" fill="#000000">Make Mempool eviction</text>
@@ -753,15 +734,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2780&#45;&gt;ZcashFoundation/zebra#2744 -->
-<g id="edge29" class="edge">
+<g id="edge28" class="edge">
 <title>ZcashFoundation/zebra#2780&#45;&gt;ZcashFoundation/zebra#2744</title>
 <path fill="none" stroke="#000000" d="M800.38,-1561C808.71,-1561 817.14,-1561 825.53,-1561"/>
 <polygon fill="#000000" stroke="#000000" points="825.74,-1564.5001 835.74,-1561 825.74,-1557.5001 825.74,-1564.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2759 -->
-<g id="node50" class="node">
+<g id="node49" class="node">
 <title>ZcashFoundation/zebra#2759</title>
-<g id="a_node50"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2759" xlink:title="ZcashFoundation/zebra#2759&#10;Limit the size and age of&#10;the rejected transaction&#10;ID list" target="_blank">
+<g id="a_node49"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2759" xlink:title="ZcashFoundation/zebra#2759&#10;Limit the size and age of&#10;the rejected transaction&#10;ID list" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="800,-1509 568,-1509 568,-1441 800,-1441 800,-1509"/>
 <text text-anchor="middle" x="684" y="-1493.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2759</text>
 <text text-anchor="middle" x="684" y="-1478.8" font-family="Times,serif" font-size="14.00" fill="#000000">Limit the size and age of</text>
@@ -771,15 +752,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2759&#45;&gt;ZcashFoundation/zebra#2744 -->
-<g id="edge30" class="edge">
+<g id="edge29" class="edge">
 <title>ZcashFoundation/zebra#2759&#45;&gt;ZcashFoundation/zebra#2744</title>
 <path fill="none" stroke="#000000" d="M790.31,-1509.1C813.22,-1516.5 837.26,-1524.2 859.6,-1531.3"/>
 <polygon fill="#000000" stroke="#000000" points="858.7974,-1534.7198 869.39,-1534.5 860.9723,-1528.0663 858.7974,-1534.7198"/>
 </g>
 <!-- ZcashFoundation/zebra#2778 -->
-<g id="node51" class="node">
+<g id="node50" class="node">
 <title>ZcashFoundation/zebra#2778</title>
-<g id="a_node51"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2778" xlink:title="ZcashFoundation/zebra#2778&#10;Add the serialized&#10;transaction size to&#10;`UnminedTx`" target="_blank">
+<g id="a_node50"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2778" xlink:title="ZcashFoundation/zebra#2778&#10;Add the serialized&#10;transaction size to&#10;`UnminedTx`" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="532,-1509 300,-1509 300,-1441 532,-1441 532,-1509"/>
 <text text-anchor="middle" x="416" y="-1493.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2778</text>
 <text text-anchor="middle" x="416" y="-1478.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add the serialized</text>
@@ -789,15 +770,15 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2778&#45;&gt;ZcashFoundation/zebra#2780 -->
-<g id="edge31" class="edge">
+<g id="edge30" class="edge">
 <title>ZcashFoundation/zebra#2778&#45;&gt;ZcashFoundation/zebra#2780</title>
 <path fill="none" stroke="#000000" d="M522.31,-1509.1C537.29,-1513.9 552.76,-1518.9 567.92,-1523.7"/>
 <polygon fill="#000000" stroke="#000000" points="567.2282,-1527.1546 577.82,-1526.9 569.3812,-1520.4939 567.2282,-1527.1546"/>
 </g>
 <!-- ZcashFoundation/zebra#2784 -->
-<g id="node52" class="node">
+<g id="node51" class="node">
 <title>ZcashFoundation/zebra#2784</title>
-<g id="a_node52"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2784" xlink:title="ZcashFoundation/zebra#2784&#10;Refactor spend conflict&#10;checks in the mempool&#10;storage to increase&#10;performance" target="_blank">
+<g id="a_node51"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2784" xlink:title="ZcashFoundation/zebra#2784&#10;Refactor spend conflict&#10;checks in the mempool&#10;storage to increase&#10;performance" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="532,-1696.5 300,-1696.5 300,-1613.5 532,-1613.5 532,-1696.5"/>
 <text text-anchor="middle" x="416" y="-1681.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2784</text>
 <text text-anchor="middle" x="416" y="-1666.3" font-family="Times,serif" font-size="14.00" fill="#000000">Refactor spend conflict</text>
@@ -808,867 +789,867 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2784&#45;&gt;ZcashFoundation/zebra#2675 -->
-<g id="edge32" class="edge">
+<g id="edge31" class="edge">
 <title>ZcashFoundation/zebra#2784&#45;&gt;ZcashFoundation/zebra#2675</title>
 <path fill="none" stroke="#000000" d="M532.38,-1661.5C540.71,-1662 549.14,-1662.5 557.53,-1662.9"/>
 <polygon fill="#000000" stroke="#000000" points="557.5519,-1666.4072 567.74,-1663.5 557.9626,-1659.4193 557.5519,-1666.4072"/>
 </g>
 <!-- ZcashFoundation/zebra#2784&#45;&gt;ZcashFoundation/zebra#2780 -->
-<g id="edge33" class="edge">
+<g id="edge32" class="edge">
 <title>ZcashFoundation/zebra#2784&#45;&gt;ZcashFoundation/zebra#2780</title>
 <path fill="none" stroke="#000000" d="M532.38,-1614.2C547.33,-1608.9 562.57,-1603.6 577.36,-1598.4"/>
 <polygon fill="#000000" stroke="#000000" points="578.7257,-1601.6296 586.99,-1595 576.3952,-1595.0289 578.7257,-1601.6296"/>
 </g>
 <!-- ZcashFoundation/zebra#2784&#45;&gt;ZcashFoundation/zebra#2744 -->
-<g id="edge34" class="edge">
+<g id="edge33" class="edge">
 <title>ZcashFoundation/zebra#2784&#45;&gt;ZcashFoundation/zebra#2744</title>
 <path fill="none" stroke="#000000" d="M532.25,-1644C608.79,-1635.6 710.93,-1622.4 800,-1604 818.52,-1600.2 838.1,-1595.3 856.82,-1590.2"/>
 <polygon fill="#000000" stroke="#000000" points="857.8248,-1593.5534 866.52,-1587.5 855.9477,-1586.8098 857.8248,-1593.5534"/>
 </g>
 <!-- ZcashFoundation/zebra#2793 -->
-<g id="node53" class="node">
+<g id="node52" class="node">
 <title>ZcashFoundation/zebra#2793</title>
-<g id="a_node53"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2793" xlink:title="ZcashFoundation/zebra#2793&#10;Set the NU5 testnet&#10;activation height to&#10;1_590_000" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2334 16,-2334 16,-2266 248,-2266 248,-2334"/>
-<text text-anchor="middle" x="132" y="-2318.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2793</text>
-<text text-anchor="middle" x="132" y="-2303.8" font-family="Times,serif" font-size="14.00" fill="#000000">Set the NU5 testnet</text>
-<text text-anchor="middle" x="132" y="-2288.8" font-family="Times,serif" font-size="14.00" fill="#000000">activation height to</text>
-<text text-anchor="middle" x="132" y="-2273.8" font-family="Times,serif" font-size="14.00" fill="#000000">1_590_000</text>
+<g id="a_node52"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2793" xlink:title="ZcashFoundation/zebra#2793&#10;Set the NU5 testnet&#10;activation height to&#10;1_599_200" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2240 16,-2240 16,-2172 248,-2172 248,-2240"/>
+<text text-anchor="middle" x="132" y="-2224.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2793</text>
+<text text-anchor="middle" x="132" y="-2209.8" font-family="Times,serif" font-size="14.00" fill="#000000">Set the NU5 testnet</text>
+<text text-anchor="middle" x="132" y="-2194.8" font-family="Times,serif" font-size="14.00" fill="#000000">activation height to</text>
+<text text-anchor="middle" x="132" y="-2179.8" font-family="Times,serif" font-size="14.00" fill="#000000">1_599_200</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2798 -->
-<g id="node54" class="node">
+<g id="node53" class="node">
 <title>ZcashFoundation/zebra#2798</title>
-<g id="a_node54"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2798" xlink:title="ZcashFoundation/zebra#2798&#10;Terminate all Foundation&#10;Zcash instances running&#10;pre&#45;NU5 testnet versions" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-2334 300,-2334 300,-2266 532,-2266 532,-2334"/>
-<text text-anchor="middle" x="416" y="-2318.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2798</text>
-<text text-anchor="middle" x="416" y="-2303.8" font-family="Times,serif" font-size="14.00" fill="#000000">Terminate all Foundation</text>
-<text text-anchor="middle" x="416" y="-2288.8" font-family="Times,serif" font-size="14.00" fill="#000000">Zcash instances running</text>
-<text text-anchor="middle" x="416" y="-2273.8" font-family="Times,serif" font-size="14.00" fill="#000000">pre&#45;NU5 testnet versions</text>
+<g id="a_node53"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2798" xlink:title="ZcashFoundation/zebra#2798&#10;Terminate all Foundation&#10;Zcash instances running&#10;pre&#45;NU5 testnet versions" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-2240 300,-2240 300,-2172 532,-2172 532,-2240"/>
+<text text-anchor="middle" x="416" y="-2224.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2798</text>
+<text text-anchor="middle" x="416" y="-2209.8" font-family="Times,serif" font-size="14.00" fill="#000000">Terminate all Foundation</text>
+<text text-anchor="middle" x="416" y="-2194.8" font-family="Times,serif" font-size="14.00" fill="#000000">Zcash instances running</text>
+<text text-anchor="middle" x="416" y="-2179.8" font-family="Times,serif" font-size="14.00" fill="#000000">pre&#45;NU5 testnet versions</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2793&#45;&gt;ZcashFoundation/zebra#2798 -->
-<g id="edge35" class="edge">
+<g id="edge34" class="edge">
 <title>ZcashFoundation/zebra#2793&#45;&gt;ZcashFoundation/zebra#2798</title>
-<path fill="none" stroke="#000000" d="M248.33,-2300C262.02,-2300 276.03,-2300 289.84,-2300"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-2303.5001 299.85,-2300 289.85,-2296.5001 289.85,-2303.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-2206C262.02,-2206 276.03,-2206 289.84,-2206"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-2209.5001 299.85,-2206 289.85,-2202.5001 289.85,-2209.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2739 -->
-<g id="node55" class="node">
+<g id="node54" class="node">
 <title>ZcashFoundation/zebra#2739</title>
-<g id="a_node55"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2739" xlink:title="ZcashFoundation/zebra#2739&#10;Upgrade ECC deps:&#10;orchard, halo2,&#10;bls12_381, jubjub, group,&#10;etc" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2435.5 16,-2435.5 16,-2352.5 248,-2352.5 248,-2435.5"/>
-<text text-anchor="middle" x="132" y="-2420.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2739</text>
-<text text-anchor="middle" x="132" y="-2405.3" font-family="Times,serif" font-size="14.00" fill="#000000">Upgrade ECC deps:</text>
-<text text-anchor="middle" x="132" y="-2390.3" font-family="Times,serif" font-size="14.00" fill="#000000">orchard, halo2,</text>
-<text text-anchor="middle" x="132" y="-2375.3" font-family="Times,serif" font-size="14.00" fill="#000000">bls12_381, jubjub, group,</text>
-<text text-anchor="middle" x="132" y="-2360.3" font-family="Times,serif" font-size="14.00" fill="#000000">etc</text>
+<g id="a_node54"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2739" xlink:title="ZcashFoundation/zebra#2739&#10;Upgrade ECC deps:&#10;orchard, halo2,&#10;bls12_381, jubjub, group,&#10;etc" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2341.5 16,-2341.5 16,-2258.5 248,-2258.5 248,-2341.5"/>
+<text text-anchor="middle" x="132" y="-2326.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2739</text>
+<text text-anchor="middle" x="132" y="-2311.3" font-family="Times,serif" font-size="14.00" fill="#000000">Upgrade ECC deps:</text>
+<text text-anchor="middle" x="132" y="-2296.3" font-family="Times,serif" font-size="14.00" fill="#000000">orchard, halo2,</text>
+<text text-anchor="middle" x="132" y="-2281.3" font-family="Times,serif" font-size="14.00" fill="#000000">bls12_381, jubjub, group,</text>
+<text text-anchor="middle" x="132" y="-2266.3" font-family="Times,serif" font-size="14.00" fill="#000000">etc</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2802 -->
-<g id="node56" class="node">
+<g id="node55" class="node">
 <title>ZcashFoundation/zebra#2802</title>
-<g id="a_node56"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/2802" xlink:title="ZcashFoundation/zebra#2802&#10;Set the NU5 testnet&#10;activation height to&#10;1_590_000" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-2428 300,-2428 300,-2424 296,-2424 296,-2420 300,-2420 300,-2368 296,-2368 296,-2364 300,-2364 300,-2360 532,-2360 532,-2428"/>
-<polyline fill="none" stroke="#000000" points="300,-2424 304,-2424 304,-2420 300,-2420 "/>
-<polyline fill="none" stroke="#000000" points="300,-2368 304,-2368 304,-2364 300,-2364 "/>
-<text text-anchor="middle" x="416" y="-2412.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2802</text>
-<text text-anchor="middle" x="416" y="-2397.8" font-family="Times,serif" font-size="14.00" fill="#000000">Set the NU5 testnet</text>
-<text text-anchor="middle" x="416" y="-2382.8" font-family="Times,serif" font-size="14.00" fill="#000000">activation height to</text>
-<text text-anchor="middle" x="416" y="-2367.8" font-family="Times,serif" font-size="14.00" fill="#000000">1_590_000</text>
+<g id="a_node55"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/2802" xlink:title="ZcashFoundation/zebra#2802&#10;Set the NU5 testnet&#10;activation height to&#10;1_599_200" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-2334 300,-2334 300,-2330 296,-2330 296,-2326 300,-2326 300,-2274 296,-2274 296,-2270 300,-2270 300,-2266 532,-2266 532,-2334"/>
+<polyline fill="none" stroke="#000000" points="300,-2330 304,-2330 304,-2326 300,-2326 "/>
+<polyline fill="none" stroke="#000000" points="300,-2274 304,-2274 304,-2270 300,-2270 "/>
+<text text-anchor="middle" x="416" y="-2318.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2802</text>
+<text text-anchor="middle" x="416" y="-2303.8" font-family="Times,serif" font-size="14.00" fill="#000000">Set the NU5 testnet</text>
+<text text-anchor="middle" x="416" y="-2288.8" font-family="Times,serif" font-size="14.00" fill="#000000">activation height to</text>
+<text text-anchor="middle" x="416" y="-2273.8" font-family="Times,serif" font-size="14.00" fill="#000000">1_599_200</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2739&#45;&gt;ZcashFoundation/zebra#2802 -->
-<g id="edge36" class="edge">
+<g id="edge35" class="edge">
 <title>ZcashFoundation/zebra#2739&#45;&gt;ZcashFoundation/zebra#2802</title>
-<path fill="none" stroke="#000000" d="M248.33,-2394C262.02,-2394 276.03,-2394 289.84,-2394"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-2397.5001 299.85,-2394 289.85,-2390.5001 289.85,-2397.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-2300C262.02,-2300 276.03,-2300 289.84,-2300"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-2303.5001 299.85,-2300 289.85,-2296.5001 289.85,-2303.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#1791 -->
-<g id="node57" class="node">
+<g id="node56" class="node">
 <title>ZcashFoundation/zebra#1791</title>
-<g id="a_node57"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1791" xlink:title="ZcashFoundation/zebra#1791&#10;Re&#45;enable `sync_large_che&#10;ckpoints_testnet` test" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-2603.5 300,-2603.5 300,-2550.5 532,-2550.5 532,-2603.5"/>
-<text text-anchor="middle" x="416" y="-2588.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1791</text>
-<text text-anchor="middle" x="416" y="-2573.3" font-family="Times,serif" font-size="14.00" fill="#000000">Re&#45;enable `sync_large_che</text>
-<text text-anchor="middle" x="416" y="-2558.3" font-family="Times,serif" font-size="14.00" fill="#000000">ckpoints_testnet` test</text>
+<g id="a_node56"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1791" xlink:title="ZcashFoundation/zebra#1791&#10;Re&#45;enable `sync_large_che&#10;ckpoints_testnet` test" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-2521.5 300,-2521.5 300,-2468.5 532,-2468.5 532,-2521.5"/>
+<text text-anchor="middle" x="416" y="-2506.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1791</text>
+<text text-anchor="middle" x="416" y="-2491.3" font-family="Times,serif" font-size="14.00" fill="#000000">Re&#45;enable `sync_large_che</text>
+<text text-anchor="middle" x="416" y="-2476.3" font-family="Times,serif" font-size="14.00" fill="#000000">ckpoints_testnet` test</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1007 -->
-<g id="node58" class="node">
+<g id="node57" class="node">
 <title>ZcashFoundation/zebra#1007</title>
-<g id="a_node58"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/1007" xlink:title="ZcashFoundation/zebra#1007&#10;Draft RFC: Initial draft&#10;for basic network&#10;integration testing" target="_blank">
-<polygon fill="#fad8c7" stroke="#000000" points="800,-2611 568,-2611 568,-2607 564,-2607 564,-2603 568,-2603 568,-2551 564,-2551 564,-2547 568,-2547 568,-2543 800,-2543 800,-2611"/>
-<polyline fill="none" stroke="#000000" points="568,-2607 572,-2607 572,-2603 568,-2603 "/>
-<polyline fill="none" stroke="#000000" points="568,-2551 572,-2551 572,-2547 568,-2547 "/>
-<text text-anchor="middle" x="684" y="-2595.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1007</text>
-<text text-anchor="middle" x="684" y="-2580.8" font-family="Times,serif" font-size="14.00" fill="#000000">Draft RFC: Initial draft</text>
-<text text-anchor="middle" x="684" y="-2565.8" font-family="Times,serif" font-size="14.00" fill="#000000">for basic network</text>
-<text text-anchor="middle" x="684" y="-2550.8" font-family="Times,serif" font-size="14.00" fill="#000000">integration testing</text>
+<g id="a_node57"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/1007" xlink:title="ZcashFoundation/zebra#1007&#10;Draft RFC: Initial draft&#10;for basic network&#10;integration testing" target="_blank">
+<polygon fill="#fad8c7" stroke="#000000" points="800,-2529 568,-2529 568,-2525 564,-2525 564,-2521 568,-2521 568,-2469 564,-2469 564,-2465 568,-2465 568,-2461 800,-2461 800,-2529"/>
+<polyline fill="none" stroke="#000000" points="568,-2525 572,-2525 572,-2521 568,-2521 "/>
+<polyline fill="none" stroke="#000000" points="568,-2469 572,-2469 572,-2465 568,-2465 "/>
+<text text-anchor="middle" x="684" y="-2513.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1007</text>
+<text text-anchor="middle" x="684" y="-2498.8" font-family="Times,serif" font-size="14.00" fill="#000000">Draft RFC: Initial draft</text>
+<text text-anchor="middle" x="684" y="-2483.8" font-family="Times,serif" font-size="14.00" fill="#000000">for basic network</text>
+<text text-anchor="middle" x="684" y="-2468.8" font-family="Times,serif" font-size="14.00" fill="#000000">integration testing</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1791&#45;&gt;ZcashFoundation/zebra#1007 -->
-<g id="edge37" class="edge">
+<g id="edge36" class="edge">
 <title>ZcashFoundation/zebra#1791&#45;&gt;ZcashFoundation/zebra#1007</title>
-<path fill="none" stroke="#000000" d="M532.38,-2577C540.71,-2577 549.14,-2577 557.53,-2577"/>
-<polygon fill="#000000" stroke="#000000" points="557.74,-2580.5001 567.74,-2577 557.74,-2573.5001 557.74,-2580.5001"/>
+<path fill="none" stroke="#000000" d="M532.38,-2495C540.71,-2495 549.14,-2495 557.53,-2495"/>
+<polygon fill="#000000" stroke="#000000" points="557.74,-2498.5001 567.74,-2495 557.74,-2491.5001 557.74,-2498.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2374 -->
-<g id="node59" class="node">
+<g id="node58" class="node">
 <title>ZcashFoundation/zebra#2374</title>
-<g id="a_node59"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2374" xlink:title="ZcashFoundation/zebra#2374&#10;ZIP&#45;200: Clear mempool&#10;storage when a network&#10;upgrade activates" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2709 16,-2709 16,-2641 248,-2641 248,-2709"/>
-<text text-anchor="middle" x="132" y="-2693.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2374</text>
-<text text-anchor="middle" x="132" y="-2678.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;200: Clear mempool</text>
-<text text-anchor="middle" x="132" y="-2663.8" font-family="Times,serif" font-size="14.00" fill="#000000">storage when a network</text>
-<text text-anchor="middle" x="132" y="-2648.8" font-family="Times,serif" font-size="14.00" fill="#000000">upgrade activates</text>
+<g id="a_node58"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2374" xlink:title="ZcashFoundation/zebra#2374&#10;ZIP&#45;200: Clear mempool&#10;storage when a network&#10;upgrade activates" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2615 16,-2615 16,-2547 248,-2547 248,-2615"/>
+<text text-anchor="middle" x="132" y="-2599.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2374</text>
+<text text-anchor="middle" x="132" y="-2584.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;200: Clear mempool</text>
+<text text-anchor="middle" x="132" y="-2569.8" font-family="Times,serif" font-size="14.00" fill="#000000">storage when a network</text>
+<text text-anchor="middle" x="132" y="-2554.8" font-family="Times,serif" font-size="14.00" fill="#000000">upgrade activates</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2710 -->
-<g id="node60" class="node">
+<g id="node59" class="node">
 <title>ZcashFoundation/zebra#2710</title>
-<g id="a_node60"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2710" xlink:title="ZcashFoundation/zebra#2710&#10;Cancel all mempool&#10;download and verify tasks&#10;when a network upgrade&#10;activates" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-2716.5 300,-2716.5 300,-2633.5 532,-2633.5 532,-2716.5"/>
-<text text-anchor="middle" x="416" y="-2701.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2710</text>
-<text text-anchor="middle" x="416" y="-2686.3" font-family="Times,serif" font-size="14.00" fill="#000000">Cancel all mempool</text>
-<text text-anchor="middle" x="416" y="-2671.3" font-family="Times,serif" font-size="14.00" fill="#000000">download and verify tasks</text>
-<text text-anchor="middle" x="416" y="-2656.3" font-family="Times,serif" font-size="14.00" fill="#000000">when a network upgrade</text>
-<text text-anchor="middle" x="416" y="-2641.3" font-family="Times,serif" font-size="14.00" fill="#000000">activates</text>
+<g id="a_node59"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2710" xlink:title="ZcashFoundation/zebra#2710&#10;Cancel all mempool&#10;download and verify tasks&#10;when a network upgrade&#10;activates" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-2622.5 300,-2622.5 300,-2539.5 532,-2539.5 532,-2622.5"/>
+<text text-anchor="middle" x="416" y="-2607.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2710</text>
+<text text-anchor="middle" x="416" y="-2592.3" font-family="Times,serif" font-size="14.00" fill="#000000">Cancel all mempool</text>
+<text text-anchor="middle" x="416" y="-2577.3" font-family="Times,serif" font-size="14.00" fill="#000000">download and verify tasks</text>
+<text text-anchor="middle" x="416" y="-2562.3" font-family="Times,serif" font-size="14.00" fill="#000000">when a network upgrade</text>
+<text text-anchor="middle" x="416" y="-2547.3" font-family="Times,serif" font-size="14.00" fill="#000000">activates</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2374&#45;&gt;ZcashFoundation/zebra#2710 -->
-<g id="edge38" class="edge">
+<g id="edge37" class="edge">
 <title>ZcashFoundation/zebra#2374&#45;&gt;ZcashFoundation/zebra#2710</title>
-<path fill="none" stroke="#000000" d="M248.33,-2675C262.02,-2675 276.03,-2675 289.84,-2675"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-2678.5001 299.85,-2675 289.85,-2671.5001 289.85,-2678.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-2581C262.02,-2581 276.03,-2581 289.84,-2581"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-2584.5001 299.85,-2581 289.85,-2577.5001 289.85,-2584.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#1827 -->
-<g id="node61" class="node">
+<g id="node60" class="node">
 <title>ZcashFoundation/zebra#1827</title>
-<g id="a_node61"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1827" xlink:title="ZcashFoundation/zebra#1827&#10;Split `WrongVersion`&#10;errors into&#10;`OutdatedVersion` and&#10;`PreActivationVersion`" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2810.5 16,-2810.5 16,-2727.5 248,-2727.5 248,-2810.5"/>
-<text text-anchor="middle" x="132" y="-2795.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1827</text>
-<text text-anchor="middle" x="132" y="-2780.3" font-family="Times,serif" font-size="14.00" fill="#000000">Split `WrongVersion`</text>
-<text text-anchor="middle" x="132" y="-2765.3" font-family="Times,serif" font-size="14.00" fill="#000000">errors into</text>
-<text text-anchor="middle" x="132" y="-2750.3" font-family="Times,serif" font-size="14.00" fill="#000000">`OutdatedVersion` and</text>
-<text text-anchor="middle" x="132" y="-2735.3" font-family="Times,serif" font-size="14.00" fill="#000000">`PreActivationVersion`</text>
+<g id="a_node60"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1827" xlink:title="ZcashFoundation/zebra#1827&#10;Split `WrongVersion`&#10;errors into&#10;`OutdatedVersion` and&#10;`PreActivationVersion`" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2716.5 16,-2716.5 16,-2633.5 248,-2633.5 248,-2716.5"/>
+<text text-anchor="middle" x="132" y="-2701.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1827</text>
+<text text-anchor="middle" x="132" y="-2686.3" font-family="Times,serif" font-size="14.00" fill="#000000">Split `WrongVersion`</text>
+<text text-anchor="middle" x="132" y="-2671.3" font-family="Times,serif" font-size="14.00" fill="#000000">errors into</text>
+<text text-anchor="middle" x="132" y="-2656.3" font-family="Times,serif" font-size="14.00" fill="#000000">`OutdatedVersion` and</text>
+<text text-anchor="middle" x="132" y="-2641.3" font-family="Times,serif" font-size="14.00" fill="#000000">`PreActivationVersion`</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1592 -->
-<g id="node62" class="node">
+<g id="node61" class="node">
 <title>ZcashFoundation/zebra#1592</title>
-<g id="a_node62"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1592" xlink:title="ZcashFoundation/zebra#1592&#10;Write tests for sync&#10;hangs" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2881.5 16,-2881.5 16,-2828.5 248,-2828.5 248,-2881.5"/>
-<text text-anchor="middle" x="132" y="-2866.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1592</text>
-<text text-anchor="middle" x="132" y="-2851.3" font-family="Times,serif" font-size="14.00" fill="#000000">Write tests for sync</text>
-<text text-anchor="middle" x="132" y="-2836.3" font-family="Times,serif" font-size="14.00" fill="#000000">hangs</text>
+<g id="a_node61"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1592" xlink:title="ZcashFoundation/zebra#1592&#10;Write tests for sync&#10;hangs" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2787.5 16,-2787.5 16,-2734.5 248,-2734.5 248,-2787.5"/>
+<text text-anchor="middle" x="132" y="-2772.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1592</text>
+<text text-anchor="middle" x="132" y="-2757.3" font-family="Times,serif" font-size="14.00" fill="#000000">Write tests for sync</text>
+<text text-anchor="middle" x="132" y="-2742.3" font-family="Times,serif" font-size="14.00" fill="#000000">hangs</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1817 -->
-<g id="node63" class="node">
+<g id="node62" class="node">
 <title>ZcashFoundation/zebra#1817</title>
-<g id="a_node63"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/1817" xlink:title="ZcashFoundation/zebra#1817&#10;Re&#45;Apply &quot;Refactor&#10;`connection.rs` to make&#10;`fail_with` errors&#10;impossible&quot; (double&#10;revert)" target="_blank">
-<polygon fill="#fad8c7" stroke="#000000" points="532,-2904 300,-2904 300,-2900 296,-2900 296,-2896 300,-2896 300,-2814 296,-2814 296,-2810 300,-2810 300,-2806 532,-2806 532,-2904"/>
-<polyline fill="none" stroke="#000000" points="300,-2900 304,-2900 304,-2896 300,-2896 "/>
-<polyline fill="none" stroke="#000000" points="300,-2814 304,-2814 304,-2810 300,-2810 "/>
-<text text-anchor="middle" x="416" y="-2888.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1817</text>
-<text text-anchor="middle" x="416" y="-2873.8" font-family="Times,serif" font-size="14.00" fill="#000000">Re&#45;Apply &quot;Refactor</text>
-<text text-anchor="middle" x="416" y="-2858.8" font-family="Times,serif" font-size="14.00" fill="#000000">`connection.rs` to make</text>
-<text text-anchor="middle" x="416" y="-2843.8" font-family="Times,serif" font-size="14.00" fill="#000000">`fail_with` errors</text>
-<text text-anchor="middle" x="416" y="-2828.8" font-family="Times,serif" font-size="14.00" fill="#000000">impossible&quot; (double</text>
-<text text-anchor="middle" x="416" y="-2813.8" font-family="Times,serif" font-size="14.00" fill="#000000">revert)</text>
+<g id="a_node62"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/1817" xlink:title="ZcashFoundation/zebra#1817&#10;Re&#45;Apply &quot;Refactor&#10;`connection.rs` to make&#10;`fail_with` errors&#10;impossible&quot; (double&#10;revert)" target="_blank">
+<polygon fill="#fad8c7" stroke="#000000" points="532,-2810 300,-2810 300,-2806 296,-2806 296,-2802 300,-2802 300,-2720 296,-2720 296,-2716 300,-2716 300,-2712 532,-2712 532,-2810"/>
+<polyline fill="none" stroke="#000000" points="300,-2806 304,-2806 304,-2802 300,-2802 "/>
+<polyline fill="none" stroke="#000000" points="300,-2720 304,-2720 304,-2716 300,-2716 "/>
+<text text-anchor="middle" x="416" y="-2794.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1817</text>
+<text text-anchor="middle" x="416" y="-2779.8" font-family="Times,serif" font-size="14.00" fill="#000000">Re&#45;Apply &quot;Refactor</text>
+<text text-anchor="middle" x="416" y="-2764.8" font-family="Times,serif" font-size="14.00" fill="#000000">`connection.rs` to make</text>
+<text text-anchor="middle" x="416" y="-2749.8" font-family="Times,serif" font-size="14.00" fill="#000000">`fail_with` errors</text>
+<text text-anchor="middle" x="416" y="-2734.8" font-family="Times,serif" font-size="14.00" fill="#000000">impossible&quot; (double</text>
+<text text-anchor="middle" x="416" y="-2719.8" font-family="Times,serif" font-size="14.00" fill="#000000">revert)</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1592&#45;&gt;ZcashFoundation/zebra#1817 -->
-<g id="edge39" class="edge">
+<g id="edge38" class="edge">
 <title>ZcashFoundation/zebra#1592&#45;&gt;ZcashFoundation/zebra#1817</title>
-<path fill="none" stroke="#000000" d="M248.33,-2855C262.02,-2855 276.03,-2855 289.84,-2855"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-2858.5001 299.85,-2855 289.85,-2851.5001 289.85,-2858.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-2761C262.02,-2761 276.03,-2761 289.84,-2761"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-2764.5001 299.85,-2761 289.85,-2757.5001 289.85,-2764.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#1841 -->
-<g id="node64" class="node">
+<g id="node63" class="node">
 <title>ZcashFoundation/zebra#1841</title>
-<g id="a_node64"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1841" xlink:title="ZcashFoundation/zebra#1841&#10;ZIP&#45;252: Update Zebra and&#10;DNS Seeders with NU5&#10;heights and protocol&#10;versions" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2982.5 16,-2982.5 16,-2899.5 248,-2899.5 248,-2982.5"/>
-<text text-anchor="middle" x="132" y="-2967.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1841</text>
-<text text-anchor="middle" x="132" y="-2952.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;252: Update Zebra and</text>
-<text text-anchor="middle" x="132" y="-2937.3" font-family="Times,serif" font-size="14.00" fill="#000000">DNS Seeders with NU5</text>
-<text text-anchor="middle" x="132" y="-2922.3" font-family="Times,serif" font-size="14.00" fill="#000000">heights and protocol</text>
-<text text-anchor="middle" x="132" y="-2907.3" font-family="Times,serif" font-size="14.00" fill="#000000">versions</text>
+<g id="a_node63"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1841" xlink:title="ZcashFoundation/zebra#1841&#10;ZIP&#45;252: Update Zebra and&#10;DNS Seeders with NU5&#10;heights and protocol&#10;versions" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2888.5 16,-2888.5 16,-2805.5 248,-2805.5 248,-2888.5"/>
+<text text-anchor="middle" x="132" y="-2873.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1841</text>
+<text text-anchor="middle" x="132" y="-2858.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;252: Update Zebra and</text>
+<text text-anchor="middle" x="132" y="-2843.3" font-family="Times,serif" font-size="14.00" fill="#000000">DNS Seeders with NU5</text>
+<text text-anchor="middle" x="132" y="-2828.3" font-family="Times,serif" font-size="14.00" fill="#000000">heights and protocol</text>
+<text text-anchor="middle" x="132" y="-2813.3" font-family="Times,serif" font-size="14.00" fill="#000000">versions</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1865 -->
-<g id="node65" class="node">
+<g id="node64" class="node">
 <title>ZcashFoundation/zebra#1865</title>
-<g id="a_node65"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1865" xlink:title="ZcashFoundation/zebra#1865&#10;Security: Running Zebra&#10;nodes should eventually&#10;stop trying to contact&#10;peers that always fail" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3170.5 16,-3170.5 16,-3087.5 248,-3087.5 248,-3170.5"/>
-<text text-anchor="middle" x="132" y="-3155.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1865</text>
-<text text-anchor="middle" x="132" y="-3140.3" font-family="Times,serif" font-size="14.00" fill="#000000">Security: Running Zebra</text>
-<text text-anchor="middle" x="132" y="-3125.3" font-family="Times,serif" font-size="14.00" fill="#000000">nodes should eventually</text>
-<text text-anchor="middle" x="132" y="-3110.3" font-family="Times,serif" font-size="14.00" fill="#000000">stop trying to contact</text>
-<text text-anchor="middle" x="132" y="-3095.3" font-family="Times,serif" font-size="14.00" fill="#000000">peers that always fail</text>
+<g id="a_node64"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1865" xlink:title="ZcashFoundation/zebra#1865&#10;Security: Running Zebra&#10;nodes should eventually&#10;stop trying to contact&#10;peers that always fail" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3076.5 16,-3076.5 16,-2993.5 248,-2993.5 248,-3076.5"/>
+<text text-anchor="middle" x="132" y="-3061.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1865</text>
+<text text-anchor="middle" x="132" y="-3046.3" font-family="Times,serif" font-size="14.00" fill="#000000">Security: Running Zebra</text>
+<text text-anchor="middle" x="132" y="-3031.3" font-family="Times,serif" font-size="14.00" fill="#000000">nodes should eventually</text>
+<text text-anchor="middle" x="132" y="-3016.3" font-family="Times,serif" font-size="14.00" fill="#000000">stop trying to contact</text>
+<text text-anchor="middle" x="132" y="-3001.3" font-family="Times,serif" font-size="14.00" fill="#000000">peers that always fail</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1956 -->
-<g id="node66" class="node">
+<g id="node65" class="node">
 <title>ZcashFoundation/zebra#1956</title>
-<g id="a_node66"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1956" xlink:title="ZcashFoundation/zebra#1956&#10;Zebra should store a&#10;persistent list of recent&#10;successful peers" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-3116 300,-3116 300,-3048 532,-3048 532,-3116"/>
-<text text-anchor="middle" x="416" y="-3100.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1956</text>
-<text text-anchor="middle" x="416" y="-3085.8" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra should store a</text>
-<text text-anchor="middle" x="416" y="-3070.8" font-family="Times,serif" font-size="14.00" fill="#000000">persistent list of recent</text>
-<text text-anchor="middle" x="416" y="-3055.8" font-family="Times,serif" font-size="14.00" fill="#000000">successful peers</text>
+<g id="a_node65"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1956" xlink:title="ZcashFoundation/zebra#1956&#10;Zebra should store a&#10;persistent list of recent&#10;successful peers" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-3022 300,-3022 300,-2954 532,-2954 532,-3022"/>
+<text text-anchor="middle" x="416" y="-3006.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1956</text>
+<text text-anchor="middle" x="416" y="-2991.8" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra should store a</text>
+<text text-anchor="middle" x="416" y="-2976.8" font-family="Times,serif" font-size="14.00" fill="#000000">persistent list of recent</text>
+<text text-anchor="middle" x="416" y="-2961.8" font-family="Times,serif" font-size="14.00" fill="#000000">successful peers</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1865&#45;&gt;ZcashFoundation/zebra#1956 -->
-<g id="edge40" class="edge">
+<g id="edge39" class="edge">
 <title>ZcashFoundation/zebra#1865&#45;&gt;ZcashFoundation/zebra#1956</title>
-<path fill="none" stroke="#000000" d="M248.33,-3109.7C262.02,-3107.5 276.03,-3105.2 289.84,-3102.9"/>
-<polygon fill="#000000" stroke="#000000" points="290.5772,-3106.325 299.85,-3101.2 289.4051,-3099.4238 290.5772,-3106.325"/>
+<path fill="none" stroke="#000000" d="M248.33,-3015.7C262.02,-3013.5 276.03,-3011.2 289.84,-3008.9"/>
+<polygon fill="#000000" stroke="#000000" points="290.5772,-3012.325 299.85,-3007.2 289.4051,-3005.4238 290.5772,-3012.325"/>
 </g>
 <!-- ZcashFoundation/zebra#1873 -->
-<g id="node67" class="node">
+<g id="node66" class="node">
 <title>ZcashFoundation/zebra#1873</title>
-<g id="a_node67"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1873" xlink:title="ZcashFoundation/zebra#1873&#10;Zebra&#39;s address book can&#10;use all available memory" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-2521.5 300,-2521.5 300,-2468.5 532,-2468.5 532,-2521.5"/>
-<text text-anchor="middle" x="416" y="-2506.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1873</text>
-<text text-anchor="middle" x="416" y="-2491.3" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra&#39;s address book can</text>
-<text text-anchor="middle" x="416" y="-2476.3" font-family="Times,serif" font-size="14.00" fill="#000000">use all available memory</text>
+<g id="a_node66"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1873" xlink:title="ZcashFoundation/zebra#1873&#10;Zebra&#39;s address book can&#10;use all available memory" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-2427.5 300,-2427.5 300,-2374.5 532,-2374.5 532,-2427.5"/>
+<text text-anchor="middle" x="416" y="-2412.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1873</text>
+<text text-anchor="middle" x="416" y="-2397.3" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra&#39;s address book can</text>
+<text text-anchor="middle" x="416" y="-2382.3" font-family="Times,serif" font-size="14.00" fill="#000000">use all available memory</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1875 -->
-<g id="node68" class="node">
+<g id="node67" class="node">
 <title>ZcashFoundation/zebra#1875</title>
-<g id="a_node68"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1875" xlink:title="ZcashFoundation/zebra#1875&#10;Zebra attempts new peer&#10;connections in a fixed,&#10;predictable order" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3257 16,-3257 16,-3189 248,-3189 248,-3257"/>
-<text text-anchor="middle" x="132" y="-3241.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1875</text>
-<text text-anchor="middle" x="132" y="-3226.8" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra attempts new peer</text>
-<text text-anchor="middle" x="132" y="-3211.8" font-family="Times,serif" font-size="14.00" fill="#000000">connections in a fixed,</text>
-<text text-anchor="middle" x="132" y="-3196.8" font-family="Times,serif" font-size="14.00" fill="#000000">predictable order</text>
+<g id="a_node67"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1875" xlink:title="ZcashFoundation/zebra#1875&#10;Zebra attempts new peer&#10;connections in a fixed,&#10;predictable order" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3163 16,-3163 16,-3095 248,-3095 248,-3163"/>
+<text text-anchor="middle" x="132" y="-3147.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1875</text>
+<text text-anchor="middle" x="132" y="-3132.8" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra attempts new peer</text>
+<text text-anchor="middle" x="132" y="-3117.8" font-family="Times,serif" font-size="14.00" fill="#000000">connections in a fixed,</text>
+<text text-anchor="middle" x="132" y="-3102.8" font-family="Times,serif" font-size="14.00" fill="#000000">predictable order</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1869 -->
-<g id="node69" class="node">
+<g id="node68" class="node">
 <title>ZcashFoundation/zebra#1869</title>
-<g id="a_node69"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1869" xlink:title="ZcashFoundation/zebra#1869&#10;Zebra should limit the&#10;number of addresses it&#10;uses from a single Addrs&#10;response" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2536.5 16,-2536.5 16,-2453.5 248,-2453.5 248,-2536.5"/>
-<text text-anchor="middle" x="132" y="-2521.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1869</text>
-<text text-anchor="middle" x="132" y="-2506.3" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra should limit the</text>
-<text text-anchor="middle" x="132" y="-2491.3" font-family="Times,serif" font-size="14.00" fill="#000000">number of addresses it</text>
-<text text-anchor="middle" x="132" y="-2476.3" font-family="Times,serif" font-size="14.00" fill="#000000">uses from a single Addrs</text>
-<text text-anchor="middle" x="132" y="-2461.3" font-family="Times,serif" font-size="14.00" fill="#000000">response</text>
+<g id="a_node68"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1869" xlink:title="ZcashFoundation/zebra#1869&#10;Zebra should limit the&#10;number of addresses it&#10;uses from a single Addrs&#10;response" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2442.5 16,-2442.5 16,-2359.5 248,-2359.5 248,-2442.5"/>
+<text text-anchor="middle" x="132" y="-2427.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1869</text>
+<text text-anchor="middle" x="132" y="-2412.3" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra should limit the</text>
+<text text-anchor="middle" x="132" y="-2397.3" font-family="Times,serif" font-size="14.00" fill="#000000">number of addresses it</text>
+<text text-anchor="middle" x="132" y="-2382.3" font-family="Times,serif" font-size="14.00" fill="#000000">uses from a single Addrs</text>
+<text text-anchor="middle" x="132" y="-2367.3" font-family="Times,serif" font-size="14.00" fill="#000000">response</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1869&#45;&gt;ZcashFoundation/zebra#1791 -->
-<g id="edge41" class="edge">
+<g id="edge40" class="edge">
 <title>ZcashFoundation/zebra#1869&#45;&gt;ZcashFoundation/zebra#1791</title>
-<path fill="none" stroke="#000000" d="M248.33,-2528.6C270.25,-2534.9 293.01,-2541.5 314.44,-2547.7"/>
-<polygon fill="#000000" stroke="#000000" points="313.6022,-2551.1008 324.18,-2550.5 315.5363,-2544.3733 313.6022,-2551.1008"/>
+<path fill="none" stroke="#000000" d="M248.33,-2439.5C274.3,-2448.1 301.45,-2457.1 326.15,-2465.3"/>
+<polygon fill="#000000" stroke="#000000" points="325.2569,-2468.6908 335.85,-2468.5 327.45,-2462.0432 325.2569,-2468.6908"/>
 </g>
 <!-- ZcashFoundation/zebra#1869&#45;&gt;ZcashFoundation/zebra#1873 -->
-<g id="edge42" class="edge">
+<g id="edge41" class="edge">
 <title>ZcashFoundation/zebra#1869&#45;&gt;ZcashFoundation/zebra#1873</title>
-<path fill="none" stroke="#000000" d="M248.33,-2495C262.02,-2495 276.03,-2495 289.84,-2495"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-2498.5001 299.85,-2495 289.85,-2491.5001 289.85,-2498.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-2401C262.02,-2401 276.03,-2401 289.84,-2401"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-2404.5001 299.85,-2401 289.85,-2397.5001 289.85,-2404.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#1890 -->
-<g id="node70" class="node">
+<g id="node69" class="node">
 <title>ZcashFoundation/zebra#1890</title>
-<g id="a_node70"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1890" xlink:title="ZcashFoundation/zebra#1890&#10;Zebra should support&#10;separate local bind and&#10;external advertise&#10;addresses" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3358.5 16,-3358.5 16,-3275.5 248,-3275.5 248,-3358.5"/>
-<text text-anchor="middle" x="132" y="-3343.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1890</text>
-<text text-anchor="middle" x="132" y="-3328.3" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra should support</text>
-<text text-anchor="middle" x="132" y="-3313.3" font-family="Times,serif" font-size="14.00" fill="#000000">separate local bind and</text>
-<text text-anchor="middle" x="132" y="-3298.3" font-family="Times,serif" font-size="14.00" fill="#000000">external advertise</text>
-<text text-anchor="middle" x="132" y="-3283.3" font-family="Times,serif" font-size="14.00" fill="#000000">addresses</text>
+<g id="a_node69"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1890" xlink:title="ZcashFoundation/zebra#1890&#10;Zebra should support&#10;separate local bind and&#10;external advertise&#10;addresses" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3264.5 16,-3264.5 16,-3181.5 248,-3181.5 248,-3264.5"/>
+<text text-anchor="middle" x="132" y="-3249.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1890</text>
+<text text-anchor="middle" x="132" y="-3234.3" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra should support</text>
+<text text-anchor="middle" x="132" y="-3219.3" font-family="Times,serif" font-size="14.00" fill="#000000">separate local bind and</text>
+<text text-anchor="middle" x="132" y="-3204.3" font-family="Times,serif" font-size="14.00" fill="#000000">external advertise</text>
+<text text-anchor="middle" x="132" y="-3189.3" font-family="Times,serif" font-size="14.00" fill="#000000">addresses</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1893 -->
-<g id="node71" class="node">
+<g id="node70" class="node">
 <title>ZcashFoundation/zebra#1893</title>
-<g id="a_node71"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1893" xlink:title="ZcashFoundation/zebra#1893&#10;Zebra should auto&#45;&#10;discover its own external&#10;IP address" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-3351 300,-3351 300,-3283 532,-3283 532,-3351"/>
-<text text-anchor="middle" x="416" y="-3335.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1893</text>
-<text text-anchor="middle" x="416" y="-3320.8" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra should auto&#45;</text>
-<text text-anchor="middle" x="416" y="-3305.8" font-family="Times,serif" font-size="14.00" fill="#000000">discover its own external</text>
-<text text-anchor="middle" x="416" y="-3290.8" font-family="Times,serif" font-size="14.00" fill="#000000">IP address</text>
+<g id="a_node70"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1893" xlink:title="ZcashFoundation/zebra#1893&#10;Zebra should auto&#45;&#10;discover its own external&#10;IP address" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-3257 300,-3257 300,-3189 532,-3189 532,-3257"/>
+<text text-anchor="middle" x="416" y="-3241.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1893</text>
+<text text-anchor="middle" x="416" y="-3226.8" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra should auto&#45;</text>
+<text text-anchor="middle" x="416" y="-3211.8" font-family="Times,serif" font-size="14.00" fill="#000000">discover its own external</text>
+<text text-anchor="middle" x="416" y="-3196.8" font-family="Times,serif" font-size="14.00" fill="#000000">IP address</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1890&#45;&gt;ZcashFoundation/zebra#1893 -->
-<g id="edge43" class="edge">
+<g id="edge42" class="edge">
 <title>ZcashFoundation/zebra#1890&#45;&gt;ZcashFoundation/zebra#1893</title>
-<path fill="none" stroke="#000000" d="M248.33,-3317C262.02,-3317 276.03,-3317 289.84,-3317"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-3320.5001 299.85,-3317 289.85,-3313.5001 289.85,-3320.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-3223C262.02,-3223 276.03,-3223 289.84,-3223"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-3226.5001 299.85,-3223 289.85,-3219.5001 289.85,-3226.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#1904 -->
-<g id="node72" class="node">
+<g id="node71" class="node">
 <title>ZcashFoundation/zebra#1904</title>
-<g id="a_node72"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1904" xlink:title="ZcashFoundation/zebra#1904&#10;Testnet DNS seeders don&#39;t&#10;show the Foundation&#39;s new&#10;zcashd nodes" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2623 16,-2623 16,-2555 248,-2555 248,-2623"/>
-<text text-anchor="middle" x="132" y="-2607.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1904</text>
-<text text-anchor="middle" x="132" y="-2592.8" font-family="Times,serif" font-size="14.00" fill="#000000">Testnet DNS seeders don&#39;t</text>
-<text text-anchor="middle" x="132" y="-2577.8" font-family="Times,serif" font-size="14.00" fill="#000000">show the Foundation&#39;s new</text>
-<text text-anchor="middle" x="132" y="-2562.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcashd nodes</text>
+<g id="a_node71"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1904" xlink:title="ZcashFoundation/zebra#1904&#10;Testnet DNS seeders don&#39;t&#10;show the Foundation&#39;s new&#10;zcashd nodes" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2529 16,-2529 16,-2461 248,-2461 248,-2529"/>
+<text text-anchor="middle" x="132" y="-2513.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1904</text>
+<text text-anchor="middle" x="132" y="-2498.8" font-family="Times,serif" font-size="14.00" fill="#000000">Testnet DNS seeders don&#39;t</text>
+<text text-anchor="middle" x="132" y="-2483.8" font-family="Times,serif" font-size="14.00" fill="#000000">show the Foundation&#39;s new</text>
+<text text-anchor="middle" x="132" y="-2468.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcashd nodes</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1904&#45;&gt;ZcashFoundation/zebra#1791 -->
-<g id="edge44" class="edge">
+<g id="edge43" class="edge">
 <title>ZcashFoundation/zebra#1904&#45;&gt;ZcashFoundation/zebra#1791</title>
-<path fill="none" stroke="#000000" d="M248.33,-2584.1C262.02,-2583.5 276.03,-2582.9 289.84,-2582.3"/>
-<polygon fill="#000000" stroke="#000000" points="289.9978,-2585.7966 299.85,-2581.9 289.7182,-2578.8022 289.9978,-2585.7966"/>
+<path fill="none" stroke="#000000" d="M248.33,-2495C262.02,-2495 276.03,-2495 289.84,-2495"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-2498.5001 299.85,-2495 289.85,-2491.5001 289.85,-2498.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#1917 -->
-<g id="node73" class="node">
+<g id="node72" class="node">
 <title>ZcashFoundation/zebra#1917</title>
-<g id="a_node73"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1917" xlink:title="ZcashFoundation/zebra#1917&#10;Check Transaction&#10;cardinality at parse&#10;time, to limit memory&#10;usage" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3459.5 16,-3459.5 16,-3376.5 248,-3376.5 248,-3459.5"/>
-<text text-anchor="middle" x="132" y="-3444.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1917</text>
-<text text-anchor="middle" x="132" y="-3429.3" font-family="Times,serif" font-size="14.00" fill="#000000">Check Transaction</text>
-<text text-anchor="middle" x="132" y="-3414.3" font-family="Times,serif" font-size="14.00" fill="#000000">cardinality at parse</text>
-<text text-anchor="middle" x="132" y="-3399.3" font-family="Times,serif" font-size="14.00" fill="#000000">time, to limit memory</text>
-<text text-anchor="middle" x="132" y="-3384.3" font-family="Times,serif" font-size="14.00" fill="#000000">usage</text>
+<g id="a_node72"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1917" xlink:title="ZcashFoundation/zebra#1917&#10;Check Transaction&#10;cardinality at parse&#10;time, to limit memory&#10;usage" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3365.5 16,-3365.5 16,-3282.5 248,-3282.5 248,-3365.5"/>
+<text text-anchor="middle" x="132" y="-3350.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1917</text>
+<text text-anchor="middle" x="132" y="-3335.3" font-family="Times,serif" font-size="14.00" fill="#000000">Check Transaction</text>
+<text text-anchor="middle" x="132" y="-3320.3" font-family="Times,serif" font-size="14.00" fill="#000000">cardinality at parse</text>
+<text text-anchor="middle" x="132" y="-3305.3" font-family="Times,serif" font-size="14.00" fill="#000000">time, to limit memory</text>
+<text text-anchor="middle" x="132" y="-3290.3" font-family="Times,serif" font-size="14.00" fill="#000000">usage</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1851 -->
-<g id="node74" class="node">
+<g id="node73" class="node">
 <title>ZcashFoundation/zebra#1851</title>
-<g id="a_node74"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1851" xlink:title="ZcashFoundation/zebra#1851&#10;Limit the number of&#10;connected peers in the&#10;PeerSet" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3546 16,-3546 16,-3478 248,-3478 248,-3546"/>
-<text text-anchor="middle" x="132" y="-3530.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1851</text>
-<text text-anchor="middle" x="132" y="-3515.8" font-family="Times,serif" font-size="14.00" fill="#000000">Limit the number of</text>
-<text text-anchor="middle" x="132" y="-3500.8" font-family="Times,serif" font-size="14.00" fill="#000000">connected peers in the</text>
-<text text-anchor="middle" x="132" y="-3485.8" font-family="Times,serif" font-size="14.00" fill="#000000">PeerSet</text>
+<g id="a_node73"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1851" xlink:title="ZcashFoundation/zebra#1851&#10;Limit the number of&#10;connected peers in the&#10;PeerSet" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3452 16,-3452 16,-3384 248,-3384 248,-3452"/>
+<text text-anchor="middle" x="132" y="-3436.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1851</text>
+<text text-anchor="middle" x="132" y="-3421.8" font-family="Times,serif" font-size="14.00" fill="#000000">Limit the number of</text>
+<text text-anchor="middle" x="132" y="-3406.8" font-family="Times,serif" font-size="14.00" fill="#000000">connected peers in the</text>
+<text text-anchor="middle" x="132" y="-3391.8" font-family="Times,serif" font-size="14.00" fill="#000000">PeerSet</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1850 -->
-<g id="node75" class="node">
+<g id="node74" class="node">
 <title>ZcashFoundation/zebra#1850</title>
-<g id="a_node75"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1850" xlink:title="ZcashFoundation/zebra#1850&#10;Security: Limit the&#10;number of outbound peer&#10;connections when dialing&#10;new peers" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3647.5 16,-3647.5 16,-3564.5 248,-3564.5 248,-3647.5"/>
-<text text-anchor="middle" x="132" y="-3632.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1850</text>
-<text text-anchor="middle" x="132" y="-3617.3" font-family="Times,serif" font-size="14.00" fill="#000000">Security: Limit the</text>
-<text text-anchor="middle" x="132" y="-3602.3" font-family="Times,serif" font-size="14.00" fill="#000000">number of outbound peer</text>
-<text text-anchor="middle" x="132" y="-3587.3" font-family="Times,serif" font-size="14.00" fill="#000000">connections when dialing</text>
-<text text-anchor="middle" x="132" y="-3572.3" font-family="Times,serif" font-size="14.00" fill="#000000">new peers</text>
+<g id="a_node74"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1850" xlink:title="ZcashFoundation/zebra#1850&#10;Security: Limit the&#10;number of outbound peer&#10;connections when dialing&#10;new peers" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3553.5 16,-3553.5 16,-3470.5 248,-3470.5 248,-3553.5"/>
+<text text-anchor="middle" x="132" y="-3538.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1850</text>
+<text text-anchor="middle" x="132" y="-3523.3" font-family="Times,serif" font-size="14.00" fill="#000000">Security: Limit the</text>
+<text text-anchor="middle" x="132" y="-3508.3" font-family="Times,serif" font-size="14.00" fill="#000000">number of outbound peer</text>
+<text text-anchor="middle" x="132" y="-3493.3" font-family="Times,serif" font-size="14.00" fill="#000000">connections when dialing</text>
+<text text-anchor="middle" x="132" y="-3478.3" font-family="Times,serif" font-size="14.00" fill="#000000">new peers</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1334 -->
-<g id="node76" class="node">
+<g id="node75" class="node">
 <title>ZcashFoundation/zebra#1334</title>
-<g id="a_node76"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1334" xlink:title="ZcashFoundation/zebra#1334&#10;After network upgrade&#10;activation, reject new&#10;connections from outdated&#10;peers" target="_blank">
-<polygon fill="#fad8c7" stroke="#000000" points="532,-3849.5 300,-3849.5 300,-3766.5 532,-3766.5 532,-3849.5"/>
-<text text-anchor="middle" x="416" y="-3834.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1334</text>
-<text text-anchor="middle" x="416" y="-3819.3" font-family="Times,serif" font-size="14.00" fill="#000000">After network upgrade</text>
-<text text-anchor="middle" x="416" y="-3804.3" font-family="Times,serif" font-size="14.00" fill="#000000">activation, reject new</text>
-<text text-anchor="middle" x="416" y="-3789.3" font-family="Times,serif" font-size="14.00" fill="#000000">connections from outdated</text>
-<text text-anchor="middle" x="416" y="-3774.3" font-family="Times,serif" font-size="14.00" fill="#000000">peers</text>
+<g id="a_node75"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1334" xlink:title="ZcashFoundation/zebra#1334&#10;After network upgrade&#10;activation, reject new&#10;connections from outdated&#10;peers" target="_blank">
+<polygon fill="#fad8c7" stroke="#000000" points="532,-3755.5 300,-3755.5 300,-3672.5 532,-3672.5 532,-3755.5"/>
+<text text-anchor="middle" x="416" y="-3740.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1334</text>
+<text text-anchor="middle" x="416" y="-3725.3" font-family="Times,serif" font-size="14.00" fill="#000000">After network upgrade</text>
+<text text-anchor="middle" x="416" y="-3710.3" font-family="Times,serif" font-size="14.00" fill="#000000">activation, reject new</text>
+<text text-anchor="middle" x="416" y="-3695.3" font-family="Times,serif" font-size="14.00" fill="#000000">connections from outdated</text>
+<text text-anchor="middle" x="416" y="-3680.3" font-family="Times,serif" font-size="14.00" fill="#000000">peers</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#706 -->
-<g id="node77" class="node">
+<g id="node76" class="node">
 <title>ZcashFoundation/zebra#706</title>
-<g id="a_node77"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/706" xlink:title="ZcashFoundation/zebra#706&#10;Do we need to prefer&#10;evicting pre&#45;upgrade&#10;peers from the peer set&#10;across a network upgrade?" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="795.5,-3779.5 572.5,-3779.5 572.5,-3696.5 795.5,-3696.5 795.5,-3779.5"/>
-<text text-anchor="middle" x="684" y="-3764.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#706</text>
-<text text-anchor="middle" x="684" y="-3749.3" font-family="Times,serif" font-size="14.00" fill="#000000">Do we need to prefer</text>
-<text text-anchor="middle" x="684" y="-3734.3" font-family="Times,serif" font-size="14.00" fill="#000000">evicting pre&#45;upgrade</text>
-<text text-anchor="middle" x="684" y="-3719.3" font-family="Times,serif" font-size="14.00" fill="#000000">peers from the peer set</text>
-<text text-anchor="middle" x="684" y="-3704.3" font-family="Times,serif" font-size="14.00" fill="#000000">across a network upgrade?</text>
+<g id="a_node76"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/706" xlink:title="ZcashFoundation/zebra#706&#10;Do we need to prefer&#10;evicting pre&#45;upgrade&#10;peers from the peer set&#10;across a network upgrade?" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="795.5,-3685.5 572.5,-3685.5 572.5,-3602.5 795.5,-3602.5 795.5,-3685.5"/>
+<text text-anchor="middle" x="684" y="-3670.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#706</text>
+<text text-anchor="middle" x="684" y="-3655.3" font-family="Times,serif" font-size="14.00" fill="#000000">Do we need to prefer</text>
+<text text-anchor="middle" x="684" y="-3640.3" font-family="Times,serif" font-size="14.00" fill="#000000">evicting pre&#45;upgrade</text>
+<text text-anchor="middle" x="684" y="-3625.3" font-family="Times,serif" font-size="14.00" fill="#000000">peers from the peer set</text>
+<text text-anchor="middle" x="684" y="-3610.3" font-family="Times,serif" font-size="14.00" fill="#000000">across a network upgrade?</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1334&#45;&gt;ZcashFoundation/zebra#706 -->
-<g id="edge45" class="edge">
+<g id="edge44" class="edge">
 <title>ZcashFoundation/zebra#1334&#45;&gt;ZcashFoundation/zebra#706</title>
-<path fill="none" stroke="#000000" d="M532.38,-3777.6C542.34,-3775 552.43,-3772.4 562.43,-3769.8"/>
-<polygon fill="#000000" stroke="#000000" points="563.5983,-3773.1124 572.39,-3767.2 561.8302,-3766.3394 563.5983,-3773.1124"/>
+<path fill="none" stroke="#000000" d="M532.38,-3683.6C542.34,-3681 552.43,-3678.4 562.43,-3675.8"/>
+<polygon fill="#000000" stroke="#000000" points="563.5983,-3679.1124 572.39,-3673.2 561.8302,-3672.3394 563.5983,-3679.1124"/>
 </g>
 <!-- ZcashFoundation/zebra#1894 -->
-<g id="node78" class="node">
+<g id="node77" class="node">
 <title>ZcashFoundation/zebra#1894</title>
-<g id="a_node78"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1894" xlink:title="ZcashFoundation/zebra#1894&#10;Zebra should follow OS&#10;directory conventions&#10;better" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3069 16,-3069 16,-3001 248,-3001 248,-3069"/>
-<text text-anchor="middle" x="132" y="-3053.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1894</text>
-<text text-anchor="middle" x="132" y="-3038.8" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra should follow OS</text>
-<text text-anchor="middle" x="132" y="-3023.8" font-family="Times,serif" font-size="14.00" fill="#000000">directory conventions</text>
-<text text-anchor="middle" x="132" y="-3008.8" font-family="Times,serif" font-size="14.00" fill="#000000">better</text>
+<g id="a_node77"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1894" xlink:title="ZcashFoundation/zebra#1894&#10;Zebra should follow OS&#10;directory conventions&#10;better" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-2975 16,-2975 16,-2907 248,-2907 248,-2975"/>
+<text text-anchor="middle" x="132" y="-2959.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1894</text>
+<text text-anchor="middle" x="132" y="-2944.8" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra should follow OS</text>
+<text text-anchor="middle" x="132" y="-2929.8" font-family="Times,serif" font-size="14.00" fill="#000000">directory conventions</text>
+<text text-anchor="middle" x="132" y="-2914.8" font-family="Times,serif" font-size="14.00" fill="#000000">better</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1894&#45;&gt;ZcashFoundation/zebra#1956 -->
-<g id="edge46" class="edge">
+<g id="edge45" class="edge">
 <title>ZcashFoundation/zebra#1894&#45;&gt;ZcashFoundation/zebra#1956</title>
-<path fill="none" stroke="#000000" d="M248.33,-3054.3C262.02,-3056.5 276.03,-3058.8 289.84,-3061.1"/>
-<polygon fill="#000000" stroke="#000000" points="289.4051,-3064.5762 299.85,-3062.8 290.5772,-3057.675 289.4051,-3064.5762"/>
+<path fill="none" stroke="#000000" d="M248.33,-2960.3C262.02,-2962.5 276.03,-2964.8 289.84,-2967.1"/>
+<polygon fill="#000000" stroke="#000000" points="289.4051,-2970.5762 299.85,-2968.8 290.5772,-2963.675 289.4051,-2970.5762"/>
 </g>
 <!-- ZcashFoundation/zebra#1874 -->
-<g id="node79" class="node">
+<g id="node78" class="node">
 <title>ZcashFoundation/zebra#1874</title>
-<g id="a_node79"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1874" xlink:title="ZcashFoundation/zebra#1874&#10;ZIP 244: Transaction&#10;Identifier Non&#45;&#10;Malleability" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3835 16,-3835 16,-3767 248,-3767 248,-3835"/>
-<text text-anchor="middle" x="132" y="-3819.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1874</text>
-<text text-anchor="middle" x="132" y="-3804.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP 244: Transaction</text>
-<text text-anchor="middle" x="132" y="-3789.8" font-family="Times,serif" font-size="14.00" fill="#000000">Identifier Non&#45;</text>
-<text text-anchor="middle" x="132" y="-3774.8" font-family="Times,serif" font-size="14.00" fill="#000000">Malleability</text>
+<g id="a_node78"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1874" xlink:title="ZcashFoundation/zebra#1874&#10;ZIP 244: Transaction&#10;Identifier Non&#45;&#10;Malleability" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3741 16,-3741 16,-3673 248,-3673 248,-3741"/>
+<text text-anchor="middle" x="132" y="-3725.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1874</text>
+<text text-anchor="middle" x="132" y="-3710.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP 244: Transaction</text>
+<text text-anchor="middle" x="132" y="-3695.8" font-family="Times,serif" font-size="14.00" fill="#000000">Identifier Non&#45;</text>
+<text text-anchor="middle" x="132" y="-3680.8" font-family="Times,serif" font-size="14.00" fill="#000000">Malleability</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1567 -->
-<g id="node80" class="node">
+<g id="node79" class="node">
 <title>ZcashFoundation/zebra#1567</title>
-<g id="a_node80"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1567" xlink:title="ZcashFoundation/zebra#1567&#10;ZIP&#45;221: Block Header&#10;Chain History Commitment" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3906.5 16,-3906.5 16,-3853.5 248,-3853.5 248,-3906.5"/>
-<text text-anchor="middle" x="132" y="-3891.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1567</text>
-<text text-anchor="middle" x="132" y="-3876.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;221: Block Header</text>
-<text text-anchor="middle" x="132" y="-3861.3" font-family="Times,serif" font-size="14.00" fill="#000000">Chain History Commitment</text>
+<g id="a_node79"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1567" xlink:title="ZcashFoundation/zebra#1567&#10;ZIP&#45;221: Block Header&#10;Chain History Commitment" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3812.5 16,-3812.5 16,-3759.5 248,-3759.5 248,-3812.5"/>
+<text text-anchor="middle" x="132" y="-3797.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1567</text>
+<text text-anchor="middle" x="132" y="-3782.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP&#45;221: Block Header</text>
+<text text-anchor="middle" x="132" y="-3767.3" font-family="Times,serif" font-size="14.00" fill="#000000">Chain History Commitment</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2015 -->
-<g id="node81" class="node">
+<g id="node80" class="node">
 <title>ZcashFoundation/zebra#2015</title>
-<g id="a_node81"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2015" xlink:title="ZcashFoundation/zebra#2015&#10;Run coverage on the&#10;latest nightly" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3977.5 16,-3977.5 16,-3924.5 248,-3924.5 248,-3977.5"/>
-<text text-anchor="middle" x="132" y="-3962.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2015</text>
-<text text-anchor="middle" x="132" y="-3947.3" font-family="Times,serif" font-size="14.00" fill="#000000">Run coverage on the</text>
-<text text-anchor="middle" x="132" y="-3932.3" font-family="Times,serif" font-size="14.00" fill="#000000">latest nightly</text>
+<g id="a_node80"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2015" xlink:title="ZcashFoundation/zebra#2015&#10;Run coverage on the&#10;latest nightly" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3883.5 16,-3883.5 16,-3830.5 248,-3830.5 248,-3883.5"/>
+<text text-anchor="middle" x="132" y="-3868.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2015</text>
+<text text-anchor="middle" x="132" y="-3853.3" font-family="Times,serif" font-size="14.00" fill="#000000">Run coverage on the</text>
+<text text-anchor="middle" x="132" y="-3838.3" font-family="Times,serif" font-size="14.00" fill="#000000">latest nightly</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2028 -->
-<g id="node82" class="node">
+<g id="node81" class="node">
 <title>ZcashFoundation/zebra#2028</title>
-<g id="a_node82"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2028" xlink:title="ZcashFoundation/zebra#2028&#10;Use the AtLeastOne&#10;generic type to enforce&#10;field counts" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4064 16,-4064 16,-3996 248,-3996 248,-4064"/>
-<text text-anchor="middle" x="132" y="-4048.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2028</text>
-<text text-anchor="middle" x="132" y="-4033.8" font-family="Times,serif" font-size="14.00" fill="#000000">Use the AtLeastOne</text>
-<text text-anchor="middle" x="132" y="-4018.8" font-family="Times,serif" font-size="14.00" fill="#000000">generic type to enforce</text>
-<text text-anchor="middle" x="132" y="-4003.8" font-family="Times,serif" font-size="14.00" fill="#000000">field counts</text>
+<g id="a_node81"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2028" xlink:title="ZcashFoundation/zebra#2028&#10;Use the AtLeastOne&#10;generic type to enforce&#10;field counts" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3970 16,-3970 16,-3902 248,-3902 248,-3970"/>
+<text text-anchor="middle" x="132" y="-3954.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2028</text>
+<text text-anchor="middle" x="132" y="-3939.8" font-family="Times,serif" font-size="14.00" fill="#000000">Use the AtLeastOne</text>
+<text text-anchor="middle" x="132" y="-3924.8" font-family="Times,serif" font-size="14.00" fill="#000000">generic type to enforce</text>
+<text text-anchor="middle" x="132" y="-3909.8" font-family="Times,serif" font-size="14.00" fill="#000000">field counts</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1774 -->
-<g id="node83" class="node">
+<g id="node82" class="node">
 <title>ZcashFoundation/zebra#1774</title>
-<g id="a_node83"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1774" xlink:title="ZcashFoundation/zebra#1774&#10;Add a size estimator to&#10;the message encoder and&#10;serializers" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4150 16,-4150 16,-4082 248,-4082 248,-4150"/>
-<text text-anchor="middle" x="132" y="-4134.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1774</text>
-<text text-anchor="middle" x="132" y="-4119.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add a size estimator to</text>
-<text text-anchor="middle" x="132" y="-4104.8" font-family="Times,serif" font-size="14.00" fill="#000000">the message encoder and</text>
-<text text-anchor="middle" x="132" y="-4089.8" font-family="Times,serif" font-size="14.00" fill="#000000">serializers</text>
+<g id="a_node82"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1774" xlink:title="ZcashFoundation/zebra#1774&#10;Add a size estimator to&#10;the message encoder and&#10;serializers" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4056 16,-4056 16,-3988 248,-3988 248,-4056"/>
+<text text-anchor="middle" x="132" y="-4040.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1774</text>
+<text text-anchor="middle" x="132" y="-4025.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add a size estimator to</text>
+<text text-anchor="middle" x="132" y="-4010.8" font-family="Times,serif" font-size="14.00" fill="#000000">the message encoder and</text>
+<text text-anchor="middle" x="132" y="-3995.8" font-family="Times,serif" font-size="14.00" fill="#000000">serializers</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2035 -->
-<g id="node84" class="node">
+<g id="node83" class="node">
 <title>ZcashFoundation/zebra#2035</title>
-<g id="a_node84"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/2035" xlink:title="ZcashFoundation/zebra#2035&#10;Add external_addr to&#10;config (network section)" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4221.5 16,-4221.5 16,-4217.5 12,-4217.5 12,-4213.5 16,-4213.5 16,-4176.5 12,-4176.5 12,-4172.5 16,-4172.5 16,-4168.5 248,-4168.5 248,-4221.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4217.5 20,-4217.5 20,-4213.5 16,-4213.5 "/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4176.5 20,-4176.5 20,-4172.5 16,-4172.5 "/>
-<text text-anchor="middle" x="132" y="-4206.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2035</text>
-<text text-anchor="middle" x="132" y="-4191.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add external_addr to</text>
-<text text-anchor="middle" x="132" y="-4176.3" font-family="Times,serif" font-size="14.00" fill="#000000">config (network section)</text>
+<g id="a_node83"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/2035" xlink:title="ZcashFoundation/zebra#2035&#10;Add external_addr to&#10;config (network section)" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4127.5 16,-4127.5 16,-4123.5 12,-4123.5 12,-4119.5 16,-4119.5 16,-4082.5 12,-4082.5 12,-4078.5 16,-4078.5 16,-4074.5 248,-4074.5 248,-4127.5"/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4123.5 20,-4123.5 20,-4119.5 16,-4119.5 "/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4082.5 20,-4082.5 20,-4078.5 16,-4078.5 "/>
+<text text-anchor="middle" x="132" y="-4112.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2035</text>
+<text text-anchor="middle" x="132" y="-4097.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add external_addr to</text>
+<text text-anchor="middle" x="132" y="-4082.3" font-family="Times,serif" font-size="14.00" fill="#000000">config (network section)</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2052 -->
-<g id="node85" class="node">
+<g id="node84" class="node">
 <title>ZcashFoundation/zebra#2052</title>
-<g id="a_node85"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2052" xlink:title="ZcashFoundation/zebra#2052&#10;Use default port for&#10;initial peers and&#10;external addresses" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-4229 300,-4229 300,-4161 532,-4161 532,-4229"/>
-<text text-anchor="middle" x="416" y="-4213.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2052</text>
-<text text-anchor="middle" x="416" y="-4198.8" font-family="Times,serif" font-size="14.00" fill="#000000">Use default port for</text>
-<text text-anchor="middle" x="416" y="-4183.8" font-family="Times,serif" font-size="14.00" fill="#000000">initial peers and</text>
-<text text-anchor="middle" x="416" y="-4168.8" font-family="Times,serif" font-size="14.00" fill="#000000">external addresses</text>
+<g id="a_node84"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2052" xlink:title="ZcashFoundation/zebra#2052&#10;Use default port for&#10;initial peers and&#10;external addresses" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-4135 300,-4135 300,-4067 532,-4067 532,-4135"/>
+<text text-anchor="middle" x="416" y="-4119.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2052</text>
+<text text-anchor="middle" x="416" y="-4104.8" font-family="Times,serif" font-size="14.00" fill="#000000">Use default port for</text>
+<text text-anchor="middle" x="416" y="-4089.8" font-family="Times,serif" font-size="14.00" fill="#000000">initial peers and</text>
+<text text-anchor="middle" x="416" y="-4074.8" font-family="Times,serif" font-size="14.00" fill="#000000">external addresses</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2035&#45;&gt;ZcashFoundation/zebra#2052 -->
-<g id="edge47" class="edge">
+<g id="edge46" class="edge">
 <title>ZcashFoundation/zebra#2035&#45;&gt;ZcashFoundation/zebra#2052</title>
-<path fill="none" stroke="#000000" d="M248.33,-4195C262.02,-4195 276.03,-4195 289.84,-4195"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-4198.5001 299.85,-4195 289.85,-4191.5001 289.85,-4198.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-4101C262.02,-4101 276.03,-4101 289.84,-4101"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-4104.5001 299.85,-4101 289.85,-4097.5001 289.85,-4104.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2092 -->
-<g id="node86" class="node">
+<g id="node85" class="node">
 <title>ZcashFoundation/zebra#2092</title>
-<g id="a_node86"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2092" xlink:title="ZcashFoundation/zebra#2092&#10;Implement Block Header&#10;FinalSaplingRoot" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4292.5 16,-4292.5 16,-4239.5 248,-4239.5 248,-4292.5"/>
-<text text-anchor="middle" x="132" y="-4277.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2092</text>
-<text text-anchor="middle" x="132" y="-4262.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Block Header</text>
-<text text-anchor="middle" x="132" y="-4247.3" font-family="Times,serif" font-size="14.00" fill="#000000">FinalSaplingRoot</text>
+<g id="a_node85"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2092" xlink:title="ZcashFoundation/zebra#2092&#10;Implement Block Header&#10;FinalSaplingRoot" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4198.5 16,-4198.5 16,-4145.5 248,-4145.5 248,-4198.5"/>
+<text text-anchor="middle" x="132" y="-4183.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2092</text>
+<text text-anchor="middle" x="132" y="-4168.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Block Header</text>
+<text text-anchor="middle" x="132" y="-4153.3" font-family="Times,serif" font-size="14.00" fill="#000000">FinalSaplingRoot</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1973 -->
-<g id="node87" class="node">
+<g id="node86" class="node">
 <title>ZcashFoundation/zebra#1973</title>
-<g id="a_node87"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1973" xlink:title="ZcashFoundation/zebra#1973&#10;Automatically invalidate&#10;preselected peers" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4363.5 16,-4363.5 16,-4310.5 248,-4310.5 248,-4363.5"/>
-<text text-anchor="middle" x="132" y="-4348.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1973</text>
-<text text-anchor="middle" x="132" y="-4333.3" font-family="Times,serif" font-size="14.00" fill="#000000">Automatically invalidate</text>
-<text text-anchor="middle" x="132" y="-4318.3" font-family="Times,serif" font-size="14.00" fill="#000000">preselected peers</text>
+<g id="a_node86"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1973" xlink:title="ZcashFoundation/zebra#1973&#10;Automatically invalidate&#10;preselected peers" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4269.5 16,-4269.5 16,-4216.5 248,-4216.5 248,-4269.5"/>
+<text text-anchor="middle" x="132" y="-4254.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1973</text>
+<text text-anchor="middle" x="132" y="-4239.3" font-family="Times,serif" font-size="14.00" fill="#000000">Automatically invalidate</text>
+<text text-anchor="middle" x="132" y="-4224.3" font-family="Times,serif" font-size="14.00" fill="#000000">preselected peers</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2156 -->
-<g id="node88" class="node">
+<g id="node87" class="node">
 <title>ZcashFoundation/zebra#2156</title>
-<g id="a_node88"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2156" xlink:title="ZcashFoundation/zebra#2156&#10;Security: Send notfound&#10;inv items to the inv&#10;collector, Credit:&#10;Equilibrium" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-4378.5 300,-4378.5 300,-4295.5 532,-4295.5 532,-4378.5"/>
-<text text-anchor="middle" x="416" y="-4363.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2156</text>
-<text text-anchor="middle" x="416" y="-4348.3" font-family="Times,serif" font-size="14.00" fill="#000000">Security: Send notfound</text>
-<text text-anchor="middle" x="416" y="-4333.3" font-family="Times,serif" font-size="14.00" fill="#000000">inv items to the inv</text>
-<text text-anchor="middle" x="416" y="-4318.3" font-family="Times,serif" font-size="14.00" fill="#000000">collector, Credit:</text>
-<text text-anchor="middle" x="416" y="-4303.3" font-family="Times,serif" font-size="14.00" fill="#000000">Equilibrium</text>
+<g id="a_node87"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2156" xlink:title="ZcashFoundation/zebra#2156&#10;Security: Send notfound&#10;inv items to the inv&#10;collector, Credit:&#10;Equilibrium" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-4284.5 300,-4284.5 300,-4201.5 532,-4201.5 532,-4284.5"/>
+<text text-anchor="middle" x="416" y="-4269.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2156</text>
+<text text-anchor="middle" x="416" y="-4254.3" font-family="Times,serif" font-size="14.00" fill="#000000">Security: Send notfound</text>
+<text text-anchor="middle" x="416" y="-4239.3" font-family="Times,serif" font-size="14.00" fill="#000000">inv items to the inv</text>
+<text text-anchor="middle" x="416" y="-4224.3" font-family="Times,serif" font-size="14.00" fill="#000000">collector, Credit:</text>
+<text text-anchor="middle" x="416" y="-4209.3" font-family="Times,serif" font-size="14.00" fill="#000000">Equilibrium</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1973&#45;&gt;ZcashFoundation/zebra#2156 -->
-<g id="edge48" class="edge">
+<g id="edge47" class="edge">
 <title>ZcashFoundation/zebra#1973&#45;&gt;ZcashFoundation/zebra#2156</title>
-<path fill="none" stroke="#000000" d="M248.33,-4337C262.02,-4337 276.03,-4337 289.84,-4337"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-4340.5001 299.85,-4337 289.85,-4333.5001 289.85,-4340.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-4243C262.02,-4243 276.03,-4243 289.84,-4243"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-4246.5001 299.85,-4243 289.85,-4239.5001 289.85,-4246.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2292 -->
-<g id="node89" class="node">
+<g id="node88" class="node">
 <title>ZcashFoundation/zebra#2292</title>
-<g id="a_node89"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2292" xlink:title="ZcashFoundation/zebra#2292&#10;Cleanup MetaAddr after&#10;security fixes" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4434.5 16,-4434.5 16,-4381.5 248,-4381.5 248,-4434.5"/>
-<text text-anchor="middle" x="132" y="-4419.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2292</text>
-<text text-anchor="middle" x="132" y="-4404.3" font-family="Times,serif" font-size="14.00" fill="#000000">Cleanup MetaAddr after</text>
-<text text-anchor="middle" x="132" y="-4389.3" font-family="Times,serif" font-size="14.00" fill="#000000">security fixes</text>
+<g id="a_node88"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2292" xlink:title="ZcashFoundation/zebra#2292&#10;Cleanup MetaAddr after&#10;security fixes" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4340.5 16,-4340.5 16,-4287.5 248,-4287.5 248,-4340.5"/>
+<text text-anchor="middle" x="132" y="-4325.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2292</text>
+<text text-anchor="middle" x="132" y="-4310.3" font-family="Times,serif" font-size="14.00" fill="#000000">Cleanup MetaAddr after</text>
+<text text-anchor="middle" x="132" y="-4295.3" font-family="Times,serif" font-size="14.00" fill="#000000">security fixes</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2293 -->
-<g id="node90" class="node">
+<g id="node89" class="node">
 <title>ZcashFoundation/zebra#2293</title>
-<g id="a_node90"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2293" xlink:title="ZcashFoundation/zebra#2293&#10;Batch MetaAddrChanges and&#10;remove identical changes" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4505.5 16,-4505.5 16,-4452.5 248,-4452.5 248,-4505.5"/>
-<text text-anchor="middle" x="132" y="-4490.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2293</text>
-<text text-anchor="middle" x="132" y="-4475.3" font-family="Times,serif" font-size="14.00" fill="#000000">Batch MetaAddrChanges and</text>
-<text text-anchor="middle" x="132" y="-4460.3" font-family="Times,serif" font-size="14.00" fill="#000000">remove identical changes</text>
+<g id="a_node89"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2293" xlink:title="ZcashFoundation/zebra#2293&#10;Batch MetaAddrChanges and&#10;remove identical changes" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4411.5 16,-4411.5 16,-4358.5 248,-4358.5 248,-4411.5"/>
+<text text-anchor="middle" x="132" y="-4396.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2293</text>
+<text text-anchor="middle" x="132" y="-4381.3" font-family="Times,serif" font-size="14.00" fill="#000000">Batch MetaAddrChanges and</text>
+<text text-anchor="middle" x="132" y="-4366.3" font-family="Times,serif" font-size="14.00" fill="#000000">remove identical changes</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2262 -->
-<g id="node91" class="node">
+<g id="node90" class="node">
 <title>ZcashFoundation/zebra#2262</title>
-<g id="a_node91"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2262" xlink:title="ZcashFoundation/zebra#2262&#10;After network upgrade&#10;activation, close&#10;existing connections to&#10;outdated peers" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3748.5 16,-3748.5 16,-3665.5 248,-3665.5 248,-3748.5"/>
-<text text-anchor="middle" x="132" y="-3733.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2262</text>
-<text text-anchor="middle" x="132" y="-3718.3" font-family="Times,serif" font-size="14.00" fill="#000000">After network upgrade</text>
-<text text-anchor="middle" x="132" y="-3703.3" font-family="Times,serif" font-size="14.00" fill="#000000">activation, close</text>
-<text text-anchor="middle" x="132" y="-3688.3" font-family="Times,serif" font-size="14.00" fill="#000000">existing connections to</text>
-<text text-anchor="middle" x="132" y="-3673.3" font-family="Times,serif" font-size="14.00" fill="#000000">outdated peers</text>
+<g id="a_node90"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2262" xlink:title="ZcashFoundation/zebra#2262&#10;After network upgrade&#10;activation, close&#10;existing connections to&#10;outdated peers" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3654.5 16,-3654.5 16,-3571.5 248,-3571.5 248,-3654.5"/>
+<text text-anchor="middle" x="132" y="-3639.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2262</text>
+<text text-anchor="middle" x="132" y="-3624.3" font-family="Times,serif" font-size="14.00" fill="#000000">After network upgrade</text>
+<text text-anchor="middle" x="132" y="-3609.3" font-family="Times,serif" font-size="14.00" fill="#000000">activation, close</text>
+<text text-anchor="middle" x="132" y="-3594.3" font-family="Times,serif" font-size="14.00" fill="#000000">existing connections to</text>
+<text text-anchor="middle" x="132" y="-3579.3" font-family="Times,serif" font-size="14.00" fill="#000000">outdated peers</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2262&#45;&gt;ZcashFoundation/zebra#1334 -->
-<g id="edge49" class="edge">
+<g id="edge48" class="edge">
 <title>ZcashFoundation/zebra#2262&#45;&gt;ZcashFoundation/zebra#1334</title>
-<path fill="none" stroke="#000000" d="M248.33,-3748.4C262.15,-3753.3 276.3,-3758.3 290.24,-3763.3"/>
-<polygon fill="#000000" stroke="#000000" points="289.2552,-3766.6641 299.85,-3766.7 291.59,-3760.065 289.2552,-3766.6641"/>
+<path fill="none" stroke="#000000" d="M248.33,-3654.4C262.15,-3659.3 276.3,-3664.3 290.24,-3669.3"/>
+<polygon fill="#000000" stroke="#000000" points="289.2552,-3672.6641 299.85,-3672.7 291.59,-3666.065 289.2552,-3672.6641"/>
 </g>
 <!-- ZcashFoundation/zebra#2262&#45;&gt;ZcashFoundation/zebra#706 -->
-<g id="edge50" class="edge">
+<g id="edge49" class="edge">
 <title>ZcashFoundation/zebra#2262&#45;&gt;ZcashFoundation/zebra#706</title>
-<path fill="none" stroke="#000000" d="M248.11,-3715.6C265.5,-3716.8 283.22,-3718 300,-3719 387.68,-3724.3 486.68,-3729.2 562.2,-3732.7"/>
-<polygon fill="#000000" stroke="#000000" points="562.0883,-3736.1982 572.22,-3733.1 562.3676,-3729.2038 562.0883,-3736.1982"/>
+<path fill="none" stroke="#000000" d="M248.11,-3621.6C265.5,-3622.8 283.22,-3624 300,-3625 387.68,-3630.3 486.68,-3635.2 562.2,-3638.7"/>
+<polygon fill="#000000" stroke="#000000" points="562.0883,-3642.1982 572.22,-3639.1 562.3676,-3635.2038 562.0883,-3642.1982"/>
 </g>
 <!-- ZcashFoundation/zebra#2261 -->
-<g id="node92" class="node">
+<g id="node91" class="node">
 <title>ZcashFoundation/zebra#2261</title>
-<g id="a_node92"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2261" xlink:title="ZcashFoundation/zebra#2261&#10;Stop sending addresses of&#10;outdated peers to other&#10;peers" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-3710 300,-3710 300,-3642 532,-3642 532,-3710"/>
-<text text-anchor="middle" x="416" y="-3694.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2261</text>
-<text text-anchor="middle" x="416" y="-3679.8" font-family="Times,serif" font-size="14.00" fill="#000000">Stop sending addresses of</text>
-<text text-anchor="middle" x="416" y="-3664.8" font-family="Times,serif" font-size="14.00" fill="#000000">outdated peers to other</text>
-<text text-anchor="middle" x="416" y="-3649.8" font-family="Times,serif" font-size="14.00" fill="#000000">peers</text>
+<g id="a_node91"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2261" xlink:title="ZcashFoundation/zebra#2261&#10;Stop sending addresses of&#10;outdated peers to other&#10;peers" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-3616 300,-3616 300,-3548 532,-3548 532,-3616"/>
+<text text-anchor="middle" x="416" y="-3600.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2261</text>
+<text text-anchor="middle" x="416" y="-3585.8" font-family="Times,serif" font-size="14.00" fill="#000000">Stop sending addresses of</text>
+<text text-anchor="middle" x="416" y="-3570.8" font-family="Times,serif" font-size="14.00" fill="#000000">outdated peers to other</text>
+<text text-anchor="middle" x="416" y="-3555.8" font-family="Times,serif" font-size="14.00" fill="#000000">peers</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2262&#45;&gt;ZcashFoundation/zebra#2261 -->
-<g id="edge51" class="edge">
+<g id="edge50" class="edge">
 <title>ZcashFoundation/zebra#2262&#45;&gt;ZcashFoundation/zebra#2261</title>
-<path fill="none" stroke="#000000" d="M248.33,-3694.3C262.02,-3692.8 276.03,-3691.3 289.84,-3689.8"/>
-<polygon fill="#000000" stroke="#000000" points="290.2922,-3693.2715 299.85,-3688.7 289.5275,-3686.3134 290.2922,-3693.2715"/>
+<path fill="none" stroke="#000000" d="M248.33,-3600.3C262.02,-3598.8 276.03,-3597.3 289.84,-3595.8"/>
+<polygon fill="#000000" stroke="#000000" points="290.2922,-3599.2715 299.85,-3594.7 289.5275,-3592.3134 290.2922,-3599.2715"/>
 </g>
 <!-- ZcashFoundation/zebra#2107 -->
-<g id="node93" class="node">
+<g id="node92" class="node">
 <title>ZcashFoundation/zebra#2107</title>
-<g id="a_node93"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2107" xlink:title="ZcashFoundation/zebra#2107&#10;Security: Stop&#10;immediately disconnecting&#10;from nodes that send&#10;unexpected messages,&#10;Credit: Equilibrium" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-3624 300,-3624 300,-3526 532,-3526 532,-3624"/>
-<text text-anchor="middle" x="416" y="-3608.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2107</text>
-<text text-anchor="middle" x="416" y="-3593.8" font-family="Times,serif" font-size="14.00" fill="#000000">Security: Stop</text>
-<text text-anchor="middle" x="416" y="-3578.8" font-family="Times,serif" font-size="14.00" fill="#000000">immediately disconnecting</text>
-<text text-anchor="middle" x="416" y="-3563.8" font-family="Times,serif" font-size="14.00" fill="#000000">from nodes that send</text>
-<text text-anchor="middle" x="416" y="-3548.8" font-family="Times,serif" font-size="14.00" fill="#000000">unexpected messages,</text>
-<text text-anchor="middle" x="416" y="-3533.8" font-family="Times,serif" font-size="14.00" fill="#000000">Credit: Equilibrium</text>
+<g id="a_node92"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2107" xlink:title="ZcashFoundation/zebra#2107&#10;Security: Stop&#10;immediately disconnecting&#10;from nodes that send&#10;unexpected messages,&#10;Credit: Equilibrium" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-3530 300,-3530 300,-3432 532,-3432 532,-3530"/>
+<text text-anchor="middle" x="416" y="-3514.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2107</text>
+<text text-anchor="middle" x="416" y="-3499.8" font-family="Times,serif" font-size="14.00" fill="#000000">Security: Stop</text>
+<text text-anchor="middle" x="416" y="-3484.8" font-family="Times,serif" font-size="14.00" fill="#000000">immediately disconnecting</text>
+<text text-anchor="middle" x="416" y="-3469.8" font-family="Times,serif" font-size="14.00" fill="#000000">from nodes that send</text>
+<text text-anchor="middle" x="416" y="-3454.8" font-family="Times,serif" font-size="14.00" fill="#000000">unexpected messages,</text>
+<text text-anchor="middle" x="416" y="-3439.8" font-family="Times,serif" font-size="14.00" fill="#000000">Credit: Equilibrium</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2262&#45;&gt;ZcashFoundation/zebra#2107 -->
-<g id="edge52" class="edge">
+<g id="edge51" class="edge">
 <title>ZcashFoundation/zebra#2262&#45;&gt;ZcashFoundation/zebra#2107</title>
-<path fill="none" stroke="#000000" d="M244.31,-3665.4C251.03,-3662.4 257.64,-3659.2 264,-3656 280.94,-3647.4 283.49,-3642.4 300,-3633 302.27,-3631.7 304.57,-3630.4 306.9,-3629.1"/>
-<polygon fill="#000000" stroke="#000000" points="308.8418,-3632.0293 315.98,-3624.2 305.5174,-3625.869 308.8418,-3632.0293"/>
+<path fill="none" stroke="#000000" d="M244.31,-3571.4C251.03,-3568.4 257.64,-3565.2 264,-3562 280.94,-3553.4 283.49,-3548.4 300,-3539 302.27,-3537.7 304.57,-3536.4 306.9,-3535.1"/>
+<polygon fill="#000000" stroke="#000000" points="308.8418,-3538.0293 315.98,-3530.2 305.5174,-3531.869 308.8418,-3538.0293"/>
 </g>
 <!-- ZcashFoundation/zebra#2107&#45;&gt;ZcashFoundation/zebra#706 -->
-<g id="edge53" class="edge">
+<g id="edge52" class="edge">
 <title>ZcashFoundation/zebra#2107&#45;&gt;ZcashFoundation/zebra#706</title>
-<path fill="none" stroke="#000000" d="M516.45,-3624.1C521.75,-3627 526.96,-3630 532,-3633 561.52,-3650.5 592.9,-3671.7 619.43,-3690.4"/>
-<polygon fill="#000000" stroke="#000000" points="617.6917,-3693.4585 627.87,-3696.4 621.7476,-3687.7532 617.6917,-3693.4585"/>
+<path fill="none" stroke="#000000" d="M516.45,-3530.1C521.75,-3533 526.96,-3536 532,-3539 561.52,-3556.5 592.9,-3577.7 619.43,-3596.4"/>
+<polygon fill="#000000" stroke="#000000" points="617.6917,-3599.4585 627.87,-3602.4 621.7476,-3593.7532 617.6917,-3599.4585"/>
 </g>
 <!-- ZcashFoundation/zcash_script#21 -->
-<g id="node94" class="node">
+<g id="node93" class="node">
 <title>ZcashFoundation/zcash_script#21</title>
-<g id="a_node94"><a xlink:href="https://github.com/ZcashFoundation/zcash_script/issues/21" xlink:title="ZcashFoundation/zcash_script#21&#10;Add support for V5&#10;transactions" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="264,-4576.5 0,-4576.5 0,-4523.5 264,-4523.5 264,-4576.5"/>
-<text text-anchor="middle" x="132" y="-4561.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zcash_script#21</text>
-<text text-anchor="middle" x="132" y="-4546.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for V5</text>
-<text text-anchor="middle" x="132" y="-4531.3" font-family="Times,serif" font-size="14.00" fill="#000000">transactions</text>
+<g id="a_node93"><a xlink:href="https://github.com/ZcashFoundation/zcash_script/issues/21" xlink:title="ZcashFoundation/zcash_script#21&#10;Add support for V5&#10;transactions" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="264,-4482.5 0,-4482.5 0,-4429.5 264,-4429.5 264,-4482.5"/>
+<text text-anchor="middle" x="132" y="-4467.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zcash_script#21</text>
+<text text-anchor="middle" x="132" y="-4452.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for V5</text>
+<text text-anchor="middle" x="132" y="-4437.3" font-family="Times,serif" font-size="14.00" fill="#000000">transactions</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2328 -->
-<g id="node95" class="node">
+<g id="node94" class="node">
 <title>ZcashFoundation/zebra#2328</title>
-<g id="a_node95"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2328" xlink:title="ZcashFoundation/zebra#2328&#10;Update `zcash_script` to&#10;support V5 transactions" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-4576.5 300,-4576.5 300,-4523.5 532,-4523.5 532,-4576.5"/>
-<text text-anchor="middle" x="416" y="-4561.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2328</text>
-<text text-anchor="middle" x="416" y="-4546.3" font-family="Times,serif" font-size="14.00" fill="#000000">Update `zcash_script` to</text>
-<text text-anchor="middle" x="416" y="-4531.3" font-family="Times,serif" font-size="14.00" fill="#000000">support V5 transactions</text>
+<g id="a_node94"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2328" xlink:title="ZcashFoundation/zebra#2328&#10;Update `zcash_script` to&#10;support V5 transactions" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-4482.5 300,-4482.5 300,-4429.5 532,-4429.5 532,-4482.5"/>
+<text text-anchor="middle" x="416" y="-4467.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2328</text>
+<text text-anchor="middle" x="416" y="-4452.3" font-family="Times,serif" font-size="14.00" fill="#000000">Update `zcash_script` to</text>
+<text text-anchor="middle" x="416" y="-4437.3" font-family="Times,serif" font-size="14.00" fill="#000000">support V5 transactions</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zcash_script#21&#45;&gt;ZcashFoundation/zebra#2328 -->
-<g id="edge54" class="edge">
+<g id="edge53" class="edge">
 <title>ZcashFoundation/zcash_script#21&#45;&gt;ZcashFoundation/zebra#2328</title>
-<path fill="none" stroke="#000000" d="M264.02,-4550C272.47,-4550 280.96,-4550 289.38,-4550"/>
-<polygon fill="#000000" stroke="#000000" points="289.6,-4553.5001 299.6,-4550 289.6,-4546.5001 289.6,-4553.5001"/>
+<path fill="none" stroke="#000000" d="M264.02,-4456C272.47,-4456 280.96,-4456 289.38,-4456"/>
+<polygon fill="#000000" stroke="#000000" points="289.6,-4459.5001 299.6,-4456 289.6,-4452.5001 289.6,-4459.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#1981 -->
-<g id="node96" class="node">
+<g id="node95" class="node">
 <title>ZcashFoundation/zebra#1981</title>
-<g id="a_node96"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1981" xlink:title="ZcashFoundation/zebra#1981&#10;Implement Transparent and&#10;Sapling validation for&#10;transaction v5" target="_blank">
-<polygon fill="#fad8c7" stroke="#000000" points="800,-4584 568,-4584 568,-4516 800,-4516 800,-4584"/>
-<text text-anchor="middle" x="684" y="-4568.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1981</text>
-<text text-anchor="middle" x="684" y="-4553.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Transparent and</text>
-<text text-anchor="middle" x="684" y="-4538.8" font-family="Times,serif" font-size="14.00" fill="#000000">Sapling validation for</text>
-<text text-anchor="middle" x="684" y="-4523.8" font-family="Times,serif" font-size="14.00" fill="#000000">transaction v5</text>
+<g id="a_node95"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1981" xlink:title="ZcashFoundation/zebra#1981&#10;Implement Transparent and&#10;Sapling validation for&#10;transaction v5" target="_blank">
+<polygon fill="#fad8c7" stroke="#000000" points="800,-4490 568,-4490 568,-4422 800,-4422 800,-4490"/>
+<text text-anchor="middle" x="684" y="-4474.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1981</text>
+<text text-anchor="middle" x="684" y="-4459.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Transparent and</text>
+<text text-anchor="middle" x="684" y="-4444.8" font-family="Times,serif" font-size="14.00" fill="#000000">Sapling validation for</text>
+<text text-anchor="middle" x="684" y="-4429.8" font-family="Times,serif" font-size="14.00" fill="#000000">transaction v5</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2328&#45;&gt;ZcashFoundation/zebra#1981 -->
-<g id="edge55" class="edge">
+<g id="edge54" class="edge">
 <title>ZcashFoundation/zebra#2328&#45;&gt;ZcashFoundation/zebra#1981</title>
-<path fill="none" stroke="#000000" d="M532.38,-4550C540.71,-4550 549.14,-4550 557.53,-4550"/>
-<polygon fill="#000000" stroke="#000000" points="557.74,-4553.5001 567.74,-4550 557.74,-4546.5001 557.74,-4553.5001"/>
+<path fill="none" stroke="#000000" d="M532.38,-4456C540.71,-4456 549.14,-4456 557.53,-4456"/>
+<polygon fill="#000000" stroke="#000000" points="557.74,-4459.5001 567.74,-4456 557.74,-4452.5001 557.74,-4459.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2338 -->
-<g id="node97" class="node">
+<g id="node96" class="node">
 <title>ZcashFoundation/zebra#2338</title>
-<g id="a_node97"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2338" xlink:title="ZcashFoundation/zebra#2338&#10;Create Error enums in&#10;`zebrad`" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4655.5 16,-4655.5 16,-4602.5 248,-4602.5 248,-4655.5"/>
-<text text-anchor="middle" x="132" y="-4640.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2338</text>
-<text text-anchor="middle" x="132" y="-4625.3" font-family="Times,serif" font-size="14.00" fill="#000000">Create Error enums in</text>
-<text text-anchor="middle" x="132" y="-4610.3" font-family="Times,serif" font-size="14.00" fill="#000000">`zebrad`</text>
+<g id="a_node96"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2338" xlink:title="ZcashFoundation/zebra#2338&#10;Create Error enums in&#10;`zebrad`" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4561.5 16,-4561.5 16,-4508.5 248,-4508.5 248,-4561.5"/>
+<text text-anchor="middle" x="132" y="-4546.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2338</text>
+<text text-anchor="middle" x="132" y="-4531.3" font-family="Times,serif" font-size="14.00" fill="#000000">Create Error enums in</text>
+<text text-anchor="middle" x="132" y="-4516.3" font-family="Times,serif" font-size="14.00" fill="#000000">`zebrad`</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2339 -->
-<g id="node98" class="node">
+<g id="node97" class="node">
 <title>ZcashFoundation/zebra#2339</title>
-<g id="a_node98"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2339" xlink:title="ZcashFoundation/zebra#2339&#10;Downcast and match&#10;Already Verified error&#10;enums in the syncer" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-4663 300,-4663 300,-4595 532,-4595 532,-4663"/>
-<text text-anchor="middle" x="416" y="-4647.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2339</text>
-<text text-anchor="middle" x="416" y="-4632.8" font-family="Times,serif" font-size="14.00" fill="#000000">Downcast and match</text>
-<text text-anchor="middle" x="416" y="-4617.8" font-family="Times,serif" font-size="14.00" fill="#000000">Already Verified error</text>
-<text text-anchor="middle" x="416" y="-4602.8" font-family="Times,serif" font-size="14.00" fill="#000000">enums in the syncer</text>
+<g id="a_node97"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2339" xlink:title="ZcashFoundation/zebra#2339&#10;Downcast and match&#10;Already Verified error&#10;enums in the syncer" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-4569 300,-4569 300,-4501 532,-4501 532,-4569"/>
+<text text-anchor="middle" x="416" y="-4553.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2339</text>
+<text text-anchor="middle" x="416" y="-4538.8" font-family="Times,serif" font-size="14.00" fill="#000000">Downcast and match</text>
+<text text-anchor="middle" x="416" y="-4523.8" font-family="Times,serif" font-size="14.00" fill="#000000">Already Verified error</text>
+<text text-anchor="middle" x="416" y="-4508.8" font-family="Times,serif" font-size="14.00" fill="#000000">enums in the syncer</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2338&#45;&gt;ZcashFoundation/zebra#2339 -->
-<g id="edge56" class="edge">
+<g id="edge55" class="edge">
 <title>ZcashFoundation/zebra#2338&#45;&gt;ZcashFoundation/zebra#2339</title>
-<path fill="none" stroke="#000000" d="M248.33,-4629C262.02,-4629 276.03,-4629 289.84,-4629"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-4632.5001 299.85,-4629 289.85,-4625.5001 289.85,-4632.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-4535C262.02,-4535 276.03,-4535 289.84,-4535"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-4538.5001 299.85,-4535 289.85,-4531.5001 289.85,-4538.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2331 -->
-<g id="node99" class="node">
+<g id="node98" class="node">
 <title>ZcashFoundation/zebra#2331</title>
-<g id="a_node99"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2331" xlink:title="ZcashFoundation/zebra#2331&#10;Remove serde from zebra&#45;&#10;chain" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4741.5 16,-4741.5 16,-4688.5 248,-4688.5 248,-4741.5"/>
-<text text-anchor="middle" x="132" y="-4726.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2331</text>
-<text text-anchor="middle" x="132" y="-4711.3" font-family="Times,serif" font-size="14.00" fill="#000000">Remove serde from zebra&#45;</text>
-<text text-anchor="middle" x="132" y="-4696.3" font-family="Times,serif" font-size="14.00" fill="#000000">chain</text>
+<g id="a_node98"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2331" xlink:title="ZcashFoundation/zebra#2331&#10;Remove serde from zebra&#45;&#10;chain" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4647.5 16,-4647.5 16,-4594.5 248,-4594.5 248,-4647.5"/>
+<text text-anchor="middle" x="132" y="-4632.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2331</text>
+<text text-anchor="middle" x="132" y="-4617.3" font-family="Times,serif" font-size="14.00" fill="#000000">Remove serde from zebra&#45;</text>
+<text text-anchor="middle" x="132" y="-4602.3" font-family="Times,serif" font-size="14.00" fill="#000000">chain</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2042 -->
-<g id="node100" class="node">
+<g id="node99" class="node">
 <title>ZcashFoundation/zebra#2042</title>
-<g id="a_node100"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2042" xlink:title="ZcashFoundation/zebra#2042&#10;zebra&#45;chain: Port array&#45;&#10;wrapper types to const&#10;generics" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-4749 300,-4749 300,-4681 532,-4681 532,-4749"/>
-<text text-anchor="middle" x="416" y="-4733.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2042</text>
-<text text-anchor="middle" x="416" y="-4718.8" font-family="Times,serif" font-size="14.00" fill="#000000">zebra&#45;chain: Port array&#45;</text>
-<text text-anchor="middle" x="416" y="-4703.8" font-family="Times,serif" font-size="14.00" fill="#000000">wrapper types to const</text>
-<text text-anchor="middle" x="416" y="-4688.8" font-family="Times,serif" font-size="14.00" fill="#000000">generics</text>
+<g id="a_node99"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2042" xlink:title="ZcashFoundation/zebra#2042&#10;zebra&#45;chain: Port array&#45;&#10;wrapper types to const&#10;generics" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-4655 300,-4655 300,-4587 532,-4587 532,-4655"/>
+<text text-anchor="middle" x="416" y="-4639.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2042</text>
+<text text-anchor="middle" x="416" y="-4624.8" font-family="Times,serif" font-size="14.00" fill="#000000">zebra&#45;chain: Port array&#45;</text>
+<text text-anchor="middle" x="416" y="-4609.8" font-family="Times,serif" font-size="14.00" fill="#000000">wrapper types to const</text>
+<text text-anchor="middle" x="416" y="-4594.8" font-family="Times,serif" font-size="14.00" fill="#000000">generics</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2331&#45;&gt;ZcashFoundation/zebra#2042 -->
-<g id="edge57" class="edge">
+<g id="edge56" class="edge">
 <title>ZcashFoundation/zebra#2331&#45;&gt;ZcashFoundation/zebra#2042</title>
-<path fill="none" stroke="#000000" d="M248.33,-4715C262.02,-4715 276.03,-4715 289.84,-4715"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-4718.5001 299.85,-4715 289.85,-4711.5001 289.85,-4718.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-4621C262.02,-4621 276.03,-4621 289.84,-4621"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-4624.5001 299.85,-4621 289.85,-4617.5001 289.85,-4624.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2375 -->
-<g id="node101" class="node">
+<g id="node100" class="node">
 <title>ZcashFoundation/zebra#2375</title>
-<g id="a_node101"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2375" xlink:title="ZcashFoundation/zebra#2375&#10;Automatically use zebrad&#10;version for the zebra&#45;&#10;network user agent" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4828 16,-4828 16,-4760 248,-4760 248,-4828"/>
-<text text-anchor="middle" x="132" y="-4812.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2375</text>
-<text text-anchor="middle" x="132" y="-4797.8" font-family="Times,serif" font-size="14.00" fill="#000000">Automatically use zebrad</text>
-<text text-anchor="middle" x="132" y="-4782.8" font-family="Times,serif" font-size="14.00" fill="#000000">version for the zebra&#45;</text>
-<text text-anchor="middle" x="132" y="-4767.8" font-family="Times,serif" font-size="14.00" fill="#000000">network user agent</text>
+<g id="a_node100"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2375" xlink:title="ZcashFoundation/zebra#2375&#10;Automatically use zebrad&#10;version for the zebra&#45;&#10;network user agent" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4734 16,-4734 16,-4666 248,-4666 248,-4734"/>
+<text text-anchor="middle" x="132" y="-4718.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2375</text>
+<text text-anchor="middle" x="132" y="-4703.8" font-family="Times,serif" font-size="14.00" fill="#000000">Automatically use zebrad</text>
+<text text-anchor="middle" x="132" y="-4688.8" font-family="Times,serif" font-size="14.00" fill="#000000">version for the zebra&#45;</text>
+<text text-anchor="middle" x="132" y="-4673.8" font-family="Times,serif" font-size="14.00" fill="#000000">network user agent</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#794 -->
-<g id="node102" class="node">
+<g id="node101" class="node">
 <title>ZcashFoundation/zebra#794</title>
-<g id="a_node102"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/794" xlink:title="ZcashFoundation/zebra#794&#10;Make sure custom user&#10;agents conform to BIP&#45;14" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="527.5,-4820.5 304.5,-4820.5 304.5,-4767.5 527.5,-4767.5 527.5,-4820.5"/>
-<text text-anchor="middle" x="416" y="-4805.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#794</text>
-<text text-anchor="middle" x="416" y="-4790.3" font-family="Times,serif" font-size="14.00" fill="#000000">Make sure custom user</text>
-<text text-anchor="middle" x="416" y="-4775.3" font-family="Times,serif" font-size="14.00" fill="#000000">agents conform to BIP&#45;14</text>
+<g id="a_node101"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/794" xlink:title="ZcashFoundation/zebra#794&#10;Make sure custom user&#10;agents conform to BIP&#45;14" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="527.5,-4726.5 304.5,-4726.5 304.5,-4673.5 527.5,-4673.5 527.5,-4726.5"/>
+<text text-anchor="middle" x="416" y="-4711.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#794</text>
+<text text-anchor="middle" x="416" y="-4696.3" font-family="Times,serif" font-size="14.00" fill="#000000">Make sure custom user</text>
+<text text-anchor="middle" x="416" y="-4681.3" font-family="Times,serif" font-size="14.00" fill="#000000">agents conform to BIP&#45;14</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2375&#45;&gt;ZcashFoundation/zebra#794 -->
-<g id="edge58" class="edge">
+<g id="edge57" class="edge">
 <title>ZcashFoundation/zebra#2375&#45;&gt;ZcashFoundation/zebra#794</title>
-<path fill="none" stroke="#000000" d="M248.33,-4794C263.39,-4794 278.85,-4794 294,-4794"/>
-<polygon fill="#000000" stroke="#000000" points="294.43,-4797.5001 304.43,-4794 294.43,-4790.5001 294.43,-4797.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-4700C263.39,-4700 278.85,-4700 294,-4700"/>
+<polygon fill="#000000" stroke="#000000" points="294.43,-4703.5001 304.43,-4700 294.43,-4696.5001 294.43,-4703.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2377 -->
-<g id="node103" class="node">
+<g id="node102" class="node">
 <title>ZcashFoundation/zebra#2377</title>
-<g id="a_node103"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2377" xlink:title="ZcashFoundation/zebra#2377&#10;Refactor history tree&#10;pruning" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4899.5 16,-4899.5 16,-4846.5 248,-4846.5 248,-4899.5"/>
-<text text-anchor="middle" x="132" y="-4884.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2377</text>
-<text text-anchor="middle" x="132" y="-4869.3" font-family="Times,serif" font-size="14.00" fill="#000000">Refactor history tree</text>
-<text text-anchor="middle" x="132" y="-4854.3" font-family="Times,serif" font-size="14.00" fill="#000000">pruning</text>
+<g id="a_node102"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2377" xlink:title="ZcashFoundation/zebra#2377&#10;Refactor history tree&#10;pruning" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4805.5 16,-4805.5 16,-4752.5 248,-4752.5 248,-4805.5"/>
+<text text-anchor="middle" x="132" y="-4790.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2377</text>
+<text text-anchor="middle" x="132" y="-4775.3" font-family="Times,serif" font-size="14.00" fill="#000000">Refactor history tree</text>
+<text text-anchor="middle" x="132" y="-4760.3" font-family="Times,serif" font-size="14.00" fill="#000000">pruning</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2378 -->
-<g id="node104" class="node">
+<g id="node103" class="node">
 <title>ZcashFoundation/zebra#2378</title>
-<g id="a_node104"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2378" xlink:title="ZcashFoundation/zebra#2378&#10;Improve history and note&#10;commitment trees forking" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4970.5 16,-4970.5 16,-4917.5 248,-4917.5 248,-4970.5"/>
-<text text-anchor="middle" x="132" y="-4955.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2378</text>
-<text text-anchor="middle" x="132" y="-4940.3" font-family="Times,serif" font-size="14.00" fill="#000000">Improve history and note</text>
-<text text-anchor="middle" x="132" y="-4925.3" font-family="Times,serif" font-size="14.00" fill="#000000">commitment trees forking</text>
+<g id="a_node103"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2378" xlink:title="ZcashFoundation/zebra#2378&#10;Improve history and note&#10;commitment trees forking" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4876.5 16,-4876.5 16,-4823.5 248,-4823.5 248,-4876.5"/>
+<text text-anchor="middle" x="132" y="-4861.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2378</text>
+<text text-anchor="middle" x="132" y="-4846.3" font-family="Times,serif" font-size="14.00" fill="#000000">Improve history and note</text>
+<text text-anchor="middle" x="132" y="-4831.3" font-family="Times,serif" font-size="14.00" fill="#000000">commitment trees forking</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1951 -->
-<g id="node105" class="node">
+<g id="node104" class="node">
 <title>ZcashFoundation/zebra#1951</title>
-<g id="a_node105"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1951" xlink:title="ZcashFoundation/zebra#1951&#10;Generalize/deduplicate&#10;async batch verification&#10;services / create a&#10;derive&#45;able proc macro" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-5071.5 16,-5071.5 16,-4988.5 248,-4988.5 248,-5071.5"/>
-<text text-anchor="middle" x="132" y="-5056.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1951</text>
-<text text-anchor="middle" x="132" y="-5041.3" font-family="Times,serif" font-size="14.00" fill="#000000">Generalize/deduplicate</text>
-<text text-anchor="middle" x="132" y="-5026.3" font-family="Times,serif" font-size="14.00" fill="#000000">async batch verification</text>
-<text text-anchor="middle" x="132" y="-5011.3" font-family="Times,serif" font-size="14.00" fill="#000000">services / create a</text>
-<text text-anchor="middle" x="132" y="-4996.3" font-family="Times,serif" font-size="14.00" fill="#000000">derive&#45;able proc macro</text>
+<g id="a_node104"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1951" xlink:title="ZcashFoundation/zebra#1951&#10;Generalize/deduplicate&#10;async batch verification&#10;services / create a&#10;derive&#45;able proc macro" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4977.5 16,-4977.5 16,-4894.5 248,-4894.5 248,-4977.5"/>
+<text text-anchor="middle" x="132" y="-4962.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1951</text>
+<text text-anchor="middle" x="132" y="-4947.3" font-family="Times,serif" font-size="14.00" fill="#000000">Generalize/deduplicate</text>
+<text text-anchor="middle" x="132" y="-4932.3" font-family="Times,serif" font-size="14.00" fill="#000000">async batch verification</text>
+<text text-anchor="middle" x="132" y="-4917.3" font-family="Times,serif" font-size="14.00" fill="#000000">services / create a</text>
+<text text-anchor="middle" x="132" y="-4902.3" font-family="Times,serif" font-size="14.00" fill="#000000">derive&#45;able proc macro</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2390 -->
-<g id="node106" class="node">
+<g id="node105" class="node">
 <title>ZcashFoundation/zebra#2390</title>
-<g id="a_node106"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2390" xlink:title="ZcashFoundation/zebra#2390&#10;Fix tasks spawned by&#10;`tower_batch::Batch` only&#10;being alive during one&#10;test execution" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-5071.5 300,-5071.5 300,-4988.5 532,-4988.5 532,-5071.5"/>
-<text text-anchor="middle" x="416" y="-5056.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2390</text>
-<text text-anchor="middle" x="416" y="-5041.3" font-family="Times,serif" font-size="14.00" fill="#000000">Fix tasks spawned by</text>
-<text text-anchor="middle" x="416" y="-5026.3" font-family="Times,serif" font-size="14.00" fill="#000000">`tower_batch::Batch` only</text>
-<text text-anchor="middle" x="416" y="-5011.3" font-family="Times,serif" font-size="14.00" fill="#000000">being alive during one</text>
-<text text-anchor="middle" x="416" y="-4996.3" font-family="Times,serif" font-size="14.00" fill="#000000">test execution</text>
+<g id="a_node105"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2390" xlink:title="ZcashFoundation/zebra#2390&#10;Fix tasks spawned by&#10;`tower_batch::Batch` only&#10;being alive during one&#10;test execution" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-4977.5 300,-4977.5 300,-4894.5 532,-4894.5 532,-4977.5"/>
+<text text-anchor="middle" x="416" y="-4962.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2390</text>
+<text text-anchor="middle" x="416" y="-4947.3" font-family="Times,serif" font-size="14.00" fill="#000000">Fix tasks spawned by</text>
+<text text-anchor="middle" x="416" y="-4932.3" font-family="Times,serif" font-size="14.00" fill="#000000">`tower_batch::Batch` only</text>
+<text text-anchor="middle" x="416" y="-4917.3" font-family="Times,serif" font-size="14.00" fill="#000000">being alive during one</text>
+<text text-anchor="middle" x="416" y="-4902.3" font-family="Times,serif" font-size="14.00" fill="#000000">test execution</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1951&#45;&gt;ZcashFoundation/zebra#2390 -->
-<g id="edge59" class="edge">
+<g id="edge58" class="edge">
 <title>ZcashFoundation/zebra#1951&#45;&gt;ZcashFoundation/zebra#2390</title>
-<path fill="none" stroke="#000000" d="M248.33,-5030C262.02,-5030 276.03,-5030 289.84,-5030"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-5033.5001 299.85,-5030 289.85,-5026.5001 289.85,-5033.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-4936C262.02,-4936 276.03,-4936 289.84,-4936"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-4939.5001 299.85,-4936 289.85,-4932.5001 289.85,-4939.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#338 -->
-<g id="node107" class="node">
+<g id="node106" class="node">
 <title>ZcashFoundation/zebra#338</title>
-<g id="a_node107"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/338" xlink:title="ZcashFoundation/zebra#338&#10;Calc Block Subsidy and&#10;Funding Streams" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="243.5,-5142.5 20.5,-5142.5 20.5,-5089.5 243.5,-5089.5 243.5,-5142.5"/>
-<text text-anchor="middle" x="132" y="-5127.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#338</text>
-<text text-anchor="middle" x="132" y="-5112.3" font-family="Times,serif" font-size="14.00" fill="#000000">Calc Block Subsidy and</text>
-<text text-anchor="middle" x="132" y="-5097.3" font-family="Times,serif" font-size="14.00" fill="#000000">Funding Streams</text>
+<g id="a_node106"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/338" xlink:title="ZcashFoundation/zebra#338&#10;Calc Block Subsidy and&#10;Funding Streams" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="243.5,-5048.5 20.5,-5048.5 20.5,-4995.5 243.5,-4995.5 243.5,-5048.5"/>
+<text text-anchor="middle" x="132" y="-5033.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#338</text>
+<text text-anchor="middle" x="132" y="-5018.3" font-family="Times,serif" font-size="14.00" fill="#000000">Calc Block Subsidy and</text>
+<text text-anchor="middle" x="132" y="-5003.3" font-family="Times,serif" font-size="14.00" fill="#000000">Funding Streams</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1162 -->
-<g id="node108" class="node">
+<g id="node107" class="node">
 <title>ZcashFoundation/zebra#1162</title>
-<g id="a_node108"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1162" xlink:title="ZcashFoundation/zebra#1162&#10;Validate coinbase miner&#10;subsidy and miner fees" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-5142.5 300,-5142.5 300,-5089.5 532,-5089.5 532,-5142.5"/>
-<text text-anchor="middle" x="416" y="-5127.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1162</text>
-<text text-anchor="middle" x="416" y="-5112.3" font-family="Times,serif" font-size="14.00" fill="#000000">Validate coinbase miner</text>
-<text text-anchor="middle" x="416" y="-5097.3" font-family="Times,serif" font-size="14.00" fill="#000000">subsidy and miner fees</text>
+<g id="a_node107"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1162" xlink:title="ZcashFoundation/zebra#1162&#10;Validate coinbase miner&#10;subsidy and miner fees" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-5048.5 300,-5048.5 300,-4995.5 532,-4995.5 532,-5048.5"/>
+<text text-anchor="middle" x="416" y="-5033.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1162</text>
+<text text-anchor="middle" x="416" y="-5018.3" font-family="Times,serif" font-size="14.00" fill="#000000">Validate coinbase miner</text>
+<text text-anchor="middle" x="416" y="-5003.3" font-family="Times,serif" font-size="14.00" fill="#000000">subsidy and miner fees</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#338&#45;&gt;ZcashFoundation/zebra#1162 -->
-<g id="edge60" class="edge">
+<g id="edge59" class="edge">
 <title>ZcashFoundation/zebra#338&#45;&gt;ZcashFoundation/zebra#1162</title>
-<path fill="none" stroke="#000000" d="M243.84,-5116C258.72,-5116 274.06,-5116 289.18,-5116"/>
-<polygon fill="#000000" stroke="#000000" points="289.59,-5119.5001 299.59,-5116 289.59,-5112.5001 289.59,-5119.5001"/>
+<path fill="none" stroke="#000000" d="M243.84,-5022C258.72,-5022 274.06,-5022 289.18,-5022"/>
+<polygon fill="#000000" stroke="#000000" points="289.59,-5025.5001 299.59,-5022 289.59,-5018.5001 289.59,-5025.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2425 -->
-<g id="node109" class="node">
+<g id="node108" class="node">
 <title>ZcashFoundation/zebra#2425</title>
-<g id="a_node109"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2425" xlink:title="ZcashFoundation/zebra#2425&#10;Design: Validate note&#10;commitment trees in state" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-5213.5 16,-5213.5 16,-5160.5 248,-5160.5 248,-5213.5"/>
-<text text-anchor="middle" x="132" y="-5198.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2425</text>
-<text text-anchor="middle" x="132" y="-5183.3" font-family="Times,serif" font-size="14.00" fill="#000000">Design: Validate note</text>
-<text text-anchor="middle" x="132" y="-5168.3" font-family="Times,serif" font-size="14.00" fill="#000000">commitment trees in state</text>
+<g id="a_node108"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2425" xlink:title="ZcashFoundation/zebra#2425&#10;Design: Validate note&#10;commitment trees in state" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-5119.5 16,-5119.5 16,-5066.5 248,-5066.5 248,-5119.5"/>
+<text text-anchor="middle" x="132" y="-5104.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2425</text>
+<text text-anchor="middle" x="132" y="-5089.3" font-family="Times,serif" font-size="14.00" fill="#000000">Design: Validate note</text>
+<text text-anchor="middle" x="132" y="-5074.3" font-family="Times,serif" font-size="14.00" fill="#000000">commitment trees in state</text>
 </a>
 </g>
 </g>