diff --git a/zcash-core-dag.svg b/zcash-core-dag.svg
index 7f975720..737087a5 100644
--- a/zcash-core-dag.svg
+++ b/zcash-core-dag.svg
@@ -4,17 +4,17 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Pages: 1 -->
-<svg width="1838pt" height="2087pt"
- viewBox="0.00 0.00 1838.00 2087.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 2083)">
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-2083 1834,-2083 1834,4 -4,4"/>
+<svg width="1927pt" height="2119pt"
+ viewBox="0.00 0.00 1927.00 2119.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 2115)">
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-2115 1923,-2115 1923,4 -4,4"/>
 <!-- zcash/librustzcash#226 -->
 <g id="node1" class="node">
 <title>zcash/librustzcash#226</title>
 <g id="a_node1"><a xlink:href="https://github.com/zcash/librustzcash/issues/226" xlink:title="zcash/librustzcash#226&#10;Bring in Bolt TZE" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="246.5,-136.5 58.5,-136.5 58.5,-98.5 246.5,-98.5 246.5,-136.5"/>
-<text text-anchor="middle" x="152.5" y="-121.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#226</text>
-<text text-anchor="middle" x="152.5" y="-106.3" font-family="Times,serif" font-size="14.00" fill="#000000">Bring in Bolt TZE</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="246.5,-683.5 58.5,-683.5 58.5,-645.5 246.5,-645.5 246.5,-683.5"/>
+<text text-anchor="middle" x="152.5" y="-668.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#226</text>
+<text text-anchor="middle" x="152.5" y="-653.3" font-family="Times,serif" font-size="14.00" fill="#000000">Bring in Bolt TZE</text>
 </a>
 </g>
 </g>
@@ -22,27 +22,27 @@
 <g id="node2" class="node">
 <title>zcash/librustzcash#225</title>
 <g id="a_node2"><a xlink:href="https://github.com/zcash/librustzcash/issues/225" xlink:title="zcash/librustzcash#225&#10;Add Bolt TZE support to&#10;the transaction builder" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="550,-144 358,-144 358,-91 550,-91 550,-144"/>
-<text text-anchor="middle" x="454" y="-128.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#225</text>
-<text text-anchor="middle" x="454" y="-113.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Bolt TZE support to</text>
-<text text-anchor="middle" x="454" y="-98.8" font-family="Times,serif" font-size="14.00" fill="#000000">the transaction builder</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="550,-691 358,-691 358,-638 550,-638 550,-691"/>
+<text text-anchor="middle" x="454" y="-675.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#225</text>
+<text text-anchor="middle" x="454" y="-660.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Bolt TZE support to</text>
+<text text-anchor="middle" x="454" y="-645.8" font-family="Times,serif" font-size="14.00" fill="#000000">the transaction builder</text>
 </a>
 </g>
 </g>
 <!-- zcash/librustzcash#226&#45;&gt;zcash/librustzcash#225 -->
 <g id="edge1" class="edge">
 <title>zcash/librustzcash#226&#45;&gt;zcash/librustzcash#225</title>
-<path fill="none" stroke="#000000" d="M246.66,-117.5C278.76,-117.5 314.86,-117.5 347.84,-117.5"/>
-<polygon fill="#000000" stroke="#000000" points="347.96,-121.0001 357.96,-117.5 347.96,-114.0001 347.96,-121.0001"/>
+<path fill="none" stroke="#000000" d="M246.66,-664.5C278.76,-664.5 314.86,-664.5 347.84,-664.5"/>
+<polygon fill="#000000" stroke="#000000" points="347.96,-668.0001 357.96,-664.5 347.96,-661.0001 347.96,-668.0001"/>
 </g>
 <!-- zcash/zcash#4190 -->
 <g id="node3" class="node">
 <title>zcash/zcash#4190</title>
 <g id="a_node3"><a xlink:href="https://github.com/zcash/zcash/issues/4190" xlink:title="zcash/zcash#4190&#10;TZE: implement zcashd&#10;&#39;host&#39; logic." target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="245.5,-208 59.5,-208 59.5,-155 245.5,-155 245.5,-208"/>
-<text text-anchor="middle" x="152.5" y="-192.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#4190</text>
-<text text-anchor="middle" x="152.5" y="-177.8" font-family="Times,serif" font-size="14.00" fill="#000000">TZE: implement zcashd</text>
-<text text-anchor="middle" x="152.5" y="-162.8" font-family="Times,serif" font-size="14.00" fill="#000000">&#39;host&#39; logic.</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="245.5,-836 59.5,-836 59.5,-783 245.5,-783 245.5,-836"/>
+<text text-anchor="middle" x="152.5" y="-820.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#4190</text>
+<text text-anchor="middle" x="152.5" y="-805.8" font-family="Times,serif" font-size="14.00" fill="#000000">TZE: implement zcashd</text>
+<text text-anchor="middle" x="152.5" y="-790.8" font-family="Times,serif" font-size="14.00" fill="#000000">&#39;host&#39; logic.</text>
 </a>
 </g>
 </g>
@@ -50,10 +50,10 @@
 <g id="node4" class="node">
 <title>zcash/orchard#4</title>
 <g id="a_node4"><a xlink:href="https://github.com/zcash/orchard/issues/4" xlink:title="zcash/orchard#4&#10;Implement the Action&#10;circuit" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" points="797.5,-837 624.5,-837 624.5,-784 797.5,-784 797.5,-837"/>
-<text text-anchor="middle" x="711" y="-821.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#4</text>
-<text text-anchor="middle" x="711" y="-806.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement the Action</text>
-<text text-anchor="middle" x="711" y="-791.8" font-family="Times,serif" font-size="14.00" fill="#000000">circuit</text>
+<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="842,-1072 669,-1072 669,-1019 842,-1019 842,-1072"/>
+<text text-anchor="middle" x="755.5" y="-1056.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#4</text>
+<text text-anchor="middle" x="755.5" y="-1041.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement the Action</text>
+<text text-anchor="middle" x="755.5" y="-1026.8" font-family="Times,serif" font-size="14.00" fill="#000000">circuit</text>
 </a>
 </g>
 </g>
@@ -61,189 +61,189 @@
 <g id="node5" class="node">
 <title>zcash/librustzcash#320</title>
 <g id="a_node5"><a xlink:href="https://github.com/zcash/librustzcash/issues/320" xlink:title="zcash/librustzcash#320&#10;Implement Orchard&#10;consensus rules as an NU&#10;feature" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" points="1065.5,-722.5 862.5,-722.5 862.5,-654.5 1065.5,-654.5 1065.5,-722.5"/>
-<text text-anchor="middle" x="964" y="-707.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#320</text>
-<text text-anchor="middle" x="964" y="-692.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Orchard</text>
-<text text-anchor="middle" x="964" y="-677.3" font-family="Times,serif" font-size="14.00" fill="#000000">consensus rules as an NU</text>
-<text text-anchor="middle" x="964" y="-662.3" font-family="Times,serif" font-size="14.00" fill="#000000">feature</text>
+<polygon fill="#a6cfff" stroke="#000000" points="1154.5,-999.5 951.5,-999.5 951.5,-931.5 1154.5,-931.5 1154.5,-999.5"/>
+<text text-anchor="middle" x="1053" y="-984.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#320</text>
+<text text-anchor="middle" x="1053" y="-969.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Orchard</text>
+<text text-anchor="middle" x="1053" y="-954.3" font-family="Times,serif" font-size="14.00" fill="#000000">consensus rules as an NU</text>
+<text text-anchor="middle" x="1053" y="-939.3" font-family="Times,serif" font-size="14.00" fill="#000000">feature</text>
 </a>
 </g>
 </g>
 <!-- zcash/orchard#4&#45;&gt;zcash/librustzcash#320 -->
 <g id="edge2" class="edge">
 <title>zcash/orchard#4&#45;&gt;zcash/librustzcash#320</title>
-<path fill="none" stroke="#000000" d="M797.68,-786.49C805.16,-782.99 812.38,-779 819,-774.5 839.6,-760.47 834.78,-746.08 855,-731.5 856.64,-730.32 858.32,-729.16 860.02,-728.03"/>
-<polygon fill="#000000" stroke="#000000" points="862.1293,-730.8412 868.8,-722.61 858.4522,-724.8847 862.1293,-730.8412"/>
+<path fill="none" stroke="#000000" d="M842.35,-1022.1C873.28,-1013.8 908.56,-1004.3 941.28,-995.54"/>
+<polygon fill="#000000" stroke="#000000" points="942.5891,-998.8126 951.34,-992.84 940.7745,-992.0519 942.5891,-998.8126"/>
 </g>
 <!-- zcash/orchard#35 -->
 <g id="node6" class="node">
 <title>zcash/orchard#35</title>
 <g id="a_node6"><a xlink:href="https://github.com/zcash/orchard/issues/35" xlink:title="zcash/orchard#35&#10;Transaction building&#10;support" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1046.5,-951 881.5,-951 881.5,-898 1046.5,-898 1046.5,-951"/>
-<text text-anchor="middle" x="964" y="-935.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#35</text>
-<text text-anchor="middle" x="964" y="-920.8" font-family="Times,serif" font-size="14.00" fill="#000000">Transaction building</text>
-<text text-anchor="middle" x="964" y="-905.8" font-family="Times,serif" font-size="14.00" fill="#000000">support</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="1135.5,-1157 970.5,-1157 970.5,-1104 1135.5,-1104 1135.5,-1157"/>
+<text text-anchor="middle" x="1053" y="-1141.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#35</text>
+<text text-anchor="middle" x="1053" y="-1126.8" font-family="Times,serif" font-size="14.00" fill="#000000">Transaction building</text>
+<text text-anchor="middle" x="1053" y="-1111.8" font-family="Times,serif" font-size="14.00" fill="#000000">support</text>
 </a>
 </g>
 </g>
 <!-- zcash/orchard#4&#45;&gt;zcash/orchard#35 -->
 <g id="edge3" class="edge">
 <title>zcash/orchard#4&#45;&gt;zcash/orchard#35</title>
-<path fill="none" stroke="#000000" d="M774.79,-837.11C789.64,-844.09 805.15,-852.06 819,-860.5 836.31,-871.05 837.12,-878.96 855,-888.5 860.48,-891.42 866.24,-894.17 872.14,-896.74"/>
-<polygon fill="#000000" stroke="#000000" points="870.9122,-900.0198 881.49,-900.62 873.5952,-893.5544 870.9122,-900.0198"/>
+<path fill="none" stroke="#000000" d="M842.03,-1066.7C863.64,-1072.3 886.72,-1078.4 908,-1084.5 925.57,-1089.5 944.23,-1095.2 962.11,-1100.8"/>
+<polygon fill="#000000" stroke="#000000" points="961.3705,-1104.2365 971.96,-1103.9 963.472,-1097.5593 961.3705,-1104.2365"/>
 </g>
 <!-- zcash/zcash#5195 -->
 <g id="node7" class="node">
 <title>zcash/zcash#5195</title>
 <g id="a_node7"><a xlink:href="https://github.com/zcash/zcash/issues/5195" xlink:title="zcash/zcash#5195&#10;Implement Orchard proof&#10;verification consensus&#10;rule" target="_blank">
-<polygon fill="#fad8c7" stroke="#000000" points="1064.5,-808.5 863.5,-808.5 863.5,-740.5 1064.5,-740.5 1064.5,-808.5"/>
-<text text-anchor="middle" x="964" y="-793.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5195</text>
-<text text-anchor="middle" x="964" y="-778.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Orchard proof</text>
-<text text-anchor="middle" x="964" y="-763.3" font-family="Times,serif" font-size="14.00" fill="#000000">verification consensus</text>
-<text text-anchor="middle" x="964" y="-748.3" font-family="Times,serif" font-size="14.00" fill="#000000">rule</text>
+<polygon fill="#fad8c7" stroke="#000000" points="1153.5,-1085.5 952.5,-1085.5 952.5,-1017.5 1153.5,-1017.5 1153.5,-1085.5"/>
+<text text-anchor="middle" x="1053" y="-1070.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5195</text>
+<text text-anchor="middle" x="1053" y="-1055.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Orchard proof</text>
+<text text-anchor="middle" x="1053" y="-1040.3" font-family="Times,serif" font-size="14.00" fill="#000000">verification consensus</text>
+<text text-anchor="middle" x="1053" y="-1025.3" font-family="Times,serif" font-size="14.00" fill="#000000">rule</text>
 </a>
 </g>
 </g>
 <!-- zcash/orchard#4&#45;&gt;zcash/zcash#5195 -->
 <g id="edge4" class="edge">
 <title>zcash/orchard#4&#45;&gt;zcash/zcash#5195</title>
-<path fill="none" stroke="#000000" d="M797.71,-798.16C815.66,-795.61 834.79,-792.89 853.46,-790.23"/>
-<polygon fill="#000000" stroke="#000000" points="854.0607,-793.6799 863.47,-788.81 853.0775,-786.7493 854.0607,-793.6799"/>
+<path fill="none" stroke="#000000" d="M842.35,-1047.3C873.59,-1047.9 909.26,-1048.6 942.26,-1049.3"/>
+<polygon fill="#000000" stroke="#000000" points="942.343,-1052.8022 952.41,-1049.5 942.4809,-1045.8036 942.343,-1052.8022"/>
 </g>
 <!-- zcash/zcash#5024 -->
 <g id="node8" class="node">
 <title>zcash/zcash#5024</title>
 <g id="a_node8"><a xlink:href="https://github.com/zcash/zcash/issues/5024" xlink:title="zcash/zcash#5024&#10;Implement NU5 consensus&#10;rules" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" points="1322.5,-801 1110.5,-801 1110.5,-748 1322.5,-748 1322.5,-801"/>
-<text text-anchor="middle" x="1216.5" y="-785.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5024</text>
-<text text-anchor="middle" x="1216.5" y="-770.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement NU5 consensus</text>
-<text text-anchor="middle" x="1216.5" y="-755.8" font-family="Times,serif" font-size="14.00" fill="#000000">rules</text>
+<polygon fill="#a6cfff" stroke="#000000" points="1411.5,-938 1199.5,-938 1199.5,-885 1411.5,-885 1411.5,-938"/>
+<text text-anchor="middle" x="1305.5" y="-922.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5024</text>
+<text text-anchor="middle" x="1305.5" y="-907.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement NU5 consensus</text>
+<text text-anchor="middle" x="1305.5" y="-892.8" font-family="Times,serif" font-size="14.00" fill="#000000">rules</text>
 </a>
 </g>
 </g>
 <!-- zcash/librustzcash#320&#45;&gt;zcash/zcash#5024 -->
 <g id="edge5" class="edge">
 <title>zcash/librustzcash#320&#45;&gt;zcash/zcash#5024</title>
-<path fill="none" stroke="#000000" d="M1064.2,-722.61C1085.6,-729.93 1108.2,-737.61 1129.2,-744.75"/>
-<polygon fill="#000000" stroke="#000000" points="1128.1055,-748.0746 1138.7,-747.99 1130.3651,-741.4493 1128.1055,-748.0746"/>
+<path fill="none" stroke="#000000" d="M1154.6,-943.77C1166,-941.34 1177.6,-938.86 1189.1,-936.4"/>
+<polygon fill="#000000" stroke="#000000" points="1190.0644,-939.7725 1199.1,-934.24 1188.5864,-932.9303 1190.0644,-939.7725"/>
 </g>
 <!-- zcash/zcash#5021 -->
 <g id="node9" class="node">
 <title>zcash/zcash#5021</title>
 <g id="a_node9"><a xlink:href="https://github.com/zcash/zcash/issues/5021" xlink:title="zcash/zcash#5021&#10;Add Orchard support to&#10;transaction builder" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1310.5,-876 1122.5,-876 1122.5,-823 1310.5,-823 1310.5,-876"/>
-<text text-anchor="middle" x="1216.5" y="-860.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5021</text>
-<text text-anchor="middle" x="1216.5" y="-845.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
-<text text-anchor="middle" x="1216.5" y="-830.8" font-family="Times,serif" font-size="14.00" fill="#000000">transaction builder</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="1399.5,-1082 1211.5,-1082 1211.5,-1029 1399.5,-1029 1399.5,-1082"/>
+<text text-anchor="middle" x="1305.5" y="-1066.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5021</text>
+<text text-anchor="middle" x="1305.5" y="-1051.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
+<text text-anchor="middle" x="1305.5" y="-1036.8" font-family="Times,serif" font-size="14.00" fill="#000000">transaction builder</text>
 </a>
 </g>
 </g>
 <!-- zcash/orchard#35&#45;&gt;zcash/zcash#5021 -->
 <g id="edge6" class="edge">
 <title>zcash/orchard#35&#45;&gt;zcash/zcash#5021</title>
-<path fill="none" stroke="#000000" d="M1046.7,-899.94C1069.3,-893.22 1094.1,-885.87 1117.5,-878.91"/>
-<polygon fill="#000000" stroke="#000000" points="1118.5156,-882.2595 1127.1,-876.05 1116.5169,-875.5509 1118.5156,-882.2595"/>
+<path fill="none" stroke="#000000" d="M1135.7,-1105.9C1158.3,-1099.2 1183.1,-1091.9 1206.5,-1084.9"/>
+<polygon fill="#000000" stroke="#000000" points="1207.48,-1088.2601 1216.1,-1082.1 1205.52,-1081.5401 1207.48,-1088.2601"/>
 </g>
 <!-- zcash/librustzcash#406 -->
 <g id="node10" class="node">
 <title>zcash/librustzcash#406</title>
 <g id="a_node10"><a xlink:href="https://github.com/zcash/librustzcash/issues/406" xlink:title="zcash/librustzcash#406&#10;Add Orchard support to&#10;the transaction builder" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1310.5,-951 1122.5,-951 1122.5,-898 1310.5,-898 1310.5,-951"/>
-<text text-anchor="middle" x="1216.5" y="-935.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#406</text>
-<text text-anchor="middle" x="1216.5" y="-920.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
-<text text-anchor="middle" x="1216.5" y="-905.8" font-family="Times,serif" font-size="14.00" fill="#000000">the transaction builder</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="1399.5,-1157 1211.5,-1157 1211.5,-1104 1399.5,-1104 1399.5,-1157"/>
+<text text-anchor="middle" x="1305.5" y="-1141.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#406</text>
+<text text-anchor="middle" x="1305.5" y="-1126.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
+<text text-anchor="middle" x="1305.5" y="-1111.8" font-family="Times,serif" font-size="14.00" fill="#000000">the transaction builder</text>
 </a>
 </g>
 </g>
 <!-- zcash/orchard#35&#45;&gt;zcash/librustzcash#406 -->
 <g id="edge7" class="edge">
 <title>zcash/orchard#35&#45;&gt;zcash/librustzcash#406</title>
-<path fill="none" stroke="#000000" d="M1046.7,-924.5C1067.5,-924.5 1090.2,-924.5 1112,-924.5"/>
-<polygon fill="#000000" stroke="#000000" points="1112.3,-928.0001 1122.3,-924.5 1112.3,-921.0001 1112.3,-928.0001"/>
+<path fill="none" stroke="#000000" d="M1135.7,-1130.5C1156.5,-1130.5 1179.2,-1130.5 1201,-1130.5"/>
+<polygon fill="#000000" stroke="#000000" points="1201.3,-1134.0001 1211.3,-1130.5 1201.3,-1127.0001 1201.3,-1134.0001"/>
 </g>
 <!-- zcash/zcash#5195&#45;&gt;zcash/zcash#5024 -->
 <g id="edge8" class="edge">
 <title>zcash/zcash#5195&#45;&gt;zcash/zcash#5024</title>
-<path fill="none" stroke="#000000" d="M1064.5,-774.5C1076.1,-774.5 1088,-774.5 1099.8,-774.5"/>
-<polygon fill="#000000" stroke="#000000" points="1100.1,-778.0001 1110.1,-774.5 1100.1,-771.0001 1100.1,-778.0001"/>
+<path fill="none" stroke="#000000" d="M1143.8,-1017.5C1150,-1014.6 1156.2,-1011.6 1162,-1008.5 1197.4,-989.82 1234.9,-964.31 1262.6,-944.15"/>
+<polygon fill="#000000" stroke="#000000" points="1264.9012,-946.803 1270.9,-938.07 1260.7645,-941.156 1264.9012,-946.803"/>
 </g>
 <!-- zcash/zcash#5023 -->
 <g id="node11" class="node">
 <title>zcash/zcash#5023</title>
 <g id="a_node11"><a xlink:href="https://github.com/zcash/zcash/issues/5023" xlink:title="zcash/zcash#5023&#10;Implement support for&#10;Orchard shielded coinbase&#10;output" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1572,-502.5 1363,-502.5 1363,-434.5 1572,-434.5 1572,-502.5"/>
-<text text-anchor="middle" x="1467.5" y="-487.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5023</text>
-<text text-anchor="middle" x="1467.5" y="-472.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement support for</text>
-<text text-anchor="middle" x="1467.5" y="-457.3" font-family="Times,serif" font-size="14.00" fill="#000000">Orchard shielded coinbase</text>
-<text text-anchor="middle" x="1467.5" y="-442.3" font-family="Times,serif" font-size="14.00" fill="#000000">output</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="1661,-951.5 1452,-951.5 1452,-883.5 1661,-883.5 1661,-951.5"/>
+<text text-anchor="middle" x="1556.5" y="-936.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5023</text>
+<text text-anchor="middle" x="1556.5" y="-921.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement support for</text>
+<text text-anchor="middle" x="1556.5" y="-906.3" font-family="Times,serif" font-size="14.00" fill="#000000">Orchard shielded coinbase</text>
+<text text-anchor="middle" x="1556.5" y="-891.3" font-family="Times,serif" font-size="14.00" fill="#000000">output</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5021&#45;&gt;zcash/zcash#5023 -->
 <g id="edge9" class="edge">
 <title>zcash/zcash#5021&#45;&gt;zcash/zcash#5023</title>
-<path fill="none" stroke="#000000" d="M1310.3,-822.71C1315.4,-818.88 1320.1,-814.5 1324,-809.5 1406.6,-704.72 1278.7,-617.28 1360,-511.5 1360.4,-511 1360.8,-510.51 1361.2,-510.02"/>
-<polygon fill="#000000" stroke="#000000" points="1363.8336,-512.3279 1368.1,-502.63 1358.7171,-507.5506 1363.8336,-512.3279"/>
+<path fill="none" stroke="#000000" d="M1353.9,-1028.9C1391.3,-1008.3 1443.5,-979.61 1485.6,-956.47"/>
+<polygon fill="#000000" stroke="#000000" points="1487.3314,-959.5122 1494.4,-951.62 1483.9526,-953.3816 1487.3314,-959.5122"/>
 </g>
 <!-- zcash/librustzcash#403 -->
 <g id="node12" class="node">
 <title>zcash/librustzcash#403</title>
 <g id="a_node12"><a xlink:href="https://github.com/zcash/librustzcash/issues/403" xlink:title="zcash/librustzcash#403&#10;Add Orchard support to&#10;`zcash_client_backend`" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1561.5,-951 1373.5,-951 1373.5,-898 1561.5,-898 1561.5,-951"/>
-<text text-anchor="middle" x="1467.5" y="-935.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#403</text>
-<text text-anchor="middle" x="1467.5" y="-920.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
-<text text-anchor="middle" x="1467.5" y="-905.8" font-family="Times,serif" font-size="14.00" fill="#000000">`zcash_client_backend`</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="1650.5,-1157 1462.5,-1157 1462.5,-1104 1650.5,-1104 1650.5,-1157"/>
+<text text-anchor="middle" x="1556.5" y="-1141.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#403</text>
+<text text-anchor="middle" x="1556.5" y="-1126.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
+<text text-anchor="middle" x="1556.5" y="-1111.8" font-family="Times,serif" font-size="14.00" fill="#000000">`zcash_client_backend`</text>
 </a>
 </g>
 </g>
 <!-- zcash/librustzcash#406&#45;&gt;zcash/librustzcash#403 -->
 <g id="edge10" class="edge">
 <title>zcash/librustzcash#406&#45;&gt;zcash/librustzcash#403</title>
-<path fill="none" stroke="#000000" d="M1310.7,-924.5C1327.8,-924.5 1345.7,-924.5 1363.1,-924.5"/>
-<polygon fill="#000000" stroke="#000000" points="1363.2,-928.0001 1373.2,-924.5 1363.2,-921.0001 1363.2,-928.0001"/>
+<path fill="none" stroke="#000000" d="M1399.7,-1130.5C1416.8,-1130.5 1434.7,-1130.5 1452.1,-1130.5"/>
+<polygon fill="#000000" stroke="#000000" points="1452.2,-1134.0001 1462.2,-1130.5 1452.2,-1127.0001 1452.2,-1134.0001"/>
 </g>
 <!-- zcash/librustzcash#404 -->
 <g id="node19" class="node">
 <title>zcash/librustzcash#404</title>
 <g id="a_node19"><a xlink:href="https://github.com/zcash/librustzcash/issues/404" xlink:title="zcash/librustzcash#404&#10;Add Orchard support to&#10;`zcash_client_sqlite`" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1814.5,-951 1626.5,-951 1626.5,-898 1814.5,-898 1814.5,-951"/>
-<text text-anchor="middle" x="1720.5" y="-935.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#404</text>
-<text text-anchor="middle" x="1720.5" y="-920.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
-<text text-anchor="middle" x="1720.5" y="-905.8" font-family="Times,serif" font-size="14.00" fill="#000000">`zcash_client_sqlite`</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="1903.5,-1157 1715.5,-1157 1715.5,-1104 1903.5,-1104 1903.5,-1157"/>
+<text text-anchor="middle" x="1809.5" y="-1141.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#404</text>
+<text text-anchor="middle" x="1809.5" y="-1126.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
+<text text-anchor="middle" x="1809.5" y="-1111.8" font-family="Times,serif" font-size="14.00" fill="#000000">`zcash_client_sqlite`</text>
 </a>
 </g>
 </g>
 <!-- zcash/librustzcash#403&#45;&gt;zcash/librustzcash#404 -->
 <g id="edge16" class="edge">
 <title>zcash/librustzcash#403&#45;&gt;zcash/librustzcash#404</title>
-<path fill="none" stroke="#000000" d="M1561.7,-924.5C1579.4,-924.5 1598,-924.5 1616,-924.5"/>
-<polygon fill="#000000" stroke="#000000" points="1616.2,-928.0001 1626.2,-924.5 1616.2,-921.0001 1616.2,-928.0001"/>
+<path fill="none" stroke="#000000" d="M1650.7,-1130.5C1668.4,-1130.5 1687,-1130.5 1705,-1130.5"/>
+<polygon fill="#000000" stroke="#000000" points="1705.2,-1134.0001 1715.2,-1130.5 1705.2,-1127.0001 1705.2,-1134.0001"/>
 </g>
 <!-- zcash/zcash#4707 -->
 <g id="node13" class="node">
 <title>zcash/zcash#4707</title>
 <g id="a_node13"><a xlink:href="https://github.com/zcash/zcash/issues/4707" xlink:title="zcash/zcash#4707&#10;[Orchard] Consensus&#10;specification" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="795.5,-766 626.5,-766 626.5,-713 795.5,-713 795.5,-766"/>
-<text text-anchor="middle" x="711" y="-750.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#4707</text>
-<text text-anchor="middle" x="711" y="-735.8" font-family="Times,serif" font-size="14.00" fill="#000000">[Orchard] Consensus</text>
-<text text-anchor="middle" x="711" y="-720.8" font-family="Times,serif" font-size="14.00" fill="#000000">specification</text>
+<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="840,-992 671,-992 671,-939 840,-939 840,-992"/>
+<text text-anchor="middle" x="755.5" y="-976.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#4707</text>
+<text text-anchor="middle" x="755.5" y="-961.8" font-family="Times,serif" font-size="14.00" fill="#000000">[Orchard] Consensus</text>
+<text text-anchor="middle" x="755.5" y="-946.8" font-family="Times,serif" font-size="14.00" fill="#000000">specification</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#4707&#45;&gt;zcash/librustzcash#320 -->
 <g id="edge11" class="edge">
 <title>zcash/zcash#4707&#45;&gt;zcash/librustzcash#320</title>
-<path fill="none" stroke="#000000" d="M795.6,-722.45C813.82,-718.77 833.36,-714.83 852.43,-710.99"/>
-<polygon fill="#000000" stroke="#000000" points="853.2479,-714.3956 862.36,-708.99 851.8658,-707.5334 853.2479,-714.3956"/>
+<path fill="none" stroke="#000000" d="M840.35,-965.5C871.72,-965.5 907.76,-965.5 941.15,-965.5"/>
+<polygon fill="#000000" stroke="#000000" points="941.42,-969.0001 951.42,-965.5 941.42,-962.0001 941.42,-969.0001"/>
 </g>
 <!-- zcash/zcash#4819 -->
 <g id="node14" class="node">
 <title>zcash/zcash#4819</title>
 <g id="a_node14"><a xlink:href="https://github.com/zcash/zcash/issues/4819" xlink:title="zcash/zcash#4819&#10;Backport upstream PRs&#10;that remove Boost usage" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="250,-998 55,-998 55,-945 250,-945 250,-998"/>
-<text text-anchor="middle" x="152.5" y="-982.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#4819</text>
-<text text-anchor="middle" x="152.5" y="-967.8" font-family="Times,serif" font-size="14.00" fill="#000000">Backport upstream PRs</text>
-<text text-anchor="middle" x="152.5" y="-952.8" font-family="Times,serif" font-size="14.00" fill="#000000">that remove Boost usage</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="250,-1102 55,-1102 55,-1049 250,-1049 250,-1102"/>
+<text text-anchor="middle" x="152.5" y="-1086.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#4819</text>
+<text text-anchor="middle" x="152.5" y="-1071.8" font-family="Times,serif" font-size="14.00" fill="#000000">Backport upstream PRs</text>
+<text text-anchor="middle" x="152.5" y="-1056.8" font-family="Times,serif" font-size="14.00" fill="#000000">that remove Boost usage</text>
 </a>
 </g>
 </g>
@@ -251,10 +251,10 @@
 <g id="node15" class="node">
 <title>zcash/orchard#33</title>
 <g id="a_node15"><a xlink:href="https://github.com/zcash/orchard/issues/33" xlink:title="zcash/orchard#33&#10;Implement note commitment&#10;tree logic for Orchard" target="_blank">
-<polygon fill="#fad8c7" stroke="#000000" points="567,-938 341,-938 341,-885 567,-885 567,-938"/>
-<text text-anchor="middle" x="454" y="-922.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#33</text>
-<text text-anchor="middle" x="454" y="-907.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement note commitment</text>
-<text text-anchor="middle" x="454" y="-892.8" font-family="Times,serif" font-size="14.00" fill="#000000">tree logic for Orchard</text>
+<polygon fill="#fad8c7" stroke="#000000" points="567,-762 341,-762 341,-709 567,-709 567,-762"/>
+<text text-anchor="middle" x="454" y="-746.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#33</text>
+<text text-anchor="middle" x="454" y="-731.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement note commitment</text>
+<text text-anchor="middle" x="454" y="-716.8" font-family="Times,serif" font-size="14.00" fill="#000000">tree logic for Orchard</text>
 </a>
 </g>
 </g>
@@ -262,1048 +262,1130 @@
 <g id="node16" class="node">
 <title>zcash/zcash#5018</title>
 <g id="a_node16"><a xlink:href="https://github.com/zcash/zcash/issues/5018" xlink:title="zcash/zcash#5018&#10;Add Orchard note&#10;commitment tree and&#10;nullifier set to&#10;CCoinsView" target="_blank">
-<polygon fill="#fad8c7" stroke="#000000" points="797,-953 625,-953 625,-870 797,-870 797,-953"/>
-<text text-anchor="middle" x="711" y="-937.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5018</text>
-<text text-anchor="middle" x="711" y="-922.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard note</text>
-<text text-anchor="middle" x="711" y="-907.8" font-family="Times,serif" font-size="14.00" fill="#000000">commitment tree and</text>
-<text text-anchor="middle" x="711" y="-892.8" font-family="Times,serif" font-size="14.00" fill="#000000">nullifier set to</text>
-<text text-anchor="middle" x="711" y="-877.8" font-family="Times,serif" font-size="14.00" fill="#000000">CCoinsView</text>
+<polygon fill="#fad8c7" stroke="#000000" points="841.5,-762 669.5,-762 669.5,-679 841.5,-679 841.5,-762"/>
+<text text-anchor="middle" x="755.5" y="-746.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5018</text>
+<text text-anchor="middle" x="755.5" y="-731.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard note</text>
+<text text-anchor="middle" x="755.5" y="-716.8" font-family="Times,serif" font-size="14.00" fill="#000000">commitment tree and</text>
+<text text-anchor="middle" x="755.5" y="-701.8" font-family="Times,serif" font-size="14.00" fill="#000000">nullifier set to</text>
+<text text-anchor="middle" x="755.5" y="-686.8" font-family="Times,serif" font-size="14.00" fill="#000000">CCoinsView</text>
 </a>
 </g>
 </g>
 <!-- zcash/orchard#33&#45;&gt;zcash/zcash#5018 -->
 <g id="edge12" class="edge">
 <title>zcash/orchard#33&#45;&gt;zcash/zcash#5018</title>
-<path fill="none" stroke="#000000" d="M567.1,-911.5C583.01,-911.5 599.23,-911.5 614.79,-911.5"/>
-<polygon fill="#000000" stroke="#000000" points="614.9,-915.0001 624.9,-911.5 614.9,-908.0001 614.9,-915.0001"/>
+<path fill="none" stroke="#000000" d="M567.13,-729.87C597.32,-728.37 629.66,-726.76 658.88,-725.31"/>
+<polygon fill="#000000" stroke="#000000" points="659.2575,-728.7956 669.07,-724.8 658.9075,-721.8043 659.2575,-728.7956"/>
 </g>
 <!-- zcash/zcash#5197 -->
 <g id="node17" class="node">
 <title>zcash/zcash#5197</title>
 <g id="a_node17"><a xlink:href="https://github.com/zcash/zcash/issues/5197" xlink:title="zcash/zcash#5197&#10;Implement NU5 block&#10;consensus rules" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="1052,-880 876,-880 876,-827 1052,-827 1052,-880"/>
-<text text-anchor="middle" x="964" y="-864.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5197</text>
-<text text-anchor="middle" x="964" y="-849.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement NU5 block</text>
-<text text-anchor="middle" x="964" y="-834.8" font-family="Times,serif" font-size="14.00" fill="#000000">consensus rules</text>
+<polygon fill="#a6cfff" stroke="#000000" points="1141,-782 965,-782 965,-729 1141,-729 1141,-782"/>
+<text text-anchor="middle" x="1053" y="-766.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5197</text>
+<text text-anchor="middle" x="1053" y="-751.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement NU5 block</text>
+<text text-anchor="middle" x="1053" y="-736.8" font-family="Times,serif" font-size="14.00" fill="#000000">consensus rules</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5018&#45;&gt;zcash/zcash#5197 -->
 <g id="edge13" class="edge">
 <title>zcash/zcash#5018&#45;&gt;zcash/zcash#5197</title>
-<path fill="none" stroke="#000000" d="M797.01,-891.78C819.09,-886.72 843.02,-881.23 865.68,-876.04"/>
-<polygon fill="#000000" stroke="#000000" points="866.6819,-879.4013 875.65,-873.76 865.1214,-872.5775 866.6819,-879.4013"/>
+<path fill="none" stroke="#000000" d="M841.55,-730.62C876.92,-734.78 918.08,-739.63 954.64,-743.93"/>
+<polygon fill="#000000" stroke="#000000" points="954.479,-747.4352 964.82,-745.13 955.2985,-740.4833 954.479,-747.4352"/>
 </g>
 <!-- zcash/zcash#5240 -->
 <g id="node18" class="node">
 <title>zcash/zcash#5240</title>
 <g id="a_node18"><a xlink:href="https://github.com/zcash/zcash/issues/5240" xlink:title="zcash/zcash#5240&#10;Add an Orchard nullifier&#10;test to `coins_tests`" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="1060,-1022 868,-1022 868,-969 1060,-969 1060,-1022"/>
-<text text-anchor="middle" x="964" y="-1006.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5240</text>
-<text text-anchor="middle" x="964" y="-991.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add an Orchard nullifier</text>
-<text text-anchor="middle" x="964" y="-976.8" font-family="Times,serif" font-size="14.00" fill="#000000">test to `coins_tests`</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="1149,-711 957,-711 957,-658 1149,-658 1149,-711"/>
+<text text-anchor="middle" x="1053" y="-695.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5240</text>
+<text text-anchor="middle" x="1053" y="-680.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add an Orchard nullifier</text>
+<text text-anchor="middle" x="1053" y="-665.8" font-family="Times,serif" font-size="14.00" fill="#000000">test to `coins_tests`</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5018&#45;&gt;zcash/zcash#5240 -->
 <g id="edge14" class="edge">
 <title>zcash/zcash#5018&#45;&gt;zcash/zcash#5240</title>
-<path fill="none" stroke="#000000" d="M797.03,-940.22C816.11,-946.58 836.24,-953.28 855,-959.5 861.23,-961.57 867.66,-963.7 874.13,-965.84"/>
-<polygon fill="#000000" stroke="#000000" points="873.0368,-969.1648 883.63,-968.98 875.2336,-962.5185 873.0368,-969.1648"/>
+<path fill="none" stroke="#000000" d="M841.55,-710.09C874.43,-706.11 912.31,-701.52 946.84,-697.35"/>
+<polygon fill="#000000" stroke="#000000" points="947.4554,-700.8011 956.96,-696.12 946.6107,-693.8522 947.4554,-700.8011"/>
 </g>
 <!-- zcash/zcash#5197&#45;&gt;zcash/zcash#5024 -->
 <g id="edge15" class="edge">
 <title>zcash/zcash#5197&#45;&gt;zcash/zcash#5024</title>
-<path fill="none" stroke="#000000" d="M1048.8,-826.97C1072.2,-819.65 1097.8,-811.65 1121.7,-804.16"/>
-<polygon fill="#000000" stroke="#000000" points="1123.0036,-807.4194 1131.5,-801.09 1120.911,-800.7395 1123.0036,-807.4194"/>
+<path fill="none" stroke="#000000" d="M1141.1,-780.46C1148.3,-783.5 1155.4,-786.84 1162,-790.5 1204.2,-813.87 1245.6,-850.69 1273,-877.58"/>
+<polygon fill="#000000" stroke="#000000" points="1270.754,-880.2838 1280.3,-884.88 1275.7038,-875.334 1270.754,-880.2838"/>
 </g>
 <!-- zcash/zcash#5019 -->
 <g id="node20" class="node">
 <title>zcash/zcash#5019</title>
 <g id="a_node20"><a xlink:href="https://github.com/zcash/zcash/issues/5019" xlink:title="zcash/zcash#5019&#10;Add Orchard keys and&#10;addresses to the wallet" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1308,-326 1125,-326 1125,-273 1308,-273 1308,-326"/>
-<text text-anchor="middle" x="1216.5" y="-310.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5019</text>
-<text text-anchor="middle" x="1216.5" y="-295.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard keys and</text>
-<text text-anchor="middle" x="1216.5" y="-280.8" font-family="Times,serif" font-size="14.00" fill="#000000">addresses to the wallet</text>
+<polygon fill="#a6cfff" stroke="#000000" points="1397,-640 1214,-640 1214,-587 1397,-587 1397,-640"/>
+<text text-anchor="middle" x="1305.5" y="-624.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5019</text>
+<text text-anchor="middle" x="1305.5" y="-609.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard keys and</text>
+<text text-anchor="middle" x="1305.5" y="-594.8" font-family="Times,serif" font-size="14.00" fill="#000000">addresses to the wallet</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5019&#45;&gt;zcash/zcash#5023 -->
 <g id="edge17" class="edge">
 <title>zcash/zcash#5019&#45;&gt;zcash/zcash#5023</title>
-<path fill="none" stroke="#000000" d="M1308.1,-323.55C1313.8,-327.01 1319.2,-330.97 1324,-335.5 1355.3,-365.08 1329.5,-395.04 1360,-425.5 1360.8,-426.28 1361.6,-427.05 1362.4,-427.8"/>
-<polygon fill="#000000" stroke="#000000" points="1360.1838,-430.5092 1370.1,-434.24 1364.6747,-425.1396 1360.1838,-430.5092"/>
+<path fill="none" stroke="#000000" d="M1327.6,-640.21C1371.3,-693.15 1469.2,-811.74 1521.7,-875.33"/>
+<polygon fill="#000000" stroke="#000000" points="1519.123,-877.7056 1528.2,-883.17 1524.5119,-873.2378 1519.123,-877.7056"/>
 </g>
 <!-- zcash/zcash#5020 -->
 <g id="node21" class="node">
 <title>zcash/zcash#5020</title>
 <g id="a_node21"><a xlink:href="https://github.com/zcash/zcash/issues/5020" xlink:title="zcash/zcash#5020&#10;Add Orchard note&#10;detection and storage to&#10;the wallet" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1563.5,-330.5 1371.5,-330.5 1371.5,-262.5 1563.5,-262.5 1563.5,-330.5"/>
-<text text-anchor="middle" x="1467.5" y="-315.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5020</text>
-<text text-anchor="middle" x="1467.5" y="-300.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard note</text>
-<text text-anchor="middle" x="1467.5" y="-285.3" font-family="Times,serif" font-size="14.00" fill="#000000">detection and storage to</text>
-<text text-anchor="middle" x="1467.5" y="-270.3" font-family="Times,serif" font-size="14.00" fill="#000000">the wallet</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="1652.5,-693.5 1460.5,-693.5 1460.5,-625.5 1652.5,-625.5 1652.5,-693.5"/>
+<text text-anchor="middle" x="1556.5" y="-678.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5020</text>
+<text text-anchor="middle" x="1556.5" y="-663.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard note</text>
+<text text-anchor="middle" x="1556.5" y="-648.3" font-family="Times,serif" font-size="14.00" fill="#000000">detection and storage to</text>
+<text text-anchor="middle" x="1556.5" y="-633.3" font-family="Times,serif" font-size="14.00" fill="#000000">the wallet</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5019&#45;&gt;zcash/zcash#5020 -->
 <g id="edge18" class="edge">
 <title>zcash/zcash#5019&#45;&gt;zcash/zcash#5020</title>
-<path fill="none" stroke="#000000" d="M1308.2,-298.4C1325.4,-298.2 1343.5,-297.98 1361.1,-297.77"/>
-<polygon fill="#000000" stroke="#000000" points="1361.4415,-301.2664 1371.4,-297.65 1361.3599,-294.2668 1361.4415,-301.2664"/>
+<path fill="none" stroke="#000000" d="M1397.2,-630.3C1414.4,-633.46 1432.5,-636.78 1450.1,-640.01"/>
+<polygon fill="#000000" stroke="#000000" points="1449.934,-643.5375 1460.4,-641.89 1451.191,-636.6512 1449.934,-643.5375"/>
 </g>
 <!-- zcash/zcash#5179 -->
 <g id="node22" class="node">
 <title>zcash/zcash#5179</title>
 <g id="a_node22"><a xlink:href="https://github.com/zcash/zcash/issues/5179" xlink:title="zcash/zcash#5179&#10;Add Unified Address key&#10;generation and storage to&#10;the wallet" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1568.5,-416.5 1366.5,-416.5 1366.5,-348.5 1568.5,-348.5 1568.5,-416.5"/>
-<text text-anchor="middle" x="1467.5" y="-401.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5179</text>
-<text text-anchor="middle" x="1467.5" y="-386.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add Unified Address key</text>
-<text text-anchor="middle" x="1467.5" y="-371.3" font-family="Times,serif" font-size="14.00" fill="#000000">generation and storage to</text>
-<text text-anchor="middle" x="1467.5" y="-356.3" font-family="Times,serif" font-size="14.00" fill="#000000">the wallet</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="1657.5,-266.5 1455.5,-266.5 1455.5,-198.5 1657.5,-198.5 1657.5,-266.5"/>
+<text text-anchor="middle" x="1556.5" y="-251.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5179</text>
+<text text-anchor="middle" x="1556.5" y="-236.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add Unified Address key</text>
+<text text-anchor="middle" x="1556.5" y="-221.3" font-family="Times,serif" font-size="14.00" fill="#000000">generation and storage to</text>
+<text text-anchor="middle" x="1556.5" y="-206.3" font-family="Times,serif" font-size="14.00" fill="#000000">the wallet</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5019&#45;&gt;zcash/zcash#5179 -->
 <g id="edge19" class="edge">
 <title>zcash/zcash#5019&#45;&gt;zcash/zcash#5179</title>
-<path fill="none" stroke="#000000" d="M1297,-326.1C1316,-332.41 1336.7,-339.24 1356.8,-345.9"/>
-<polygon fill="#000000" stroke="#000000" points="1355.7066,-349.2248 1366.3,-349.05 1357.9098,-342.5805 1355.7066,-349.2248"/>
+<path fill="none" stroke="#000000" d="M1327.3,-586.75C1351.3,-556.18 1389.5,-503.86 1413,-453.5 1437.4,-401.1 1418.2,-377.45 1449,-328.5 1462.1,-307.65 1481,-288.64 1499.4,-273.13"/>
+<polygon fill="#000000" stroke="#000000" points="1501.7032,-275.7674 1507.2,-266.71 1497.2547,-270.3627 1501.7032,-275.7674"/>
+</g>
+<!-- zcash/zcash#5255 -->
+<g id="node23" class="node">
+<title>zcash/zcash#5255</title>
+<g id="a_node23"><a xlink:href="https://github.com/zcash/zcash/issues/5255" xlink:title="zcash/zcash#5255&#10;Add the ability to&#10;generate Orchard spending&#10;keys in the wallet" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1664,-607.5 1449,-607.5 1449,-539.5 1664,-539.5 1664,-607.5"/>
+<text text-anchor="middle" x="1556.5" y="-592.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5255</text>
+<text text-anchor="middle" x="1556.5" y="-577.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add the ability to</text>
+<text text-anchor="middle" x="1556.5" y="-562.3" font-family="Times,serif" font-size="14.00" fill="#000000">generate Orchard spending</text>
+<text text-anchor="middle" x="1556.5" y="-547.3" font-family="Times,serif" font-size="14.00" fill="#000000">keys in the wallet</text>
+</a>
+</g>
+</g>
+<!-- zcash/zcash#5019&#45;&gt;zcash/zcash#5255 -->
+<g id="edge20" class="edge">
+<title>zcash/zcash#5019&#45;&gt;zcash/zcash#5255</title>
+<path fill="none" stroke="#000000" d="M1397.2,-598.89C1410.7,-596.73 1424.8,-594.49 1438.8,-592.26"/>
+<polygon fill="#000000" stroke="#000000" points="1439.5757,-595.6806 1448.9,-590.65 1438.4737,-588.7679 1439.5757,-595.6806"/>
+</g>
+<!-- zcash/zcash#5256 -->
+<g id="node24" class="node">
+<title>zcash/zcash#5256</title>
+<g id="a_node24"><a xlink:href="https://github.com/zcash/zcash/issues/5256" xlink:title="zcash/zcash#5256&#10;Add support for Orchard&#10;receiver inside Unified&#10;Address logic" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1906.5,-744.5 1712.5,-744.5 1712.5,-676.5 1906.5,-676.5 1906.5,-744.5"/>
+<text text-anchor="middle" x="1809.5" y="-729.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5256</text>
+<text text-anchor="middle" x="1809.5" y="-714.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for Orchard</text>
+<text text-anchor="middle" x="1809.5" y="-699.3" font-family="Times,serif" font-size="14.00" fill="#000000">receiver inside Unified</text>
+<text text-anchor="middle" x="1809.5" y="-684.3" font-family="Times,serif" font-size="14.00" fill="#000000">Address logic</text>
+</a>
+</g>
+</g>
+<!-- zcash/zcash#5019&#45;&gt;zcash/zcash#5256 -->
+<g id="edge21" class="edge">
+<title>zcash/zcash#5019&#45;&gt;zcash/zcash#5256</title>
+<path fill="none" stroke="#000000" d="M1337.3,-640.2C1364.8,-661.58 1406.8,-689.98 1449,-702.5 1531.5,-727.01 1629.4,-727.49 1702.4,-722.69"/>
+<polygon fill="#000000" stroke="#000000" points="1702.7701,-726.1727 1712.5,-721.98 1702.2792,-719.1899 1702.7701,-726.1727"/>
 </g>
 <!-- zcash/zcash#5178 -->
-<g id="node23" class="node">
+<g id="node25" class="node">
 <title>zcash/zcash#5178</title>
-<g id="a_node23"><a xlink:href="https://github.com/zcash/zcash/issues/5178" xlink:title="zcash/zcash#5178&#10;New RPC: z_getnewaccount" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1830,-251.5 1611,-251.5 1611,-213.5 1830,-213.5 1830,-251.5"/>
-<text text-anchor="middle" x="1720.5" y="-236.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5178</text>
-<text text-anchor="middle" x="1720.5" y="-221.3" font-family="Times,serif" font-size="14.00" fill="#000000">New RPC: z_getnewaccount</text>
+<g id="a_node25"><a xlink:href="https://github.com/zcash/zcash/issues/5178" xlink:title="zcash/zcash#5178&#10;New RPC: z_getnewaccount" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1919,-180.5 1700,-180.5 1700,-142.5 1919,-142.5 1919,-180.5"/>
+<text text-anchor="middle" x="1809.5" y="-165.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5178</text>
+<text text-anchor="middle" x="1809.5" y="-150.3" font-family="Times,serif" font-size="14.00" fill="#000000">New RPC: z_getnewaccount</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5179&#45;&gt;zcash/zcash#5178 -->
-<g id="edge20" class="edge">
+<g id="edge22" class="edge">
 <title>zcash/zcash#5179&#45;&gt;zcash/zcash#5178</title>
-<path fill="none" stroke="#000000" d="M1564.2,-348.41C1568,-345.66 1571.7,-342.69 1575,-339.5 1602.9,-312.87 1581.4,-285.26 1611,-260.5 1612.4,-259.35 1613.8,-258.25 1615.2,-257.2"/>
-<polygon fill="#000000" stroke="#000000" points="1617.3721,-259.9649 1623.9,-251.62 1613.593,-254.0727 1617.3721,-259.9649"/>
+<path fill="none" stroke="#000000" d="M1657.9,-201.56C1672,-197.42 1686.3,-193.29 1700,-189.5 1707.7,-187.37 1715.6,-185.22 1723.6,-183.1"/>
+<polygon fill="#000000" stroke="#000000" points="1724.6149,-186.4523 1733.4,-180.53 1722.8392,-179.6812 1724.6149,-186.4523"/>
 </g>
 <!-- zcash/zcash#5182 -->
-<g id="node24" class="node">
+<g id="node26" class="node">
 <title>zcash/zcash#5182</title>
-<g id="a_node24"><a xlink:href="https://github.com/zcash/zcash/issues/5182" xlink:title="zcash/zcash#5182&#10;New RPC:&#10;z_getbalanceforaddress" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1814,-409 1627,-409 1627,-356 1814,-356 1814,-409"/>
-<text text-anchor="middle" x="1720.5" y="-393.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5182</text>
-<text text-anchor="middle" x="1720.5" y="-378.8" font-family="Times,serif" font-size="14.00" fill="#000000">New RPC:</text>
-<text text-anchor="middle" x="1720.5" y="-363.8" font-family="Times,serif" font-size="14.00" fill="#000000">z_getbalanceforaddress</text>
+<g id="a_node26"><a xlink:href="https://github.com/zcash/zcash/issues/5182" xlink:title="zcash/zcash#5182&#10;New RPC:&#10;z_getbalanceforaddress" target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" points="1903,-338 1716,-338 1716,-285 1903,-285 1903,-338"/>
+<text text-anchor="middle" x="1809.5" y="-322.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5182</text>
+<text text-anchor="middle" x="1809.5" y="-307.8" font-family="Times,serif" font-size="14.00" fill="#000000">New RPC:</text>
+<text text-anchor="middle" x="1809.5" y="-292.8" font-family="Times,serif" font-size="14.00" fill="#000000">z_getbalanceforaddress</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5179&#45;&gt;zcash/zcash#5182 -->
-<g id="edge21" class="edge">
+<g id="edge23" class="edge">
 <title>zcash/zcash#5179&#45;&gt;zcash/zcash#5182</title>
-<path fill="none" stroke="#000000" d="M1568.6,-382.5C1584.4,-382.5 1600.7,-382.5 1616.6,-382.5"/>
-<polygon fill="#000000" stroke="#000000" points="1617,-386.0001 1627,-382.5 1617,-379.0001 1617,-386.0001"/>
+<path fill="none" stroke="#000000" d="M1657.6,-264.06C1676.5,-269.96 1696.1,-276.09 1714.8,-281.92"/>
+<polygon fill="#000000" stroke="#000000" points="1713.8105,-285.2778 1724.4,-284.94 1715.9112,-278.6004 1713.8105,-285.2778"/>
 </g>
 <!-- zcash/zcash#5185 -->
-<g id="node25" class="node">
+<g id="node27" class="node">
 <title>zcash/zcash#5185</title>
-<g id="a_node25"><a xlink:href="https://github.com/zcash/zcash/issues/5185" xlink:title="zcash/zcash#5185&#10;Add support for funding&#10;z_sendmany from a UA&#10;account" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1815,-337.5 1626,-337.5 1626,-269.5 1815,-269.5 1815,-337.5"/>
-<text text-anchor="middle" x="1720.5" y="-322.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5185</text>
-<text text-anchor="middle" x="1720.5" y="-307.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for funding</text>
-<text text-anchor="middle" x="1720.5" y="-292.3" font-family="Times,serif" font-size="14.00" fill="#000000">z_sendmany from a UA</text>
-<text text-anchor="middle" x="1720.5" y="-277.3" font-family="Times,serif" font-size="14.00" fill="#000000">account</text>
+<g id="a_node27"><a xlink:href="https://github.com/zcash/zcash/issues/5185" xlink:title="zcash/zcash#5185&#10;Add support for funding&#10;z_sendmany from a UA&#10;account" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1904,-266.5 1715,-266.5 1715,-198.5 1904,-198.5 1904,-266.5"/>
+<text text-anchor="middle" x="1809.5" y="-251.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5185</text>
+<text text-anchor="middle" x="1809.5" y="-236.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for funding</text>
+<text text-anchor="middle" x="1809.5" y="-221.3" font-family="Times,serif" font-size="14.00" fill="#000000">z_sendmany from a UA</text>
+<text text-anchor="middle" x="1809.5" y="-206.3" font-family="Times,serif" font-size="14.00" fill="#000000">account</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5179&#45;&gt;zcash/zcash#5185 -->
-<g id="edge22" class="edge">
+<g id="edge24" class="edge">
 <title>zcash/zcash#5179&#45;&gt;zcash/zcash#5185</title>
-<path fill="none" stroke="#000000" d="M1568.6,-350.94C1584.2,-346.06 1600.4,-341.02 1616,-336.12"/>
-<polygon fill="#000000" stroke="#000000" points="1617.1984,-339.4125 1625.7,-333.09 1615.1113,-332.7309 1617.1984,-339.4125"/>
+<path fill="none" stroke="#000000" d="M1657.6,-232.5C1673.1,-232.5 1689,-232.5 1704.6,-232.5"/>
+<polygon fill="#000000" stroke="#000000" points="1704.7,-236.0001 1714.7,-232.5 1704.7,-229.0001 1704.7,-236.0001"/>
 </g>
 <!-- zcash/zcash#5180 -->
-<g id="node26" class="node">
+<g id="node28" class="node">
 <title>zcash/zcash#5180</title>
-<g id="a_node26"><a xlink:href="https://github.com/zcash/zcash/issues/5180" xlink:title="zcash/zcash#5180&#10;New RPC:&#10;z_getaddressforaccount" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1814.5,-551 1626.5,-551 1626.5,-498 1814.5,-498 1814.5,-551"/>
-<text text-anchor="middle" x="1720.5" y="-535.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5180</text>
-<text text-anchor="middle" x="1720.5" y="-520.8" font-family="Times,serif" font-size="14.00" fill="#000000">New RPC:</text>
-<text text-anchor="middle" x="1720.5" y="-505.8" font-family="Times,serif" font-size="14.00" fill="#000000">z_getaddressforaccount</text>
+<g id="a_node28"><a xlink:href="https://github.com/zcash/zcash/issues/5180" xlink:title="zcash/zcash#5180&#10;New RPC:&#10;z_getaddressforaccount" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1903.5,-53 1715.5,-53 1715.5,0 1903.5,0 1903.5,-53"/>
+<text text-anchor="middle" x="1809.5" y="-37.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5180</text>
+<text text-anchor="middle" x="1809.5" y="-22.8" font-family="Times,serif" font-size="14.00" fill="#000000">New RPC:</text>
+<text text-anchor="middle" x="1809.5" y="-7.8" font-family="Times,serif" font-size="14.00" fill="#000000">z_getaddressforaccount</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5179&#45;&gt;zcash/zcash#5180 -->
-<g id="edge23" class="edge">
+<g id="edge25" class="edge">
 <title>zcash/zcash#5179&#45;&gt;zcash/zcash#5180</title>
-<path fill="none" stroke="#000000" d="M1563.4,-416.63C1567.5,-419.38 1571.4,-422.33 1575,-425.5 1599.3,-446.67 1586,-468.11 1611,-488.5 1613.1,-490.19 1615.2,-491.8 1617.4,-493.33"/>
-<polygon fill="#000000" stroke="#000000" points="1615.9664,-496.5617 1626.3,-498.9 1619.68,-490.628 1615.9664,-496.5617"/>
+<path fill="none" stroke="#000000" d="M1653.4,-198.48C1657.2,-195.43 1660.8,-192.11 1664,-188.5 1703.1,-144.75 1659.2,-103.67 1700,-61.5 1702.1,-59.281 1704.4,-57.203 1706.8,-55.256"/>
+<polygon fill="#000000" stroke="#000000" points="1709.2864,-57.782 1715.4,-49.129 1705.2247,-52.0809 1709.2864,-57.782"/>
 </g>
 <!-- zcash/zcash#5183 -->
-<g id="node27" class="node">
+<g id="node29" class="node">
 <title>zcash/zcash#5183</title>
-<g id="a_node27"><a xlink:href="https://github.com/zcash/zcash/issues/5183" xlink:title="zcash/zcash#5183&#10;New RPC:&#10;z_getbalanceforaccount" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1814.5,-480 1626.5,-480 1626.5,-427 1814.5,-427 1814.5,-480"/>
-<text text-anchor="middle" x="1720.5" y="-464.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5183</text>
-<text text-anchor="middle" x="1720.5" y="-449.8" font-family="Times,serif" font-size="14.00" fill="#000000">New RPC:</text>
-<text text-anchor="middle" x="1720.5" y="-434.8" font-family="Times,serif" font-size="14.00" fill="#000000">z_getbalanceforaccount</text>
+<g id="a_node29"><a xlink:href="https://github.com/zcash/zcash/issues/5183" xlink:title="zcash/zcash#5183&#10;New RPC:&#10;z_getbalanceforaccount" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1903.5,-124 1715.5,-124 1715.5,-71 1903.5,-71 1903.5,-124"/>
+<text text-anchor="middle" x="1809.5" y="-108.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5183</text>
+<text text-anchor="middle" x="1809.5" y="-93.8" font-family="Times,serif" font-size="14.00" fill="#000000">New RPC:</text>
+<text text-anchor="middle" x="1809.5" y="-78.8" font-family="Times,serif" font-size="14.00" fill="#000000">z_getbalanceforaccount</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5179&#45;&gt;zcash/zcash#5183 -->
-<g id="edge24" class="edge">
+<g id="edge26" class="edge">
 <title>zcash/zcash#5179&#45;&gt;zcash/zcash#5183</title>
-<path fill="none" stroke="#000000" d="M1568.6,-410.87C1584.3,-415.28 1600.6,-419.85 1616.4,-424.28"/>
-<polygon fill="#000000" stroke="#000000" points="1615.5251,-427.6698 1626.1,-427.02 1617.428,-420.9334 1615.5251,-427.6698"/>
+<path fill="none" stroke="#000000" d="M1650.3,-198.35C1655.1,-195.31 1659.7,-192.03 1664,-188.5 1686.5,-169.91 1676.8,-151.28 1700,-133.5 1702.1,-131.9 1704.2,-130.37 1706.5,-128.91"/>
+<polygon fill="#000000" stroke="#000000" points="1708.553,-131.7588 1715.3,-123.59 1704.9315,-125.7684 1708.553,-131.7588"/>
 </g>
 <!-- zcash/orchard#36 -->
-<g id="node28" class="node">
+<g id="node30" class="node">
 <title>zcash/orchard#36</title>
-<g id="a_node28"><a xlink:href="https://github.com/zcash/orchard/issues/36" xlink:title="zcash/orchard#36&#10;Parsing and serialization&#10;of Orchard keys and&#10;addresses" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="1061,-251.5 867,-251.5 867,-183.5 1061,-183.5 1061,-251.5"/>
-<text text-anchor="middle" x="964" y="-236.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#36</text>
-<text text-anchor="middle" x="964" y="-221.3" font-family="Times,serif" font-size="14.00" fill="#000000">Parsing and serialization</text>
-<text text-anchor="middle" x="964" y="-206.3" font-family="Times,serif" font-size="14.00" fill="#000000">of Orchard keys and</text>
-<text text-anchor="middle" x="964" y="-191.3" font-family="Times,serif" font-size="14.00" fill="#000000">addresses</text>
+<g id="a_node30"><a xlink:href="https://github.com/zcash/orchard/issues/36" xlink:title="zcash/orchard#36&#10;Parsing and serialization&#10;of Orchard keys and&#10;addresses" target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="1150,-568.5 956,-568.5 956,-500.5 1150,-500.5 1150,-568.5"/>
+<text text-anchor="middle" x="1053" y="-553.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#36</text>
+<text text-anchor="middle" x="1053" y="-538.3" font-family="Times,serif" font-size="14.00" fill="#000000">Parsing and serialization</text>
+<text text-anchor="middle" x="1053" y="-523.3" font-family="Times,serif" font-size="14.00" fill="#000000">of Orchard keys and</text>
+<text text-anchor="middle" x="1053" y="-508.3" font-family="Times,serif" font-size="14.00" fill="#000000">addresses</text>
 </a>
 </g>
 </g>
 <!-- zcash/orchard#36&#45;&gt;zcash/zcash#5019 -->
-<g id="edge25" class="edge">
+<g id="edge27" class="edge">
 <title>zcash/orchard#36&#45;&gt;zcash/zcash#5019</title>
-<path fill="none" stroke="#000000" d="M1061.3,-249.09C1082.3,-255.9 1104.4,-263.08 1125.1,-269.82"/>
-<polygon fill="#000000" stroke="#000000" points="1124.3082,-273.2424 1134.9,-272.99 1126.4626,-266.5821 1124.3082,-273.2424"/>
+<path fill="none" stroke="#000000" d="M1150.3,-564.93C1170.2,-571.17 1191.2,-577.73 1211,-583.93"/>
+<polygon fill="#000000" stroke="#000000" points="1210.0105,-587.2878 1220.6,-586.95 1212.1112,-580.6104 1210.0105,-587.2878"/>
 </g>
 <!-- zcash/librustzcash#371 -->
-<g id="node29" class="node">
+<g id="node31" class="node">
 <title>zcash/librustzcash#371</title>
-<g id="a_node29"><a xlink:href="https://github.com/zcash/librustzcash/issues/371" xlink:title="zcash/librustzcash#371&#10;Implement parsing and&#10;serialization of Unified&#10;Addresses" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" points="1310.5,-246.5 1122.5,-246.5 1122.5,-178.5 1310.5,-178.5 1310.5,-246.5"/>
-<text text-anchor="middle" x="1216.5" y="-231.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#371</text>
-<text text-anchor="middle" x="1216.5" y="-216.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement parsing and</text>
-<text text-anchor="middle" x="1216.5" y="-201.3" font-family="Times,serif" font-size="14.00" fill="#000000">serialization of Unified</text>
-<text text-anchor="middle" x="1216.5" y="-186.3" font-family="Times,serif" font-size="14.00" fill="#000000">Addresses</text>
+<g id="a_node31"><a xlink:href="https://github.com/zcash/librustzcash/issues/371" xlink:title="zcash/librustzcash#371&#10;Implement parsing and&#10;serialization of Unified&#10;Addresses" target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" points="1399.5,-444.5 1211.5,-444.5 1211.5,-376.5 1399.5,-376.5 1399.5,-444.5"/>
+<text text-anchor="middle" x="1305.5" y="-429.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#371</text>
+<text text-anchor="middle" x="1305.5" y="-414.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement parsing and</text>
+<text text-anchor="middle" x="1305.5" y="-399.3" font-family="Times,serif" font-size="14.00" fill="#000000">serialization of Unified</text>
+<text text-anchor="middle" x="1305.5" y="-384.3" font-family="Times,serif" font-size="14.00" fill="#000000">Addresses</text>
 </a>
 </g>
 </g>
 <!-- zcash/orchard#36&#45;&gt;zcash/librustzcash#371 -->
-<g id="edge26" class="edge">
+<g id="edge28" class="edge">
 <title>zcash/orchard#36&#45;&gt;zcash/librustzcash#371</title>
-<path fill="none" stroke="#000000" d="M1061.3,-215.57C1077.8,-215.25 1095.1,-214.9 1111.8,-214.57"/>
-<polygon fill="#000000" stroke="#000000" points="1112.2692,-218.0617 1122.2,-214.37 1112.1345,-211.063 1112.2692,-218.0617"/>
+<path fill="none" stroke="#000000" d="M1122.3,-500.45C1154.6,-484.59 1193.2,-465.65 1226.6,-449.24"/>
+<polygon fill="#000000" stroke="#000000" points="1228.4556,-452.2287 1235.9,-444.69 1225.3793,-445.9408 1228.4556,-452.2287"/>
 </g>
 <!-- zcash/zcash#5133 -->
-<g id="node30" class="node">
+<g id="node32" class="node">
 <title>zcash/zcash#5133</title>
-<g id="a_node30"><a xlink:href="https://github.com/zcash/zcash/issues/5133" xlink:title="zcash/zcash#5133&#10;Implement Unified Address&#10;parsing and serialization&#10;to KeyIO" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1575,-244.5 1360,-244.5 1360,-176.5 1575,-176.5 1575,-244.5"/>
-<text text-anchor="middle" x="1467.5" y="-229.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5133</text>
-<text text-anchor="middle" x="1467.5" y="-214.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Unified Address</text>
-<text text-anchor="middle" x="1467.5" y="-199.3" font-family="Times,serif" font-size="14.00" fill="#000000">parsing and serialization</text>
-<text text-anchor="middle" x="1467.5" y="-184.3" font-family="Times,serif" font-size="14.00" fill="#000000">to KeyIO</text>
+<g id="a_node32"><a xlink:href="https://github.com/zcash/zcash/issues/5133" xlink:title="zcash/zcash#5133&#10;Implement Unified Address&#10;parsing and serialization&#10;to KeyIO" target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" points="1664,-405.5 1449,-405.5 1449,-337.5 1664,-337.5 1664,-405.5"/>
+<text text-anchor="middle" x="1556.5" y="-390.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5133</text>
+<text text-anchor="middle" x="1556.5" y="-375.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Unified Address</text>
+<text text-anchor="middle" x="1556.5" y="-360.3" font-family="Times,serif" font-size="14.00" fill="#000000">parsing and serialization</text>
+<text text-anchor="middle" x="1556.5" y="-345.3" font-family="Times,serif" font-size="14.00" fill="#000000">to KeyIO</text>
 </a>
 </g>
 </g>
 <!-- zcash/librustzcash#371&#45;&gt;zcash/zcash#5133 -->
-<g id="edge27" class="edge">
+<g id="edge29" class="edge">
 <title>zcash/librustzcash#371&#45;&gt;zcash/zcash#5133</title>
-<path fill="none" stroke="#000000" d="M1310.7,-211.75C1323.3,-211.65 1336.4,-211.54 1349.3,-211.44"/>
-<polygon fill="#000000" stroke="#000000" points="1349.7273,-214.9369 1359.7,-211.36 1349.6733,-207.9371 1349.7273,-214.9369"/>
+<path fill="none" stroke="#000000" d="M1399.7,-395.87C1412.4,-393.89 1425.6,-391.83 1438.7,-389.8"/>
+<polygon fill="#000000" stroke="#000000" points="1439.3541,-393.2405 1448.7,-388.25 1438.2819,-386.3231 1439.3541,-393.2405"/>
+</g>
+<!-- zcash/librustzcash#372 -->
+<g id="node33" class="node">
+<title>zcash/librustzcash#372</title>
+<g id="a_node33"><a xlink:href="https://github.com/zcash/librustzcash/issues/372" xlink:title="zcash/librustzcash#372&#10;Implement parsing and&#10;serialization of Unified&#10;[Incoming / Full] Viewing&#10;Keys and Unified Spending&#10;Keys" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1661.5,-521.5 1451.5,-521.5 1451.5,-423.5 1661.5,-423.5 1661.5,-521.5"/>
+<text text-anchor="middle" x="1556.5" y="-506.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#372</text>
+<text text-anchor="middle" x="1556.5" y="-491.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement parsing and</text>
+<text text-anchor="middle" x="1556.5" y="-476.3" font-family="Times,serif" font-size="14.00" fill="#000000">serialization of Unified</text>
+<text text-anchor="middle" x="1556.5" y="-461.3" font-family="Times,serif" font-size="14.00" fill="#000000">[Incoming / Full] Viewing</text>
+<text text-anchor="middle" x="1556.5" y="-446.3" font-family="Times,serif" font-size="14.00" fill="#000000">Keys and Unified Spending</text>
+<text text-anchor="middle" x="1556.5" y="-431.3" font-family="Times,serif" font-size="14.00" fill="#000000">Keys</text>
+</a>
+</g>
+</g>
+<!-- zcash/librustzcash#371&#45;&gt;zcash/librustzcash#372 -->
+<g id="edge30" class="edge">
+<title>zcash/librustzcash#371&#45;&gt;zcash/librustzcash#372</title>
+<path fill="none" stroke="#000000" d="M1399.7,-433.76C1413.2,-437.11 1427.3,-440.58 1441.2,-444.02"/>
+<polygon fill="#000000" stroke="#000000" points="1440.7529,-447.5145 1451.3,-446.51 1442.4285,-440.718 1440.7529,-447.5145"/>
+</g>
+<!-- zcash/zcash#5133&#45;&gt;zcash/zcash#5256 -->
+<g id="edge31" class="edge">
+<title>zcash/zcash#5133&#45;&gt;zcash/zcash#5256</title>
+<path fill="none" stroke="#000000" d="M1655.8,-405.73C1658.7,-408.44 1661.5,-411.35 1664,-414.5 1729,-496.15 1641.3,-560.26 1700,-646.5 1706.1,-655.49 1714,-663.39 1722.6,-670.29"/>
+<polygon fill="#000000" stroke="#000000" points="1720.6776,-673.2214 1730.8,-676.35 1724.838,-667.5918 1720.6776,-673.2214"/>
 </g>
 <!-- zcash/zcash#5133&#45;&gt;zcash/zcash#5178 -->
-<g id="edge28" class="edge">
+<g id="edge32" class="edge">
 <title>zcash/zcash#5133&#45;&gt;zcash/zcash#5178</title>
-<path fill="none" stroke="#000000" d="M1575.2,-219.86C1583.7,-220.6 1592.3,-221.35 1600.9,-222.1"/>
-<polygon fill="#000000" stroke="#000000" points="1600.6342,-225.59 1610.9,-222.97 1601.241,-218.6164 1600.6342,-225.59"/>
+<path fill="none" stroke="#000000" d="M1603.5,-337.32C1624.1,-320.5 1647.4,-298.83 1664,-275.5 1688,-241.76 1668.6,-216.58 1700,-189.5 1701.3,-188.35 1702.7,-187.25 1704.1,-186.2"/>
+<polygon fill="#000000" stroke="#000000" points="1706.107,-189.0687 1712.5,-180.62 1702.2337,-183.2379 1706.107,-189.0687"/>
 </g>
 <!-- zcash/zcash#5133&#45;&gt;zcash/zcash#5182 -->
-<g id="edge29" class="edge">
+<g id="edge33" class="edge">
 <title>zcash/zcash#5133&#45;&gt;zcash/zcash#5182</title>
-<path fill="none" stroke="#000000" d="M1565,-244.72C1568.5,-247.43 1571.9,-250.36 1575,-253.5 1606.2,-285.02 1578.9,-315.98 1611,-346.5 1613.4,-348.77 1615.9,-350.9 1618.6,-352.9"/>
-<polygon fill="#000000" stroke="#000000" points="1616.6505,-355.8068 1626.9,-358.49 1620.5609,-350.0008 1616.6505,-355.8068"/>
+<path fill="none" stroke="#000000" d="M1664.2,-345.97C1678,-342.68 1692.2,-339.32 1706,-336.05"/>
+<polygon fill="#000000" stroke="#000000" points="1706.9842,-339.4135 1715.9,-333.69 1705.3609,-332.6043 1706.9842,-339.4135"/>
 </g>
 <!-- zcash/zcash#5133&#45;&gt;zcash/zcash#5185 -->
-<g id="edge30" class="edge">
+<g id="edge34" class="edge">
 <title>zcash/zcash#5133&#45;&gt;zcash/zcash#5185</title>
-<path fill="none" stroke="#000000" d="M1560.3,-244.6C1579.1,-251.52 1599,-258.83 1618.1,-265.87"/>
-<polygon fill="#000000" stroke="#000000" points="1617.1065,-269.2337 1627.7,-269.4 1619.5223,-262.6638 1617.1065,-269.2337"/>
+<path fill="none" stroke="#000000" d="M1602.1,-337.29C1629.6,-317.66 1665.7,-293.42 1700,-275.5 1702.9,-273.96 1705.9,-272.45 1709,-270.95"/>
+<polygon fill="#000000" stroke="#000000" points="1710.751,-273.9939 1718.3,-266.56 1707.7628,-267.6637 1710.751,-273.9939"/>
 </g>
 <!-- zcash/zcash#5181 -->
-<g id="node31" class="node">
+<g id="node34" class="node">
 <title>zcash/zcash#5181</title>
-<g id="a_node31"><a xlink:href="https://github.com/zcash/zcash/issues/5181" xlink:title="zcash/zcash#5181&#10;New RPC:&#10;z_listunifiedreceivers" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1805.5,-53 1635.5,-53 1635.5,0 1805.5,0 1805.5,-53"/>
-<text text-anchor="middle" x="1720.5" y="-37.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5181</text>
-<text text-anchor="middle" x="1720.5" y="-22.8" font-family="Times,serif" font-size="14.00" fill="#000000">New RPC:</text>
-<text text-anchor="middle" x="1720.5" y="-7.8" font-family="Times,serif" font-size="14.00" fill="#000000">z_listunifiedreceivers</text>
+<g id="a_node34"><a xlink:href="https://github.com/zcash/zcash/issues/5181" xlink:title="zcash/zcash#5181&#10;New RPC:&#10;z_listunifiedreceivers" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1894.5,-480 1724.5,-480 1724.5,-427 1894.5,-427 1894.5,-480"/>
+<text text-anchor="middle" x="1809.5" y="-464.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5181</text>
+<text text-anchor="middle" x="1809.5" y="-449.8" font-family="Times,serif" font-size="14.00" fill="#000000">New RPC:</text>
+<text text-anchor="middle" x="1809.5" y="-434.8" font-family="Times,serif" font-size="14.00" fill="#000000">z_listunifiedreceivers</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5133&#45;&gt;zcash/zcash#5181 -->
-<g id="edge31" class="edge">
+<g id="edge35" class="edge">
 <title>zcash/zcash#5133&#45;&gt;zcash/zcash#5181</title>
-<path fill="none" stroke="#000000" d="M1492.1,-176.48C1518.1,-142.79 1562.1,-91.962 1611,-61.5 1615.8,-58.534 1620.8,-55.797 1626,-53.274"/>
-<polygon fill="#000000" stroke="#000000" points="1627.8401,-56.2826 1635.5,-48.963 1624.9474,-49.9082 1627.8401,-56.2826"/>
+<path fill="none" stroke="#000000" d="M1661.6,-405.56C1680.2,-411.61 1699.5,-417.85 1717.8,-423.77"/>
+<polygon fill="#000000" stroke="#000000" points="1716.9079,-427.1602 1727.5,-426.92 1719.07,-420.5024 1716.9079,-427.1602"/>
 </g>
 <!-- zcash/zcash#5184 -->
-<g id="node32" class="node">
+<g id="node35" class="node">
 <title>zcash/zcash#5184</title>
-<g id="a_node32"><a xlink:href="https://github.com/zcash/zcash/issues/5184" xlink:title="zcash/zcash#5184&#10;Add support for UA&#10;recipients to z_sendmany" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1820.5,-195 1620.5,-195 1620.5,-142 1820.5,-142 1820.5,-195"/>
-<text text-anchor="middle" x="1720.5" y="-179.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5184</text>
-<text text-anchor="middle" x="1720.5" y="-164.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for UA</text>
-<text text-anchor="middle" x="1720.5" y="-149.8" font-family="Times,serif" font-size="14.00" fill="#000000">recipients to z_sendmany</text>
+<g id="a_node35"><a xlink:href="https://github.com/zcash/zcash/issues/5184" xlink:title="zcash/zcash#5184&#10;Add support for UA&#10;recipients to z_sendmany" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1909.5,-409 1709.5,-409 1709.5,-356 1909.5,-356 1909.5,-409"/>
+<text text-anchor="middle" x="1809.5" y="-393.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5184</text>
+<text text-anchor="middle" x="1809.5" y="-378.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for UA</text>
+<text text-anchor="middle" x="1809.5" y="-363.8" font-family="Times,serif" font-size="14.00" fill="#000000">recipients to z_sendmany</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5133&#45;&gt;zcash/zcash#5184 -->
-<g id="edge32" class="edge">
+<g id="edge36" class="edge">
 <title>zcash/zcash#5133&#45;&gt;zcash/zcash#5184</title>
-<path fill="none" stroke="#000000" d="M1575.2,-192.63C1586.7,-190.71 1598.5,-188.76 1610,-186.84"/>
-<polygon fill="#000000" stroke="#000000" points="1610.9018,-190.2387 1620.2,-185.16 1609.7641,-183.3318 1610.9018,-190.2387"/>
+<path fill="none" stroke="#000000" d="M1664.2,-376.18C1675.7,-376.68 1687.5,-377.19 1699,-377.7"/>
+<polygon fill="#000000" stroke="#000000" points="1699.0584,-381.2057 1709.2,-378.14 1699.3602,-374.2122 1699.0584,-381.2057"/>
 </g>
 <!-- zcash/zcash#5191 -->
-<g id="node33" class="node">
+<g id="node36" class="node">
 <title>zcash/zcash#5191</title>
-<g id="a_node33"><a xlink:href="https://github.com/zcash/zcash/issues/5191" xlink:title="zcash/zcash#5191&#10;z_getbalance: Return&#10;error if given a UA" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1805,-124 1636,-124 1636,-71 1805,-71 1805,-124"/>
-<text text-anchor="middle" x="1720.5" y="-108.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5191</text>
-<text text-anchor="middle" x="1720.5" y="-93.8" font-family="Times,serif" font-size="14.00" fill="#000000">z_getbalance: Return</text>
-<text text-anchor="middle" x="1720.5" y="-78.8" font-family="Times,serif" font-size="14.00" fill="#000000">error if given a UA</text>
+<g id="a_node36"><a xlink:href="https://github.com/zcash/zcash/issues/5191" xlink:title="zcash/zcash#5191&#10;z_getbalance: Return&#10;error if given a UA" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1894,-551 1725,-551 1725,-498 1894,-498 1894,-551"/>
+<text text-anchor="middle" x="1809.5" y="-535.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5191</text>
+<text text-anchor="middle" x="1809.5" y="-520.8" font-family="Times,serif" font-size="14.00" fill="#000000">z_getbalance: Return</text>
+<text text-anchor="middle" x="1809.5" y="-505.8" font-family="Times,serif" font-size="14.00" fill="#000000">error if given a UA</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5133&#45;&gt;zcash/zcash#5191 -->
-<g id="edge33" class="edge">
+<g id="edge37" class="edge">
 <title>zcash/zcash#5133&#45;&gt;zcash/zcash#5191</title>
-<path fill="none" stroke="#000000" d="M1524.2,-176.46C1550.1,-161.76 1581.5,-145.08 1611,-132.5 1616,-130.37 1621.2,-128.3 1626.4,-126.29"/>
-<polygon fill="#000000" stroke="#000000" points="1627.7453,-129.524 1635.9,-122.76 1625.3071,-122.9623 1627.7453,-129.524"/>
+<path fill="none" stroke="#000000" d="M1653.1,-405.7C1657,-408.42 1660.6,-411.35 1664,-414.5 1690.8,-439.41 1672.5,-464.44 1700,-488.5 1704.8,-492.73 1710.2,-496.47 1715.9,-499.77"/>
+<polygon fill="#000000" stroke="#000000" points="1714.5262,-503.0032 1725,-504.6 1717.808,-496.8202 1714.5262,-503.0032"/>
+</g>
+<!-- zcash/zcash#5257 -->
+<g id="node37" class="node">
+<title>zcash/zcash#5257</title>
+<g id="a_node37"><a xlink:href="https://github.com/zcash/zcash/issues/5257" xlink:title="zcash/zcash#5257&#10;Implement Unified Viewing&#10;Key parsing and&#10;serialization" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1916.5,-637.5 1702.5,-637.5 1702.5,-569.5 1916.5,-569.5 1916.5,-637.5"/>
+<text text-anchor="middle" x="1809.5" y="-622.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5257</text>
+<text text-anchor="middle" x="1809.5" y="-607.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Unified Viewing</text>
+<text text-anchor="middle" x="1809.5" y="-592.3" font-family="Times,serif" font-size="14.00" fill="#000000">Key parsing and</text>
+<text text-anchor="middle" x="1809.5" y="-577.3" font-family="Times,serif" font-size="14.00" fill="#000000">serialization</text>
+</a>
+</g>
+</g>
+<!-- zcash/zcash#5133&#45;&gt;zcash/zcash#5257 -->
+<g id="edge38" class="edge">
+<title>zcash/zcash#5133&#45;&gt;zcash/zcash#5257</title>
+<path fill="none" stroke="#000000" d="M1654.9,-405.63C1658.2,-408.37 1661.2,-411.32 1664,-414.5 1707.6,-464.56 1656.4,-509.41 1700,-559.5 1700.9,-560.5 1701.8,-561.48 1702.7,-562.43"/>
+<polygon fill="#000000" stroke="#000000" points="1700.474,-565.1382 1710.2,-569.34 1705.2171,-559.99 1700.474,-565.1382"/>
+</g>
+<!-- zcash/librustzcash#372&#45;&gt;zcash/zcash#5257 -->
+<g id="edge39" class="edge">
+<title>zcash/librustzcash#372&#45;&gt;zcash/zcash#5257</title>
+<path fill="none" stroke="#000000" d="M1650.1,-521.61C1654.8,-524.54 1659.5,-527.51 1664,-530.5 1681.1,-541.87 1682.3,-549.11 1700,-559.5 1703.1,-561.29 1706.2,-563.04 1709.4,-564.74"/>
+<polygon fill="#000000" stroke="#000000" points="1708.1012,-568.0064 1718.6,-569.43 1711.2805,-561.77 1708.1012,-568.0064"/>
 </g>
 <!-- zcash/orchard#30 -->
-<g id="node34" class="node">
+<g id="node38" class="node">
 <title>zcash/orchard#30</title>
-<g id="a_node34"><a xlink:href="https://github.com/zcash/orchard/issues/30" xlink:title="zcash/orchard#30&#10;Implement ZIP 32 for&#10;Orchard" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="1050,-326 878,-326 878,-273 1050,-273 1050,-326"/>
-<text text-anchor="middle" x="964" y="-310.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#30</text>
-<text text-anchor="middle" x="964" y="-295.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement ZIP 32 for</text>
-<text text-anchor="middle" x="964" y="-280.8" font-family="Times,serif" font-size="14.00" fill="#000000">Orchard</text>
+<g id="a_node38"><a xlink:href="https://github.com/zcash/orchard/issues/30" xlink:title="zcash/orchard#30&#10;Implement ZIP 32 for&#10;Orchard" target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="1139,-640 967,-640 967,-587 1139,-587 1139,-640"/>
+<text text-anchor="middle" x="1053" y="-624.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#30</text>
+<text text-anchor="middle" x="1053" y="-609.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement ZIP 32 for</text>
+<text text-anchor="middle" x="1053" y="-594.8" font-family="Times,serif" font-size="14.00" fill="#000000">Orchard</text>
 </a>
 </g>
 </g>
 <!-- zcash/orchard#30&#45;&gt;zcash/zcash#5019 -->
-<g id="edge34" class="edge">
+<g id="edge40" class="edge">
 <title>zcash/orchard#30&#45;&gt;zcash/zcash#5019</title>
-<path fill="none" stroke="#000000" d="M1050.2,-299.5C1070.9,-299.5 1093.2,-299.5 1114.6,-299.5"/>
-<polygon fill="#000000" stroke="#000000" points="1114.7,-303.0001 1124.7,-299.5 1114.7,-296.0001 1114.7,-303.0001"/>
+<path fill="none" stroke="#000000" d="M1139.2,-613.5C1159.9,-613.5 1182.2,-613.5 1203.6,-613.5"/>
+<polygon fill="#000000" stroke="#000000" points="1203.7,-617.0001 1213.7,-613.5 1203.7,-610.0001 1203.7,-617.0001"/>
 </g>
 <!-- zcash/zcash#2534 -->
-<g id="node35" class="node">
+<g id="node39" class="node">
 <title>zcash/zcash#2534</title>
-<g id="a_node35"><a xlink:href="https://github.com/zcash/zcash/pull/2534" xlink:title="zcash/zcash#2534&#10;Bitcoin 0.12 P2P/Net PRs&#10;1" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="252.5,-1072 52.5,-1072 52.5,-1068 48.5,-1068 48.5,-1064 52.5,-1064 52.5,-1027 48.5,-1027 48.5,-1023 52.5,-1023 52.5,-1019 252.5,-1019 252.5,-1072"/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="52.5,-1068 56.5,-1068 56.5,-1064 52.5,-1064 "/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="52.5,-1027 56.5,-1027 56.5,-1023 52.5,-1023 "/>
-<text text-anchor="middle" x="152.5" y="-1056.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#2534</text>
-<text text-anchor="middle" x="152.5" y="-1041.8" font-family="Times,serif" font-size="14.00" fill="#000000">Bitcoin 0.12 P2P/Net PRs</text>
-<text text-anchor="middle" x="152.5" y="-1026.8" font-family="Times,serif" font-size="14.00" fill="#000000">1</text>
+<g id="a_node39"><a xlink:href="https://github.com/zcash/zcash/pull/2534" xlink:title="zcash/zcash#2534&#10;Bitcoin 0.12 P2P/Net PRs&#10;1" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="252.5,-1194 52.5,-1194 52.5,-1190 48.5,-1190 48.5,-1186 52.5,-1186 52.5,-1149 48.5,-1149 48.5,-1145 52.5,-1145 52.5,-1141 252.5,-1141 252.5,-1194"/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="52.5,-1190 56.5,-1190 56.5,-1186 52.5,-1186 "/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="52.5,-1149 56.5,-1149 56.5,-1145 52.5,-1145 "/>
+<text text-anchor="middle" x="152.5" y="-1178.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#2534</text>
+<text text-anchor="middle" x="152.5" y="-1163.8" font-family="Times,serif" font-size="14.00" fill="#000000">Bitcoin 0.12 P2P/Net PRs</text>
+<text text-anchor="middle" x="152.5" y="-1148.8" font-family="Times,serif" font-size="14.00" fill="#000000">1</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5003 -->
-<g id="node36" class="node">
+<g id="node40" class="node">
 <title>zcash/zcash#5003</title>
-<g id="a_node36"><a xlink:href="https://github.com/zcash/zcash/pull/5003" xlink:title="zcash/zcash#5003&#10;net: prerequisites for&#10;p2p encapsulation changes" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="560,-1121 348,-1121 348,-1117 344,-1117 344,-1113 348,-1113 348,-1076 344,-1076 344,-1072 348,-1072 348,-1068 560,-1068 560,-1121"/>
-<polyline fill="none" stroke="#000000" points="348,-1117 352,-1117 352,-1113 348,-1113 "/>
-<polyline fill="none" stroke="#000000" points="348,-1076 352,-1076 352,-1072 348,-1072 "/>
-<text text-anchor="middle" x="454" y="-1105.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5003</text>
-<text text-anchor="middle" x="454" y="-1090.8" font-family="Times,serif" font-size="14.00" fill="#000000">net: prerequisites for</text>
-<text text-anchor="middle" x="454" y="-1075.8" font-family="Times,serif" font-size="14.00" fill="#000000">p2p encapsulation changes</text>
+<g id="a_node40"><a xlink:href="https://github.com/zcash/zcash/pull/5003" xlink:title="zcash/zcash#5003&#10;net: prerequisites for&#10;p2p encapsulation changes" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="560,-1229 348,-1229 348,-1225 344,-1225 344,-1221 348,-1221 348,-1184 344,-1184 344,-1180 348,-1180 348,-1176 560,-1176 560,-1229"/>
+<polyline fill="none" stroke="#000000" points="348,-1225 352,-1225 352,-1221 348,-1221 "/>
+<polyline fill="none" stroke="#000000" points="348,-1184 352,-1184 352,-1180 348,-1180 "/>
+<text text-anchor="middle" x="454" y="-1213.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5003</text>
+<text text-anchor="middle" x="454" y="-1198.8" font-family="Times,serif" font-size="14.00" fill="#000000">net: prerequisites for</text>
+<text text-anchor="middle" x="454" y="-1183.8" font-family="Times,serif" font-size="14.00" fill="#000000">p2p encapsulation changes</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#2534&#45;&gt;zcash/zcash#5003 -->
-<g id="edge35" class="edge">
+<g id="edge41" class="edge">
 <title>zcash/zcash#2534&#45;&gt;zcash/zcash#5003</title>
-<path fill="none" stroke="#000000" d="M252.9,-1061.8C280.05,-1066.2 309.67,-1071 337.63,-1075.6"/>
-<polygon fill="#000000" stroke="#000000" points="337.4187,-1079.1095 347.84,-1077.2 338.5025,-1072.1939 337.4187,-1079.1095"/>
+<path fill="none" stroke="#000000" d="M252.9,-1179.2C280.05,-1182.3 309.67,-1185.7 337.63,-1189"/>
+<polygon fill="#000000" stroke="#000000" points="337.4998,-1192.5087 347.84,-1190.2 338.3169,-1185.5566 337.4998,-1192.5087"/>
 </g>
 <!-- zcash/zcash#5005 -->
-<g id="node37" class="node">
+<g id="node41" class="node">
 <title>zcash/zcash#5005</title>
-<g id="a_node37"><a xlink:href="https://github.com/zcash/zcash/pull/5005" xlink:title="zcash/zcash#5005&#10;net: Split DNS resolving&#10;functionality out of net&#10;structures" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="806.5,-1044.5 615.5,-1044.5 615.5,-1040.5 611.5,-1040.5 611.5,-1036.5 615.5,-1036.5 615.5,-984.5 611.5,-984.5 611.5,-980.5 615.5,-980.5 615.5,-976.5 806.5,-976.5 806.5,-1044.5"/>
-<polyline fill="none" stroke="#000000" points="615.5,-1040.5 619.5,-1040.5 619.5,-1036.5 615.5,-1036.5 "/>
-<polyline fill="none" stroke="#000000" points="615.5,-984.5 619.5,-984.5 619.5,-980.5 615.5,-980.5 "/>
-<text text-anchor="middle" x="711" y="-1029.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5005</text>
-<text text-anchor="middle" x="711" y="-1014.3" font-family="Times,serif" font-size="14.00" fill="#000000">net: Split DNS resolving</text>
-<text text-anchor="middle" x="711" y="-999.3" font-family="Times,serif" font-size="14.00" fill="#000000">functionality out of net</text>
-<text text-anchor="middle" x="711" y="-984.3" font-family="Times,serif" font-size="14.00" fill="#000000">structures</text>
+<g id="a_node41"><a xlink:href="https://github.com/zcash/zcash/pull/5005" xlink:title="zcash/zcash#5005&#10;net: Split DNS resolving&#10;functionality out of net&#10;structures" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="851,-1161.5 660,-1161.5 660,-1157.5 656,-1157.5 656,-1153.5 660,-1153.5 660,-1101.5 656,-1101.5 656,-1097.5 660,-1097.5 660,-1093.5 851,-1093.5 851,-1161.5"/>
+<polyline fill="none" stroke="#000000" points="660,-1157.5 664,-1157.5 664,-1153.5 660,-1153.5 "/>
+<polyline fill="none" stroke="#000000" points="660,-1101.5 664,-1101.5 664,-1097.5 660,-1097.5 "/>
+<text text-anchor="middle" x="755.5" y="-1146.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5005</text>
+<text text-anchor="middle" x="755.5" y="-1131.3" font-family="Times,serif" font-size="14.00" fill="#000000">net: Split DNS resolving</text>
+<text text-anchor="middle" x="755.5" y="-1116.3" font-family="Times,serif" font-size="14.00" fill="#000000">functionality out of net</text>
+<text text-anchor="middle" x="755.5" y="-1101.3" font-family="Times,serif" font-size="14.00" fill="#000000">structures</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#2534&#45;&gt;zcash/zcash#5005 -->
-<g id="edge36" class="edge">
+<g id="edge42" class="edge">
 <title>zcash/zcash#2534&#45;&gt;zcash/zcash#5005</title>
-<path fill="none" stroke="#000000" d="M252.67,-1039.2C352.06,-1033 503.8,-1023.5 605.14,-1017.1"/>
-<polygon fill="#000000" stroke="#000000" points="605.6116,-1020.5785 615.39,-1016.5 605.2025,-1013.5904 605.6116,-1020.5785"/>
+<path fill="none" stroke="#000000" d="M252.75,-1160.8C362.52,-1153.6 537.78,-1141.9 649.7,-1134.5"/>
+<polygon fill="#000000" stroke="#000000" points="650.2506,-1137.9707 659.99,-1133.8 649.7755,-1130.9869 650.2506,-1137.9707"/>
 </g>
 <!-- zcash/zcash#5004 -->
-<g id="node38" class="node">
+<g id="node42" class="node">
 <title>zcash/zcash#5004</title>
-<g id="a_node38"><a xlink:href="https://github.com/zcash/zcash/pull/5004" xlink:title="zcash/zcash#5004&#10;Verify that expected&#10;services are available&#10;from peer nodes &amp;&#10;disconnect otherwise." target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="798,-1146 624,-1146 624,-1142 620,-1142 620,-1138 624,-1138 624,-1071 620,-1071 620,-1067 624,-1067 624,-1063 798,-1063 798,-1146"/>
-<polyline fill="none" stroke="#000000" points="624,-1142 628,-1142 628,-1138 624,-1138 "/>
-<polyline fill="none" stroke="#000000" points="624,-1071 628,-1071 628,-1067 624,-1067 "/>
-<text text-anchor="middle" x="711" y="-1130.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5004</text>
-<text text-anchor="middle" x="711" y="-1115.8" font-family="Times,serif" font-size="14.00" fill="#000000">Verify that expected</text>
-<text text-anchor="middle" x="711" y="-1100.8" font-family="Times,serif" font-size="14.00" fill="#000000">services are available</text>
-<text text-anchor="middle" x="711" y="-1085.8" font-family="Times,serif" font-size="14.00" fill="#000000">from peer nodes &amp;</text>
-<text text-anchor="middle" x="711" y="-1070.8" font-family="Times,serif" font-size="14.00" fill="#000000">disconnect otherwise.</text>
+<g id="a_node42"><a xlink:href="https://github.com/zcash/zcash/pull/5004" xlink:title="zcash/zcash#5004&#10;Verify that expected&#10;services are available&#10;from peer nodes &amp;&#10;disconnect otherwise." target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="842.5,-1263 668.5,-1263 668.5,-1259 664.5,-1259 664.5,-1255 668.5,-1255 668.5,-1188 664.5,-1188 664.5,-1184 668.5,-1184 668.5,-1180 842.5,-1180 842.5,-1263"/>
+<polyline fill="none" stroke="#000000" points="668.5,-1259 672.5,-1259 672.5,-1255 668.5,-1255 "/>
+<polyline fill="none" stroke="#000000" points="668.5,-1188 672.5,-1188 672.5,-1184 668.5,-1184 "/>
+<text text-anchor="middle" x="755.5" y="-1247.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5004</text>
+<text text-anchor="middle" x="755.5" y="-1232.8" font-family="Times,serif" font-size="14.00" fill="#000000">Verify that expected</text>
+<text text-anchor="middle" x="755.5" y="-1217.8" font-family="Times,serif" font-size="14.00" fill="#000000">services are available</text>
+<text text-anchor="middle" x="755.5" y="-1202.8" font-family="Times,serif" font-size="14.00" fill="#000000">from peer nodes &amp;</text>
+<text text-anchor="middle" x="755.5" y="-1187.8" font-family="Times,serif" font-size="14.00" fill="#000000">disconnect otherwise.</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5003&#45;&gt;zcash/zcash#5004 -->
-<g id="edge37" class="edge">
+<g id="edge43" class="edge">
 <title>zcash/zcash#5003&#45;&gt;zcash/zcash#5004</title>
-<path fill="none" stroke="#000000" d="M560.02,-1098.6C577.7,-1099.3 595.97,-1100 613.43,-1100.7"/>
-<polygon fill="#000000" stroke="#000000" points="613.4803,-1104.2046 623.61,-1101.1 613.7552,-1097.21 613.4803,-1104.2046"/>
+<path fill="none" stroke="#000000" d="M560.3,-1209.2C592.12,-1211.2 626.84,-1213.4 658.06,-1215.4"/>
+<polygon fill="#000000" stroke="#000000" points="657.8785,-1218.8953 668.07,-1216 658.2974,-1211.9078 657.8785,-1218.8953"/>
 </g>
 <!-- zcash/zcash#5006 -->
-<g id="node39" class="node">
+<g id="node43" class="node">
 <title>zcash/zcash#5006</title>
-<g id="a_node39"><a xlink:href="https://github.com/zcash/zcash/pull/5006" xlink:title="zcash/zcash#5006&#10;Rework AddNode behaviour" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1073,-1103.5 855,-1103.5 855,-1099.5 851,-1099.5 851,-1095.5 855,-1095.5 855,-1073.5 851,-1073.5 851,-1069.5 855,-1069.5 855,-1065.5 1073,-1065.5 1073,-1103.5"/>
-<polyline fill="none" stroke="#000000" points="855,-1099.5 859,-1099.5 859,-1095.5 855,-1095.5 "/>
-<polyline fill="none" stroke="#000000" points="855,-1073.5 859,-1073.5 859,-1069.5 855,-1069.5 "/>
-<text text-anchor="middle" x="964" y="-1088.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5006</text>
-<text text-anchor="middle" x="964" y="-1073.3" font-family="Times,serif" font-size="14.00" fill="#000000">Rework AddNode behaviour</text>
+<g id="a_node43"><a xlink:href="https://github.com/zcash/zcash/pull/5006" xlink:title="zcash/zcash#5006&#10;Rework AddNode behaviour" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1162,-1235.5 944,-1235.5 944,-1231.5 940,-1231.5 940,-1227.5 944,-1227.5 944,-1205.5 940,-1205.5 940,-1201.5 944,-1201.5 944,-1197.5 1162,-1197.5 1162,-1235.5"/>
+<polyline fill="none" stroke="#000000" points="944,-1231.5 948,-1231.5 948,-1227.5 944,-1227.5 "/>
+<polyline fill="none" stroke="#000000" points="944,-1205.5 948,-1205.5 948,-1201.5 944,-1201.5 "/>
+<text text-anchor="middle" x="1053" y="-1220.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5006</text>
+<text text-anchor="middle" x="1053" y="-1205.3" font-family="Times,serif" font-size="14.00" fill="#000000">Rework AddNode behaviour</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5005&#45;&gt;zcash/zcash#5006 -->
-<g id="edge38" class="edge">
+<g id="edge44" class="edge">
 <title>zcash/zcash#5005&#45;&gt;zcash/zcash#5006</title>
-<path fill="none" stroke="#000000" d="M806.65,-1038.5C833.95,-1046.5 863.29,-1055 889.15,-1062.6"/>
-<polygon fill="#000000" stroke="#000000" points="888.2969,-1065.9978 898.88,-1065.5 890.2963,-1059.2894 888.2969,-1065.9978"/>
+<path fill="none" stroke="#000000" d="M851.22,-1154C870.08,-1159.3 889.69,-1165 908,-1170.5 933.13,-1178 960.58,-1186.6 984.78,-1194.4"/>
+<polygon fill="#000000" stroke="#000000" points="983.99,-1197.821 994.58,-1197.5 986.1013,-1191.1469 983.99,-1197.821"/>
 </g>
 <!-- zcash/zcash#5004&#45;&gt;zcash/zcash#5006 -->
-<g id="edge39" class="edge">
+<g id="edge45" class="edge">
 <title>zcash/zcash#5004&#45;&gt;zcash/zcash#5006</title>
-<path fill="none" stroke="#000000" d="M798.07,-1097.6C813.08,-1096.4 828.91,-1095.2 844.59,-1093.9"/>
-<polygon fill="#000000" stroke="#000000" points="845.1717,-1097.3654 854.87,-1093.1 844.6286,-1090.3865 845.1717,-1097.3654"/>
+<path fill="none" stroke="#000000" d="M842.75,-1220C871.17,-1219.6 903.23,-1219 933.58,-1218.5"/>
+<polygon fill="#000000" stroke="#000000" points="933.8804,-1221.9949 943.81,-1218.3 933.7435,-1214.9962 933.8804,-1221.9949"/>
 </g>
 <!-- zcash/zcash#5008 -->
-<g id="node40" class="node">
+<g id="node44" class="node">
 <title>zcash/zcash#5008</title>
-<g id="a_node40"><a xlink:href="https://github.com/zcash/zcash/pull/5008" xlink:title="zcash/zcash#5008&#10;net: Feeler connections&#10;to increase online addrs&#10;in the tried table." target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1311,-1118.5 1122,-1118.5 1122,-1114.5 1118,-1114.5 1118,-1110.5 1122,-1110.5 1122,-1058.5 1118,-1058.5 1118,-1054.5 1122,-1054.5 1122,-1050.5 1311,-1050.5 1311,-1118.5"/>
-<polyline fill="none" stroke="#000000" points="1122,-1114.5 1126,-1114.5 1126,-1110.5 1122,-1110.5 "/>
-<polyline fill="none" stroke="#000000" points="1122,-1058.5 1126,-1058.5 1126,-1054.5 1122,-1054.5 "/>
-<text text-anchor="middle" x="1216.5" y="-1103.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5008</text>
-<text text-anchor="middle" x="1216.5" y="-1088.3" font-family="Times,serif" font-size="14.00" fill="#000000">net: Feeler connections</text>
-<text text-anchor="middle" x="1216.5" y="-1073.3" font-family="Times,serif" font-size="14.00" fill="#000000">to increase online addrs</text>
-<text text-anchor="middle" x="1216.5" y="-1058.3" font-family="Times,serif" font-size="14.00" fill="#000000">in the tried table.</text>
+<g id="a_node44"><a xlink:href="https://github.com/zcash/zcash/pull/5008" xlink:title="zcash/zcash#5008&#10;net: Feeler connections&#10;to increase online addrs&#10;in the tried table." target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1400,-1250.5 1211,-1250.5 1211,-1246.5 1207,-1246.5 1207,-1242.5 1211,-1242.5 1211,-1190.5 1207,-1190.5 1207,-1186.5 1211,-1186.5 1211,-1182.5 1400,-1182.5 1400,-1250.5"/>
+<polyline fill="none" stroke="#000000" points="1211,-1246.5 1215,-1246.5 1215,-1242.5 1211,-1242.5 "/>
+<polyline fill="none" stroke="#000000" points="1211,-1190.5 1215,-1190.5 1215,-1186.5 1211,-1186.5 "/>
+<text text-anchor="middle" x="1305.5" y="-1235.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5008</text>
+<text text-anchor="middle" x="1305.5" y="-1220.3" font-family="Times,serif" font-size="14.00" fill="#000000">net: Feeler connections</text>
+<text text-anchor="middle" x="1305.5" y="-1205.3" font-family="Times,serif" font-size="14.00" fill="#000000">to increase online addrs</text>
+<text text-anchor="middle" x="1305.5" y="-1190.3" font-family="Times,serif" font-size="14.00" fill="#000000">in the tried table.</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5006&#45;&gt;zcash/zcash#5008 -->
-<g id="edge40" class="edge">
+<g id="edge46" class="edge">
 <title>zcash/zcash#5006&#45;&gt;zcash/zcash#5008</title>
-<path fill="none" stroke="#000000" d="M1073.3,-1084.5C1086,-1084.5 1099,-1084.5 1111.6,-1084.5"/>
-<polygon fill="#000000" stroke="#000000" points="1111.7,-1088.0001 1121.7,-1084.5 1111.7,-1081.0001 1111.7,-1088.0001"/>
+<path fill="none" stroke="#000000" d="M1162.3,-1216.5C1175,-1216.5 1188,-1216.5 1200.6,-1216.5"/>
+<polygon fill="#000000" stroke="#000000" points="1200.7,-1220.0001 1210.7,-1216.5 1200.7,-1213.0001 1200.7,-1220.0001"/>
 </g>
 <!-- zcash/zcash#5034 -->
-<g id="node41" class="node">
+<g id="node45" class="node">
 <title>zcash/zcash#5034</title>
-<g id="a_node41"><a xlink:href="https://github.com/zcash/zcash/pull/5034" xlink:title="zcash/zcash#5034&#10;Bitcoin 0.17 locking PRs" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="249,-1202.5 56,-1202.5 56,-1198.5 52,-1198.5 52,-1194.5 56,-1194.5 56,-1172.5 52,-1172.5 52,-1168.5 56,-1168.5 56,-1164.5 249,-1164.5 249,-1202.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="56,-1198.5 60,-1198.5 60,-1194.5 56,-1194.5 "/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="56,-1172.5 60,-1172.5 60,-1168.5 56,-1168.5 "/>
-<text text-anchor="middle" x="152.5" y="-1187.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5034</text>
-<text text-anchor="middle" x="152.5" y="-1172.3" font-family="Times,serif" font-size="14.00" fill="#000000">Bitcoin 0.17 locking PRs</text>
+<g id="a_node45"><a xlink:href="https://github.com/zcash/zcash/pull/5034" xlink:title="zcash/zcash#5034&#10;Bitcoin 0.17 locking PRs" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="249,-1319.5 56,-1319.5 56,-1315.5 52,-1315.5 52,-1311.5 56,-1311.5 56,-1289.5 52,-1289.5 52,-1285.5 56,-1285.5 56,-1281.5 249,-1281.5 249,-1319.5"/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="56,-1315.5 60,-1315.5 60,-1311.5 56,-1311.5 "/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="56,-1289.5 60,-1289.5 60,-1285.5 56,-1285.5 "/>
+<text text-anchor="middle" x="152.5" y="-1304.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5034</text>
+<text text-anchor="middle" x="152.5" y="-1289.3" font-family="Times,serif" font-size="14.00" fill="#000000">Bitcoin 0.17 locking PRs</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5050 -->
-<g id="node42" class="node">
+<g id="node46" class="node">
 <title>zcash/zcash#5050</title>
-<g id="a_node42"><a xlink:href="https://github.com/zcash/zcash/pull/5050" xlink:title="zcash/zcash#5050&#10;Bitcoin 0.18 locking PRs" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="550.5,-1202.5 357.5,-1202.5 357.5,-1198.5 353.5,-1198.5 353.5,-1194.5 357.5,-1194.5 357.5,-1172.5 353.5,-1172.5 353.5,-1168.5 357.5,-1168.5 357.5,-1164.5 550.5,-1164.5 550.5,-1202.5"/>
-<polyline fill="none" stroke="#000000" points="357.5,-1198.5 361.5,-1198.5 361.5,-1194.5 357.5,-1194.5 "/>
-<polyline fill="none" stroke="#000000" points="357.5,-1172.5 361.5,-1172.5 361.5,-1168.5 357.5,-1168.5 "/>
-<text text-anchor="middle" x="454" y="-1187.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5050</text>
-<text text-anchor="middle" x="454" y="-1172.3" font-family="Times,serif" font-size="14.00" fill="#000000">Bitcoin 0.18 locking PRs</text>
+<g id="a_node46"><a xlink:href="https://github.com/zcash/zcash/pull/5050" xlink:title="zcash/zcash#5050&#10;Bitcoin 0.18 locking PRs" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="550.5,-1319.5 357.5,-1319.5 357.5,-1315.5 353.5,-1315.5 353.5,-1311.5 357.5,-1311.5 357.5,-1289.5 353.5,-1289.5 353.5,-1285.5 357.5,-1285.5 357.5,-1281.5 550.5,-1281.5 550.5,-1319.5"/>
+<polyline fill="none" stroke="#000000" points="357.5,-1315.5 361.5,-1315.5 361.5,-1311.5 357.5,-1311.5 "/>
+<polyline fill="none" stroke="#000000" points="357.5,-1289.5 361.5,-1289.5 361.5,-1285.5 357.5,-1285.5 "/>
+<text text-anchor="middle" x="454" y="-1304.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5050</text>
+<text text-anchor="middle" x="454" y="-1289.3" font-family="Times,serif" font-size="14.00" fill="#000000">Bitcoin 0.18 locking PRs</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5034&#45;&gt;zcash/zcash#5050 -->
-<g id="edge41" class="edge">
+<g id="edge47" class="edge">
 <title>zcash/zcash#5034&#45;&gt;zcash/zcash#5050</title>
-<path fill="none" stroke="#000000" d="M249.14,-1183.5C280.38,-1183.5 315.19,-1183.5 347.13,-1183.5"/>
-<polygon fill="#000000" stroke="#000000" points="347.39,-1187.0001 357.39,-1183.5 347.39,-1180.0001 347.39,-1187.0001"/>
+<path fill="none" stroke="#000000" d="M249.14,-1300.5C280.38,-1300.5 315.19,-1300.5 347.13,-1300.5"/>
+<polygon fill="#000000" stroke="#000000" points="347.39,-1304.0001 357.39,-1300.5 347.39,-1297.0001 347.39,-1304.0001"/>
 </g>
 <!-- zcash/zcash#5163 -->
-<g id="node43" class="node">
+<g id="node47" class="node">
 <title>zcash/zcash#5163</title>
-<g id="a_node43"><a xlink:href="https://github.com/zcash/zcash/pull/5163" xlink:title="zcash/zcash#5163&#10;Bitcoin 0.19 locking PRs" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="807.5,-1202.5 614.5,-1202.5 614.5,-1198.5 610.5,-1198.5 610.5,-1194.5 614.5,-1194.5 614.5,-1172.5 610.5,-1172.5 610.5,-1168.5 614.5,-1168.5 614.5,-1164.5 807.5,-1164.5 807.5,-1202.5"/>
-<polyline fill="none" stroke="#000000" points="614.5,-1198.5 618.5,-1198.5 618.5,-1194.5 614.5,-1194.5 "/>
-<polyline fill="none" stroke="#000000" points="614.5,-1172.5 618.5,-1172.5 618.5,-1168.5 614.5,-1168.5 "/>
-<text text-anchor="middle" x="711" y="-1187.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5163</text>
-<text text-anchor="middle" x="711" y="-1172.3" font-family="Times,serif" font-size="14.00" fill="#000000">Bitcoin 0.19 locking PRs</text>
+<g id="a_node47"><a xlink:href="https://github.com/zcash/zcash/pull/5163" xlink:title="zcash/zcash#5163&#10;Bitcoin 0.19 locking PRs" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="852,-1319.5 659,-1319.5 659,-1315.5 655,-1315.5 655,-1311.5 659,-1311.5 659,-1289.5 655,-1289.5 655,-1285.5 659,-1285.5 659,-1281.5 852,-1281.5 852,-1319.5"/>
+<polyline fill="none" stroke="#000000" points="659,-1315.5 663,-1315.5 663,-1311.5 659,-1311.5 "/>
+<polyline fill="none" stroke="#000000" points="659,-1289.5 663,-1289.5 663,-1285.5 659,-1285.5 "/>
+<text text-anchor="middle" x="755.5" y="-1304.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5163</text>
+<text text-anchor="middle" x="755.5" y="-1289.3" font-family="Times,serif" font-size="14.00" fill="#000000">Bitcoin 0.19 locking PRs</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5050&#45;&gt;zcash/zcash#5163 -->
-<g id="edge42" class="edge">
+<g id="edge48" class="edge">
 <title>zcash/zcash#5050&#45;&gt;zcash/zcash#5163</title>
-<path fill="none" stroke="#000000" d="M550.79,-1183.5C568.16,-1183.5 586.35,-1183.5 603.98,-1183.5"/>
-<polygon fill="#000000" stroke="#000000" points="604.29,-1187.0001 614.29,-1183.5 604.29,-1180.0001 604.29,-1187.0001"/>
+<path fill="none" stroke="#000000" d="M550.64,-1300.5C581.88,-1300.5 616.69,-1300.5 648.63,-1300.5"/>
+<polygon fill="#000000" stroke="#000000" points="648.89,-1304.0001 658.89,-1300.5 648.89,-1297.0001 648.89,-1304.0001"/>
 </g>
 <!-- zcash/zcash#5176 -->
-<g id="node44" class="node">
+<g id="node48" class="node">
 <title>zcash/zcash#5176</title>
-<g id="a_node44"><a xlink:href="https://github.com/zcash/zcash/issues/5176" xlink:title="zcash/zcash#5176&#10;Implement BIP 39 seed&#10;phrase support" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1056.5,-401 871.5,-401 871.5,-348 1056.5,-348 1056.5,-401"/>
-<text text-anchor="middle" x="964" y="-385.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5176</text>
-<text text-anchor="middle" x="964" y="-370.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement BIP 39 seed</text>
-<text text-anchor="middle" x="964" y="-355.8" font-family="Times,serif" font-size="14.00" fill="#000000">phrase support</text>
+<g id="a_node48"><a xlink:href="https://github.com/zcash/zcash/issues/5176" xlink:title="zcash/zcash#5176&#10;Implement BIP 39 seed&#10;phrase support" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1145.5,-324 960.5,-324 960.5,-271 1145.5,-271 1145.5,-324"/>
+<text text-anchor="middle" x="1053" y="-308.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5176</text>
+<text text-anchor="middle" x="1053" y="-293.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement BIP 39 seed</text>
+<text text-anchor="middle" x="1053" y="-278.8" font-family="Times,serif" font-size="14.00" fill="#000000">phrase support</text>
 </a>
 </g>
 </g>
-<!-- zcash/zcash#5176&#45;&gt;zcash/zcash#5019 -->
-<g id="edge43" class="edge">
-<title>zcash/zcash#5176&#45;&gt;zcash/zcash#5019</title>
-<path fill="none" stroke="#000000" d="M1053.4,-347.95C1074.2,-341.78 1096.4,-335.17 1117.6,-328.88"/>
-<polygon fill="#000000" stroke="#000000" points="1118.6215,-332.2277 1127.2,-326.01 1116.6165,-325.521 1118.6215,-332.2277"/>
+<!-- zcash/zcash#5176&#45;&gt;zcash/zcash#5255 -->
+<g id="edge49" class="edge">
+<title>zcash/zcash#5176&#45;&gt;zcash/zcash#5255</title>
+<path fill="none" stroke="#000000" d="M1145.9,-314.29C1251,-333.46 1408.2,-362.78 1413,-367.5 1466.1,-419.29 1401,-473.94 1449,-530.5 1449.5,-531.1 1450,-531.7 1450.6,-532.29"/>
+<polygon fill="#000000" stroke="#000000" points="1448.3827,-535.015 1458,-539.46 1453.2537,-529.9878 1448.3827,-535.015"/>
 </g>
 <!-- zcash/zcash#2673 -->
-<g id="node45" class="node">
+<g id="node49" class="node">
 <title>zcash/zcash#2673</title>
-<g id="a_node45"><a xlink:href="https://github.com/zcash/zcash/issues/2673" xlink:title="zcash/zcash#2673&#10;Support Hierarchical&#10;Deterministic t&#45;addresses&#10;(BIP 32)" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1317.5,-412.5 1115.5,-412.5 1115.5,-344.5 1317.5,-344.5 1317.5,-412.5"/>
-<text text-anchor="middle" x="1216.5" y="-397.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#2673</text>
-<text text-anchor="middle" x="1216.5" y="-382.3" font-family="Times,serif" font-size="14.00" fill="#000000">Support Hierarchical</text>
-<text text-anchor="middle" x="1216.5" y="-367.3" font-family="Times,serif" font-size="14.00" fill="#000000">Deterministic t&#45;addresses</text>
-<text text-anchor="middle" x="1216.5" y="-352.3" font-family="Times,serif" font-size="14.00" fill="#000000">(BIP 32)</text>
+<g id="a_node49"><a xlink:href="https://github.com/zcash/zcash/issues/2673" xlink:title="zcash/zcash#2673&#10;Support Hierarchical&#10;Deterministic t&#45;addresses&#10;(BIP 32)" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1406.5,-314.5 1204.5,-314.5 1204.5,-246.5 1406.5,-246.5 1406.5,-314.5"/>
+<text text-anchor="middle" x="1305.5" y="-299.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#2673</text>
+<text text-anchor="middle" x="1305.5" y="-284.3" font-family="Times,serif" font-size="14.00" fill="#000000">Support Hierarchical</text>
+<text text-anchor="middle" x="1305.5" y="-269.3" font-family="Times,serif" font-size="14.00" fill="#000000">Deterministic t&#45;addresses</text>
+<text text-anchor="middle" x="1305.5" y="-254.3" font-family="Times,serif" font-size="14.00" fill="#000000">(BIP 32)</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5176&#45;&gt;zcash/zcash#2673 -->
-<g id="edge44" class="edge">
+<g id="edge50" class="edge">
 <title>zcash/zcash#5176&#45;&gt;zcash/zcash#2673</title>
-<path fill="none" stroke="#000000" d="M1056.6,-375.97C1072.4,-376.22 1089.1,-376.48 1105.3,-376.74"/>
-<polygon fill="#000000" stroke="#000000" points="1105.3458,-380.2411 1115.4,-376.9 1105.4567,-373.2419 1105.3458,-380.2411"/>
+<path fill="none" stroke="#000000" d="M1145.6,-291.27C1161.4,-290.2 1178.1,-289.08 1194.3,-287.98"/>
+<polygon fill="#000000" stroke="#000000" points="1194.6536,-291.4643 1204.4,-287.31 1194.1902,-284.4797 1194.6536,-291.4643"/>
 </g>
 <!-- zcash/zcash#2673&#45;&gt;zcash/zcash#5179 -->
-<g id="edge45" class="edge">
+<g id="edge51" class="edge">
 <title>zcash/zcash#2673&#45;&gt;zcash/zcash#5179</title>
-<path fill="none" stroke="#000000" d="M1317.5,-380.11C1330.2,-380.31 1343.2,-380.52 1356.1,-380.72"/>
-<polygon fill="#000000" stroke="#000000" points="1356.243,-384.2228 1366.3,-380.89 1356.3597,-377.2237 1356.243,-384.2228"/>
+<path fill="none" stroke="#000000" d="M1406.5,-261.18C1419.3,-258.73 1432.5,-256.22 1445.4,-253.74"/>
+<polygon fill="#000000" stroke="#000000" points="1446.1338,-257.1632 1455.3,-251.85 1444.821,-250.2874 1446.1338,-257.1632"/>
 </g>
 <!-- zcash/zips#364 -->
-<g id="node46" class="node">
+<g id="node50" class="node">
 <title>zcash/zips#364</title>
-<g id="a_node46"><a xlink:href="https://github.com/zcash/zips/issues/364" xlink:title="zcash/zips#364&#10;[ZIP 339] Wallet Recovery&#10;Words (a la BIP 39)" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="813.5,-401 608.5,-401 608.5,-348 813.5,-348 813.5,-401"/>
-<text text-anchor="middle" x="711" y="-385.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zips#364</text>
-<text text-anchor="middle" x="711" y="-370.8" font-family="Times,serif" font-size="14.00" fill="#000000">[ZIP 339] Wallet Recovery</text>
-<text text-anchor="middle" x="711" y="-355.8" font-family="Times,serif" font-size="14.00" fill="#000000">Words (a la BIP 39)</text>
+<g id="a_node50"><a xlink:href="https://github.com/zcash/zips/issues/364" xlink:title="zcash/zips#364&#10;[ZIP 339] Wallet Recovery&#10;Words (a la BIP 39)" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="858,-324 653,-324 653,-271 858,-271 858,-324"/>
+<text text-anchor="middle" x="755.5" y="-308.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zips#364</text>
+<text text-anchor="middle" x="755.5" y="-293.8" font-family="Times,serif" font-size="14.00" fill="#000000">[ZIP 339] Wallet Recovery</text>
+<text text-anchor="middle" x="755.5" y="-278.8" font-family="Times,serif" font-size="14.00" fill="#000000">Words (a la BIP 39)</text>
 </a>
 </g>
 </g>
 <!-- zcash/zips#364&#45;&gt;zcash/zcash#5176 -->
-<g id="edge46" class="edge">
+<g id="edge52" class="edge">
 <title>zcash/zips#364&#45;&gt;zcash/zcash#5176</title>
-<path fill="none" stroke="#000000" d="M813.54,-374.5C829.16,-374.5 845.28,-374.5 860.91,-374.5"/>
-<polygon fill="#000000" stroke="#000000" points="861.1,-378.0001 871.1,-374.5 861.1,-371.0001 861.1,-378.0001"/>
+<path fill="none" stroke="#000000" d="M858.3,-297.5C887.9,-297.5 920.18,-297.5 949.8,-297.5"/>
+<polygon fill="#000000" stroke="#000000" points="950.16,-301.0001 960.16,-297.5 950.16,-294.0001 950.16,-301.0001"/>
 </g>
 <!-- zcash/zcash#5177 -->
-<g id="node47" class="node">
+<g id="node51" class="node">
 <title>zcash/zcash#5177</title>
-<g id="a_node47"><a xlink:href="https://github.com/zcash/zcash/issues/5177" xlink:title="zcash/zcash#5177&#10;Deprecate old address&#45;&#10;related RPCs" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="243.5,-1274 61.5,-1274 61.5,-1221 243.5,-1221 243.5,-1274"/>
-<text text-anchor="middle" x="152.5" y="-1258.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5177</text>
-<text text-anchor="middle" x="152.5" y="-1243.8" font-family="Times,serif" font-size="14.00" fill="#000000">Deprecate old address&#45;</text>
-<text text-anchor="middle" x="152.5" y="-1228.8" font-family="Times,serif" font-size="14.00" fill="#000000">related RPCs</text>
+<g id="a_node51"><a xlink:href="https://github.com/zcash/zcash/issues/5177" xlink:title="zcash/zcash#5177&#10;Deprecate old address&#45;&#10;related RPCs" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="243.5,-1391 61.5,-1391 61.5,-1338 243.5,-1338 243.5,-1391"/>
+<text text-anchor="middle" x="152.5" y="-1375.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5177</text>
+<text text-anchor="middle" x="152.5" y="-1360.8" font-family="Times,serif" font-size="14.00" fill="#000000">Deprecate old address&#45;</text>
+<text text-anchor="middle" x="152.5" y="-1345.8" font-family="Times,serif" font-size="14.00" fill="#000000">related RPCs</text>
 </a>
 </g>
 </g>
 <!-- zcash/zips#511 -->
-<g id="node48" class="node">
+<g id="node52" class="node">
 <title>zcash/zips#511</title>
-<g id="a_node48"><a xlink:href="https://github.com/zcash/zips/issues/511" xlink:title="zcash/zips#511&#10;ZIP 32: Document standard&#10;key structure for Unified&#10;Addresses" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="1324,-498.5 1109,-498.5 1109,-430.5 1324,-430.5 1324,-498.5"/>
-<text text-anchor="middle" x="1216.5" y="-483.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zips#511</text>
-<text text-anchor="middle" x="1216.5" y="-468.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP 32: Document standard</text>
-<text text-anchor="middle" x="1216.5" y="-453.3" font-family="Times,serif" font-size="14.00" fill="#000000">key structure for Unified</text>
-<text text-anchor="middle" x="1216.5" y="-438.3" font-family="Times,serif" font-size="14.00" fill="#000000">Addresses</text>
+<g id="a_node52"><a xlink:href="https://github.com/zcash/zips/issues/511" xlink:title="zcash/zips#511&#10;ZIP 32: Document standard&#10;key structure for Unified&#10;Addresses" target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="1413,-221.5 1198,-221.5 1198,-153.5 1413,-153.5 1413,-221.5"/>
+<text text-anchor="middle" x="1305.5" y="-206.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zips#511</text>
+<text text-anchor="middle" x="1305.5" y="-191.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP 32: Document standard</text>
+<text text-anchor="middle" x="1305.5" y="-176.3" font-family="Times,serif" font-size="14.00" fill="#000000">key structure for Unified</text>
+<text text-anchor="middle" x="1305.5" y="-161.3" font-family="Times,serif" font-size="14.00" fill="#000000">Addresses</text>
 </a>
 </g>
 </g>
 <!-- zcash/zips#511&#45;&gt;zcash/zcash#5179 -->
-<g id="edge47" class="edge">
+<g id="edge53" class="edge">
 <title>zcash/zips#511&#45;&gt;zcash/zcash#5179</title>
-<path fill="none" stroke="#000000" d="M1320.8,-430.44C1332.7,-426.55 1344.8,-422.57 1356.8,-418.66"/>
-<polygon fill="#000000" stroke="#000000" points="1357.9775,-421.9575 1366.4,-415.53 1355.8076,-415.3023 1357.9775,-421.9575"/>
+<path fill="none" stroke="#000000" d="M1413,-206.78C1423.6,-208.68 1434.4,-210.61 1445,-212.51"/>
+<polygon fill="#000000" stroke="#000000" points="1444.6378,-216.001 1455.1,-214.33 1445.8792,-209.112 1444.6378,-216.001"/>
 </g>
 <!-- zcash/librustzcash#387 -->
-<g id="node49" class="node">
+<g id="node53" class="node">
 <title>zcash/librustzcash#387</title>
-<g id="a_node49"><a xlink:href="https://github.com/zcash/librustzcash/issues/387" xlink:title="zcash/librustzcash#387&#10;Implement Unified Address&#10;key derivation" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1575,-574 1360,-574 1360,-521 1575,-521 1575,-574"/>
-<text text-anchor="middle" x="1467.5" y="-558.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#387</text>
-<text text-anchor="middle" x="1467.5" y="-543.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Unified Address</text>
-<text text-anchor="middle" x="1467.5" y="-528.8" font-family="Times,serif" font-size="14.00" fill="#000000">key derivation</text>
+<g id="a_node53"><a xlink:href="https://github.com/zcash/librustzcash/issues/387" xlink:title="zcash/librustzcash#387&#10;Implement Unified Address&#10;key derivation" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1664,-180 1449,-180 1449,-127 1664,-127 1664,-180"/>
+<text text-anchor="middle" x="1556.5" y="-164.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#387</text>
+<text text-anchor="middle" x="1556.5" y="-149.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Unified Address</text>
+<text text-anchor="middle" x="1556.5" y="-134.8" font-family="Times,serif" font-size="14.00" fill="#000000">key derivation</text>
 </a>
 </g>
 </g>
 <!-- zcash/zips#511&#45;&gt;zcash/librustzcash#387 -->
-<g id="edge48" class="edge">
+<g id="edge54" class="edge">
 <title>zcash/zips#511&#45;&gt;zcash/librustzcash#387</title>
-<path fill="none" stroke="#000000" d="M1319.7,-498.62C1338.9,-504.98 1358.9,-511.57 1377.6,-517.79"/>
-<polygon fill="#000000" stroke="#000000" points="1376.8073,-521.2133 1387.4,-521 1378.9863,-514.561 1376.8073,-521.2133"/>
+<path fill="none" stroke="#000000" d="M1413,-172.93C1421.6,-171.78 1430.2,-170.61 1438.8,-169.45"/>
+<polygon fill="#000000" stroke="#000000" points="1439.3629,-172.9058 1448.8,-168.09 1438.4195,-165.9696 1439.3629,-172.9058"/>
 </g>
 <!-- zcash/zcash#5186 -->
-<g id="node50" class="node">
+<g id="node54" class="node">
 <title>zcash/zcash#5186</title>
-<g id="a_node50"><a xlink:href="https://github.com/zcash/zcash/issues/5186" xlink:title="zcash/zcash#5186&#10;z_viewtransaction: Figure&#10;out how to render UAs" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="254,-1345 51,-1345 51,-1292 254,-1292 254,-1345"/>
-<text text-anchor="middle" x="152.5" y="-1329.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5186</text>
-<text text-anchor="middle" x="152.5" y="-1314.8" font-family="Times,serif" font-size="14.00" fill="#000000">z_viewtransaction: Figure</text>
-<text text-anchor="middle" x="152.5" y="-1299.8" font-family="Times,serif" font-size="14.00" fill="#000000">out how to render UAs</text>
+<g id="a_node54"><a xlink:href="https://github.com/zcash/zcash/issues/5186" xlink:title="zcash/zcash#5186&#10;z_viewtransaction: Figure&#10;out how to render UAs" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="254,-1462 51,-1462 51,-1409 254,-1409 254,-1462"/>
+<text text-anchor="middle" x="152.5" y="-1446.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5186</text>
+<text text-anchor="middle" x="152.5" y="-1431.8" font-family="Times,serif" font-size="14.00" fill="#000000">z_viewtransaction: Figure</text>
+<text text-anchor="middle" x="152.5" y="-1416.8" font-family="Times,serif" font-size="14.00" fill="#000000">out how to render UAs</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5198 -->
-<g id="node51" class="node">
+<g id="node55" class="node">
 <title>zcash/zcash#5198</title>
-<g id="a_node51"><a xlink:href="https://github.com/zcash/zcash/issues/5198" xlink:title="zcash/zcash#5198&#10;Switch to a `(txid,&#10;auth_digest)` identifier&#10;in places where the node&#10;needs to commit to a&#10;specific instance of a&#10;transaction" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="250.5,-1476 54.5,-1476 54.5,-1363 250.5,-1363 250.5,-1476"/>
-<text text-anchor="middle" x="152.5" y="-1460.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5198</text>
-<text text-anchor="middle" x="152.5" y="-1445.8" font-family="Times,serif" font-size="14.00" fill="#000000">Switch to a `(txid,</text>
-<text text-anchor="middle" x="152.5" y="-1430.8" font-family="Times,serif" font-size="14.00" fill="#000000">auth_digest)` identifier</text>
-<text text-anchor="middle" x="152.5" y="-1415.8" font-family="Times,serif" font-size="14.00" fill="#000000">in places where the node</text>
-<text text-anchor="middle" x="152.5" y="-1400.8" font-family="Times,serif" font-size="14.00" fill="#000000">needs to commit to a</text>
-<text text-anchor="middle" x="152.5" y="-1385.8" font-family="Times,serif" font-size="14.00" fill="#000000">specific instance of a</text>
-<text text-anchor="middle" x="152.5" y="-1370.8" font-family="Times,serif" font-size="14.00" fill="#000000">transaction</text>
+<g id="a_node55"><a xlink:href="https://github.com/zcash/zcash/issues/5198" xlink:title="zcash/zcash#5198&#10;Switch to a `(txid,&#10;auth_digest)` identifier&#10;in places where the node&#10;needs to commit to a&#10;specific instance of a&#10;transaction" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="250.5,-1593 54.5,-1593 54.5,-1480 250.5,-1480 250.5,-1593"/>
+<text text-anchor="middle" x="152.5" y="-1577.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5198</text>
+<text text-anchor="middle" x="152.5" y="-1562.8" font-family="Times,serif" font-size="14.00" fill="#000000">Switch to a `(txid,</text>
+<text text-anchor="middle" x="152.5" y="-1547.8" font-family="Times,serif" font-size="14.00" fill="#000000">auth_digest)` identifier</text>
+<text text-anchor="middle" x="152.5" y="-1532.8" font-family="Times,serif" font-size="14.00" fill="#000000">in places where the node</text>
+<text text-anchor="middle" x="152.5" y="-1517.8" font-family="Times,serif" font-size="14.00" fill="#000000">needs to commit to a</text>
+<text text-anchor="middle" x="152.5" y="-1502.8" font-family="Times,serif" font-size="14.00" fill="#000000">specific instance of a</text>
+<text text-anchor="middle" x="152.5" y="-1487.8" font-family="Times,serif" font-size="14.00" fill="#000000">transaction</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5199 -->
-<g id="node52" class="node">
+<g id="node56" class="node">
 <title>zcash/zcash#5199</title>
-<g id="a_node52"><a xlink:href="https://github.com/zcash/zcash/issues/5199" xlink:title="zcash/zcash#5199&#10;[ZIP 239] Relay v5+&#10;transactions with a&#10;(txid, auth_digest) tuple&#10;(or digest thereof)" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="247,-1577 58,-1577 58,-1494 247,-1494 247,-1577"/>
-<text text-anchor="middle" x="152.5" y="-1561.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5199</text>
-<text text-anchor="middle" x="152.5" y="-1546.8" font-family="Times,serif" font-size="14.00" fill="#000000">[ZIP 239] Relay v5+</text>
-<text text-anchor="middle" x="152.5" y="-1531.8" font-family="Times,serif" font-size="14.00" fill="#000000">transactions with a</text>
-<text text-anchor="middle" x="152.5" y="-1516.8" font-family="Times,serif" font-size="14.00" fill="#000000">(txid, auth_digest) tuple</text>
-<text text-anchor="middle" x="152.5" y="-1501.8" font-family="Times,serif" font-size="14.00" fill="#000000">(or digest thereof)</text>
+<g id="a_node56"><a xlink:href="https://github.com/zcash/zcash/issues/5199" xlink:title="zcash/zcash#5199&#10;[ZIP 239] Relay v5+&#10;transactions with a&#10;(txid, auth_digest) tuple&#10;(or digest thereof)" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="247,-1694 58,-1694 58,-1611 247,-1611 247,-1694"/>
+<text text-anchor="middle" x="152.5" y="-1678.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5199</text>
+<text text-anchor="middle" x="152.5" y="-1663.8" font-family="Times,serif" font-size="14.00" fill="#000000">[ZIP 239] Relay v5+</text>
+<text text-anchor="middle" x="152.5" y="-1648.8" font-family="Times,serif" font-size="14.00" fill="#000000">transactions with a</text>
+<text text-anchor="middle" x="152.5" y="-1633.8" font-family="Times,serif" font-size="14.00" fill="#000000">(txid, auth_digest) tuple</text>
+<text text-anchor="middle" x="152.5" y="-1618.8" font-family="Times,serif" font-size="14.00" fill="#000000">(or digest thereof)</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5223 -->
-<g id="node53" class="node">
+<g id="node57" class="node">
 <title>zcash/zcash#5223</title>
-<g id="a_node53"><a xlink:href="https://github.com/zcash/zcash/issues/5223" xlink:title="zcash/zcash#5223&#10;Add RPC test case that&#10;checks the auth data&#10;commitments for v4 txs" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="246.5,-1663.5 58.5,-1663.5 58.5,-1595.5 246.5,-1595.5 246.5,-1663.5"/>
-<text text-anchor="middle" x="152.5" y="-1648.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5223</text>
-<text text-anchor="middle" x="152.5" y="-1633.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add RPC test case that</text>
-<text text-anchor="middle" x="152.5" y="-1618.3" font-family="Times,serif" font-size="14.00" fill="#000000">checks the auth data</text>
-<text text-anchor="middle" x="152.5" y="-1603.3" font-family="Times,serif" font-size="14.00" fill="#000000">commitments for v4 txs</text>
+<g id="a_node57"><a xlink:href="https://github.com/zcash/zcash/issues/5223" xlink:title="zcash/zcash#5223&#10;Add RPC test case that&#10;checks the auth data&#10;commitments for v4 txs" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="246.5,-1780.5 58.5,-1780.5 58.5,-1712.5 246.5,-1712.5 246.5,-1780.5"/>
+<text text-anchor="middle" x="152.5" y="-1765.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5223</text>
+<text text-anchor="middle" x="152.5" y="-1750.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add RPC test case that</text>
+<text text-anchor="middle" x="152.5" y="-1735.3" font-family="Times,serif" font-size="14.00" fill="#000000">checks the auth data</text>
+<text text-anchor="middle" x="152.5" y="-1720.3" font-family="Times,serif" font-size="14.00" fill="#000000">commitments for v4 txs</text>
 </a>
 </g>
 </g>
 <!-- zcash/zips#534 -->
-<g id="node54" class="node">
+<g id="node58" class="node">
 <title>zcash/zips#534</title>
-<g id="a_node54"><a xlink:href="https://github.com/zcash/zips/issues/534" xlink:title="zcash/zips#534&#10;Adding to a full note&#10;commitment tree should be&#10;a consensus error" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="260,-1749.5 45,-1749.5 45,-1681.5 260,-1681.5 260,-1749.5"/>
-<text text-anchor="middle" x="152.5" y="-1734.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zips#534</text>
-<text text-anchor="middle" x="152.5" y="-1719.3" font-family="Times,serif" font-size="14.00" fill="#000000">Adding to a full note</text>
-<text text-anchor="middle" x="152.5" y="-1704.3" font-family="Times,serif" font-size="14.00" fill="#000000">commitment tree should be</text>
-<text text-anchor="middle" x="152.5" y="-1689.3" font-family="Times,serif" font-size="14.00" fill="#000000">a consensus error</text>
+<g id="a_node58"><a xlink:href="https://github.com/zcash/zips/issues/534" xlink:title="zcash/zips#534&#10;Adding to a full note&#10;commitment tree should be&#10;a consensus error" target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="561.5,-863.5 346.5,-863.5 346.5,-795.5 561.5,-795.5 561.5,-863.5"/>
+<text text-anchor="middle" x="454" y="-848.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zips#534</text>
+<text text-anchor="middle" x="454" y="-833.3" font-family="Times,serif" font-size="14.00" fill="#000000">Adding to a full note</text>
+<text text-anchor="middle" x="454" y="-818.3" font-family="Times,serif" font-size="14.00" fill="#000000">commitment tree should be</text>
+<text text-anchor="middle" x="454" y="-803.3" font-family="Times,serif" font-size="14.00" fill="#000000">a consensus error</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash#5241 -->
-<g id="node55" class="node">
+<g id="node59" class="node">
 <title>zcash/zcash#5241</title>
-<g id="a_node55"><a xlink:href="https://github.com/zcash/zcash/pull/5241" xlink:title="zcash/zcash#5241&#10;Consensus: Add check to&#10;ensure that the Orchard&#10;commitment tree is not&#10;overfull after&#10;AppendBundle." target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" points="552.5,-1764.5 355.5,-1764.5 355.5,-1760.5 351.5,-1760.5 351.5,-1756.5 355.5,-1756.5 355.5,-1674.5 351.5,-1674.5 351.5,-1670.5 355.5,-1670.5 355.5,-1666.5 552.5,-1666.5 552.5,-1764.5"/>
-<polyline fill="none" stroke="#000000" points="355.5,-1760.5 359.5,-1760.5 359.5,-1756.5 355.5,-1756.5 "/>
-<polyline fill="none" stroke="#000000" points="355.5,-1674.5 359.5,-1674.5 359.5,-1670.5 355.5,-1670.5 "/>
-<text text-anchor="middle" x="454" y="-1749.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5241</text>
-<text text-anchor="middle" x="454" y="-1734.3" font-family="Times,serif" font-size="14.00" fill="#000000">Consensus: Add check to</text>
-<text text-anchor="middle" x="454" y="-1719.3" font-family="Times,serif" font-size="14.00" fill="#000000">ensure that the Orchard</text>
-<text text-anchor="middle" x="454" y="-1704.3" font-family="Times,serif" font-size="14.00" fill="#000000">commitment tree is not</text>
-<text text-anchor="middle" x="454" y="-1689.3" font-family="Times,serif" font-size="14.00" fill="#000000">overfull after</text>
-<text text-anchor="middle" x="454" y="-1674.3" font-family="Times,serif" font-size="14.00" fill="#000000">AppendBundle.</text>
+<g id="a_node59"><a xlink:href="https://github.com/zcash/zcash/pull/5241" xlink:title="zcash/zcash#5241&#10;Consensus: Add check to&#10;ensure that the Orchard&#10;commitment tree is not&#10;overfull after&#10;AppendBundle." target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" points="854,-878.5 657,-878.5 657,-874.5 653,-874.5 653,-870.5 657,-870.5 657,-788.5 653,-788.5 653,-784.5 657,-784.5 657,-780.5 854,-780.5 854,-878.5"/>
+<polyline fill="none" stroke="#000000" points="657,-874.5 661,-874.5 661,-870.5 657,-870.5 "/>
+<polyline fill="none" stroke="#000000" points="657,-788.5 661,-788.5 661,-784.5 657,-784.5 "/>
+<text text-anchor="middle" x="755.5" y="-863.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5241</text>
+<text text-anchor="middle" x="755.5" y="-848.3" font-family="Times,serif" font-size="14.00" fill="#000000">Consensus: Add check to</text>
+<text text-anchor="middle" x="755.5" y="-833.3" font-family="Times,serif" font-size="14.00" fill="#000000">ensure that the Orchard</text>
+<text text-anchor="middle" x="755.5" y="-818.3" font-family="Times,serif" font-size="14.00" fill="#000000">commitment tree is not</text>
+<text text-anchor="middle" x="755.5" y="-803.3" font-family="Times,serif" font-size="14.00" fill="#000000">overfull after</text>
+<text text-anchor="middle" x="755.5" y="-788.3" font-family="Times,serif" font-size="14.00" fill="#000000">AppendBundle.</text>
 </a>
 </g>
 </g>
 <!-- zcash/zips#534&#45;&gt;zcash/zcash#5241 -->
-<g id="edge49" class="edge">
+<g id="edge55" class="edge">
 <title>zcash/zips#534&#45;&gt;zcash/zcash#5241</title>
-<path fill="none" stroke="#000000" d="M260.07,-1715.5C287.63,-1715.5 317.3,-1715.5 344.94,-1715.5"/>
-<polygon fill="#000000" stroke="#000000" points="345.02,-1719.0001 355.02,-1715.5 345.02,-1712.0001 345.02,-1719.0001"/>
+<path fill="none" stroke="#000000" d="M561.57,-829.5C589.13,-829.5 618.8,-829.5 646.44,-829.5"/>
+<polygon fill="#000000" stroke="#000000" points="646.52,-833.0001 656.52,-829.5 646.52,-826.0001 646.52,-833.0001"/>
 </g>
-<!-- zcash/halo2#63 -->
-<g id="node56" class="node">
-<title>zcash/halo2#63</title>
-<g id="a_node56"><a xlink:href="https://github.com/zcash/halo2/issues/63" xlink:title="zcash/halo2#63&#10;Implement zero&#45;knowledge&#45;&#10;ness" target="_blank">
-<polygon fill="#fad8c7" stroke="#000000" points="819,-695 603,-695 603,-642 819,-642 819,-695"/>
-<text text-anchor="middle" x="711" y="-679.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#63</text>
-<text text-anchor="middle" x="711" y="-664.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement zero&#45;knowledge&#45;</text>
-<text text-anchor="middle" x="711" y="-649.8" font-family="Times,serif" font-size="14.00" fill="#000000">ness</text>
+<!-- zcash/zcash#5241&#45;&gt;zcash/zcash#5197 -->
+<g id="edge56" class="edge">
+<title>zcash/zcash#5241&#45;&gt;zcash/zcash#5197</title>
+<path fill="none" stroke="#000000" d="M854.15,-804.96C886.49,-796.92 922.41,-787.98 954.73,-779.94"/>
+<polygon fill="#000000" stroke="#000000" points="955.7692,-783.2883 964.63,-777.48 954.0811,-776.4949 955.7692,-783.2883"/>
+</g>
+<!-- zcash/zcash#5245 -->
+<g id="node60" class="node">
+<title>zcash/zcash#5245</title>
+<g id="a_node60"><a xlink:href="https://github.com/zcash/zcash/issues/5245" xlink:title="zcash/zcash#5245&#10;Implement consensus rule&#10;that if effectiveVersion&#10;≥ 5 and nActionsOrchard &gt;&#10;0, at least one of&#10;enableSpendsOrchard and&#10;enableOutputsOrchard is 1" target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="1161.5,-913 944.5,-913 944.5,-800 1161.5,-800 1161.5,-913"/>
+<text text-anchor="middle" x="1053" y="-897.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash#5245</text>
+<text text-anchor="middle" x="1053" y="-882.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement consensus rule</text>
+<text text-anchor="middle" x="1053" y="-867.8" font-family="Times,serif" font-size="14.00" fill="#000000">that if effectiveVersion</text>
+<text text-anchor="middle" x="1053" y="-852.8" font-family="Times,serif" font-size="14.00" fill="#000000">≥ 5 and nActionsOrchard &gt;</text>
+<text text-anchor="middle" x="1053" y="-837.8" font-family="Times,serif" font-size="14.00" fill="#000000">0, at least one of</text>
+<text text-anchor="middle" x="1053" y="-822.8" font-family="Times,serif" font-size="14.00" fill="#000000">enableSpendsOrchard and</text>
+<text text-anchor="middle" x="1053" y="-807.8" font-family="Times,serif" font-size="14.00" fill="#000000">enableOutputsOrchard is 1</text>
 </a>
 </g>
 </g>
-<!-- zcash/halo2#63&#45;&gt;zcash/librustzcash#320 -->
-<g id="edge50" class="edge">
-<title>zcash/halo2#63&#45;&gt;zcash/librustzcash#320</title>
-<path fill="none" stroke="#000000" d="M819.03,-677.04C830.03,-677.91 841.22,-678.79 852.27,-679.67"/>
-<polygon fill="#000000" stroke="#000000" points="852.1071,-683.1679 862.35,-680.46 852.6541,-676.1893 852.1071,-683.1679"/>
+<!-- zcash/zcash#5245&#45;&gt;zcash/zcash#5024 -->
+<g id="edge57" class="edge">
+<title>zcash/zcash#5245&#45;&gt;zcash/zcash#5024</title>
+<path fill="none" stroke="#000000" d="M1161.5,-880.14C1170.8,-882.15 1180.1,-884.19 1189.4,-886.21"/>
+<polygon fill="#000000" stroke="#000000" points="1188.8827,-889.6796 1199.4,-888.4 1190.3803,-882.8417 1188.8827,-889.6796"/>
+</g>
+<!-- zcash/zips#538 -->
+<g id="node61" class="node">
+<title>zcash/zips#538</title>
+<g id="a_node61"><a xlink:href="https://github.com/zcash/zips/pull/538" xlink:title="zcash/zips#538&#10;ZIP 316: Define HRPs for&#10;Unified Viewing Keys, and&#10;include the HRP in the&#10;padding" target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="858,-514 653,-514 653,-510 649,-510 649,-506 653,-506 653,-439 649,-439 649,-435 653,-435 653,-431 858,-431 858,-514"/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="653,-510 657,-510 657,-506 653,-506 "/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="653,-439 657,-439 657,-435 653,-435 "/>
+<text text-anchor="middle" x="755.5" y="-498.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zips#538</text>
+<text text-anchor="middle" x="755.5" y="-483.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZIP 316: Define HRPs for</text>
+<text text-anchor="middle" x="755.5" y="-468.8" font-family="Times,serif" font-size="14.00" fill="#000000">Unified Viewing Keys, and</text>
+<text text-anchor="middle" x="755.5" y="-453.8" font-family="Times,serif" font-size="14.00" fill="#000000">include the HRP in the</text>
+<text text-anchor="middle" x="755.5" y="-438.8" font-family="Times,serif" font-size="14.00" fill="#000000">padding</text>
+</a>
+</g>
+</g>
+<!-- zcash/zips#538&#45;&gt;zcash/librustzcash#372 -->
+<g id="edge58" class="edge">
+<title>zcash/zips#538&#45;&gt;zcash/librustzcash#372</title>
+<path fill="none" stroke="#000000" d="M858.17,-472.5C1007.8,-472.5 1285,-472.5 1441.4,-472.5"/>
+<polygon fill="#000000" stroke="#000000" points="1441.5,-476.0001 1451.5,-472.5 1441.5,-469.0001 1441.5,-476.0001"/>
+</g>
+<!-- zcash/librustzcash#418 -->
+<g id="node62" class="node">
+<title>zcash/librustzcash#418</title>
+<g id="a_node62"><a xlink:href="https://github.com/zcash/librustzcash/issues/418" xlink:title="zcash/librustzcash#418&#10;zcash_address: Add HRPs&#10;to padding of UAs" target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" points="1154.5,-437 951.5,-437 951.5,-384 1154.5,-384 1154.5,-437"/>
+<text text-anchor="middle" x="1053" y="-421.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#418</text>
+<text text-anchor="middle" x="1053" y="-406.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash_address: Add HRPs</text>
+<text text-anchor="middle" x="1053" y="-391.8" font-family="Times,serif" font-size="14.00" fill="#000000">to padding of UAs</text>
+</a>
+</g>
+</g>
+<!-- zcash/zips#538&#45;&gt;zcash/librustzcash#418 -->
+<g id="edge59" class="edge">
+<title>zcash/zips#538&#45;&gt;zcash/librustzcash#418</title>
+<path fill="none" stroke="#000000" d="M858.3,-451.08C885.15,-445.48 914.21,-439.42 941.49,-433.74"/>
+<polygon fill="#000000" stroke="#000000" points="942.3767,-437.1304 951.45,-431.66 940.9457,-430.2782 942.3767,-437.1304"/>
+</g>
+<!-- zcash/librustzcash#418&#45;&gt;zcash/librustzcash#371 -->
+<g id="edge60" class="edge">
+<title>zcash/librustzcash#418&#45;&gt;zcash/librustzcash#371</title>
+<path fill="none" stroke="#000000" d="M1154.6,-410.5C1170,-410.5 1185.9,-410.5 1201.4,-410.5"/>
+<polygon fill="#000000" stroke="#000000" points="1201.5,-414.0001 1211.5,-410.5 1201.5,-407.0001 1201.5,-414.0001"/>
+</g>
+<!-- zcash&#45;hackworks/zcash&#45;test&#45;vectors#43 -->
+<g id="node63" class="node">
+<title>zcash&#45;hackworks/zcash&#45;test&#45;vectors#43</title>
+<g id="a_node63"><a xlink:href="https://github.com/zcash-hackworks/zcash-test-vectors/issues/43" xlink:title="zcash&#45;hackworks/zcash&#45;test&#45;vectors#43&#10;Update padding in Unified&#10;Address test vectors" target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="908,-413 603,-413 603,-360 908,-360 908,-413"/>
+<text text-anchor="middle" x="755.5" y="-397.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash&#45;hackworks/zcash&#45;test&#45;vectors#43</text>
+<text text-anchor="middle" x="755.5" y="-382.8" font-family="Times,serif" font-size="14.00" fill="#000000">Update padding in Unified</text>
+<text text-anchor="middle" x="755.5" y="-367.8" font-family="Times,serif" font-size="14.00" fill="#000000">Address test vectors</text>
+</a>
+</g>
+</g>
+<!-- zcash&#45;hackworks/zcash&#45;test&#45;vectors#43&#45;&gt;zcash/librustzcash#418 -->
+<g id="edge61" class="edge">
+<title>zcash&#45;hackworks/zcash&#45;test&#45;vectors#43&#45;&gt;zcash/librustzcash#418</title>
+<path fill="none" stroke="#000000" d="M908.17,-398.82C919.2,-399.71 930.2,-400.59 940.93,-401.46"/>
+<polygon fill="#000000" stroke="#000000" points="940.8714,-404.9665 951.12,-402.28 941.433,-397.9891 940.8714,-404.9665"/>
 </g>
 <!-- zcash&#45;hackworks/zcash&#45;test&#45;vectors#36 -->
-<g id="node57" class="node">
+<g id="node64" class="node">
 <title>zcash&#45;hackworks/zcash&#45;test&#45;vectors#36</title>
-<g id="a_node57"><a xlink:href="https://github.com/zcash-hackworks/zcash-test-vectors/issues/36" xlink:title="zcash&#45;hackworks/zcash&#45;test&#45;vectors#36&#10;Orchard Merkle path test&#10;vectors" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="305,-921 0,-921 0,-868 305,-868 305,-921"/>
-<text text-anchor="middle" x="152.5" y="-905.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash&#45;hackworks/zcash&#45;test&#45;vectors#36</text>
-<text text-anchor="middle" x="152.5" y="-890.8" font-family="Times,serif" font-size="14.00" fill="#000000">Orchard Merkle path test</text>
-<text text-anchor="middle" x="152.5" y="-875.8" font-family="Times,serif" font-size="14.00" fill="#000000">vectors</text>
+<g id="a_node64"><a xlink:href="https://github.com/zcash-hackworks/zcash-test-vectors/issues/36" xlink:title="zcash&#45;hackworks/zcash&#45;test&#45;vectors#36&#10;Orchard Merkle path test&#10;vectors" target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="305,-990 0,-990 0,-937 305,-937 305,-990"/>
+<text text-anchor="middle" x="152.5" y="-974.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash&#45;hackworks/zcash&#45;test&#45;vectors#36</text>
+<text text-anchor="middle" x="152.5" y="-959.8" font-family="Times,serif" font-size="14.00" fill="#000000">Orchard Merkle path test</text>
+<text text-anchor="middle" x="152.5" y="-944.8" font-family="Times,serif" font-size="14.00" fill="#000000">vectors</text>
 </a>
 </g>
 </g>
 <!-- zcash&#45;hackworks/zcash&#45;test&#45;vectors#36&#45;&gt;zcash/orchard#33 -->
-<g id="edge51" class="edge">
+<g id="edge62" class="edge">
 <title>zcash&#45;hackworks/zcash&#45;test&#45;vectors#36&#45;&gt;zcash/orchard#33</title>
-<path fill="none" stroke="#000000" d="M305.02,-903.1C313.53,-903.58 322.04,-904.06 330.43,-904.53"/>
-<polygon fill="#000000" stroke="#000000" points="330.4169,-908.0348 340.6,-905.11 330.8155,-901.0462 330.4169,-908.0348"/>
+<path fill="none" stroke="#000000" d="M194.29,-936.9C226.93,-914.78 272.12,-881.1 305,-844.5 325.27,-821.93 318.18,-806.5 341,-786.5 349.51,-779.04 359.3,-772.49 369.47,-766.8"/>
+<polygon fill="#000000" stroke="#000000" points="371.2996,-769.7913 378.49,-762.01 368.0165,-763.609 371.2996,-769.7913"/>
 </g>
 <!-- zcash/orchard#95 -->
-<g id="node58" class="node">
+<g id="node65" class="node">
 <title>zcash/orchard#95</title>
-<g id="a_node58"><a xlink:href="https://github.com/zcash/orchard/issues/95" xlink:title="zcash/orchard#95&#10;Implement Merkle path&#10;validity chip" target="_blank">
-<polygon fill="#fad8c7" stroke="#000000" points="547.5,-867 360.5,-867 360.5,-814 547.5,-814 547.5,-867"/>
-<text text-anchor="middle" x="454" y="-851.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#95</text>
-<text text-anchor="middle" x="454" y="-836.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Merkle path</text>
-<text text-anchor="middle" x="454" y="-821.8" font-family="Times,serif" font-size="14.00" fill="#000000">validity chip</text>
+<g id="a_node65"><a xlink:href="https://github.com/zcash/orchard/issues/95" xlink:title="zcash/orchard#95&#10;Implement Merkle path&#10;validity chip" target="_blank">
+<polygon fill="#fad8c7" stroke="#000000" points="547.5,-1011 360.5,-1011 360.5,-958 547.5,-958 547.5,-1011"/>
+<text text-anchor="middle" x="454" y="-995.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#95</text>
+<text text-anchor="middle" x="454" y="-980.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Merkle path</text>
+<text text-anchor="middle" x="454" y="-965.8" font-family="Times,serif" font-size="14.00" fill="#000000">validity chip</text>
 </a>
 </g>
 </g>
 <!-- zcash&#45;hackworks/zcash&#45;test&#45;vectors#36&#45;&gt;zcash/orchard#95 -->
-<g id="edge52" class="edge">
+<g id="edge63" class="edge">
 <title>zcash&#45;hackworks/zcash&#45;test&#45;vectors#36&#45;&gt;zcash/orchard#95</title>
-<path fill="none" stroke="#000000" d="M300.6,-867.97C317.37,-864.97 334.19,-861.96 350.22,-859.09"/>
-<polygon fill="#000000" stroke="#000000" points="350.8649,-862.5303 360.09,-857.32 349.6292,-855.6402 350.8649,-862.5303"/>
+<path fill="none" stroke="#000000" d="M305.02,-974.12C320.33,-975.19 335.61,-976.25 350.24,-977.27"/>
+<polygon fill="#000000" stroke="#000000" points="350.0302,-980.7638 360.25,-977.97 350.5186,-973.7808 350.0302,-980.7638"/>
 </g>
 <!-- zcash/orchard#95&#45;&gt;zcash/orchard#4 -->
-<g id="edge53" class="edge">
+<g id="edge64" class="edge">
 <title>zcash/orchard#95&#45;&gt;zcash/orchard#4</title>
-<path fill="none" stroke="#000000" d="M547.51,-829.58C569.29,-827.04 592.52,-824.33 614.43,-821.77"/>
-<polygon fill="#000000" stroke="#000000" points="614.8715,-825.2423 624.4,-820.61 614.0625,-818.2892 614.8715,-825.2423"/>
+<path fill="none" stroke="#000000" d="M547.74,-1003.5C583.06,-1010.6 623.27,-1018.7 658.84,-1025.9"/>
+<polygon fill="#000000" stroke="#000000" points="658.2552,-1029.3525 668.75,-1027.9 659.6401,-1022.4908 658.2552,-1029.3525"/>
 </g>
 <!-- zcash/halo2#75 -->
-<g id="node59" class="node">
+<g id="node66" class="node">
 <title>zcash/halo2#75</title>
-<g id="a_node59"><a xlink:href="https://github.com/zcash/halo2/issues/75" xlink:title="zcash/halo2#75&#10;Implement support for&#10;recursion" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1053.5,-547 874.5,-547 874.5,-494 1053.5,-494 1053.5,-547"/>
-<text text-anchor="middle" x="964" y="-531.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#75</text>
-<text text-anchor="middle" x="964" y="-516.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement support for</text>
-<text text-anchor="middle" x="964" y="-501.8" font-family="Times,serif" font-size="14.00" fill="#000000">recursion</text>
+<g id="a_node66"><a xlink:href="https://github.com/zcash/halo2/issues/75" xlink:title="zcash/halo2#75&#10;Implement support for&#10;recursion" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1142.5,-1895 963.5,-1895 963.5,-1842 1142.5,-1842 1142.5,-1895"/>
+<text text-anchor="middle" x="1053" y="-1879.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#75</text>
+<text text-anchor="middle" x="1053" y="-1864.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement support for</text>
+<text text-anchor="middle" x="1053" y="-1849.8" font-family="Times,serif" font-size="14.00" fill="#000000">recursion</text>
 </a>
 </g>
 </g>
 <!-- zcash/halo2#251 -->
-<g id="node60" class="node">
+<g id="node67" class="node">
 <title>zcash/halo2#251</title>
-<g id="a_node60"><a xlink:href="https://github.com/zcash/halo2/issues/251" xlink:title="zcash/halo2#251&#10;Implement user&#45;facing API&#10;for recursive proving" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1321.5,-570 1111.5,-570 1111.5,-517 1321.5,-517 1321.5,-570"/>
-<text text-anchor="middle" x="1216.5" y="-554.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#251</text>
-<text text-anchor="middle" x="1216.5" y="-539.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement user&#45;facing API</text>
-<text text-anchor="middle" x="1216.5" y="-524.8" font-family="Times,serif" font-size="14.00" fill="#000000">for recursive proving</text>
+<g id="a_node67"><a xlink:href="https://github.com/zcash/halo2/issues/251" xlink:title="zcash/halo2#251&#10;Implement user&#45;facing API&#10;for recursive proving" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1410.5,-1895 1200.5,-1895 1200.5,-1842 1410.5,-1842 1410.5,-1895"/>
+<text text-anchor="middle" x="1305.5" y="-1879.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#251</text>
+<text text-anchor="middle" x="1305.5" y="-1864.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement user&#45;facing API</text>
+<text text-anchor="middle" x="1305.5" y="-1849.8" font-family="Times,serif" font-size="14.00" fill="#000000">for recursive proving</text>
 </a>
 </g>
 </g>
 <!-- zcash/halo2#75&#45;&gt;zcash/halo2#251 -->
-<g id="edge54" class="edge">
+<g id="edge65" class="edge">
 <title>zcash/halo2#75&#45;&gt;zcash/halo2#251</title>
-<path fill="none" stroke="#000000" d="M1053.7,-528.67C1069,-530.06 1085,-531.52 1100.8,-532.96"/>
-<polygon fill="#000000" stroke="#000000" points="1100.8233,-536.4766 1111.1,-533.9 1101.4595,-529.5056 1100.8233,-536.4766"/>
+<path fill="none" stroke="#000000" d="M1142.7,-1868.5C1158,-1868.5 1174,-1868.5 1189.8,-1868.5"/>
+<polygon fill="#000000" stroke="#000000" points="1190.1,-1872.0001 1200.1,-1868.5 1190.1,-1865.0001 1190.1,-1872.0001"/>
 </g>
 <!-- zcash/halo2#79 -->
-<g id="node61" class="node">
+<g id="node68" class="node">
 <title>zcash/halo2#79</title>
-<g id="a_node61"><a xlink:href="https://github.com/zcash/halo2/issues/79" xlink:title="zcash/halo2#79&#10;Migrate Rescue and&#10;Poseidon gadgets to&#10;algebraic hash&#10;abstraction" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="791.5,-624 630.5,-624 630.5,-541 791.5,-541 791.5,-624"/>
-<text text-anchor="middle" x="711" y="-608.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#79</text>
-<text text-anchor="middle" x="711" y="-593.8" font-family="Times,serif" font-size="14.00" fill="#000000">Migrate Rescue and</text>
-<text text-anchor="middle" x="711" y="-578.8" font-family="Times,serif" font-size="14.00" fill="#000000">Poseidon gadgets to</text>
-<text text-anchor="middle" x="711" y="-563.8" font-family="Times,serif" font-size="14.00" fill="#000000">algebraic hash</text>
-<text text-anchor="middle" x="711" y="-548.8" font-family="Times,serif" font-size="14.00" fill="#000000">abstraction</text>
+<g id="a_node68"><a xlink:href="https://github.com/zcash/halo2/issues/79" xlink:title="zcash/halo2#79&#10;Migrate Rescue and&#10;Poseidon gadgets to&#10;algebraic hash&#10;abstraction" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="836,-2111 675,-2111 675,-2028 836,-2028 836,-2111"/>
+<text text-anchor="middle" x="755.5" y="-2095.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#79</text>
+<text text-anchor="middle" x="755.5" y="-2080.8" font-family="Times,serif" font-size="14.00" fill="#000000">Migrate Rescue and</text>
+<text text-anchor="middle" x="755.5" y="-2065.8" font-family="Times,serif" font-size="14.00" fill="#000000">Poseidon gadgets to</text>
+<text text-anchor="middle" x="755.5" y="-2050.8" font-family="Times,serif" font-size="14.00" fill="#000000">algebraic hash</text>
+<text text-anchor="middle" x="755.5" y="-2035.8" font-family="Times,serif" font-size="14.00" fill="#000000">abstraction</text>
 </a>
 </g>
 </g>
 <!-- zcash/halo2#78 -->
-<g id="node62" class="node">
+<g id="node69" class="node">
 <title>zcash/halo2#78</title>
-<g id="a_node62"><a xlink:href="https://github.com/zcash/halo2/issues/78" xlink:title="zcash/halo2#78&#10;Implement algebraic hash&#10;/ random oracle&#10;abstraction gadget" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="556,-616.5 352,-616.5 352,-548.5 556,-548.5 556,-616.5"/>
-<text text-anchor="middle" x="454" y="-601.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#78</text>
-<text text-anchor="middle" x="454" y="-586.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement algebraic hash</text>
-<text text-anchor="middle" x="454" y="-571.3" font-family="Times,serif" font-size="14.00" fill="#000000">/ random oracle</text>
-<text text-anchor="middle" x="454" y="-556.3" font-family="Times,serif" font-size="14.00" fill="#000000">abstraction gadget</text>
+<g id="a_node69"><a xlink:href="https://github.com/zcash/halo2/issues/78" xlink:title="zcash/halo2#78&#10;Implement algebraic hash&#10;/ random oracle&#10;abstraction gadget" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="556,-2103.5 352,-2103.5 352,-2035.5 556,-2035.5 556,-2103.5"/>
+<text text-anchor="middle" x="454" y="-2088.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#78</text>
+<text text-anchor="middle" x="454" y="-2073.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement algebraic hash</text>
+<text text-anchor="middle" x="454" y="-2058.3" font-family="Times,serif" font-size="14.00" fill="#000000">/ random oracle</text>
+<text text-anchor="middle" x="454" y="-2043.3" font-family="Times,serif" font-size="14.00" fill="#000000">abstraction gadget</text>
 </a>
 </g>
 </g>
 <!-- zcash/halo2#78&#45;&gt;zcash/halo2#79 -->
-<g id="edge55" class="edge">
+<g id="edge66" class="edge">
 <title>zcash/halo2#78&#45;&gt;zcash/halo2#79</title>
-<path fill="none" stroke="#000000" d="M556.31,-582.5C577.48,-582.5 599.65,-582.5 620.37,-582.5"/>
-<polygon fill="#000000" stroke="#000000" points="620.41,-586.0001 630.41,-582.5 620.41,-579.0001 620.41,-586.0001"/>
+<path fill="none" stroke="#000000" d="M556.07,-2069.5C591.37,-2069.5 630.65,-2069.5 664.96,-2069.5"/>
+<polygon fill="#000000" stroke="#000000" points="664.96,-2073.0001 674.96,-2069.5 664.96,-2066.0001 664.96,-2073.0001"/>
 </g>
 <!-- zcash/halo2#250 -->
-<g id="node63" class="node">
+<g id="node70" class="node">
 <title>zcash/halo2#250</title>
-<g id="a_node63"><a xlink:href="https://github.com/zcash/halo2/issues/250" xlink:title="zcash/halo2#250&#10;Implement the recursive&#10;verifier circuit" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="808,-523 614,-523 614,-470 808,-470 808,-523"/>
-<text text-anchor="middle" x="711" y="-507.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#250</text>
-<text text-anchor="middle" x="711" y="-492.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement the recursive</text>
-<text text-anchor="middle" x="711" y="-477.8" font-family="Times,serif" font-size="14.00" fill="#000000">verifier circuit</text>
+<g id="a_node70"><a xlink:href="https://github.com/zcash/halo2/issues/250" xlink:title="zcash/halo2#250&#10;Implement the recursive&#10;verifier circuit" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="852.5,-1895 658.5,-1895 658.5,-1842 852.5,-1842 852.5,-1895"/>
+<text text-anchor="middle" x="755.5" y="-1879.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#250</text>
+<text text-anchor="middle" x="755.5" y="-1864.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement the recursive</text>
+<text text-anchor="middle" x="755.5" y="-1849.8" font-family="Times,serif" font-size="14.00" fill="#000000">verifier circuit</text>
 </a>
 </g>
 </g>
 <!-- zcash/halo2#78&#45;&gt;zcash/halo2#250 -->
-<g id="edge56" class="edge">
+<g id="edge67" class="edge">
 <title>zcash/halo2#78&#45;&gt;zcash/halo2#250</title>
-<path fill="none" stroke="#000000" d="M552.91,-548.39C569.61,-542.7 586.79,-536.9 603,-531.5 608.2,-529.77 613.55,-528 618.94,-526.22"/>
-<polygon fill="#000000" stroke="#000000" points="620.2801,-529.4639 628.69,-523.02 618.0972,-522.813 620.2801,-529.4639"/>
+<path fill="none" stroke="#000000" d="M550.3,-2035.4C556.05,-2032.6 561.66,-2029.6 567,-2026.5 626.83,-1991.4 686.63,-1937.2 722.35,-1902.3"/>
+<polygon fill="#000000" stroke="#000000" points="724.9008,-1904.7007 729.59,-1895.2 719.9996,-1899.7028 724.9008,-1904.7007"/>
 </g>
 <!-- zcash/halo2#250&#45;&gt;zcash/halo2#75 -->
-<g id="edge57" class="edge">
+<g id="edge68" class="edge">
 <title>zcash/halo2#250&#45;&gt;zcash/halo2#75</title>
-<path fill="none" stroke="#000000" d="M808.09,-505.71C826.43,-507.45 845.65,-509.27 864.08,-511.02"/>
-<polygon fill="#000000" stroke="#000000" points="863.9346,-514.5218 874.22,-511.98 864.5944,-507.553 863.9346,-514.5218"/>
+<path fill="none" stroke="#000000" d="M852.5,-1868.5C884.63,-1868.5 920.44,-1868.5 952.81,-1868.5"/>
+<polygon fill="#000000" stroke="#000000" points="953.19,-1872.0001 963.19,-1868.5 953.19,-1865.0001 953.19,-1872.0001"/>
 </g>
 <!-- zcash/halo2#57 -->
-<g id="node64" class="node">
+<g id="node71" class="node">
 <title>zcash/halo2#57</title>
-<g id="a_node64"><a xlink:href="https://github.com/zcash/halo2/issues/57" xlink:title="zcash/halo2#57&#10;Remove unused&#10;fixed_values from&#10;ProvingKey" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="224,-1835.5 81,-1835.5 81,-1767.5 224,-1767.5 224,-1835.5"/>
-<text text-anchor="middle" x="152.5" y="-1820.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#57</text>
-<text text-anchor="middle" x="152.5" y="-1805.3" font-family="Times,serif" font-size="14.00" fill="#000000">Remove unused</text>
-<text text-anchor="middle" x="152.5" y="-1790.3" font-family="Times,serif" font-size="14.00" fill="#000000">fixed_values from</text>
-<text text-anchor="middle" x="152.5" y="-1775.3" font-family="Times,serif" font-size="14.00" fill="#000000">ProvingKey</text>
+<g id="a_node71"><a xlink:href="https://github.com/zcash/halo2/issues/57" xlink:title="zcash/halo2#57&#10;Remove unused&#10;fixed_values from&#10;ProvingKey" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="224,-1938.5 81,-1938.5 81,-1870.5 224,-1870.5 224,-1938.5"/>
+<text text-anchor="middle" x="152.5" y="-1923.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#57</text>
+<text text-anchor="middle" x="152.5" y="-1908.3" font-family="Times,serif" font-size="14.00" fill="#000000">Remove unused</text>
+<text text-anchor="middle" x="152.5" y="-1893.3" font-family="Times,serif" font-size="14.00" fill="#000000">fixed_values from</text>
+<text text-anchor="middle" x="152.5" y="-1878.3" font-family="Times,serif" font-size="14.00" fill="#000000">ProvingKey</text>
 </a>
 </g>
 </g>
 <!-- zcash/halo2#82 -->
-<g id="node65" class="node">
+<g id="node72" class="node">
 <title>zcash/halo2#82</title>
-<g id="a_node65"><a xlink:href="https://github.com/zcash/halo2/issues/82" xlink:title="zcash/halo2#82&#10;Consider not sampling&#10;beta and gamma if there&#10;are no permutations or&#10;lookups" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="249,-1937 56,-1937 56,-1854 249,-1854 249,-1937"/>
-<text text-anchor="middle" x="152.5" y="-1921.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#82</text>
-<text text-anchor="middle" x="152.5" y="-1906.8" font-family="Times,serif" font-size="14.00" fill="#000000">Consider not sampling</text>
-<text text-anchor="middle" x="152.5" y="-1891.8" font-family="Times,serif" font-size="14.00" fill="#000000">beta and gamma if there</text>
-<text text-anchor="middle" x="152.5" y="-1876.8" font-family="Times,serif" font-size="14.00" fill="#000000">are no permutations or</text>
-<text text-anchor="middle" x="152.5" y="-1861.8" font-family="Times,serif" font-size="14.00" fill="#000000">lookups</text>
+<g id="a_node72"><a xlink:href="https://github.com/zcash/halo2/issues/82" xlink:title="zcash/halo2#82&#10;Consider not sampling&#10;beta and gamma if there&#10;are no permutations or&#10;lookups" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="249,-2040 56,-2040 56,-1957 249,-1957 249,-2040"/>
+<text text-anchor="middle" x="152.5" y="-2024.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#82</text>
+<text text-anchor="middle" x="152.5" y="-2009.8" font-family="Times,serif" font-size="14.00" fill="#000000">Consider not sampling</text>
+<text text-anchor="middle" x="152.5" y="-1994.8" font-family="Times,serif" font-size="14.00" fill="#000000">beta and gamma if there</text>
+<text text-anchor="middle" x="152.5" y="-1979.8" font-family="Times,serif" font-size="14.00" fill="#000000">are no permutations or</text>
+<text text-anchor="middle" x="152.5" y="-1964.8" font-family="Times,serif" font-size="14.00" fill="#000000">lookups</text>
 </a>
 </g>
 </g>
 <!-- zcash/halo2#248 -->
-<g id="node66" class="node">
+<g id="node73" class="node">
 <title>zcash/halo2#248</title>
-<g id="a_node66"><a xlink:href="https://github.com/zcash/halo2/issues/248" xlink:title="zcash/halo2#248&#10;Implement endoscaling in&#10;the circuit" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="555.5,-444 352.5,-444 352.5,-391 555.5,-391 555.5,-444"/>
-<text text-anchor="middle" x="454" y="-428.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#248</text>
-<text text-anchor="middle" x="454" y="-413.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement endoscaling in</text>
-<text text-anchor="middle" x="454" y="-398.8" font-family="Times,serif" font-size="14.00" fill="#000000">the circuit</text>
+<g id="a_node73"><a xlink:href="https://github.com/zcash/halo2/issues/248" xlink:title="zcash/halo2#248&#10;Implement endoscaling in&#10;the circuit" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="555.5,-2017 352.5,-2017 352.5,-1964 555.5,-1964 555.5,-2017"/>
+<text text-anchor="middle" x="454" y="-2001.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#248</text>
+<text text-anchor="middle" x="454" y="-1986.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement endoscaling in</text>
+<text text-anchor="middle" x="454" y="-1971.8" font-family="Times,serif" font-size="14.00" fill="#000000">the circuit</text>
 </a>
 </g>
 </g>
 <!-- zcash/halo2#248&#45;&gt;zcash/halo2#250 -->
-<g id="edge58" class="edge">
+<g id="edge69" class="edge">
 <title>zcash/halo2#248&#45;&gt;zcash/halo2#250</title>
-<path fill="none" stroke="#000000" d="M540.29,-444.03C564.24,-451.39 590.38,-459.42 614.85,-466.94"/>
-<polygon fill="#000000" stroke="#000000" points="613.9129,-470.3135 624.5,-469.91 615.972,-463.6232 613.9129,-470.3135"/>
+<path fill="none" stroke="#000000" d="M541.05,-1963.9C549.86,-1960.9 558.64,-1957.7 567,-1954.5 609.51,-1938.1 656.11,-1916.9 692.34,-1899.6"/>
+<polygon fill="#000000" stroke="#000000" points="694.2662,-1902.5594 701.79,-1895.1 691.2566,-1896.2394 694.2662,-1902.5594"/>
 </g>
 <!-- zcash/halo2#249 -->
-<g id="node67" class="node">
+<g id="node74" class="node">
 <title>zcash/halo2#249</title>
-<g id="a_node67"><a xlink:href="https://github.com/zcash/halo2/issues/249" xlink:title="zcash/halo2#249&#10;Implement circuit logic&#10;for handling public&#10;inputs" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="546.5,-372.5 361.5,-372.5 361.5,-304.5 546.5,-304.5 546.5,-372.5"/>
-<text text-anchor="middle" x="454" y="-357.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#249</text>
-<text text-anchor="middle" x="454" y="-342.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement circuit logic</text>
-<text text-anchor="middle" x="454" y="-327.3" font-family="Times,serif" font-size="14.00" fill="#000000">for handling public</text>
-<text text-anchor="middle" x="454" y="-312.3" font-family="Times,serif" font-size="14.00" fill="#000000">inputs</text>
+<g id="a_node74"><a xlink:href="https://github.com/zcash/halo2/issues/249" xlink:title="zcash/halo2#249&#10;Implement circuit logic&#10;for handling public&#10;inputs" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="546.5,-1945.5 361.5,-1945.5 361.5,-1877.5 546.5,-1877.5 546.5,-1945.5"/>
+<text text-anchor="middle" x="454" y="-1930.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#249</text>
+<text text-anchor="middle" x="454" y="-1915.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement circuit logic</text>
+<text text-anchor="middle" x="454" y="-1900.3" font-family="Times,serif" font-size="14.00" fill="#000000">for handling public</text>
+<text text-anchor="middle" x="454" y="-1885.3" font-family="Times,serif" font-size="14.00" fill="#000000">inputs</text>
 </a>
 </g>
 </g>
 <!-- zcash/halo2#249&#45;&gt;zcash/halo2#250 -->
-<g id="edge59" class="edge">
+<g id="edge70" class="edge">
 <title>zcash/halo2#249&#45;&gt;zcash/halo2#250</title>
-<path fill="none" stroke="#000000" d="M546.68,-371.03C553.68,-374.31 560.53,-377.81 567,-381.5 569.85,-383.13 628.43,-430.1 669.98,-463.49"/>
-<polygon fill="#000000" stroke="#000000" points="667.8036,-466.2312 677.79,-469.77 672.1901,-460.776 667.8036,-466.2312"/>
+<path fill="none" stroke="#000000" d="M546.51,-1898.3C578.67,-1893.7 615,-1888.5 648.25,-1883.8"/>
+<polygon fill="#000000" stroke="#000000" points="649.0843,-1887.2151 658.47,-1882.3 648.0677,-1880.2893 649.0843,-1887.2151"/>
 </g>
 <!-- zcash/halo2#246 -->
-<g id="node68" class="node">
+<g id="node75" class="node">
 <title>zcash/halo2#246</title>
-<g id="a_node68"><a xlink:href="https://github.com/zcash/halo2/issues/246" xlink:title="zcash/halo2#246&#10;Create recursive proof&#10;structures" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="242,-279 63,-279 63,-226 242,-226 242,-279"/>
-<text text-anchor="middle" x="152.5" y="-263.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#246</text>
-<text text-anchor="middle" x="152.5" y="-248.8" font-family="Times,serif" font-size="14.00" fill="#000000">Create recursive proof</text>
-<text text-anchor="middle" x="152.5" y="-233.8" font-family="Times,serif" font-size="14.00" fill="#000000">structures</text>
+<g id="a_node75"><a xlink:href="https://github.com/zcash/halo2/issues/246" xlink:title="zcash/halo2#246&#10;Create recursive proof&#10;structures" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="242,-1852 63,-1852 63,-1799 242,-1799 242,-1852"/>
+<text text-anchor="middle" x="152.5" y="-1836.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#246</text>
+<text text-anchor="middle" x="152.5" y="-1821.8" font-family="Times,serif" font-size="14.00" fill="#000000">Create recursive proof</text>
+<text text-anchor="middle" x="152.5" y="-1806.8" font-family="Times,serif" font-size="14.00" fill="#000000">structures</text>
 </a>
 </g>
 </g>
 <!-- zcash/halo2#247 -->
-<g id="node69" class="node">
+<g id="node76" class="node">
 <title>zcash/halo2#247</title>
-<g id="a_node69"><a xlink:href="https://github.com/zcash/halo2/issues/247" xlink:title="zcash/halo2#247&#10;Implement underlying&#10;scaffolding for the&#10;recursive circuit" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="542,-286.5 366,-286.5 366,-218.5 542,-218.5 542,-286.5"/>
-<text text-anchor="middle" x="454" y="-271.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#247</text>
-<text text-anchor="middle" x="454" y="-256.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement underlying</text>
-<text text-anchor="middle" x="454" y="-241.3" font-family="Times,serif" font-size="14.00" fill="#000000">scaffolding for the</text>
-<text text-anchor="middle" x="454" y="-226.3" font-family="Times,serif" font-size="14.00" fill="#000000">recursive circuit</text>
+<g id="a_node76"><a xlink:href="https://github.com/zcash/halo2/issues/247" xlink:title="zcash/halo2#247&#10;Implement underlying&#10;scaffolding for the&#10;recursive circuit" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="542,-1859.5 366,-1859.5 366,-1791.5 542,-1791.5 542,-1859.5"/>
+<text text-anchor="middle" x="454" y="-1844.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#247</text>
+<text text-anchor="middle" x="454" y="-1829.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement underlying</text>
+<text text-anchor="middle" x="454" y="-1814.3" font-family="Times,serif" font-size="14.00" fill="#000000">scaffolding for the</text>
+<text text-anchor="middle" x="454" y="-1799.3" font-family="Times,serif" font-size="14.00" fill="#000000">recursive circuit</text>
 </a>
 </g>
 </g>
 <!-- zcash/halo2#246&#45;&gt;zcash/halo2#247 -->
-<g id="edge60" class="edge">
+<g id="edge71" class="edge">
 <title>zcash/halo2#246&#45;&gt;zcash/halo2#247</title>
-<path fill="none" stroke="#000000" d="M242.14,-252.5C277.92,-252.5 319.23,-252.5 355.81,-252.5"/>
-<polygon fill="#000000" stroke="#000000" points="356,-256.0001 366,-252.5 356,-249.0001 356,-256.0001"/>
+<path fill="none" stroke="#000000" d="M242.14,-1825.5C277.92,-1825.5 319.23,-1825.5 355.81,-1825.5"/>
+<polygon fill="#000000" stroke="#000000" points="356,-1829.0001 366,-1825.5 356,-1822.0001 356,-1829.0001"/>
 </g>
 <!-- zcash/halo2#247&#45;&gt;zcash/halo2#250 -->
-<g id="edge61" class="edge">
+<g id="edge72" class="edge">
 <title>zcash/halo2#247&#45;&gt;zcash/halo2#250</title>
-<path fill="none" stroke="#000000" d="M542.04,-276.55C551.27,-281.7 559.87,-287.94 567,-295.5 603.47,-334.14 573.03,-365.63 603,-409.5 617.5,-430.72 638.68,-449.37 658.46,-463.91"/>
-<polygon fill="#000000" stroke="#000000" points="656.648,-466.9168 666.82,-469.88 660.716,-461.2202 656.648,-466.9168"/>
+<path fill="none" stroke="#000000" d="M542.02,-1838.1C575.24,-1842.8 613.41,-1848.2 648.2,-1853.2"/>
+<polygon fill="#000000" stroke="#000000" points="647.9971,-1856.7077 658.4,-1854.7 649.0157,-1849.7822 647.9971,-1856.7077"/>
 </g>
 <!-- zcash/halo2#245 -->
-<g id="node70" class="node">
+<g id="node77" class="node">
 <title>zcash/halo2#245</title>
-<g id="a_node70"><a xlink:href="https://github.com/zcash/halo2/issues/245" xlink:title="zcash/halo2#245&#10;Remove the need to&#10;multiply by powers of x^n&#10;in verifier" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="557,-702.5 351,-702.5 351,-634.5 557,-634.5 557,-702.5"/>
-<text text-anchor="middle" x="454" y="-687.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#245</text>
-<text text-anchor="middle" x="454" y="-672.3" font-family="Times,serif" font-size="14.00" fill="#000000">Remove the need to</text>
-<text text-anchor="middle" x="454" y="-657.3" font-family="Times,serif" font-size="14.00" fill="#000000">multiply by powers of x^n</text>
-<text text-anchor="middle" x="454" y="-642.3" font-family="Times,serif" font-size="14.00" fill="#000000">in verifier</text>
+<g id="a_node77"><a xlink:href="https://github.com/zcash/halo2/issues/245" xlink:title="zcash/halo2#245&#10;Remove the need to&#10;multiply by powers of x^n&#10;in verifier" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="557,-1773.5 351,-1773.5 351,-1705.5 557,-1705.5 557,-1773.5"/>
+<text text-anchor="middle" x="454" y="-1758.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#245</text>
+<text text-anchor="middle" x="454" y="-1743.3" font-family="Times,serif" font-size="14.00" fill="#000000">Remove the need to</text>
+<text text-anchor="middle" x="454" y="-1728.3" font-family="Times,serif" font-size="14.00" fill="#000000">multiply by powers of x^n</text>
+<text text-anchor="middle" x="454" y="-1713.3" font-family="Times,serif" font-size="14.00" fill="#000000">in verifier</text>
 </a>
 </g>
 </g>
-<!-- zcash/halo2#245&#45;&gt;zcash/halo2#63 -->
-<g id="edge62" class="edge">
-<title>zcash/halo2#245&#45;&gt;zcash/halo2#63</title>
-<path fill="none" stroke="#000000" d="M557.05,-668.5C568.83,-668.5 580.91,-668.5 592.87,-668.5"/>
-<polygon fill="#000000" stroke="#000000" points="592.88,-672.0001 602.88,-668.5 592.88,-665.0001 592.88,-672.0001"/>
-</g>
 <!-- zcash/halo2#245&#45;&gt;zcash/halo2#250 -->
-<g id="edge63" class="edge">
+<g id="edge73" class="edge">
 <title>zcash/halo2#245&#45;&gt;zcash/halo2#250</title>
-<path fill="none" stroke="#000000" d="M556.7,-634.38C560.35,-631.64 563.81,-628.69 567,-625.5 598.67,-593.9 570.55,-562.29 603,-531.5 603.82,-530.72 604.66,-529.96 605.52,-529.21"/>
-<polygon fill="#000000" stroke="#000000" points="607.8525,-531.831 613.63,-522.95 603.5753,-526.2897 607.8525,-531.831"/>
+<path fill="none" stroke="#000000" d="M545.17,-1773.6C552.58,-1776.6 559.93,-1779.5 567,-1782.5 608.44,-1799.8 654.29,-1820.7 690.39,-1837.5"/>
+<polygon fill="#000000" stroke="#000000" points="689.2971,-1840.8563 699.83,-1842 692.3092,-1834.5375 689.2971,-1840.8563"/>
 </g>
 <!-- zcash/halo2#210 -->
-<g id="node71" class="node">
+<g id="node78" class="node">
 <title>zcash/halo2#210</title>
-<g id="a_node71"><a xlink:href="https://github.com/zcash/halo2/issues/210" xlink:title="zcash/halo2#210&#10;Make multiopen&#10;point_index_map dependent&#10;only on the rotation" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="563,-530.5 345,-530.5 345,-462.5 563,-462.5 563,-530.5"/>
-<text text-anchor="middle" x="454" y="-515.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#210</text>
-<text text-anchor="middle" x="454" y="-500.3" font-family="Times,serif" font-size="14.00" fill="#000000">Make multiopen</text>
-<text text-anchor="middle" x="454" y="-485.3" font-family="Times,serif" font-size="14.00" fill="#000000">point_index_map dependent</text>
-<text text-anchor="middle" x="454" y="-470.3" font-family="Times,serif" font-size="14.00" fill="#000000">only on the rotation</text>
+<g id="a_node78"><a xlink:href="https://github.com/zcash/halo2/issues/210" xlink:title="zcash/halo2#210&#10;Make multiopen&#10;point_index_map dependent&#10;only on the rotation" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="563,-1687.5 345,-1687.5 345,-1619.5 563,-1619.5 563,-1687.5"/>
+<text text-anchor="middle" x="454" y="-1672.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#210</text>
+<text text-anchor="middle" x="454" y="-1657.3" font-family="Times,serif" font-size="14.00" fill="#000000">Make multiopen</text>
+<text text-anchor="middle" x="454" y="-1642.3" font-family="Times,serif" font-size="14.00" fill="#000000">point_index_map dependent</text>
+<text text-anchor="middle" x="454" y="-1627.3" font-family="Times,serif" font-size="14.00" fill="#000000">only on the rotation</text>
 </a>
 </g>
 </g>
 <!-- zcash/halo2#210&#45;&gt;zcash/halo2#250 -->
-<g id="edge64" class="edge">
+<g id="edge74" class="edge">
 <title>zcash/halo2#210&#45;&gt;zcash/halo2#250</title>
-<path fill="none" stroke="#000000" d="M563.36,-496.5C576.75,-496.5 590.43,-496.5 603.79,-496.5"/>
-<polygon fill="#000000" stroke="#000000" points="603.93,-500.0001 613.93,-496.5 603.93,-493.0001 603.93,-500.0001"/>
+<path fill="none" stroke="#000000" d="M551.04,-1687.6C556.54,-1690.4 561.91,-1693.4 567,-1696.5 629.7,-1735.1 690.43,-1796.1 725.32,-1834.1"/>
+<polygon fill="#000000" stroke="#000000" points="723.0356,-1836.788 732.37,-1841.8 728.1985,-1832.0609 723.0356,-1836.788"/>
 </g>
 <!-- zcash/halo2#312 -->
-<g id="node72" class="node">
+<g id="node79" class="node">
 <title>zcash/halo2#312</title>
-<g id="a_node72"><a xlink:href="https://github.com/zcash/halo2/issues/312" xlink:title="zcash/halo2#312&#10;[Book] Document gadget&#10;API" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="250,-2008 55,-2008 55,-1955 250,-1955 250,-2008"/>
-<text text-anchor="middle" x="152.5" y="-1992.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#312</text>
-<text text-anchor="middle" x="152.5" y="-1977.8" font-family="Times,serif" font-size="14.00" fill="#000000">[Book] Document gadget</text>
-<text text-anchor="middle" x="152.5" y="-1962.8" font-family="Times,serif" font-size="14.00" fill="#000000">API</text>
+<g id="a_node79"><a xlink:href="https://github.com/zcash/halo2/issues/312" xlink:title="zcash/halo2#312&#10;[Book] Document gadget&#10;API" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="250,-2111 55,-2111 55,-2058 250,-2058 250,-2111"/>
+<text text-anchor="middle" x="152.5" y="-2095.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/halo2#312</text>
+<text text-anchor="middle" x="152.5" y="-2080.8" font-family="Times,serif" font-size="14.00" fill="#000000">[Book] Document gadget</text>
+<text text-anchor="middle" x="152.5" y="-2065.8" font-family="Times,serif" font-size="14.00" fill="#000000">API</text>
 </a>
 </g>
 </g>
-<!-- zcash/orchard#96 -->
-<g id="node73" class="node">
-<title>zcash/orchard#96</title>
-<g id="a_node73"><a xlink:href="https://github.com/zcash/orchard/issues/96" xlink:title="zcash/orchard#96&#10;Implement Sinsemilla&#10;gadget" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" points="540.5,-796 367.5,-796 367.5,-743 540.5,-743 540.5,-796"/>
-<text text-anchor="middle" x="454" y="-780.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#96</text>
-<text text-anchor="middle" x="454" y="-765.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Sinsemilla</text>
-<text text-anchor="middle" x="454" y="-750.8" font-family="Times,serif" font-size="14.00" fill="#000000">gadget</text>
-</a>
-</g>
-</g>
-<!-- zcash/orchard#96&#45;&gt;zcash/orchard#4 -->
-<g id="edge65" class="edge">
-<title>zcash/orchard#96&#45;&gt;zcash/orchard#4</title>
-<path fill="none" stroke="#000000" d="M540.65,-783.32C564.34,-787.1 590.17,-791.22 614.38,-795.09"/>
-<polygon fill="#000000" stroke="#000000" points="613.8636,-798.5518 624.29,-796.67 614.9658,-791.6391 613.8636,-798.5518"/>
-</g>
-<!-- zcash/orchard#118 -->
-<g id="node74" class="node">
-<title>zcash/orchard#118</title>
-<g id="a_node74"><a xlink:href="https://github.com/zcash/orchard/pull/118" xlink:title="zcash/orchard#118&#10;Sinsemilla chip with&#10;Commit Domain" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="233.5,-2079 71.5,-2079 71.5,-2075 67.5,-2075 67.5,-2071 71.5,-2071 71.5,-2034 67.5,-2034 67.5,-2030 71.5,-2030 71.5,-2026 233.5,-2026 233.5,-2079"/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="71.5,-2075 75.5,-2075 75.5,-2071 71.5,-2071 "/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="71.5,-2034 75.5,-2034 75.5,-2030 71.5,-2030 "/>
-<text text-anchor="middle" x="152.5" y="-2063.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#118</text>
-<text text-anchor="middle" x="152.5" y="-2048.8" font-family="Times,serif" font-size="14.00" fill="#000000">Sinsemilla chip with</text>
-<text text-anchor="middle" x="152.5" y="-2033.8" font-family="Times,serif" font-size="14.00" fill="#000000">Commit Domain</text>
-</a>
-</g>
-</g>
-<!-- zcash/orchard#101 -->
-<g id="node75" class="node">
-<title>zcash/orchard#101</title>
-<g id="a_node75"><a xlink:href="https://github.com/zcash/orchard/pull/101" xlink:title="zcash/orchard#101&#10;[WIP] Action circuit" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="534.5,-2071.5 373.5,-2071.5 373.5,-2067.5 369.5,-2067.5 369.5,-2063.5 373.5,-2063.5 373.5,-2041.5 369.5,-2041.5 369.5,-2037.5 373.5,-2037.5 373.5,-2033.5 534.5,-2033.5 534.5,-2071.5"/>
-<polyline fill="none" stroke="#000000" points="373.5,-2067.5 377.5,-2067.5 377.5,-2063.5 373.5,-2063.5 "/>
-<polyline fill="none" stroke="#000000" points="373.5,-2041.5 377.5,-2041.5 377.5,-2037.5 373.5,-2037.5 "/>
-<text text-anchor="middle" x="454" y="-2056.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#101</text>
-<text text-anchor="middle" x="454" y="-2041.3" font-family="Times,serif" font-size="14.00" fill="#000000">[WIP] Action circuit</text>
-</a>
-</g>
-</g>
-<!-- zcash/orchard#118&#45;&gt;zcash/orchard#101 -->
-<g id="edge66" class="edge">
-<title>zcash/orchard#118&#45;&gt;zcash/orchard#101</title>
-<path fill="none" stroke="#000000" d="M233.69,-2052.5C273.73,-2052.5 322.16,-2052.5 363.4,-2052.5"/>
-<polygon fill="#000000" stroke="#000000" points="363.45,-2056.0001 373.45,-2052.5 363.45,-2049.0001 363.45,-2056.0001"/>
-</g>
-<!-- zcash/orchard#145 -->
-<g id="node76" class="node">
-<title>zcash/orchard#145</title>
-<g id="a_node76"><a xlink:href="https://github.com/zcash/orchard/pull/145" xlink:title="zcash/orchard#145&#10;Refactor&#10;`mul_fixed_short` API to&#10;copy in (`magnitude`,&#10;`sign`)" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="250.5,-811 54.5,-811 54.5,-807 50.5,-807 50.5,-803 54.5,-803 54.5,-736 50.5,-736 50.5,-732 54.5,-732 54.5,-728 250.5,-728 250.5,-811"/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="54.5,-807 58.5,-807 58.5,-803 54.5,-803 "/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="54.5,-736 58.5,-736 58.5,-732 54.5,-732 "/>
-<text text-anchor="middle" x="152.5" y="-795.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/orchard#145</text>
-<text text-anchor="middle" x="152.5" y="-780.8" font-family="Times,serif" font-size="14.00" fill="#000000">Refactor</text>
-<text text-anchor="middle" x="152.5" y="-765.8" font-family="Times,serif" font-size="14.00" fill="#000000">`mul_fixed_short` API to</text>
-<text text-anchor="middle" x="152.5" y="-750.8" font-family="Times,serif" font-size="14.00" fill="#000000">copy in (`magnitude`,</text>
-<text text-anchor="middle" x="152.5" y="-735.8" font-family="Times,serif" font-size="14.00" fill="#000000">`sign`)</text>
-</a>
-</g>
-</g>
-<!-- zcash/orchard#145&#45;&gt;zcash/orchard#96 -->
-<g id="edge67" class="edge">
-<title>zcash/orchard#145&#45;&gt;zcash/orchard#96</title>
-<path fill="none" stroke="#000000" d="M250.81,-769.5C284.75,-769.5 322.76,-769.5 356.63,-769.5"/>
-<polygon fill="#000000" stroke="#000000" points="357,-773.0001 367,-769.5 357,-766.0001 357,-773.0001"/>
-</g>
 </g>
 </svg>
diff --git a/zcash-wallet-dag.svg b/zcash-wallet-dag.svg
index e550c57b..32685c17 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="760pt" height="964pt"
- viewBox="0.00 0.00 760.00 963.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 959.5)">
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-959.5 756,-959.5 756,4 -4,4"/>
+<svg width="782pt" height="949pt"
+ viewBox="0.00 0.00 782.00 948.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 944.5)">
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-944.5 778,-944.5 778,4 -4,4"/>
 <!-- zcash/librustzcash#226 -->
 <g id="node1" class="node">
 <title>zcash/librustzcash#226</title>
@@ -51,194 +51,231 @@
 <g id="node4" class="node">
 <title>zcash/librustzcash#371</title>
 <g id="a_node4"><a xlink:href="https://github.com/zcash/librustzcash/issues/371" xlink:title="zcash/librustzcash#371&#10;Implement parsing and&#10;serialization of Unified&#10;Addresses" target="_blank">
-<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="233,-217.5 45,-217.5 45,-149.5 233,-149.5 233,-217.5"/>
-<text text-anchor="middle" x="139" y="-202.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#371</text>
-<text text-anchor="middle" x="139" y="-187.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement parsing and</text>
-<text text-anchor="middle" x="139" y="-172.3" font-family="Times,serif" font-size="14.00" fill="#000000">serialization of Unified</text>
-<text text-anchor="middle" x="139" y="-157.3" font-family="Times,serif" font-size="14.00" fill="#000000">Addresses</text>
+<polygon fill="#a6cfff" stroke="#000000" points="515,-210.5 327,-210.5 327,-142.5 515,-142.5 515,-210.5"/>
+<text text-anchor="middle" x="421" y="-195.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#371</text>
+<text text-anchor="middle" x="421" y="-180.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement parsing and</text>
+<text text-anchor="middle" x="421" y="-165.3" font-family="Times,serif" font-size="14.00" fill="#000000">serialization of Unified</text>
+<text text-anchor="middle" x="421" y="-150.3" font-family="Times,serif" font-size="14.00" fill="#000000">Addresses</text>
 </a>
 </g>
 </g>
-<!-- zcash/librustzcash#387 -->
+<!-- zcash/librustzcash#372 -->
 <g id="node5" class="node">
+<title>zcash/librustzcash#372</title>
+<g id="a_node5"><a xlink:href="https://github.com/zcash/librustzcash/issues/372" xlink:title="zcash/librustzcash#372&#10;Implement parsing and&#10;serialization of Unified&#10;[Incoming / Full] Viewing&#10;Keys and Unified Spending&#10;Keys" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="774,-225.5 564,-225.5 564,-127.5 774,-127.5 774,-225.5"/>
+<text text-anchor="middle" x="669" y="-210.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#372</text>
+<text text-anchor="middle" x="669" y="-195.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement parsing and</text>
+<text text-anchor="middle" x="669" y="-180.3" font-family="Times,serif" font-size="14.00" fill="#000000">serialization of Unified</text>
+<text text-anchor="middle" x="669" y="-165.3" font-family="Times,serif" font-size="14.00" fill="#000000">[Incoming / Full] Viewing</text>
+<text text-anchor="middle" x="669" y="-150.3" font-family="Times,serif" font-size="14.00" fill="#000000">Keys and Unified Spending</text>
+<text text-anchor="middle" x="669" y="-135.3" font-family="Times,serif" font-size="14.00" fill="#000000">Keys</text>
+</a>
+</g>
+</g>
+<!-- zcash/librustzcash#371&#45;&gt;zcash/librustzcash#372 -->
+<g id="edge2" class="edge">
+<title>zcash/librustzcash#371&#45;&gt;zcash/librustzcash#372</title>
+<path fill="none" stroke="#000000" d="M515.11,-176.5C527.65,-176.5 540.63,-176.5 553.48,-176.5"/>
+<polygon fill="#000000" stroke="#000000" points="553.76,-180.0001 563.76,-176.5 553.76,-173.0001 553.76,-180.0001"/>
+</g>
+<!-- zcash/librustzcash#387 -->
+<g id="node6" class="node">
 <title>zcash/librustzcash#387</title>
-<g id="a_node5"><a xlink:href="https://github.com/zcash/librustzcash/issues/387" xlink:title="zcash/librustzcash#387&#10;Implement Unified Address&#10;key derivation" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="246.5,-289 31.5,-289 31.5,-236 246.5,-236 246.5,-289"/>
-<text text-anchor="middle" x="139" y="-273.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#387</text>
-<text text-anchor="middle" x="139" y="-258.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Unified Address</text>
-<text text-anchor="middle" x="139" y="-243.8" font-family="Times,serif" font-size="14.00" fill="#000000">key derivation</text>
+<g id="a_node6"><a xlink:href="https://github.com/zcash/librustzcash/issues/387" xlink:title="zcash/librustzcash#387&#10;Implement Unified Address&#10;key derivation" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="246.5,-274 31.5,-274 31.5,-221 246.5,-221 246.5,-274"/>
+<text text-anchor="middle" x="139" y="-258.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#387</text>
+<text text-anchor="middle" x="139" y="-243.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Unified Address</text>
+<text text-anchor="middle" x="139" y="-228.8" font-family="Times,serif" font-size="14.00" fill="#000000">key derivation</text>
 </a>
 </g>
 </g>
 <!-- zcash/librustzcash#403 -->
-<g id="node6" class="node">
+<g id="node7" class="node">
 <title>zcash/librustzcash#403</title>
-<g id="a_node6"><a xlink:href="https://github.com/zcash/librustzcash/issues/403" xlink:title="zcash/librustzcash#403&#10;Add Orchard support to&#10;`zcash_client_backend`" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="515,-360 327,-360 327,-307 515,-307 515,-360"/>
-<text text-anchor="middle" x="421" y="-344.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#403</text>
-<text text-anchor="middle" x="421" y="-329.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
-<text text-anchor="middle" x="421" y="-314.8" font-family="Times,serif" font-size="14.00" fill="#000000">`zcash_client_backend`</text>
+<g id="a_node7"><a xlink:href="https://github.com/zcash/librustzcash/issues/403" xlink:title="zcash/librustzcash#403&#10;Add Orchard support to&#10;`zcash_client_backend`" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="515,-345 327,-345 327,-292 515,-292 515,-345"/>
+<text text-anchor="middle" x="421" y="-329.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#403</text>
+<text text-anchor="middle" x="421" y="-314.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
+<text text-anchor="middle" x="421" y="-299.8" font-family="Times,serif" font-size="14.00" fill="#000000">`zcash_client_backend`</text>
 </a>
 </g>
 </g>
 <!-- zcash/librustzcash#404 -->
-<g id="node7" class="node">
+<g id="node8" class="node">
 <title>zcash/librustzcash#404</title>
-<g id="a_node7"><a xlink:href="https://github.com/zcash/librustzcash/issues/404" xlink:title="zcash/librustzcash#404&#10;Add Orchard support to&#10;`zcash_client_sqlite`" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="752,-360 564,-360 564,-307 752,-307 752,-360"/>
-<text text-anchor="middle" x="658" y="-344.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#404</text>
-<text text-anchor="middle" x="658" y="-329.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
-<text text-anchor="middle" x="658" y="-314.8" font-family="Times,serif" font-size="14.00" fill="#000000">`zcash_client_sqlite`</text>
+<g id="a_node8"><a xlink:href="https://github.com/zcash/librustzcash/issues/404" xlink:title="zcash/librustzcash#404&#10;Add Orchard support to&#10;`zcash_client_sqlite`" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="763,-345 575,-345 575,-292 763,-292 763,-345"/>
+<text text-anchor="middle" x="669" y="-329.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#404</text>
+<text text-anchor="middle" x="669" y="-314.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
+<text text-anchor="middle" x="669" y="-299.8" font-family="Times,serif" font-size="14.00" fill="#000000">`zcash_client_sqlite`</text>
 </a>
 </g>
 </g>
 <!-- zcash/librustzcash#403&#45;&gt;zcash/librustzcash#404 -->
-<g id="edge2" class="edge">
+<g id="edge3" class="edge">
 <title>zcash/librustzcash#403&#45;&gt;zcash/librustzcash#404</title>
-<path fill="none" stroke="#000000" d="M515.01,-333.5C527.65,-333.5 540.69,-333.5 553.5,-333.5"/>
-<polygon fill="#000000" stroke="#000000" points="553.72,-337.0001 563.72,-333.5 553.72,-330.0001 553.72,-337.0001"/>
+<path fill="none" stroke="#000000" d="M515.11,-318.5C531.34,-318.5 548.29,-318.5 564.77,-318.5"/>
+<polygon fill="#000000" stroke="#000000" points="564.95,-322.0001 574.95,-318.5 564.95,-315.0001 564.95,-322.0001"/>
 </g>
 <!-- zcash/librustzcash#406 -->
-<g id="node8" class="node">
+<g id="node9" class="node">
 <title>zcash/librustzcash#406</title>
-<g id="a_node8"><a xlink:href="https://github.com/zcash/librustzcash/issues/406" xlink:title="zcash/librustzcash#406&#10;Add Orchard support to&#10;the transaction builder" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="233,-360 45,-360 45,-307 233,-307 233,-360"/>
-<text text-anchor="middle" x="139" y="-344.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#406</text>
-<text text-anchor="middle" x="139" y="-329.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
-<text text-anchor="middle" x="139" y="-314.8" font-family="Times,serif" font-size="14.00" fill="#000000">the transaction builder</text>
+<g id="a_node9"><a xlink:href="https://github.com/zcash/librustzcash/issues/406" xlink:title="zcash/librustzcash#406&#10;Add Orchard support to&#10;the transaction builder" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="233,-345 45,-345 45,-292 233,-292 233,-345"/>
+<text text-anchor="middle" x="139" y="-329.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#406</text>
+<text text-anchor="middle" x="139" y="-314.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Orchard support to</text>
+<text text-anchor="middle" x="139" y="-299.8" font-family="Times,serif" font-size="14.00" fill="#000000">the transaction builder</text>
 </a>
 </g>
 </g>
 <!-- zcash/librustzcash#406&#45;&gt;zcash/librustzcash#403 -->
-<g id="edge3" class="edge">
+<g id="edge4" class="edge">
 <title>zcash/librustzcash#406&#45;&gt;zcash/librustzcash#403</title>
-<path fill="none" stroke="#000000" d="M233.29,-333.5C259.99,-333.5 289.2,-333.5 316.45,-333.5"/>
-<polygon fill="#000000" stroke="#000000" points="316.79,-337.0001 326.79,-333.5 316.79,-330.0001 316.79,-337.0001"/>
+<path fill="none" stroke="#000000" d="M233.29,-318.5C259.99,-318.5 289.2,-318.5 316.45,-318.5"/>
+<polygon fill="#000000" stroke="#000000" points="316.79,-322.0001 326.79,-318.5 316.79,-315.0001 316.79,-322.0001"/>
+</g>
+<!-- zcash/librustzcash#418 -->
+<g id="node10" class="node">
+<title>zcash/librustzcash#418</title>
+<g id="a_node10"><a xlink:href="https://github.com/zcash/librustzcash/issues/418" xlink:title="zcash/librustzcash#418&#10;zcash_address: Add HRPs&#10;to padding of UAs" target="_blank">
+<polygon fill="#a6cfff" stroke="#000000" stroke-width="2" points="240.5,-203 37.5,-203 37.5,-150 240.5,-150 240.5,-203"/>
+<text text-anchor="middle" x="139" y="-187.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/librustzcash#418</text>
+<text text-anchor="middle" x="139" y="-172.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash_address: Add HRPs</text>
+<text text-anchor="middle" x="139" y="-157.8" font-family="Times,serif" font-size="14.00" fill="#000000">to padding of UAs</text>
+</a>
+</g>
+</g>
+<!-- zcash/librustzcash#418&#45;&gt;zcash/librustzcash#371 -->
+<g id="edge5" class="edge">
+<title>zcash/librustzcash#418&#45;&gt;zcash/librustzcash#371</title>
+<path fill="none" stroke="#000000" d="M240.81,-176.5C265.49,-176.5 291.91,-176.5 316.71,-176.5"/>
+<polygon fill="#000000" stroke="#000000" points="316.85,-180.0001 326.85,-176.5 316.85,-173.0001 316.85,-180.0001"/>
 </g>
 <!-- zcash/zcash&#45;android&#45;wallet&#45;sdk#147 -->
-<g id="node9" class="node">
+<g id="node11" class="node">
 <title>zcash/zcash&#45;android&#45;wallet&#45;sdk#147</title>
-<g id="a_node9"><a xlink:href="https://github.com/zcash/zcash-android-wallet-sdk/issues/147" xlink:title="zcash/zcash&#45;android&#45;wallet&#45;sdk#147&#10;Android: Create&#10;t&#45;addresses in demo app" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="278,-431 0,-431 0,-378 278,-378 278,-431"/>
-<text text-anchor="middle" x="139" y="-415.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;android&#45;wallet&#45;sdk#147</text>
-<text text-anchor="middle" x="139" y="-400.8" font-family="Times,serif" font-size="14.00" fill="#000000">Android: Create</text>
-<text text-anchor="middle" x="139" y="-385.8" font-family="Times,serif" font-size="14.00" fill="#000000">t&#45;addresses in demo app</text>
+<g id="a_node11"><a xlink:href="https://github.com/zcash/zcash-android-wallet-sdk/issues/147" xlink:title="zcash/zcash&#45;android&#45;wallet&#45;sdk#147&#10;Android: Create&#10;t&#45;addresses in demo app" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="278,-416 0,-416 0,-363 278,-363 278,-416"/>
+<text text-anchor="middle" x="139" y="-400.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;android&#45;wallet&#45;sdk#147</text>
+<text text-anchor="middle" x="139" y="-385.8" font-family="Times,serif" font-size="14.00" fill="#000000">Android: Create</text>
+<text text-anchor="middle" x="139" y="-370.8" font-family="Times,serif" font-size="14.00" fill="#000000">t&#45;addresses in demo app</text>
 </a>
 </g>
 </g>
 <!-- zcash/ZcashLightClientKit#162 -->
-<g id="node10" class="node">
+<g id="node12" class="node">
 <title>zcash/ZcashLightClientKit#162</title>
-<g id="a_node10"><a xlink:href="https://github.com/zcash/ZcashLightClientKit/issues/162" xlink:title="zcash/ZcashLightClientKit#162&#10;Fetch t&#45;address balance&#10;in demo app" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="262,-502 16,-502 16,-449 262,-449 262,-502"/>
-<text text-anchor="middle" x="139" y="-486.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/ZcashLightClientKit#162</text>
-<text text-anchor="middle" x="139" y="-471.8" font-family="Times,serif" font-size="14.00" fill="#000000">Fetch t&#45;address balance</text>
-<text text-anchor="middle" x="139" y="-456.8" font-family="Times,serif" font-size="14.00" fill="#000000">in demo app</text>
+<g id="a_node12"><a xlink:href="https://github.com/zcash/ZcashLightClientKit/issues/162" xlink:title="zcash/ZcashLightClientKit#162&#10;Fetch t&#45;address balance&#10;in demo app" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="262,-487 16,-487 16,-434 262,-434 262,-487"/>
+<text text-anchor="middle" x="139" y="-471.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/ZcashLightClientKit#162</text>
+<text text-anchor="middle" x="139" y="-456.8" font-family="Times,serif" font-size="14.00" fill="#000000">Fetch t&#45;address balance</text>
+<text text-anchor="middle" x="139" y="-441.8" font-family="Times,serif" font-size="14.00" fill="#000000">in demo app</text>
 </a>
 </g>
 </g>
 <!-- zcash/ZcashLightClientKit#161 -->
-<g id="node11" class="node">
+<g id="node13" class="node">
 <title>zcash/ZcashLightClientKit#161</title>
-<g id="a_node11"><a xlink:href="https://github.com/zcash/ZcashLightClientKit/issues/161" xlink:title="zcash/ZcashLightClientKit#161&#10;iOS: Create t&#45;addresses&#10;in demo app" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="262,-573 16,-573 16,-520 262,-520 262,-573"/>
-<text text-anchor="middle" x="139" y="-557.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/ZcashLightClientKit#161</text>
-<text text-anchor="middle" x="139" y="-542.8" font-family="Times,serif" font-size="14.00" fill="#000000">iOS: Create t&#45;addresses</text>
-<text text-anchor="middle" x="139" y="-527.8" font-family="Times,serif" font-size="14.00" fill="#000000">in demo app</text>
+<g id="a_node13"><a xlink:href="https://github.com/zcash/ZcashLightClientKit/issues/161" xlink:title="zcash/ZcashLightClientKit#161&#10;iOS: Create t&#45;addresses&#10;in demo app" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="262,-558 16,-558 16,-505 262,-505 262,-558"/>
+<text text-anchor="middle" x="139" y="-542.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/ZcashLightClientKit#161</text>
+<text text-anchor="middle" x="139" y="-527.8" font-family="Times,serif" font-size="14.00" fill="#000000">iOS: Create t&#45;addresses</text>
+<text text-anchor="middle" x="139" y="-512.8" font-family="Times,serif" font-size="14.00" fill="#000000">in demo app</text>
 </a>
 </g>
 </g>
 <!-- zcash/ZcashLightClientKit#95 -->
-<g id="node12" class="node">
+<g id="node14" class="node">
 <title>zcash/ZcashLightClientKit#95</title>
-<g id="a_node12"><a xlink:href="https://github.com/zcash/ZcashLightClientKit/issues/95" xlink:title="zcash/ZcashLightClientKit#95&#10;Better Error handling" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="257.5,-771.5 20.5,-771.5 20.5,-733.5 257.5,-733.5 257.5,-771.5"/>
-<text text-anchor="middle" x="139" y="-756.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/ZcashLightClientKit#95</text>
-<text text-anchor="middle" x="139" y="-741.3" font-family="Times,serif" font-size="14.00" fill="#000000">Better Error handling</text>
+<g id="a_node14"><a xlink:href="https://github.com/zcash/ZcashLightClientKit/issues/95" xlink:title="zcash/ZcashLightClientKit#95&#10;Better Error handling" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="257.5,-756.5 20.5,-756.5 20.5,-718.5 257.5,-718.5 257.5,-756.5"/>
+<text text-anchor="middle" x="139" y="-741.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/ZcashLightClientKit#95</text>
+<text text-anchor="middle" x="139" y="-726.3" font-family="Times,serif" font-size="14.00" fill="#000000">Better Error handling</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash&#45;ios&#45;wallet#212 -->
-<g id="node13" class="node">
+<g id="node15" class="node">
 <title>zcash/zcash&#45;ios&#45;wallet#212</title>
-<g id="a_node13"><a xlink:href="https://github.com/zcash/zcash-ios-wallet/issues/212" xlink:title="zcash/zcash&#45;ios&#45;wallet#212&#10;Disconnected States&#10;Handling" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="528,-708 314,-708 314,-655 528,-655 528,-708"/>
-<text text-anchor="middle" x="421" y="-692.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;ios&#45;wallet#212</text>
-<text text-anchor="middle" x="421" y="-677.8" font-family="Times,serif" font-size="14.00" fill="#000000">Disconnected States</text>
-<text text-anchor="middle" x="421" y="-662.8" font-family="Times,serif" font-size="14.00" fill="#000000">Handling</text>
+<g id="a_node15"><a xlink:href="https://github.com/zcash/zcash-ios-wallet/issues/212" xlink:title="zcash/zcash&#45;ios&#45;wallet#212&#10;Disconnected States&#10;Handling" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="528,-693 314,-693 314,-640 528,-640 528,-693"/>
+<text text-anchor="middle" x="421" y="-677.8" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;ios&#45;wallet#212</text>
+<text text-anchor="middle" x="421" y="-662.8" font-family="Times,serif" font-size="14.00" fill="#000000">Disconnected States</text>
+<text text-anchor="middle" x="421" y="-647.8" font-family="Times,serif" font-size="14.00" fill="#000000">Handling</text>
 </a>
 </g>
 </g>
 <!-- zcash/ZcashLightClientKit#95&#45;&gt;zcash/zcash&#45;ios&#45;wallet#212 -->
-<g id="edge4" class="edge">
+<g id="edge6" class="edge">
 <title>zcash/ZcashLightClientKit#95&#45;&gt;zcash/zcash&#45;ios&#45;wallet#212</title>
-<path fill="none" stroke="#000000" d="M239.47,-733.42C252.48,-730.61 265.58,-727.61 278,-724.5 294.19,-720.45 311.27,-715.71 327.79,-710.9"/>
-<polygon fill="#000000" stroke="#000000" points="328.8267,-714.2434 337.43,-708.06 326.8485,-707.5287 328.8267,-714.2434"/>
+<path fill="none" stroke="#000000" d="M239.47,-718.42C252.48,-715.61 265.58,-712.61 278,-709.5 294.19,-705.45 311.27,-700.71 327.79,-695.9"/>
+<polygon fill="#000000" stroke="#000000" points="328.8267,-699.2434 337.43,-693.06 326.8485,-692.5287 328.8267,-699.2434"/>
 </g>
 <!-- zcash/zcash&#45;android&#45;wallet#100 -->
-<g id="node14" class="node">
+<g id="node16" class="node">
 <title>zcash/zcash&#45;android&#45;wallet#100</title>
-<g id="a_node14"><a xlink:href="https://github.com/zcash/zcash-android-wallet/issues/100" xlink:title="zcash/zcash&#45;android&#45;wallet#100&#10;Test of seed restore" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="263,-827.5 15,-827.5 15,-789.5 263,-789.5 263,-827.5"/>
-<text text-anchor="middle" x="139" y="-812.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;android&#45;wallet#100</text>
-<text text-anchor="middle" x="139" y="-797.3" font-family="Times,serif" font-size="14.00" fill="#000000">Test of seed restore</text>
+<g id="a_node16"><a xlink:href="https://github.com/zcash/zcash-android-wallet/issues/100" xlink:title="zcash/zcash&#45;android&#45;wallet#100&#10;Test of seed restore" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="263,-812.5 15,-812.5 15,-774.5 263,-774.5 263,-812.5"/>
+<text text-anchor="middle" x="139" y="-797.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;android&#45;wallet#100</text>
+<text text-anchor="middle" x="139" y="-782.3" font-family="Times,serif" font-size="14.00" fill="#000000">Test of seed restore</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash&#45;android&#45;wallet#49 -->
-<g id="node15" class="node">
+<g id="node17" 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,-899 19.5,-899 19.5,-846 258.5,-846 258.5,-899"/>
-<text text-anchor="middle" x="139" y="-883.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="-868.8" font-family="Times,serif" font-size="14.00" fill="#000000">Android: Send: Press and</text>
-<text text-anchor="middle" x="139" y="-853.8" font-family="Times,serif" font-size="14.00" fill="#000000">Hold UX</text>
+<g id="a_node17"><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,-884 19.5,-884 19.5,-831 258.5,-831 258.5,-884"/>
+<text text-anchor="middle" x="139" y="-868.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="-853.8" font-family="Times,serif" font-size="14.00" fill="#000000">Android: Send: Press and</text>
+<text text-anchor="middle" x="139" y="-838.8" font-family="Times,serif" font-size="14.00" fill="#000000">Hold UX</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash&#45;android&#45;wallet#271 -->
-<g id="node16" class="node">
+<g id="node18" class="node">
 <title>zcash/zcash&#45;android&#45;wallet#271</title>
-<g id="a_node16"><a xlink:href="https://github.com/zcash/zcash-android-wallet/issues/271" xlink:title="zcash/zcash&#45;android&#45;wallet#271&#10;[iOS] App Navigation" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="263,-955.5 15,-955.5 15,-917.5 263,-917.5 263,-955.5"/>
-<text text-anchor="middle" x="139" y="-940.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;android&#45;wallet#271</text>
-<text text-anchor="middle" x="139" y="-925.3" font-family="Times,serif" font-size="14.00" fill="#000000">[iOS] App Navigation</text>
+<g id="a_node18"><a xlink:href="https://github.com/zcash/zcash-android-wallet/issues/271" xlink:title="zcash/zcash&#45;android&#45;wallet#271&#10;[iOS] App Navigation" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="263,-940.5 15,-940.5 15,-902.5 263,-902.5 263,-940.5"/>
+<text text-anchor="middle" x="139" y="-925.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;android&#45;wallet#271</text>
+<text text-anchor="middle" x="139" y="-910.3" font-family="Times,serif" font-size="14.00" fill="#000000">[iOS] App Navigation</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash&#45;ios&#45;wallet#152 -->
-<g id="node17" class="node">
+<g id="node19" class="node">
 <title>zcash/zcash&#45;ios&#45;wallet#152</title>
-<g id="a_node17"><a xlink:href="https://github.com/zcash/zcash-ios-wallet/issues/152" xlink:title="zcash/zcash&#45;ios&#45;wallet#152&#10;Disconnected Wallet shows&#10;generic error instead of&#10;disconnected state" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="246,-715.5 32,-715.5 32,-647.5 246,-647.5 246,-715.5"/>
-<text text-anchor="middle" x="139" y="-700.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;ios&#45;wallet#152</text>
-<text text-anchor="middle" x="139" y="-685.3" font-family="Times,serif" font-size="14.00" fill="#000000">Disconnected Wallet shows</text>
-<text text-anchor="middle" x="139" y="-670.3" font-family="Times,serif" font-size="14.00" fill="#000000">generic error instead of</text>
-<text text-anchor="middle" x="139" y="-655.3" font-family="Times,serif" font-size="14.00" fill="#000000">disconnected state</text>
+<g id="a_node19"><a xlink:href="https://github.com/zcash/zcash-ios-wallet/issues/152" xlink:title="zcash/zcash&#45;ios&#45;wallet#152&#10;Disconnected Wallet shows&#10;generic error instead of&#10;disconnected state" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="246,-700.5 32,-700.5 32,-632.5 246,-632.5 246,-700.5"/>
+<text text-anchor="middle" x="139" y="-685.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;ios&#45;wallet#152</text>
+<text text-anchor="middle" x="139" y="-670.3" font-family="Times,serif" font-size="14.00" fill="#000000">Disconnected Wallet shows</text>
+<text text-anchor="middle" x="139" y="-655.3" font-family="Times,serif" font-size="14.00" fill="#000000">generic error instead of</text>
+<text text-anchor="middle" x="139" y="-640.3" font-family="Times,serif" font-size="14.00" fill="#000000">disconnected state</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash&#45;ios&#45;wallet#152&#45;&gt;zcash/zcash&#45;ios&#45;wallet#212 -->
-<g id="edge5" class="edge">
+<g id="edge7" class="edge">
 <title>zcash/zcash&#45;ios&#45;wallet#152&#45;&gt;zcash/zcash&#45;ios&#45;wallet#212</title>
-<path fill="none" stroke="#000000" d="M246.01,-681.5C264.77,-681.5 284.38,-681.5 303.4,-681.5"/>
-<polygon fill="#000000" stroke="#000000" points="303.59,-685.0001 313.59,-681.5 303.59,-678.0001 303.59,-685.0001"/>
+<path fill="none" stroke="#000000" d="M246.01,-666.5C264.77,-666.5 284.38,-666.5 303.4,-666.5"/>
+<polygon fill="#000000" stroke="#000000" points="303.59,-670.0001 313.59,-666.5 303.59,-663.0001 303.59,-670.0001"/>
 </g>
 <!-- zcash/zcash&#45;ios&#45;wallet#211 -->
-<g id="node18" class="node">
+<g id="node20" class="node">
 <title>zcash/zcash&#45;ios&#45;wallet#211</title>
-<g id="a_node18"><a xlink:href="https://github.com/zcash/zcash-ios-wallet/issues/211" xlink:title="zcash/zcash&#45;ios&#45;wallet#211&#10;connection error dialog" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="246,-629.5 32,-629.5 32,-591.5 246,-591.5 246,-629.5"/>
-<text text-anchor="middle" x="139" y="-614.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;ios&#45;wallet#211</text>
-<text text-anchor="middle" x="139" y="-599.3" font-family="Times,serif" font-size="14.00" fill="#000000">connection error dialog</text>
+<g id="a_node20"><a xlink:href="https://github.com/zcash/zcash-ios-wallet/issues/211" xlink:title="zcash/zcash&#45;ios&#45;wallet#211&#10;connection error dialog" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="246,-614.5 32,-614.5 32,-576.5 246,-576.5 246,-614.5"/>
+<text text-anchor="middle" x="139" y="-599.3" font-family="Times,serif" font-size="14.00" fill="#000000">zcash/zcash&#45;ios&#45;wallet#211</text>
+<text text-anchor="middle" x="139" y="-584.3" font-family="Times,serif" font-size="14.00" fill="#000000">connection error dialog</text>
 </a>
 </g>
 </g>
 <!-- zcash/zcash&#45;ios&#45;wallet#211&#45;&gt;zcash/zcash&#45;ios&#45;wallet#212 -->
-<g id="edge6" class="edge">
+<g id="edge8" class="edge">
 <title>zcash/zcash&#45;ios&#45;wallet#211&#45;&gt;zcash/zcash&#45;ios&#45;wallet#212</title>
-<path fill="none" stroke="#000000" d="M239.47,-629.58C252.48,-632.39 265.58,-635.39 278,-638.5 294.19,-642.55 311.27,-647.29 327.79,-652.1"/>
-<polygon fill="#000000" stroke="#000000" points="326.8485,-655.4713 337.43,-654.94 328.8267,-648.7566 326.8485,-655.4713"/>
+<path fill="none" stroke="#000000" d="M239.47,-614.58C252.48,-617.39 265.58,-620.39 278,-623.5 294.19,-627.55 311.27,-632.29 327.79,-637.1"/>
+<polygon fill="#000000" stroke="#000000" points="326.8485,-640.4713 337.43,-639.94 328.8267,-633.7566 326.8485,-640.4713"/>
 </g>
 </g>
 </svg>
diff --git a/zcash-zf-dag.svg b/zcash-zf-dag.svg
index e22492d6..7b92dfe0 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="1344pt" height="4959pt"
- viewBox="0.00 0.00 1344.00 4958.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 4954.5)">
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-4954.5 1340,-4954.5 1340,4 -4,4"/>
+<svg width="1344pt" height="5073pt"
+ viewBox="0.00 0.00 1344.00 5072.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 5068.5)">
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-5068.5 1340,-5068.5 1340,4 -4,4"/>
 <!-- ZcashFoundation/zebra#1135 -->
 <g id="node1" class="node">
 <title>ZcashFoundation/zebra#1135</title>
@@ -331,10 +331,10 @@
 <g id="node22" class="node">
 <title>ZcashFoundation/zebra#1400</title>
 <g id="a_node22"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1400" xlink:title="ZcashFoundation/zebra#1400&#10;Test that zcashd and&#10;Zebra can sync from Zebra" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1058.5 16,-1058.5 16,-1005.5 248,-1005.5 248,-1058.5"/>
-<text text-anchor="middle" x="132" y="-1043.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1400</text>
-<text text-anchor="middle" x="132" y="-1028.3" font-family="Times,serif" font-size="14.00" fill="#000000">Test that zcashd and</text>
-<text text-anchor="middle" x="132" y="-1013.3" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra can sync from Zebra</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1099.5 16,-1099.5 16,-1046.5 248,-1046.5 248,-1099.5"/>
+<text text-anchor="middle" x="132" y="-1084.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1400</text>
+<text text-anchor="middle" x="132" y="-1069.3" font-family="Times,serif" font-size="14.00" fill="#000000">Test that zcashd and</text>
+<text text-anchor="middle" x="132" y="-1054.3" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra can sync from Zebra</text>
 </a>
 </g>
 </g>
@@ -366,7 +366,7 @@
 <!-- ZcashFoundation/zebra#1287&#45;&gt;ZcashFoundation/zebra#2135 -->
 <g id="edge16" class="edge">
 <title>ZcashFoundation/zebra#1287&#45;&gt;ZcashFoundation/zebra#2135</title>
-<path fill="none" stroke="#000000" d="M206.01,-946.66C226.47,-960.54 247.55,-977.29 264,-996 287.1,-1022.3 270.14,-1047.8 300,-1066 394.92,-1123.9 696.15,-1086.7 800,-1047 843.25,-1030.5 884.23,-997.23 912.71,-970.24"/>
+<path fill="none" stroke="#000000" d="M173.86,-946.63C220.98,-993.26 292.06,-1062.8 300,-1066 403.17,-1107.5 696.15,-1086.7 800,-1047 843.25,-1030.5 884.23,-997.23 912.71,-970.24"/>
 <polygon fill="#000000" stroke="#000000" points="915.2722,-972.6315 920.04,-963.17 910.4126,-967.5931 915.2722,-972.6315"/>
 </g>
 <!-- ZcashFoundation/zebra#2092 -->
@@ -426,11 +426,11 @@
 <g id="node26" class="node">
 <title>ZcashFoundation/zebra#1311</title>
 <g id="a_node26"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1311" xlink:title="ZcashFoundation/zebra#1311&#10;Create function for post&#45;&#10;blossom height&#10;adjustments" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1227 16,-1227 16,-1159 248,-1159 248,-1227"/>
-<text text-anchor="middle" x="132" y="-1211.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1311</text>
-<text text-anchor="middle" x="132" y="-1196.8" font-family="Times,serif" font-size="14.00" fill="#000000">Create function for post&#45;</text>
-<text text-anchor="middle" x="132" y="-1181.8" font-family="Times,serif" font-size="14.00" fill="#000000">blossom height</text>
-<text text-anchor="middle" x="132" y="-1166.8" font-family="Times,serif" font-size="14.00" fill="#000000">adjustments</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-1221 16,-1221 16,-1153 248,-1153 248,-1221"/>
+<text text-anchor="middle" x="132" y="-1205.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1311</text>
+<text text-anchor="middle" x="132" y="-1190.8" font-family="Times,serif" font-size="14.00" fill="#000000">Create function for post&#45;</text>
+<text text-anchor="middle" x="132" y="-1175.8" font-family="Times,serif" font-size="14.00" fill="#000000">blossom height</text>
+<text text-anchor="middle" x="132" y="-1160.8" font-family="Times,serif" font-size="14.00" fill="#000000">adjustments</text>
 </a>
 </g>
 </g>
@@ -438,20 +438,20 @@
 <g id="node27" class="node">
 <title>ZcashFoundation/zebra#1170</title>
 <g id="a_node27"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/1170" xlink:title="ZcashFoundation/zebra#1170&#10;Calculate and validate&#10;founders reward addresses" target="_blank">
-<polygon fill="#fad8c7" stroke="#000000" points="532,-1219.5 300,-1219.5 300,-1215.5 296,-1215.5 296,-1211.5 300,-1211.5 300,-1174.5 296,-1174.5 296,-1170.5 300,-1170.5 300,-1166.5 532,-1166.5 532,-1219.5"/>
-<polyline fill="none" stroke="#000000" points="300,-1215.5 304,-1215.5 304,-1211.5 300,-1211.5 "/>
-<polyline fill="none" stroke="#000000" points="300,-1174.5 304,-1174.5 304,-1170.5 300,-1170.5 "/>
-<text text-anchor="middle" x="416" y="-1204.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1170</text>
-<text text-anchor="middle" x="416" y="-1189.3" font-family="Times,serif" font-size="14.00" fill="#000000">Calculate and validate</text>
-<text text-anchor="middle" x="416" y="-1174.3" font-family="Times,serif" font-size="14.00" fill="#000000">founders reward addresses</text>
+<polygon fill="#fad8c7" stroke="#000000" points="532,-1213.5 300,-1213.5 300,-1209.5 296,-1209.5 296,-1205.5 300,-1205.5 300,-1168.5 296,-1168.5 296,-1164.5 300,-1164.5 300,-1160.5 532,-1160.5 532,-1213.5"/>
+<polyline fill="none" stroke="#000000" points="300,-1209.5 304,-1209.5 304,-1205.5 300,-1205.5 "/>
+<polyline fill="none" stroke="#000000" points="300,-1168.5 304,-1168.5 304,-1164.5 300,-1164.5 "/>
+<text text-anchor="middle" x="416" y="-1198.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1170</text>
+<text text-anchor="middle" x="416" y="-1183.3" font-family="Times,serif" font-size="14.00" fill="#000000">Calculate and validate</text>
+<text text-anchor="middle" x="416" y="-1168.3" font-family="Times,serif" font-size="14.00" fill="#000000">founders reward addresses</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1311&#45;&gt;ZcashFoundation/zebra#1170 -->
 <g id="edge22" class="edge">
 <title>ZcashFoundation/zebra#1311&#45;&gt;ZcashFoundation/zebra#1170</title>
-<path fill="none" stroke="#000000" d="M248.33,-1193C262.02,-1193 276.03,-1193 289.84,-1193"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-1196.5001 299.85,-1193 289.85,-1189.5001 289.85,-1196.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-1187C262.02,-1187 276.03,-1187 289.84,-1187"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-1190.5001 299.85,-1187 289.85,-1183.5001 289.85,-1190.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#936 -->
 <g id="node28" class="node">
@@ -700,8 +700,8 @@
 <!-- ZcashFoundation/zebra#2200&#45;&gt;ZcashFoundation/zebra#2391 -->
 <g id="edge37" class="edge">
 <title>ZcashFoundation/zebra#2200&#45;&gt;ZcashFoundation/zebra#2391</title>
-<path fill="none" stroke="#000000" d="M452.84,-1279C476.46,-1266 507.22,-1247.7 532,-1228 549.97,-1213.7 548.77,-1203.5 568,-1191 570.13,-1189.6 572.3,-1188.3 574.52,-1187"/>
-<polygon fill="#000000" stroke="#000000" points="576.2551,-1190.0399 583.27,-1182.1 572.8348,-1183.9323 576.2551,-1190.0399"/>
+<path fill="none" stroke="#000000" d="M447.78,-1278.8C471.53,-1264 504.5,-1242.7 532,-1222 548.87,-1209.3 549.81,-1201.7 568,-1191 570.51,-1189.5 573.09,-1188.1 575.71,-1186.7"/>
+<polygon fill="#000000" stroke="#000000" points="577.5116,-1189.7085 584.78,-1182 574.2909,-1183.4934 577.5116,-1189.7085"/>
 </g>
 <!-- ZcashFoundation/zebra#950 -->
 <g id="node42" class="node">
@@ -1283,47 +1283,47 @@
 <g id="node81" class="node">
 <title>ZcashFoundation/zebra#2103</title>
 <g id="a_node81"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2103" xlink:title="ZcashFoundation/zebra#2103&#10;Validate&#10;bindingSigOrchard for&#10;Transaction::V5" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-3897 300,-3897 300,-3829 532,-3829 532,-3897"/>
-<text text-anchor="middle" x="416" y="-3881.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2103</text>
-<text text-anchor="middle" x="416" y="-3866.8" font-family="Times,serif" font-size="14.00" fill="#000000">Validate</text>
-<text text-anchor="middle" x="416" y="-3851.8" font-family="Times,serif" font-size="14.00" fill="#000000">bindingSigOrchard for</text>
-<text text-anchor="middle" x="416" y="-3836.8" font-family="Times,serif" font-size="14.00" fill="#000000">Transaction::V5</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-3919 300,-3919 300,-3851 532,-3851 532,-3919"/>
+<text text-anchor="middle" x="416" y="-3903.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2103</text>
+<text text-anchor="middle" x="416" y="-3888.8" font-family="Times,serif" font-size="14.00" fill="#000000">Validate</text>
+<text text-anchor="middle" x="416" y="-3873.8" font-family="Times,serif" font-size="14.00" fill="#000000">bindingSigOrchard for</text>
+<text text-anchor="middle" x="416" y="-3858.8" font-family="Times,serif" font-size="14.00" fill="#000000">Transaction::V5</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2102&#45;&gt;ZcashFoundation/zebra#2103 -->
 <g id="edge54" class="edge">
 <title>ZcashFoundation/zebra#2102&#45;&gt;ZcashFoundation/zebra#2103</title>
-<path fill="none" stroke="#000000" d="M248.33,-3863C262.02,-3863 276.03,-3863 289.84,-3863"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-3866.5001 299.85,-3863 289.85,-3859.5001 289.85,-3866.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-3872C262.02,-3873.1 276.03,-3874.2 289.84,-3875.2"/>
+<polygon fill="#000000" stroke="#000000" points="289.6029,-3878.6921 299.85,-3876 290.1606,-3871.7144 289.6029,-3878.6921"/>
 </g>
 <!-- ZcashFoundation/zebra#2317 -->
 <g id="node82" class="node">
 <title>ZcashFoundation/zebra#2317</title>
 <g id="a_node82"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2317" xlink:title="ZcashFoundation/zebra#2317&#10;Validate Orchard&#10;SpendAuth signatures for&#10;Transaction::V5" target="_blank">
-<polygon fill="#fad8c7" stroke="#000000" points="532,-3811 300,-3811 300,-3743 532,-3743 532,-3811"/>
-<text text-anchor="middle" x="416" y="-3795.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2317</text>
-<text text-anchor="middle" x="416" y="-3780.8" font-family="Times,serif" font-size="14.00" fill="#000000">Validate Orchard</text>
-<text text-anchor="middle" x="416" y="-3765.8" font-family="Times,serif" font-size="14.00" fill="#000000">SpendAuth signatures for</text>
-<text text-anchor="middle" x="416" y="-3750.8" font-family="Times,serif" font-size="14.00" fill="#000000">Transaction::V5</text>
+<polygon fill="#fad8c7" stroke="#000000" points="532,-3833 300,-3833 300,-3765 532,-3765 532,-3833"/>
+<text text-anchor="middle" x="416" y="-3817.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2317</text>
+<text text-anchor="middle" x="416" y="-3802.8" font-family="Times,serif" font-size="14.00" fill="#000000">Validate Orchard</text>
+<text text-anchor="middle" x="416" y="-3787.8" font-family="Times,serif" font-size="14.00" fill="#000000">SpendAuth signatures for</text>
+<text text-anchor="middle" x="416" y="-3772.8" font-family="Times,serif" font-size="14.00" fill="#000000">Transaction::V5</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2102&#45;&gt;ZcashFoundation/zebra#2317 -->
 <g id="edge55" class="edge">
 <title>ZcashFoundation/zebra#2102&#45;&gt;ZcashFoundation/zebra#2317</title>
-<path fill="none" stroke="#000000" d="M244.65,-3828.9C260.83,-3824 277.55,-3818.9 293.9,-3814"/>
-<polygon fill="#000000" stroke="#000000" points="294.923,-3817.3473 303.48,-3811.1 292.8948,-3810.6475 294.923,-3817.3473"/>
+<path fill="none" stroke="#000000" d="M248.33,-3836.8C262.02,-3833.7 276.03,-3830.5 289.84,-3827.4"/>
+<polygon fill="#000000" stroke="#000000" points="290.8344,-3830.7651 299.85,-3825.2 289.3318,-3823.9282 290.8344,-3830.7651"/>
 </g>
 <!-- ZcashFoundation/zebra#2329 -->
 <g id="node83" class="node">
 <title>ZcashFoundation/zebra#2329</title>
 <g id="a_node83"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2329" xlink:title="ZcashFoundation/zebra#2329&#10;State: Validate&#10;transparent coinbase&#10;outputs" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-3983 16,-3983 16,-3915 248,-3915 248,-3983"/>
-<text text-anchor="middle" x="132" y="-3967.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2329</text>
-<text text-anchor="middle" x="132" y="-3952.8" font-family="Times,serif" font-size="14.00" fill="#000000">State: Validate</text>
-<text text-anchor="middle" x="132" y="-3937.8" font-family="Times,serif" font-size="14.00" fill="#000000">transparent coinbase</text>
-<text text-anchor="middle" x="132" y="-3922.8" font-family="Times,serif" font-size="14.00" fill="#000000">outputs</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4026 16,-4026 16,-3958 248,-3958 248,-4026"/>
+<text text-anchor="middle" x="132" y="-4010.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2329</text>
+<text text-anchor="middle" x="132" y="-3995.8" font-family="Times,serif" font-size="14.00" fill="#000000">State: Validate</text>
+<text text-anchor="middle" x="132" y="-3980.8" font-family="Times,serif" font-size="14.00" fill="#000000">transparent coinbase</text>
+<text text-anchor="middle" x="132" y="-3965.8" font-family="Times,serif" font-size="14.00" fill="#000000">outputs</text>
 </a>
 </g>
 </g>
@@ -1331,28 +1331,28 @@
 <g id="node84" class="node">
 <title>ZcashFoundation/zebra#2330</title>
 <g id="a_node84"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2330" xlink:title="ZcashFoundation/zebra#2330&#10;Transaction Verifier:&#10;Validate transparent&#10;coinbase outputs" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="532,-3983 300,-3983 300,-3915 532,-3915 532,-3983"/>
-<text text-anchor="middle" x="416" y="-3967.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2330</text>
-<text text-anchor="middle" x="416" y="-3952.8" font-family="Times,serif" font-size="14.00" fill="#000000">Transaction Verifier:</text>
-<text text-anchor="middle" x="416" y="-3937.8" font-family="Times,serif" font-size="14.00" fill="#000000">Validate transparent</text>
-<text text-anchor="middle" x="416" y="-3922.8" font-family="Times,serif" font-size="14.00" fill="#000000">coinbase outputs</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-4026 300,-4026 300,-3958 532,-3958 532,-4026"/>
+<text text-anchor="middle" x="416" y="-4010.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2330</text>
+<text text-anchor="middle" x="416" y="-3995.8" font-family="Times,serif" font-size="14.00" fill="#000000">Transaction Verifier:</text>
+<text text-anchor="middle" x="416" y="-3980.8" font-family="Times,serif" font-size="14.00" fill="#000000">Validate transparent</text>
+<text text-anchor="middle" x="416" y="-3965.8" font-family="Times,serif" font-size="14.00" fill="#000000">coinbase outputs</text>
 </a>
 </g>
 </g>
 <!-- ZcashFoundation/zebra#2329&#45;&gt;ZcashFoundation/zebra#2330 -->
 <g id="edge56" class="edge">
 <title>ZcashFoundation/zebra#2329&#45;&gt;ZcashFoundation/zebra#2330</title>
-<path fill="none" stroke="#000000" d="M248.33,-3949C262.02,-3949 276.03,-3949 289.84,-3949"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-3952.5001 299.85,-3949 289.85,-3945.5001 289.85,-3952.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-3992C262.02,-3992 276.03,-3992 289.84,-3992"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-3995.5001 299.85,-3992 289.85,-3988.5001 289.85,-3995.5001"/>
 </g>
 <!-- ZcashFoundation/zcash_script#21 -->
 <g id="node85" class="node">
 <title>ZcashFoundation/zcash_script#21</title>
 <g id="a_node85"><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,-4054.5 0,-4054.5 0,-4001.5 264,-4001.5 264,-4054.5"/>
-<text text-anchor="middle" x="132" y="-4039.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zcash_script#21</text>
-<text text-anchor="middle" x="132" y="-4024.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for V5</text>
-<text text-anchor="middle" x="132" y="-4009.3" font-family="Times,serif" font-size="14.00" fill="#000000">transactions</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="264,-4097.5 0,-4097.5 0,-4044.5 264,-4044.5 264,-4097.5"/>
+<text text-anchor="middle" x="132" y="-4082.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zcash_script#21</text>
+<text text-anchor="middle" x="132" y="-4067.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add support for V5</text>
+<text text-anchor="middle" x="132" y="-4052.3" font-family="Times,serif" font-size="14.00" fill="#000000">transactions</text>
 </a>
 </g>
 </g>
@@ -1360,45 +1360,45 @@
 <g id="node86" class="node">
 <title>ZcashFoundation/zebra#2328</title>
 <g id="a_node86"><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,-4054.5 300,-4054.5 300,-4001.5 532,-4001.5 532,-4054.5"/>
-<text text-anchor="middle" x="416" y="-4039.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2328</text>
-<text text-anchor="middle" x="416" y="-4024.3" font-family="Times,serif" font-size="14.00" fill="#000000">Update `zcash_script` to</text>
-<text text-anchor="middle" x="416" y="-4009.3" font-family="Times,serif" font-size="14.00" fill="#000000">support V5 transactions</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-4097.5 300,-4097.5 300,-4044.5 532,-4044.5 532,-4097.5"/>
+<text text-anchor="middle" x="416" y="-4082.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2328</text>
+<text text-anchor="middle" x="416" y="-4067.3" font-family="Times,serif" font-size="14.00" fill="#000000">Update `zcash_script` to</text>
+<text text-anchor="middle" x="416" y="-4052.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="edge57" class="edge">
 <title>ZcashFoundation/zcash_script#21&#45;&gt;ZcashFoundation/zebra#2328</title>
-<path fill="none" stroke="#000000" d="M264.02,-4028C272.47,-4028 280.96,-4028 289.38,-4028"/>
-<polygon fill="#000000" stroke="#000000" points="289.6,-4031.5001 299.6,-4028 289.6,-4024.5001 289.6,-4031.5001"/>
+<path fill="none" stroke="#000000" d="M264.02,-4071C272.47,-4071 280.96,-4071 289.38,-4071"/>
+<polygon fill="#000000" stroke="#000000" points="289.6,-4074.5001 299.6,-4071 289.6,-4067.5001 289.6,-4074.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#1981 -->
 <g id="node87" class="node">
 <title>ZcashFoundation/zebra#1981</title>
 <g id="a_node87"><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,-4062 568,-4062 568,-3994 800,-3994 800,-4062"/>
-<text text-anchor="middle" x="684" y="-4046.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1981</text>
-<text text-anchor="middle" x="684" y="-4031.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Transparent and</text>
-<text text-anchor="middle" x="684" y="-4016.8" font-family="Times,serif" font-size="14.00" fill="#000000">Sapling validation for</text>
-<text text-anchor="middle" x="684" y="-4001.8" font-family="Times,serif" font-size="14.00" fill="#000000">transaction v5</text>
+<polygon fill="#fad8c7" stroke="#000000" points="800,-4105 568,-4105 568,-4037 800,-4037 800,-4105"/>
+<text text-anchor="middle" x="684" y="-4089.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1981</text>
+<text text-anchor="middle" x="684" y="-4074.8" font-family="Times,serif" font-size="14.00" fill="#000000">Implement Transparent and</text>
+<text text-anchor="middle" x="684" y="-4059.8" font-family="Times,serif" font-size="14.00" fill="#000000">Sapling validation for</text>
+<text text-anchor="middle" x="684" y="-4044.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="edge58" class="edge">
 <title>ZcashFoundation/zebra#2328&#45;&gt;ZcashFoundation/zebra#1981</title>
-<path fill="none" stroke="#000000" d="M532.38,-4028C540.71,-4028 549.14,-4028 557.53,-4028"/>
-<polygon fill="#000000" stroke="#000000" points="557.74,-4031.5001 567.74,-4028 557.74,-4024.5001 557.74,-4031.5001"/>
+<path fill="none" stroke="#000000" d="M532.38,-4071C540.71,-4071 549.14,-4071 557.53,-4071"/>
+<polygon fill="#000000" stroke="#000000" points="557.74,-4074.5001 567.74,-4071 557.74,-4067.5001 557.74,-4074.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2338 -->
 <g id="node88" class="node">
 <title>ZcashFoundation/zebra#2338</title>
 <g id="a_node88"><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,-4133.5 16,-4133.5 16,-4080.5 248,-4080.5 248,-4133.5"/>
-<text text-anchor="middle" x="132" y="-4118.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2338</text>
-<text text-anchor="middle" x="132" y="-4103.3" font-family="Times,serif" font-size="14.00" fill="#000000">Create Error enums in</text>
-<text text-anchor="middle" x="132" y="-4088.3" font-family="Times,serif" font-size="14.00" fill="#000000">`zebrad`</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4176.5 16,-4176.5 16,-4123.5 248,-4123.5 248,-4176.5"/>
+<text text-anchor="middle" x="132" y="-4161.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2338</text>
+<text text-anchor="middle" x="132" y="-4146.3" font-family="Times,serif" font-size="14.00" fill="#000000">Create Error enums in</text>
+<text text-anchor="middle" x="132" y="-4131.3" font-family="Times,serif" font-size="14.00" fill="#000000">`zebrad`</text>
 </a>
 </g>
 </g>
@@ -1406,28 +1406,28 @@
 <g id="node89" class="node">
 <title>ZcashFoundation/zebra#2339</title>
 <g id="a_node89"><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,-4141 300,-4141 300,-4073 532,-4073 532,-4141"/>
-<text text-anchor="middle" x="416" y="-4125.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2339</text>
-<text text-anchor="middle" x="416" y="-4110.8" font-family="Times,serif" font-size="14.00" fill="#000000">Downcast and match</text>
-<text text-anchor="middle" x="416" y="-4095.8" font-family="Times,serif" font-size="14.00" fill="#000000">Already Verified error</text>
-<text text-anchor="middle" x="416" y="-4080.8" font-family="Times,serif" font-size="14.00" fill="#000000">enums in the syncer</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-4184 300,-4184 300,-4116 532,-4116 532,-4184"/>
+<text text-anchor="middle" x="416" y="-4168.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2339</text>
+<text text-anchor="middle" x="416" y="-4153.8" font-family="Times,serif" font-size="14.00" fill="#000000">Downcast and match</text>
+<text text-anchor="middle" x="416" y="-4138.8" font-family="Times,serif" font-size="14.00" fill="#000000">Already Verified error</text>
+<text text-anchor="middle" x="416" y="-4123.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="edge59" class="edge">
 <title>ZcashFoundation/zebra#2338&#45;&gt;ZcashFoundation/zebra#2339</title>
-<path fill="none" stroke="#000000" d="M248.33,-4107C262.02,-4107 276.03,-4107 289.84,-4107"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-4110.5001 299.85,-4107 289.85,-4103.5001 289.85,-4110.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-4150C262.02,-4150 276.03,-4150 289.84,-4150"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-4153.5001 299.85,-4150 289.85,-4146.5001 289.85,-4153.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2331 -->
 <g id="node90" class="node">
 <title>ZcashFoundation/zebra#2331</title>
 <g id="a_node90"><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,-4219.5 16,-4219.5 16,-4166.5 248,-4166.5 248,-4219.5"/>
-<text text-anchor="middle" x="132" y="-4204.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2331</text>
-<text text-anchor="middle" x="132" y="-4189.3" font-family="Times,serif" font-size="14.00" fill="#000000">Remove serde from zebra&#45;</text>
-<text text-anchor="middle" x="132" y="-4174.3" font-family="Times,serif" font-size="14.00" fill="#000000">chain</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4262.5 16,-4262.5 16,-4209.5 248,-4209.5 248,-4262.5"/>
+<text text-anchor="middle" x="132" y="-4247.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2331</text>
+<text text-anchor="middle" x="132" y="-4232.3" font-family="Times,serif" font-size="14.00" fill="#000000">Remove serde from zebra&#45;</text>
+<text text-anchor="middle" x="132" y="-4217.3" font-family="Times,serif" font-size="14.00" fill="#000000">chain</text>
 </a>
 </g>
 </g>
@@ -1435,29 +1435,29 @@
 <g id="node91" class="node">
 <title>ZcashFoundation/zebra#2042</title>
 <g id="a_node91"><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,-4227 300,-4227 300,-4159 532,-4159 532,-4227"/>
-<text text-anchor="middle" x="416" y="-4211.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2042</text>
-<text text-anchor="middle" x="416" y="-4196.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="-4181.8" font-family="Times,serif" font-size="14.00" fill="#000000">wrapper types to const</text>
-<text text-anchor="middle" x="416" y="-4166.8" font-family="Times,serif" font-size="14.00" fill="#000000">generics</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-4270 300,-4270 300,-4202 532,-4202 532,-4270"/>
+<text text-anchor="middle" x="416" y="-4254.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2042</text>
+<text text-anchor="middle" x="416" y="-4239.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="-4224.8" font-family="Times,serif" font-size="14.00" fill="#000000">wrapper types to const</text>
+<text text-anchor="middle" x="416" y="-4209.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="edge60" class="edge">
 <title>ZcashFoundation/zebra#2331&#45;&gt;ZcashFoundation/zebra#2042</title>
-<path fill="none" stroke="#000000" d="M248.33,-4193C262.02,-4193 276.03,-4193 289.84,-4193"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-4196.5001 299.85,-4193 289.85,-4189.5001 289.85,-4196.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-4236C262.02,-4236 276.03,-4236 289.84,-4236"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-4239.5001 299.85,-4236 289.85,-4232.5001 289.85,-4239.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2375 -->
 <g id="node92" class="node">
 <title>ZcashFoundation/zebra#2375</title>
 <g id="a_node92"><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,-4306 16,-4306 16,-4238 248,-4238 248,-4306"/>
-<text text-anchor="middle" x="132" y="-4290.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2375</text>
-<text text-anchor="middle" x="132" y="-4275.8" font-family="Times,serif" font-size="14.00" fill="#000000">Automatically use zebrad</text>
-<text text-anchor="middle" x="132" y="-4260.8" font-family="Times,serif" font-size="14.00" fill="#000000">version for the zebra&#45;</text>
-<text text-anchor="middle" x="132" y="-4245.8" font-family="Times,serif" font-size="14.00" fill="#000000">network user agent</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4349 16,-4349 16,-4281 248,-4281 248,-4349"/>
+<text text-anchor="middle" x="132" y="-4333.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2375</text>
+<text text-anchor="middle" x="132" y="-4318.8" font-family="Times,serif" font-size="14.00" fill="#000000">Automatically use zebrad</text>
+<text text-anchor="middle" x="132" y="-4303.8" font-family="Times,serif" font-size="14.00" fill="#000000">version for the zebra&#45;</text>
+<text text-anchor="middle" x="132" y="-4288.8" font-family="Times,serif" font-size="14.00" fill="#000000">network user agent</text>
 </a>
 </g>
 </g>
@@ -1465,18 +1465,18 @@
 <g id="node93" class="node">
 <title>ZcashFoundation/zebra#794</title>
 <g id="a_node93"><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,-4298.5 304.5,-4298.5 304.5,-4245.5 527.5,-4245.5 527.5,-4298.5"/>
-<text text-anchor="middle" x="416" y="-4283.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#794</text>
-<text text-anchor="middle" x="416" y="-4268.3" font-family="Times,serif" font-size="14.00" fill="#000000">Make sure custom user</text>
-<text text-anchor="middle" x="416" y="-4253.3" font-family="Times,serif" font-size="14.00" fill="#000000">agents conform to BIP&#45;14</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="527.5,-4341.5 304.5,-4341.5 304.5,-4288.5 527.5,-4288.5 527.5,-4341.5"/>
+<text text-anchor="middle" x="416" y="-4326.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#794</text>
+<text text-anchor="middle" x="416" y="-4311.3" font-family="Times,serif" font-size="14.00" fill="#000000">Make sure custom user</text>
+<text text-anchor="middle" x="416" y="-4296.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="edge61" class="edge">
 <title>ZcashFoundation/zebra#2375&#45;&gt;ZcashFoundation/zebra#794</title>
-<path fill="none" stroke="#000000" d="M248.33,-4272C263.39,-4272 278.85,-4272 294,-4272"/>
-<polygon fill="#000000" stroke="#000000" points="294.43,-4275.5001 304.43,-4272 294.43,-4268.5001 294.43,-4275.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-4315C263.39,-4315 278.85,-4315 294,-4315"/>
+<polygon fill="#000000" stroke="#000000" points="294.43,-4318.5001 304.43,-4315 294.43,-4311.5001 294.43,-4318.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#2381 -->
 <g id="node94" class="node">
@@ -1517,10 +1517,10 @@
 <g id="node96" class="node">
 <title>ZcashFoundation/zebra#2377</title>
 <g id="a_node96"><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,-4377.5 16,-4377.5 16,-4324.5 248,-4324.5 248,-4377.5"/>
-<text text-anchor="middle" x="132" y="-4362.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2377</text>
-<text text-anchor="middle" x="132" y="-4347.3" font-family="Times,serif" font-size="14.00" fill="#000000">Refactor history tree</text>
-<text text-anchor="middle" x="132" y="-4332.3" font-family="Times,serif" font-size="14.00" fill="#000000">pruning</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4420.5 16,-4420.5 16,-4367.5 248,-4367.5 248,-4420.5"/>
+<text text-anchor="middle" x="132" y="-4405.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2377</text>
+<text text-anchor="middle" x="132" y="-4390.3" font-family="Times,serif" font-size="14.00" fill="#000000">Refactor history tree</text>
+<text text-anchor="middle" x="132" y="-4375.3" font-family="Times,serif" font-size="14.00" fill="#000000">pruning</text>
 </a>
 </g>
 </g>
@@ -1528,10 +1528,10 @@
 <g id="node97" class="node">
 <title>ZcashFoundation/zebra#2378</title>
 <g id="a_node97"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2378" xlink:title="ZcashFoundation/zebra#2378&#10;Improve history tree&#10;forking" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4448.5 16,-4448.5 16,-4395.5 248,-4395.5 248,-4448.5"/>
-<text text-anchor="middle" x="132" y="-4433.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2378</text>
-<text text-anchor="middle" x="132" y="-4418.3" font-family="Times,serif" font-size="14.00" fill="#000000">Improve history tree</text>
-<text text-anchor="middle" x="132" y="-4403.3" font-family="Times,serif" font-size="14.00" fill="#000000">forking</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4491.5 16,-4491.5 16,-4438.5 248,-4438.5 248,-4491.5"/>
+<text text-anchor="middle" x="132" y="-4476.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2378</text>
+<text text-anchor="middle" x="132" y="-4461.3" font-family="Times,serif" font-size="14.00" fill="#000000">Improve history tree</text>
+<text text-anchor="middle" x="132" y="-4446.3" font-family="Times,serif" font-size="14.00" fill="#000000">forking</text>
 </a>
 </g>
 </g>
@@ -1539,12 +1539,12 @@
 <g id="node98" class="node">
 <title>ZcashFoundation/zebra#1951</title>
 <g id="a_node98"><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,-4549.5 16,-4549.5 16,-4466.5 248,-4466.5 248,-4549.5"/>
-<text text-anchor="middle" x="132" y="-4534.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1951</text>
-<text text-anchor="middle" x="132" y="-4519.3" font-family="Times,serif" font-size="14.00" fill="#000000">Generalize/deduplicate</text>
-<text text-anchor="middle" x="132" y="-4504.3" font-family="Times,serif" font-size="14.00" fill="#000000">async batch verification</text>
-<text text-anchor="middle" x="132" y="-4489.3" font-family="Times,serif" font-size="14.00" fill="#000000">services / create a</text>
-<text text-anchor="middle" x="132" y="-4474.3" font-family="Times,serif" font-size="14.00" fill="#000000">derive&#45;able proc macro</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4592.5 16,-4592.5 16,-4509.5 248,-4509.5 248,-4592.5"/>
+<text text-anchor="middle" x="132" y="-4577.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1951</text>
+<text text-anchor="middle" x="132" y="-4562.3" font-family="Times,serif" font-size="14.00" fill="#000000">Generalize/deduplicate</text>
+<text text-anchor="middle" x="132" y="-4547.3" font-family="Times,serif" font-size="14.00" fill="#000000">async batch verification</text>
+<text text-anchor="middle" x="132" y="-4532.3" font-family="Times,serif" font-size="14.00" fill="#000000">services / create a</text>
+<text text-anchor="middle" x="132" y="-4517.3" font-family="Times,serif" font-size="14.00" fill="#000000">derive&#45;able proc macro</text>
 </a>
 </g>
 </g>
@@ -1552,20 +1552,20 @@
 <g id="node99" class="node">
 <title>ZcashFoundation/zebra#2390</title>
 <g id="a_node99"><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,-4549.5 300,-4549.5 300,-4466.5 532,-4466.5 532,-4549.5"/>
-<text text-anchor="middle" x="416" y="-4534.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2390</text>
-<text text-anchor="middle" x="416" y="-4519.3" font-family="Times,serif" font-size="14.00" fill="#000000">Fix tasks spawned by</text>
-<text text-anchor="middle" x="416" y="-4504.3" font-family="Times,serif" font-size="14.00" fill="#000000">`tower_batch::Batch` only</text>
-<text text-anchor="middle" x="416" y="-4489.3" font-family="Times,serif" font-size="14.00" fill="#000000">being alive during one</text>
-<text text-anchor="middle" x="416" y="-4474.3" font-family="Times,serif" font-size="14.00" fill="#000000">test execution</text>
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-4592.5 300,-4592.5 300,-4509.5 532,-4509.5 532,-4592.5"/>
+<text text-anchor="middle" x="416" y="-4577.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2390</text>
+<text text-anchor="middle" x="416" y="-4562.3" font-family="Times,serif" font-size="14.00" fill="#000000">Fix tasks spawned by</text>
+<text text-anchor="middle" x="416" y="-4547.3" font-family="Times,serif" font-size="14.00" fill="#000000">`tower_batch::Batch` only</text>
+<text text-anchor="middle" x="416" y="-4532.3" font-family="Times,serif" font-size="14.00" fill="#000000">being alive during one</text>
+<text text-anchor="middle" x="416" y="-4517.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="edge64" class="edge">
 <title>ZcashFoundation/zebra#1951&#45;&gt;ZcashFoundation/zebra#2390</title>
-<path fill="none" stroke="#000000" d="M248.33,-4508C262.02,-4508 276.03,-4508 289.84,-4508"/>
-<polygon fill="#000000" stroke="#000000" points="289.85,-4511.5001 299.85,-4508 289.85,-4504.5001 289.85,-4511.5001"/>
+<path fill="none" stroke="#000000" d="M248.33,-4551C262.02,-4551 276.03,-4551 289.84,-4551"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-4554.5001 299.85,-4551 289.85,-4547.5001 289.85,-4554.5001"/>
 </g>
 <!-- ZcashFoundation/zebra#338 -->
 <g id="node100" class="node">
@@ -1588,12 +1588,12 @@
 <g id="node101" class="node">
 <title>ZcashFoundation/zebra#2231</title>
 <g id="a_node101"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/2231" xlink:title="ZcashFoundation/zebra#2231&#10;Stop double&#45;spends by&#10;checking nullifiers and&#10;UTXO spends in each non&#45;&#10;finalized chain" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4650.5 16,-4650.5 16,-4567.5 248,-4567.5 248,-4650.5"/>
-<text text-anchor="middle" x="132" y="-4635.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2231</text>
-<text text-anchor="middle" x="132" y="-4620.3" font-family="Times,serif" font-size="14.00" fill="#000000">Stop double&#45;spends by</text>
-<text text-anchor="middle" x="132" y="-4605.3" font-family="Times,serif" font-size="14.00" fill="#000000">checking nullifiers and</text>
-<text text-anchor="middle" x="132" y="-4590.3" font-family="Times,serif" font-size="14.00" fill="#000000">UTXO spends in each non&#45;</text>
-<text text-anchor="middle" x="132" y="-4575.3" font-family="Times,serif" font-size="14.00" fill="#000000">finalized chain</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4693.5 16,-4693.5 16,-4610.5 248,-4610.5 248,-4693.5"/>
+<text text-anchor="middle" x="132" y="-4678.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2231</text>
+<text text-anchor="middle" x="132" y="-4663.3" font-family="Times,serif" font-size="14.00" fill="#000000">Stop double&#45;spends by</text>
+<text text-anchor="middle" x="132" y="-4648.3" font-family="Times,serif" font-size="14.00" fill="#000000">checking nullifiers and</text>
+<text text-anchor="middle" x="132" y="-4633.3" font-family="Times,serif" font-size="14.00" fill="#000000">UTXO spends in each non&#45;</text>
+<text text-anchor="middle" x="132" y="-4618.3" font-family="Times,serif" font-size="14.00" fill="#000000">finalized chain</text>
 </a>
 </g>
 </g>
@@ -1601,12 +1601,12 @@
 <g id="node102" class="node">
 <title>ZcashFoundation/zebra#2441</title>
 <g id="a_node102"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/2441" xlink:title="ZcashFoundation/zebra#2441&#10;Add orchard&#10;binding_verification_key" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4721.5 16,-4721.5 16,-4717.5 12,-4717.5 12,-4713.5 16,-4713.5 16,-4676.5 12,-4676.5 12,-4672.5 16,-4672.5 16,-4668.5 248,-4668.5 248,-4721.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4717.5 20,-4717.5 20,-4713.5 16,-4713.5 "/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4676.5 20,-4676.5 20,-4672.5 16,-4672.5 "/>
-<text text-anchor="middle" x="132" y="-4706.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2441</text>
-<text text-anchor="middle" x="132" y="-4691.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add orchard</text>
-<text text-anchor="middle" x="132" y="-4676.3" font-family="Times,serif" font-size="14.00" fill="#000000">binding_verification_key</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4764.5 16,-4764.5 16,-4760.5 12,-4760.5 12,-4756.5 16,-4756.5 16,-4719.5 12,-4719.5 12,-4715.5 16,-4715.5 16,-4711.5 248,-4711.5 248,-4764.5"/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4760.5 20,-4760.5 20,-4756.5 16,-4756.5 "/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4719.5 20,-4719.5 20,-4715.5 16,-4715.5 "/>
+<text text-anchor="middle" x="132" y="-4749.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2441</text>
+<text text-anchor="middle" x="132" y="-4734.3" font-family="Times,serif" font-size="14.00" fill="#000000">Add orchard</text>
+<text text-anchor="middle" x="132" y="-4719.3" font-family="Times,serif" font-size="14.00" fill="#000000">binding_verification_key</text>
 </a>
 </g>
 </g>
@@ -1614,13 +1614,13 @@
 <g id="node103" class="node">
 <title>ZcashFoundation/zebra#2458</title>
 <g id="a_node103"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/2458" xlink:title="ZcashFoundation/zebra#2458&#10;[WIP] Tracking anchors&#10;and note commitment trees&#10;in zebra&#45;state" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4808 16,-4808 16,-4804 12,-4804 12,-4800 16,-4800 16,-4748 12,-4748 12,-4744 16,-4744 16,-4740 248,-4740 248,-4808"/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4804 20,-4804 20,-4800 16,-4800 "/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4748 20,-4748 20,-4744 16,-4744 "/>
-<text text-anchor="middle" x="132" y="-4792.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2458</text>
-<text text-anchor="middle" x="132" y="-4777.8" font-family="Times,serif" font-size="14.00" fill="#000000">[WIP] Tracking anchors</text>
-<text text-anchor="middle" x="132" y="-4762.8" font-family="Times,serif" font-size="14.00" fill="#000000">and note commitment trees</text>
-<text text-anchor="middle" x="132" y="-4747.8" font-family="Times,serif" font-size="14.00" fill="#000000">in zebra&#45;state</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4851 16,-4851 16,-4847 12,-4847 12,-4843 16,-4843 16,-4791 12,-4791 12,-4787 16,-4787 16,-4783 248,-4783 248,-4851"/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4847 20,-4847 20,-4843 16,-4843 "/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4791 20,-4791 20,-4787 16,-4787 "/>
+<text text-anchor="middle" x="132" y="-4835.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2458</text>
+<text text-anchor="middle" x="132" y="-4820.8" font-family="Times,serif" font-size="14.00" fill="#000000">[WIP] Tracking anchors</text>
+<text text-anchor="middle" x="132" y="-4805.8" font-family="Times,serif" font-size="14.00" fill="#000000">and note commitment trees</text>
+<text text-anchor="middle" x="132" y="-4790.8" font-family="Times,serif" font-size="14.00" fill="#000000">in zebra&#45;state</text>
 </a>
 </g>
 </g>
@@ -1628,10 +1628,10 @@
 <g id="node104" class="node">
 <title>ZcashFoundation/zebra#2425</title>
 <g id="a_node104"><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,-4879.5 16,-4879.5 16,-4826.5 248,-4826.5 248,-4879.5"/>
-<text text-anchor="middle" x="132" y="-4864.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2425</text>
-<text text-anchor="middle" x="132" y="-4849.3" font-family="Times,serif" font-size="14.00" fill="#000000">Design: Validate note</text>
-<text text-anchor="middle" x="132" y="-4834.3" font-family="Times,serif" font-size="14.00" fill="#000000">commitment trees in state</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4922.5 16,-4922.5 16,-4869.5 248,-4869.5 248,-4922.5"/>
+<text text-anchor="middle" x="132" y="-4907.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2425</text>
+<text text-anchor="middle" x="132" y="-4892.3" font-family="Times,serif" font-size="14.00" fill="#000000">Design: Validate note</text>
+<text text-anchor="middle" x="132" y="-4877.3" font-family="Times,serif" font-size="14.00" fill="#000000">commitment trees in state</text>
 </a>
 </g>
 </g>
@@ -1639,14 +1639,46 @@
 <g id="node105" class="node">
 <title>ZcashFoundation/zebra#2486</title>
 <g id="a_node105"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/2486" xlink:title="ZcashFoundation/zebra#2486&#10;Implement the first part&#10;of the value pools RFC" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4950.5 16,-4950.5 16,-4946.5 12,-4946.5 12,-4942.5 16,-4942.5 16,-4905.5 12,-4905.5 12,-4901.5 16,-4901.5 16,-4897.5 248,-4897.5 248,-4950.5"/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4946.5 20,-4946.5 20,-4942.5 16,-4942.5 "/>
-<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4905.5 20,-4905.5 20,-4901.5 16,-4901.5 "/>
-<text text-anchor="middle" x="132" y="-4935.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2486</text>
-<text text-anchor="middle" x="132" y="-4920.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement the first part</text>
-<text text-anchor="middle" x="132" y="-4905.3" font-family="Times,serif" font-size="14.00" fill="#000000">of the value pools RFC</text>
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-4993.5 16,-4993.5 16,-4989.5 12,-4989.5 12,-4985.5 16,-4985.5 16,-4948.5 12,-4948.5 12,-4944.5 16,-4944.5 16,-4940.5 248,-4940.5 248,-4993.5"/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4989.5 20,-4989.5 20,-4985.5 16,-4985.5 "/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-4948.5 20,-4948.5 20,-4944.5 16,-4944.5 "/>
+<text text-anchor="middle" x="132" y="-4978.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2486</text>
+<text text-anchor="middle" x="132" y="-4963.3" font-family="Times,serif" font-size="14.00" fill="#000000">Implement the first part</text>
+<text text-anchor="middle" x="132" y="-4948.3" font-family="Times,serif" font-size="14.00" fill="#000000">of the value pools RFC</text>
 </a>
 </g>
 </g>
+<!-- ZcashFoundation/zebra#2497 -->
+<g id="node106" class="node">
+<title>ZcashFoundation/zebra#2497</title>
+<g id="a_node106"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/2497" xlink:title="ZcashFoundation/zebra#2497&#10;Reject duplicate Sapling&#10;and Orchard nullifiers" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="248,-5064.5 16,-5064.5 16,-5060.5 12,-5060.5 12,-5056.5 16,-5056.5 16,-5019.5 12,-5019.5 12,-5015.5 16,-5015.5 16,-5011.5 248,-5011.5 248,-5064.5"/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-5060.5 20,-5060.5 20,-5056.5 16,-5056.5 "/>
+<polyline fill="none" stroke="#000000" stroke-width="2" points="16,-5019.5 20,-5019.5 20,-5015.5 16,-5015.5 "/>
+<text text-anchor="middle" x="132" y="-5049.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2497</text>
+<text text-anchor="middle" x="132" y="-5034.3" font-family="Times,serif" font-size="14.00" fill="#000000">Reject duplicate Sapling</text>
+<text text-anchor="middle" x="132" y="-5019.3" font-family="Times,serif" font-size="14.00" fill="#000000">and Orchard nullifiers</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#2504 -->
+<g id="node107" class="node">
+<title>ZcashFoundation/zebra#2504</title>
+<g id="a_node107"><a xlink:href="https://github.com/ZcashFoundation/zebra/pull/2504" xlink:title="ZcashFoundation/zebra#2504&#10;Rename the nullifier test&#10;module" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="532,-5064.5 300,-5064.5 300,-5060.5 296,-5060.5 296,-5056.5 300,-5056.5 300,-5019.5 296,-5019.5 296,-5015.5 300,-5015.5 300,-5011.5 532,-5011.5 532,-5064.5"/>
+<polyline fill="none" stroke="#000000" points="300,-5060.5 304,-5060.5 304,-5056.5 300,-5056.5 "/>
+<polyline fill="none" stroke="#000000" points="300,-5019.5 304,-5019.5 304,-5015.5 300,-5015.5 "/>
+<text text-anchor="middle" x="416" y="-5049.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#2504</text>
+<text text-anchor="middle" x="416" y="-5034.3" font-family="Times,serif" font-size="14.00" fill="#000000">Rename the nullifier test</text>
+<text text-anchor="middle" x="416" y="-5019.3" font-family="Times,serif" font-size="14.00" fill="#000000">module</text>
+</a>
+</g>
+</g>
+<!-- ZcashFoundation/zebra#2497&#45;&gt;ZcashFoundation/zebra#2504 -->
+<g id="edge66" class="edge">
+<title>ZcashFoundation/zebra#2497&#45;&gt;ZcashFoundation/zebra#2504</title>
+<path fill="none" stroke="#000000" d="M248.33,-5038C262.02,-5038 276.03,-5038 289.84,-5038"/>
+<polygon fill="#000000" stroke="#000000" points="289.85,-5041.5001 299.85,-5038 289.85,-5034.5001 289.85,-5041.5001"/>
+</g>
 </g>
 </svg>