mirror of https://github.com/zcash/zips.git
More WIP, and rename orchard.pdf to nu5.pdf.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood
parent
dae8852187
commit
6ac5901a42
|
|
@ -18,10 +18,10 @@ NOCRUFT?=|perl -pe 's|[{\<\(]\/[^ ]* ?||g;s|^.* has been referenced but does not
|
|||
|
||||
.PHONY: all all-specs release
|
||||
all: .Makefile.uptodate
|
||||
$(MAKE) orchard canopy heartwood blossom sapling sprout
|
||||
$(MAKE) nu5 canopy heartwood blossom sapling sprout
|
||||
|
||||
all-specs: .Makefile.uptodate
|
||||
$(MAKE) orchard.pdf canopy.pdf heartwood.pdf blossom.pdf sapling.pdf sprout.pdf
|
||||
$(MAKE) nu5.pdf canopy.pdf heartwood.pdf blossom.pdf sapling.pdf sprout.pdf
|
||||
|
||||
release:
|
||||
ifeq ($(shell git tag --points-at HEAD |wc -l),0)
|
||||
|
|
@ -56,8 +56,8 @@ heartwood.pdf: protocol.tex zcash.bib incremental_merkle.png key_components_sapl
|
|||
canopy.pdf: protocol.tex zcash.bib incremental_merkle.png key_components_sapling.png
|
||||
$(MAKE) canopy
|
||||
|
||||
orchard.pdf: protocol.tex zcash.bib incremental_merkle.png key_components_sapling.png
|
||||
$(MAKE) orchard
|
||||
nu5.pdf: protocol.tex zcash.bib incremental_merkle.png key_components_sapling.png
|
||||
$(MAKE) nu5
|
||||
|
||||
.PHONY: auxsprout
|
||||
auxsprout:
|
||||
|
|
@ -120,17 +120,17 @@ canopy:
|
|||
mv -f aux/canopy.pdf .
|
||||
cp -f canopy.pdf protocol.pdf
|
||||
|
||||
.PHONY: auxorchard
|
||||
auxorchard:
|
||||
printf '\\toggletrue{isorchard}\n\\renewcommand{\\docversion}{Version %s [\\OrchardSpec]}' "$$(git describe --tags --abbrev=6)" |tee protocol.ver
|
||||
.PHONY: auxnu5
|
||||
auxnu5:
|
||||
printf '\\toggletrue{isnufive}\n\\renewcommand{\\docversion}{Version %s [\\NUFiveSpec]}' "$$(git describe --tags --abbrev=6)" |tee protocol.ver
|
||||
mkdir -p aux
|
||||
rm -f aux/orchard.*
|
||||
$(LATEXMK) -jobname=orchard -auxdir=aux -outdir=aux $(EXTRAOPT) protocol $(NOCRUFT)
|
||||
rm -f aux/nu5.*
|
||||
$(LATEXMK) -jobname=nu5 -auxdir=aux -outdir=aux $(EXTRAOPT) protocol $(NOCRUFT)
|
||||
|
||||
.PHONY: orchard
|
||||
orchard:
|
||||
$(MAKE) auxorchard
|
||||
mv -f aux/orchard.pdf .
|
||||
.PHONY: nu5
|
||||
nu5:
|
||||
$(MAKE) auxnu5
|
||||
mv -f aux/nu5.pdf .
|
||||
|
||||
.PHONY: nolatexmk-sprout
|
||||
nolatexmk-sprout:
|
||||
|
|
@ -193,18 +193,18 @@ nolatexmk-canopy:
|
|||
sh mymakeindex.sh -o canopy.ind canopy.idx
|
||||
$(LATEX) -jobname=canopy protocol.tex || { touch incremental_merkle.png; exit 1; }
|
||||
|
||||
.PHONY: nolatexmk-orchard
|
||||
nolatexmk-orchard:
|
||||
printf '\\toggletrue{isorchard}\n\\renewcommand{\\docversion}{Version %s [\\OrchardSpec]}' "$$(git describe --tags --abbrev=6)" |tee protocol.ver
|
||||
.PHONY: nolatexmk-nu5
|
||||
nolatexmk-nu5:
|
||||
printf '\\toggletrue{isnufive}\n\\renewcommand{\\docversion}{Version %s [\\NUFiveSpec]}' "$$(git describe --tags --abbrev=6)" |tee protocol.ver
|
||||
# If $(LATEX) fails, touch an input so that 'make' won't think it is up-to-date next time.
|
||||
rm -f orchard.aux orchard.bbl orchard.blg orchard.brf orchard.bcf
|
||||
$(LATEX) -jobname=orchard protocol.tex || { touch incremental_merkle.png; exit 1; }
|
||||
biber orchard
|
||||
$(LATEX) -jobname=orchard protocol.tex || { touch incremental_merkle.png; exit 1; }
|
||||
$(LATEX) -jobname=orchard protocol.tex || { touch incremental_merkle.png; exit 1; }
|
||||
sh mymakeindex.sh -o orchard.ind orchard.idx
|
||||
$(LATEX) -jobname=orchard protocol.tex || { touch incremental_merkle.png; exit 1; }
|
||||
rm -f nu5.aux nu5.bbl nu5.blg nu5.brf nu5.bcf
|
||||
$(LATEX) -jobname=nu5 protocol.tex || { touch incremental_merkle.png; exit 1; }
|
||||
biber nu5
|
||||
$(LATEX) -jobname=nu5 protocol.tex || { touch incremental_merkle.png; exit 1; }
|
||||
$(LATEX) -jobname=nu5 protocol.tex || { touch incremental_merkle.png; exit 1; }
|
||||
sh mymakeindex.sh -o nu5.ind nu5.idx
|
||||
$(LATEX) -jobname=nu5 protocol.tex || { touch incremental_merkle.png; exit 1; }
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f aux/* html/* protocol.ver protocol.pdf orchard.pdf canopy.pdf heartwood.pdf blossom.pdf sapling.pdf sprout.pdf
|
||||
rm -f aux/* html/* protocol.ver protocol.pdf nu5.pdf canopy.pdf heartwood.pdf blossom.pdf sapling.pdf sprout.pdf
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 346 KiB After Width: | Height: | Size: 360 KiB |
|
|
@ -9,15 +9,15 @@
|
|||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="1720"
|
||||
width="1740"
|
||||
height="680"
|
||||
id="svg2"
|
||||
version="1.1"
|
||||
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
|
||||
sodipodi:docname="key_components_orchard.svg"
|
||||
inkscape:export-filename="/home/daira/zips/protocol/key_components_orchard.png"
|
||||
inkscape:export-xdpi="179.99957"
|
||||
inkscape:export-ydpi="179.99957">
|
||||
inkscape:export-xdpi="180"
|
||||
inkscape:export-ydpi="180">
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
|
|
@ -26,20 +26,27 @@
|
|||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.6204593"
|
||||
inkscape:cx="859.26717"
|
||||
inkscape:cx="1236.3236"
|
||||
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="3849"
|
||||
inkscape:window-y="558"
|
||||
inkscape:window-x="4158"
|
||||
inkscape:window-y="280"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:lockguides="false"
|
||||
inkscape:snap-global="false" />
|
||||
<defs
|
||||
id="defs4">
|
||||
<inkscape:perspective
|
||||
sodipodi:type="inkscape:persp3d"
|
||||
inkscape:vp_x="0 : 340 : 1"
|
||||
inkscape:vp_y="0 : 1000 : 0"
|
||||
inkscape:vp_z="1740 : 340 : 1"
|
||||
inkscape:persp3d-origin="870 : 226.66667 : 1"
|
||||
id="perspective2378" />
|
||||
<marker
|
||||
inkscape:stockid="Arrow2Lend"
|
||||
orient="auto"
|
||||
|
|
@ -670,6 +677,32 @@
|
|||
id="path4007-2-4-4-3-6-1"
|
||||
inkscape:connector-curvature="0" />
|
||||
</marker>
|
||||
<marker
|
||||
style="overflow:visible"
|
||||
id="Arrow2Lend-7-3-0-6-4-53"
|
||||
refX="0"
|
||||
refY="0"
|
||||
orient="auto"
|
||||
inkscape:stockid="Arrow2Lend">
|
||||
<path
|
||||
d="M -11.403143,-4.732916 1.416553,-0.01878889 -11.403144,4.6953372 c 2.0480517,-2.7832182 2.0362508,-6.5911436 10e-7,-9.4282532 z"
|
||||
style="fill-rule:evenodd;stroke-width:0.73333335;stroke-linejoin:round"
|
||||
id="path4007-2-4-4-3-6-5"
|
||||
inkscape:connector-curvature="0" />
|
||||
</marker>
|
||||
<marker
|
||||
style="overflow:visible"
|
||||
id="Arrow2Lend-2-3-5-7-6"
|
||||
refX="0"
|
||||
refY="0"
|
||||
orient="auto"
|
||||
inkscape:stockid="Arrow2Lend">
|
||||
<path
|
||||
d="M -11.403143,-4.732916 1.416553,-0.01878889 -11.403144,4.6953372 c 2.0480517,-2.7832182 2.0362508,-6.5911436 10e-7,-9.4282532 z"
|
||||
style="fill-rule:evenodd;stroke-width:0.73333335;stroke-linejoin:round"
|
||||
id="path4007-6-5-6-7-2"
|
||||
inkscape:connector-curvature="0" />
|
||||
</marker>
|
||||
</defs>
|
||||
<metadata
|
||||
id="metadata7">
|
||||
|
|
@ -689,31 +722,26 @@
|
|||
inkscape:label="Layer 1"
|
||||
transform="translate(0,-442.51961)">
|
||||
<g
|
||||
id="g4307"
|
||||
transform="translate(-112.14286,9.2857143)">
|
||||
<g
|
||||
id="g3746-7"
|
||||
transform="translate(604.1158,-5.714285)">
|
||||
<rect
|
||||
ry="24.5238"
|
||||
y="643.80969"
|
||||
x="836.3877"
|
||||
height="53.333305"
|
||||
width="103.07283"
|
||||
id="rect2985-3-3-0-91-99-7-6-8"
|
||||
style="fill:#fdfe99;fill-opacity:1;stroke:#000000;stroke-width:1.06666672;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<text
|
||||
id="text3755-1-5-6-5-4-5"
|
||||
y="679.06274"
|
||||
x="871.18103"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
xml:space="preserve"><tspan
|
||||
y="679.06274"
|
||||
x="871.18103"
|
||||
id="tspan3757-3-7-0-4-6-9"
|
||||
sodipodi:role="line"
|
||||
style="stroke-width:1.06666672">ivk</tspan></text>
|
||||
</g>
|
||||
id="g1931">
|
||||
<rect
|
||||
style="fill:#fdfe99;fill-opacity:1;stroke:#000000;stroke-width:1.06666672;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="rect2985-3-3-0-91-99-7-6-8"
|
||||
width="89.496468"
|
||||
height="53.333313"
|
||||
x="1407.3505"
|
||||
y="648.0954"
|
||||
ry="24.5238" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="1435.9728"
|
||||
y="683.34845"
|
||||
id="text3755-1-5-6-5-4-5"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3757-3-7-0-4-6-9"
|
||||
x="1435.9728"
|
||||
y="683.34845">ivk</tspan></text>
|
||||
</g>
|
||||
<g
|
||||
id="g4365"
|
||||
|
|
@ -1073,52 +1101,51 @@
|
|||
sodipodi:role="line"
|
||||
id="tspan4954">Shielded payment address</tspan></text>
|
||||
<g
|
||||
id="g4396"
|
||||
transform="translate(-67.857143,11.428572)">
|
||||
id="g2329">
|
||||
<rect
|
||||
style="fill:#74da9a;fill-opacity:1;stroke:#000000;stroke-width:1.06666672;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="rect2985-5"
|
||||
width="202.57152"
|
||||
height="52.619019"
|
||||
x="744.03662"
|
||||
y="550.32275"
|
||||
x="676.1795"
|
||||
y="561.75134"
|
||||
ry="26.309505" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="770.78357"
|
||||
y="583.03699"
|
||||
x="702.92645"
|
||||
y="594.46558"
|
||||
id="text3755-9"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3757-1"
|
||||
x="770.78357"
|
||||
y="583.03699">d</tspan></text>
|
||||
x="702.92645"
|
||||
y="594.46558">d</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="884.70239"
|
||||
y="582.65271"
|
||||
x="816.84528"
|
||||
y="594.0813"
|
||||
id="text3755-1-0"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3757-3-2"
|
||||
x="884.70239"
|
||||
y="582.65271">pk</tspan></text>
|
||||
x="816.84528"
|
||||
y="594.0813">pk</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:14.9333334px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="916.70239"
|
||||
y="586.46228"
|
||||
x="848.84528"
|
||||
y="597.89087"
|
||||
id="text3759-1-2"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3761-4-0"
|
||||
x="916.70239"
|
||||
y="586.46228">d</tspan></text>
|
||||
x="848.84528"
|
||||
y="597.89087">d</tspan></text>
|
||||
<path
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-2-3)"
|
||||
d="m 793.1148,575.61687 c 22.7903,-0.003 80.51581,0.22414 80.51581,0.22414"
|
||||
d="m 725.25766,587.04544 c 22.7903,-0.003 80.51581,0.22414 80.51581,0.22414"
|
||||
id="path3980-1-1"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
|
@ -1495,41 +1522,42 @@
|
|||
<text
|
||||
id="text3850-4-1"
|
||||
y="579.58453"
|
||||
x="1574.2539"
|
||||
x="1635.3477"
|
||||
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';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;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';text-align:center;text-anchor:middle;stroke-width:1.06666672"
|
||||
y="579.58453"
|
||||
x="1574.2539"
|
||||
x="1635.3477"
|
||||
sodipodi:role="line"
|
||||
id="tspan1344-8">Transmission</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';text-align:center;text-anchor:middle;stroke-width:1.06666672"
|
||||
y="604.98767"
|
||||
x="1574.2539"
|
||||
x="1635.3477"
|
||||
sodipodi:role="line"
|
||||
id="tspan1342-5">key</tspan></text>
|
||||
<text
|
||||
id="text3850-3-5-0"
|
||||
y="593.10675"
|
||||
x="1157.1399"
|
||||
y="591.25543"
|
||||
x="1189.8466"
|
||||
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';stroke-width:1.06666672"
|
||||
y="593.10675"
|
||||
x="1157.1399"
|
||||
y="591.25543"
|
||||
x="1189.8466"
|
||||
id="tspan3852-9-7-6"
|
||||
sodipodi:role="line">Diversifier</tspan></text>
|
||||
<g
|
||||
transform="translate(1048.2903,370.59984)"
|
||||
id="g3955-7-5">
|
||||
transform="matrix(1.0585133,0,0,1,1077.5429,370.59984)"
|
||||
id="g3955-7-5"
|
||||
style="stroke-width:0.97196776">
|
||||
<path
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.03676569px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 249.14286,177.75775 c -0.25764,-14.71955 21.92205,-12.18965 44.95238,-12.95237 32.7619,0.76191 37.97651,-2.12253 41.90476,-6.09526 3.3153,-3.35282 2.28571,-5.33331 2.28571,-5.33331"
|
||||
id="path3917-7-8"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="ccsc" />
|
||||
<path
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.03676569px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 427.88398,177.71154 c 0.25764,-14.71955 -21.92205,-12.18965 -44.95239,-12.95237 -32.76189,0.76191 -37.97651,-2.12253 -41.90475,-6.09526 -3.3153,-3.35282 -2.28571,-5.33331 -2.28571,-5.33331"
|
||||
id="path3917-2-1-6"
|
||||
inkscape:connector-curvature="0"
|
||||
|
|
@ -1538,61 +1566,60 @@
|
|||
<text
|
||||
id="text3850-7-7-2"
|
||||
y="516.17737"
|
||||
x="1244.6627"
|
||||
x="1293.4143"
|
||||
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';stroke-width:1.06666672"
|
||||
y="516.17737"
|
||||
x="1244.6627"
|
||||
x="1293.4143"
|
||||
sodipodi:role="line"
|
||||
id="tspan4954-8">Shielded payment address</tspan></text>
|
||||
<g
|
||||
id="g4406"
|
||||
transform="translate(-112.14286,9.2857143)">
|
||||
id="g1941">
|
||||
<rect
|
||||
style="fill:#74da9a;fill-opacity:1;stroke:#000000;stroke-width:1.06666672;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="rect2985-5-8"
|
||||
width="202.57152"
|
||||
width="227.25592"
|
||||
height="52.619019"
|
||||
x="1398.6028"
|
||||
y="551.16852"
|
||||
x="1322.8693"
|
||||
y="560.45422"
|
||||
ry="26.309505" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="1425.3497"
|
||||
y="583.88275"
|
||||
x="1343.4452"
|
||||
y="593.16846"
|
||||
id="text3755-9-0"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3757-1-2"
|
||||
x="1425.3497"
|
||||
y="583.88275">d</tspan></text>
|
||||
x="1343.4452"
|
||||
y="593.16846">d</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="1539.2686"
|
||||
y="583.49847"
|
||||
x="1488.2195"
|
||||
y="592.78418"
|
||||
id="text3755-1-0-1"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3757-3-2-0"
|
||||
x="1539.2686"
|
||||
y="583.49847">pk</tspan></text>
|
||||
x="1488.2195"
|
||||
y="592.78418">pk</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:14.9333334px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="1571.2686"
|
||||
y="587.30804"
|
||||
x="1520.2195"
|
||||
y="596.59375"
|
||||
id="text3759-1-2-5"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3761-4-0-1"
|
||||
x="1571.2686"
|
||||
y="587.30804">d</tspan></text>
|
||||
x="1520.2195"
|
||||
y="596.59375">d</tspan></text>
|
||||
<path
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-2-3-54)"
|
||||
d="m 1447.6809,576.46258 c 22.7903,-0.003 80.5158,0.22414 80.5158,0.22414"
|
||||
d="m 1367.6277,585.74829 c 22.7903,-0.003 109.5199,0.22414 109.5199,0.22414"
|
||||
id="path3980-1-1-2"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
|
|
@ -1601,7 +1628,7 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3980-1-1-6-9"
|
||||
d="m 1379.4011,659.91608 c 0,-22.7903 0.2241,-66.08651 0.2241,-66.08651"
|
||||
d="m 1452.22,659.91608 c 0,-22.7903 0.2241,-66.08651 0.2241,-66.08651"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-2-3-5-7)" />
|
||||
<g
|
||||
id="g4330"
|
||||
|
|
@ -1642,25 +1669,25 @@
|
|||
</g>
|
||||
<text
|
||||
id="text3850-3-0-97-4-0"
|
||||
y="666.91577"
|
||||
x="1245.3494"
|
||||
y="731.09509"
|
||||
x="1286.6956"
|
||||
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';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;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';text-align:center;text-anchor:middle;stroke-width:1.06666672"
|
||||
y="666.91577"
|
||||
x="1245.3494"
|
||||
y="731.09509"
|
||||
x="1286.6956"
|
||||
id="tspan3852-9-93-4-6-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';text-align:center;text-anchor:middle;stroke-width:1.06666672"
|
||||
y="692.31891"
|
||||
x="1245.3494"
|
||||
y="756.49823"
|
||||
x="1286.6956"
|
||||
sodipodi:role="line"
|
||||
id="tspan5016-6-9">viewing key</tspan></text>
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3980-2-2-8-4-6"
|
||||
d="M 1429.7008,789.88616 1380.5384,687.90853"
|
||||
d="m 1453.7681,789.26905 -0.4108,-101.36052"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-7-3-0-6-4)" />
|
||||
<text
|
||||
id="text3850-7-7-4-7"
|
||||
|
|
@ -1675,54 +1702,51 @@
|
|||
id="tspan3852-97-4-6-5"
|
||||
sodipodi:role="line">Orchard</tspan></text>
|
||||
<g
|
||||
id="g4313"
|
||||
transform="translate(-112.14286,9.2857143)">
|
||||
<g
|
||||
id="g4795-5"
|
||||
transform="translate(597.49499,-95.19057)">
|
||||
<rect
|
||||
ry="24.5238"
|
||||
y="733.35297"
|
||||
x="982.09619"
|
||||
height="53.333305"
|
||||
width="103.07283"
|
||||
id="rect2985-3-3-0-91-99"
|
||||
style="fill:#dbb385;fill-opacity:1;stroke:#000000;stroke-width:1.06666672;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<text
|
||||
id="text3755-6-0-5-0-3-1"
|
||||
y="768.79889"
|
||||
x="1013.1075"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
xml:space="preserve"><tspan
|
||||
y="768.79889"
|
||||
x="1013.1075"
|
||||
id="tspan3757-7-4-2-7-6-4"
|
||||
sodipodi:role="line"
|
||||
style="stroke-width:1.06666672">ovk</tspan></text>
|
||||
</g>
|
||||
</g>
|
||||
<g
|
||||
id="g4430"
|
||||
transform="translate(-112.14286,9.2857143)">
|
||||
id="g1926">
|
||||
<rect
|
||||
style="fill:#e58ddf;fill-opacity:1;stroke:#000000;stroke-width:1.06666672;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="rect2985-9-36-9-2"
|
||||
width="80.000008"
|
||||
height="51.809525"
|
||||
x="1438.403"
|
||||
y="917.15436"
|
||||
ry="24.761904" />
|
||||
ry="24.5238"
|
||||
y="648.0954"
|
||||
x="1507.5894"
|
||||
height="53.333313"
|
||||
width="88.87941"
|
||||
id="rect2985-3-3-0-91-99-7-6-8-8"
|
||||
style="fill:#dbb385;fill-opacity:1;stroke:#000000;stroke-width:1.06666672;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="1454.4135"
|
||||
y="952.30164"
|
||||
id="text3755-6-0-7"><tspan
|
||||
x="1529.9323"
|
||||
y="682.98596"
|
||||
id="text3755-6-0-5-0-3-1"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3757-7-4-1"
|
||||
x="1454.4135"
|
||||
y="952.30164">ask</tspan></text>
|
||||
id="tspan3757-7-4-2-7-6-4"
|
||||
x="1529.9323"
|
||||
y="682.98596">ovk</tspan></text>
|
||||
</g>
|
||||
<g
|
||||
id="g2293">
|
||||
<g
|
||||
id="g1916">
|
||||
<rect
|
||||
ry="24.761904"
|
||||
y="926.44006"
|
||||
x="1324.4088"
|
||||
height="51.809509"
|
||||
width="81.851326"
|
||||
id="rect2985-9-36-9-2"
|
||||
style="fill:#e58ddf;fill-opacity:1;stroke:#000000;stroke-width:1.06666672;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<text
|
||||
id="text3755-6-0-7"
|
||||
y="961.58734"
|
||||
x="1343.5049"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
xml:space="preserve"><tspan
|
||||
y="961.58734"
|
||||
x="1343.5049"
|
||||
id="tspan3757-7-4-1"
|
||||
sodipodi:role="line"
|
||||
style="stroke-width:1.06666672">ask</tspan></text>
|
||||
</g>
|
||||
</g>
|
||||
<g
|
||||
id="g4435"
|
||||
|
|
@ -1766,65 +1790,20 @@
|
|||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-7-6)" />
|
||||
<text
|
||||
id="text3850-3-0-97-4-2"
|
||||
y="666.7793"
|
||||
x="1653.1328"
|
||||
y="667.39636"
|
||||
x="1668.5605"
|
||||
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';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;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';text-align:center;text-anchor:middle;stroke-width:1.06666672"
|
||||
y="666.7793"
|
||||
x="1653.1328"
|
||||
y="667.39636"
|
||||
x="1668.5605"
|
||||
id="tspan3852-9-93-4-6-7"
|
||||
sodipodi:role="line">Outgoing</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';text-align:center;text-anchor:middle;stroke-width:1.06666672"
|
||||
y="692.18243"
|
||||
x="1653.1328"
|
||||
y="692.7995"
|
||||
x="1668.5605"
|
||||
sodipodi:role="line"
|
||||
id="tspan5016-6-3">viewing key</tspan></text>
|
||||
<g
|
||||
id="g4322"
|
||||
transform="translate(-110.71429,61.428571)">
|
||||
<rect
|
||||
style="fill:#fdb341;fill-opacity:1;stroke:#000000;stroke-width:1.06666672;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="rect2985-3-3-0-89"
|
||||
width="257.28308"
|
||||
height="52.619019"
|
||||
x="1435.4259"
|
||||
y="728.49835"
|
||||
ry="24.5238" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="1463.0876"
|
||||
y="763.90143"
|
||||
id="text3755-6-0-5-3"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3757-7-4-2-1"
|
||||
x="1463.0876"
|
||||
y="763.90143">ak</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="1549.0366"
|
||||
y="764.0827"
|
||||
id="text3755-6-0-5-0-4"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3757-7-4-2-7-8"
|
||||
x="1549.0366"
|
||||
y="764.0827">nk</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="1622.481"
|
||||
y="764.0827"
|
||||
id="text3755-6-0-5-0-1-1"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3757-7-4-2-7-1-3"
|
||||
x="1622.481"
|
||||
y="764.0827">rivk</tspan></text>
|
||||
</g>
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
|
|
@ -1875,24 +1854,6 @@
|
|||
x="224.32634"
|
||||
id="tspan3852-97-4-6-5-8-6"
|
||||
sodipodi:role="line">Sprout</tspan></text>
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3980-2-2-5-0"
|
||||
d="M 1367.0969,937.07504 1367.7,829.1539"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-7-3-5-5)" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3980-2-6-4"
|
||||
d="m 1453.9091,1029.432 0.3322,-200.46474"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-7-36-8)" />
|
||||
<path
|
||||
sodipodi:nodetypes="ccc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3980-2-2-2"
|
||||
d="m 1474.0864,1030.7016 59.6171,-60.98617 -0.2344,-140.46698"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-7-0-8)" />
|
||||
<g
|
||||
id="g5102"
|
||||
transform="translate(-137.56998,-85.018466)">
|
||||
|
|
@ -1937,7 +1898,7 @@
|
|||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3980-2-2-8-4-6-1"
|
||||
d="m 1469.6969,790.05094 49.1624,-101.97763"
|
||||
d="m 1501.1695,790.05094 49.1624,-101.97763"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-7-3-0-6-4-5)" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
|
|
@ -1945,5 +1906,118 @@
|
|||
id="path3980-2-2-8-4"
|
||||
d="M 769.5289,737.47431 769.248,688.78989"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-7-3-0-6)" />
|
||||
<text
|
||||
id="text3850-3-0-97-4-0-3"
|
||||
y="681.05157"
|
||||
x="1220.2979"
|
||||
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';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;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';text-align:center;text-anchor:middle;stroke-width:1.06666672"
|
||||
y="681.05157"
|
||||
x="1220.2979"
|
||||
sodipodi:role="line"
|
||||
id="tspan5016-6-9-0">Diversifier key</tspan></text>
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3980-1-1-6-9-9"
|
||||
d="m 1351.264,659.24127 c 0,-22.7903 0.2241,-60.53253 0.2241,-60.53253"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-2-3-5-7-6)" />
|
||||
<g
|
||||
id="g1921">
|
||||
<rect
|
||||
ry="24.5238"
|
||||
y="648.0954"
|
||||
x="1308.2632"
|
||||
height="53.333313"
|
||||
width="87.645195"
|
||||
id="rect2985-3-3-0-91-99-7-6-8-3"
|
||||
style="fill:#b2fff4;fill-opacity:1;stroke:#000000;stroke-width:1.06666672;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="1334.1586"
|
||||
y="682.98596"
|
||||
id="text3755-6-0-5-0-3-1-3"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3757-7-4-2-7-6-4-4"
|
||||
x="1334.1586"
|
||||
y="682.98596">dk</tspan></text>
|
||||
</g>
|
||||
<path
|
||||
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 2;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-7)"
|
||||
d="m 1345.2976,728.80408 77.1386,-38.87787"
|
||||
id="path1894"
|
||||
inkscape:connector-curvature="0"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<g
|
||||
id="g2407">
|
||||
<rect
|
||||
style="fill:#fdb341;fill-opacity:1;stroke:#000000;stroke-width:1.06666672;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
||||
id="rect2985-3-3-0-89"
|
||||
width="257.28308"
|
||||
height="52.619019"
|
||||
x="1324.7117"
|
||||
y="789.92694"
|
||||
ry="24.5238" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="1351.1392"
|
||||
y="825.33002"
|
||||
id="text3755-6-0-5-3"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3757-7-4-2-1"
|
||||
x="1351.1392"
|
||||
y="825.33002">ak</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="1438.3224"
|
||||
y="825.51129"
|
||||
id="text3755-6-0-5-0-4"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3757-7-4-2-7-8"
|
||||
x="1438.3224"
|
||||
y="825.51129">nk</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-weight:normal;font-size:25.60000038px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
|
||||
x="1511.7667"
|
||||
y="825.51129"
|
||||
id="text3755-6-0-5-0-1-1"><tspan
|
||||
style="stroke-width:1.06666672"
|
||||
sodipodi:role="line"
|
||||
id="tspan3757-7-4-2-7-1-3"
|
||||
x="1511.7667"
|
||||
y="825.51129">rivk</tspan></text>
|
||||
</g>
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3980-2-2-5-0"
|
||||
d="M 1367.0969,937.07504 1367.7,829.1539"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-7-3-5-5)" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3980-2-6-4"
|
||||
d="m 1453.9091,1029.432 0.3322,-200.46474"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-7-36-8)" />
|
||||
<path
|
||||
sodipodi:nodetypes="ccc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3980-2-2-2"
|
||||
d="m 1474.0864,1030.7016 59.6171,-60.98617 -0.2344,-140.46698"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-7-0-8)" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path3980-2-2-8-4-6-6"
|
||||
d="M 1402.1809,789.21135 1353.0185,687.23372"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend-7-3-0-6-4-53)" />
|
||||
</g>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 93 KiB After Width: | Height: | Size: 96 KiB |
File diff suppressed because it is too large
Load Diff
|
|
@ -1283,9 +1283,18 @@ Last revised February~5, 2018.}
|
|||
presort={ZIP-0224},
|
||||
author={Daira Hopwood and Jack Grigg and Sean Bowe and Kris Nuttycombe and Ying Tong Lai},
|
||||
title={Orchard Shielded Protocol},
|
||||
howpublished={Zcash Improvement Proposal 224. Reserved.},
|
||||
url={https://zips.z.cash/zip-0224},
|
||||
urldate={2021-01-10}
|
||||
howpublished={Zcash Improvement Proposal 224. Created February~27, 2021.},
|
||||
url={https://zips.z.cash/zip-0225},
|
||||
urldate={2021-03-21}
|
||||
}
|
||||
|
||||
@misc{ZIP-225,
|
||||
presort={ZIP-0225},
|
||||
author={Daira Hopwood and Jack Grigg and Sean Bowe and Kris Nuttycombe and Ying Tong Lai},
|
||||
title={Version 5 Transaction Format},
|
||||
howpublished={Zcash Improvement Proposal 225. Created February~28, 2021.},
|
||||
url={https://zips.z.cash/zip-0225},
|
||||
urldate={2021-03-21}
|
||||
}
|
||||
|
||||
@misc{ZIP-243,
|
||||
|
|
@ -1299,9 +1308,9 @@ Last revised February~5, 2018.}
|
|||
|
||||
@misc{ZIP-244,
|
||||
presort={ZIP-0244},
|
||||
author={Kris Nuttycombe},
|
||||
title={Transaction Signature Validation for Transparent {Z}cash Extensions},
|
||||
howpublished={Zcash Improvement Proposal 244. Reserved.},
|
||||
author={Kris Nuttycombe and Daira Hopwood},
|
||||
title={Transaction Identifier Non-Malleability},
|
||||
howpublished={Zcash Improvement Proposal 244. Created January~6, 2021.},
|
||||
url={https://zips.z.cash/zip-0244},
|
||||
urldate={2021-01-10}
|
||||
}
|
||||
|
|
@ -1309,8 +1318,8 @@ Last revised February~5, 2018.}
|
|||
@misc{ZIP-245,
|
||||
presort={ZIP-0245},
|
||||
author={Daira Hopwood and Kris Nuttycombe},
|
||||
title={Transaction Non-Malleability},
|
||||
howpublished={Zcash Improvement Proposal 245. Reserved.},
|
||||
title={Transaction Identifier Digests & Signature Validation for {T}ransparent {Z}cash {E}xtensions},
|
||||
howpublished={Zcash Improvement Proposal 245. Created January~13, 2021.},
|
||||
url={https://zips.z.cash/zip-0245},
|
||||
urldate={2021-01-10}
|
||||
}
|
||||
|
|
@ -1346,7 +1355,7 @@ Last revised February~5, 2018.}
|
|||
presort={ZIP-0302},
|
||||
author={Jay Graber and Jack Grigg},
|
||||
title={Standardized Memo Field Format},
|
||||
howpublished={Zcash Improvement Proposal 302 (in progress).},
|
||||
howpublished={Zcash Improvement Proposal 302. Reserved.},
|
||||
url={https://github.com/zcash/zips/pull/105},
|
||||
urldate={2020-02-13}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue