diff --git a/protocol/protocol.tex b/protocol/protocol.tex index ccf5fa92..4e670e53 100644 --- a/protocol/protocol.tex +++ b/protocol/protocol.tex @@ -211,6 +211,7 @@ \newcommand{\coinbaseTransaction}{\term{coinbase transaction}} \newcommand{\coinbaseTransactions}{\term{coinbase transactions}} \newcommand{\transparent}{\term{transparent}} +\newcommand{\xTransparent}{\term{Transparent}} \newcommand{\transparentValuePool}{\term{transparent value pool}} \newcommand{\xprotected}{\term{protected}} \newcommand{\protectedNote}{\term{protected note}} @@ -969,7 +970,7 @@ views of valid \blocks, and therefore of the sequence of \treestates in those \nsubsection{\JoinSplitTransfers{} and Descriptions} \label{joinsplit} A \joinSplitDescription is data included in a \transaction that describes a \joinSplitTransfer, -i.e.\ a confidential value transfer. This kind of value transfer is the primary +i.e.\ a \xprotected value transfer. This kind of value transfer is the primary \Zcash-specific operation performed by \transactions; it uses, but should not be confused with, the \joinSplitStatement used for the \zkSNARK proof and verification. @@ -2586,11 +2587,11 @@ Bytes & \heading{Name} & \heading{Data Type} & \heading{Description} \\ \Varies & $\txInCount$ & \compactSize & Number of \transparent inputs in this transaction. \\ \hline -\Varies & $\txIn$ & $\txIn$ & Transparent inputs, encoded as in \Bitcoin. \\ \hline +\Varies & $\txIn$ & $\txIn$ & \xTransparent inputs, encoded as in \Bitcoin. \\ \hline \Varies & $\txOutCount$ & \compactSize & Number of \transparent outputs in this transaction. \\ \hline -\Varies & $\txOut$ & $\txOut$ & Transparent outputs, encoded as in \Bitcoin. \\ \hline +\Varies & $\txOut$ & $\txOut$ & \xTransparent outputs, encoded as in \Bitcoin. \\ \hline 4 & $\lockTime$ & \type{uint32\_t} & A Unix epoch time or block number, encoded as in \Bitcoin. \\ \hline @@ -2634,7 +2635,7 @@ Software that creates \transactions{} \SHOULD use version 1 for \transactions wi \pnote{ A \transactionVersionNumber of 2 does not have the same meaning as in \Bitcoin, where it is associated with support for \ScriptOP{CHECKSEQUENCEVERIFY} as specified in \cite{BIP-68}. -\Zcash was forked from \Bitcoin v0.11.2 and does not support BIP 68, or the related BIPs +\Zcash was forked from \Bitcoin v0.11.2 and does not currently support BIP 68, or the related BIPs 9, 112 and 113. }