zec
/
zips
mirror of https://github.com/zcash/zips.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update the Sprout key component diagram in \crossref{addressesandkeys} to remove magenta highlighting.Remove magenta highlighting 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2021-03-30 14:34:34 +01:00
parent e1f105eaa1
commit 6c8f9fb478
5 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
protocol/key_components_orchard.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 362 KiB

After

Width:  |  Height:  |  Size: 356 KiB

42
protocol/key_components_orchard.svg
View File

@ -26,20 +26,34 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.6204593"
inkscape:cx="1236.3236"
inkscape:cx="846.3359"
inkscape:cy="340.87761"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="3490"
inkscape:window-height="1797"
inkscape:window-x="4158"
inkscape:window-y="280"
inkscape:window-maximized="0"
inkscape:window-width="3840"
inkscape:window-height="2113"
inkscape:window-x="3840"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:lockguides="false"
inkscape:snap-global="false" />
<defs
id="defs4">
<marker
inkscape:stockid="Arrow2Lend"
orient="auto"
refY="0.0"
refX="0.0"
id="marker1420"
style="overflow:visible;"
inkscape:isstock="true">
<path
id="path1178"
style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(1.1) rotate(180) translate(1,0)" />
</marker>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 340 : 1"
@ -712,7 +726,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@ -830,14 +844,14 @@
id="text3850-8"
y="674.0401"
x="1.1770992"
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.20000076px;line-height:125%;font-family:Serif;-inkscape-font-specification:'Serif Italic';letter-spacing:0px;word-spacing:0px;fill:#f10090;fill-opacity:1;stroke:none;stroke-width:1.06666672"
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.20000076px;line-height:125%;font-family:Serif;-inkscape-font-specification:'Serif Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672;"
xml:space="preserve"><tspan
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.46666718px;font-family:Quattrocento;-inkscape-font-specification:'Quattrocento Italic';fill:#f10090;fill-opacity:1;stroke-width:1.06666672"
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.46666718px;font-family:Quattrocento;-inkscape-font-specification:'Quattrocento Italic';fill:#000000;fill-opacity:1;stroke-width:1.06666672;"
y="674.0401"
x="1.1770992"
id="tspan3852-3"
sodipodi:role="line"> Incoming</tspan><tspan
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.46666718px;font-family:Quattrocento;-inkscape-font-specification:'Quattrocento Italic';fill:#f10090;fill-opacity:1;stroke-width:1.06666672"
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.46666718px;font-family:Quattrocento;-inkscape-font-specification:'Quattrocento Italic';fill:#000000;fill-opacity:1;stroke-width:1.06666672;"
y="699.44324"
x="1.1770992"
sodipodi:role="line"
@ -1002,27 +1016,27 @@
y="676.25372">sk</tspan></text>
</g>
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#f10090;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lendh)"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0015748;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker1420);stroke-miterlimit:4;stroke-dasharray:none"
d="m 267.67938,943.07484 c 13.34726,-19.916 17.58393,-28.45003 24.03935,-46.47757 3.31248,-9.25049 6.23409,-19.55143 7.6985,-38.78777 1.38353,-18.174 0.29483,-34.40533 0.55584,-57.15903 l 0.55822,-102.74298"
id="path4668"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csscc" />
<g
id="g4689"
style="fill:none;fill-opacity:1;stroke:#f10090;stroke-opacity:1"
style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
transform="translate(-0.461026,-285.72528)">
<path
sodipodi:nodetypes="czzzc"
inkscape:connector-curvature="0"
id="path4670"
d="m 156.2806,930.52347 c -3.22019,0.27418 -4.8062,0.90755 -6.85506,3.96663 -2.04886,3.05908 -2.06364,10.34355 -2.01133,15.3383 0.0523,4.99475 -0.10857,8.93699 -2.51642,11.96863 -2.40782,3.03165 -4.09355,3.97036 -8.40092,3.77013"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#f10090;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="czzzc"
inkscape:connector-curvature="0"
id="path4670-6"
d="m 156.2806,1000.6108 c -3.22019,-0.2741 -4.8062,-0.9075 -6.85506,-3.96658 -2.04886,-3.05908 -2.06364,-10.34355 -2.01133,-15.3383 0.0523,-4.99475 -0.10857,-8.93699 -2.51642,-11.96863 -2.40782,-3.03165 -4.09355,-3.97036 -8.40092,-3.77013"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#f10090;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<path
sodipodi:nodetypes="cc"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 98 KiB

BIN
protocol/key_components_sapling.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 229 KiB

After

Width:  |  Height:  |  Size: 223 KiB

22
protocol/key_components_sapling.svg
View File

@ -26,15 +26,15 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4"
inkscape:cx="578.63382"
inkscape:cy="453.59131"
inkscape:cx="681.16675"
inkscape:cy="396.44845"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="3150"
inkscape:window-height="1491"
inkscape:window-x="453"
inkscape:window-y="118"
inkscape:window-x="682"
inkscape:window-y="232"
inkscape:window-maximized="0"
inkscape:lockguides="false"
inkscape:snap-global="false" />
@ -531,14 +531,14 @@
id="text3850-8"
y="668.83093"
x="23.203564"
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.20000076px;line-height:125%;font-family:Serif;-inkscape-font-specification:'Serif Italic';letter-spacing:0px;word-spacing:0px;fill:#f10090;fill-opacity:1;stroke:none;stroke-width:1.06666672"
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.20000076px;line-height:125%;font-family:Serif;-inkscape-font-specification:'Serif Italic';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672;"
xml:space="preserve"><tspan
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.46666718px;font-family:Quattrocento;-inkscape-font-specification:'Quattrocento Italic';fill:#f10090;fill-opacity:1;stroke-width:1.06666672"
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.46666718px;font-family:Quattrocento;-inkscape-font-specification:'Quattrocento Italic';fill:#000000;fill-opacity:1;stroke-width:1.06666672;"
y="668.83093"
x="23.203564"
id="tspan3852-3"
sodipodi:role="line"> Incoming</tspan><tspan
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.46666718px;font-family:Quattrocento;-inkscape-font-specification:'Quattrocento Italic';fill:#f10090;fill-opacity:1;stroke-width:1.06666672"
style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.46666718px;font-family:Quattrocento;-inkscape-font-specification:'Quattrocento Italic';fill:#000000;fill-opacity:1;stroke-width:1.06666672;"
y="694.23407"
x="23.203564"
sodipodi:role="line"
@ -690,27 +690,27 @@
sodipodi:role="line"
style="stroke-width:1.06666672">sk</tspan></text>
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#f10090;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lendh)"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker6075)"
d="m 289.70585,937.86564 c 13.34726,-19.916 17.58393,-28.45003 24.03935,-46.47757 3.31248,-9.25049 6.23409,-19.55143 7.6985,-38.78777 1.38353,-18.174 0.29483,-34.40533 0.55584,-57.15903 l 0.55822,-102.74298"
id="path4668"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csscc" />
<g
id="g4689"
style="fill:none;fill-opacity:1;stroke:#f10090;stroke-opacity:1"
style="fill:none;fill-opacity:1;stroke:#050003;stroke-opacity:1"
transform="translate(21.565438,-290.93448)">
<path
sodipodi:nodetypes="czzzc"
inkscape:connector-curvature="0"
id="path4670"
d="m 156.2806,930.52347 c -3.22019,0.27418 -4.8062,0.90755 -6.85506,3.96663 -2.04886,3.05908 -2.06364,10.34355 -2.01133,15.3383 0.0523,4.99475 -0.10857,8.93699 -2.51642,11.96863 -2.40782,3.03165 -4.09355,3.97036 -8.40092,3.77013"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#f10090;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#050003;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="czzzc"
inkscape:connector-curvature="0"
id="path4670-6"
d="m 156.2806,1000.6108 c -3.22019,-0.2741 -4.8062,-0.9075 -6.85506,-3.96658 -2.04886,-3.05908 -2.06364,-10.34355 -2.01133,-15.3383 0.0523,-4.99475 -0.10857,-8.93699 -2.51642,-11.96863 -2.40782,-3.03165 -4.09355,-3.97036 -8.40092,-3.77013"
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#f10090;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#050003;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<path
sodipodi:nodetypes="cc"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

2
protocol/protocol.tex
View File

@ -14120,6 +14120,8 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}.
} %nufive
\item Write the caution about linkage between the abstract and concrete protocols in
\crossref{cautionlinkage}.
\item Update the \Sprout key component diagram in \crossref{addressesandkeys} to remove
magenta highlighting.
\end{itemize}