diff --git a/protocol/protocol.tex b/protocol/protocol.tex index 30b7e057..05b08eab 100644 --- a/protocol/protocol.tex +++ b/protocol/protocol.tex @@ -894,7 +894,7 @@ is one for which the \noteCommitment has been publically revealed on the \introlist A \transaction can contain \transparent inputs, outputs, and scripts, which all -work as in \Bitcoin \cite{Bitcoin-Protocol}. It also contains a sequence of zero or +work as in \Bitcoin \cite{Bitc-Protocol}. It also contains a sequence of zero or more \joinSplitDescriptions. Each of these describes a \joinSplitTransfer\hairspace\footnote{ \joinSplitTransfers in \Zcash generalize ``Mint'' and ``Pour'' \transactions in \Zerocash; see \crossref{trstructure} for differences.} @@ -939,7 +939,7 @@ revealing which one. This implies that a spent \note cannot be linked to the view the set of possibilities for a given \note input to a \transaction ---its \noteTraceabilitySet--- includes \emph{all} previous notes that the adversary does not control or know to have been spent. This contrasts with -other proposals for private payment systems, such as CoinJoin \cite{Bitcoin-CoinJoin} +other proposals for private payment systems, such as CoinJoin \cite{Bitc-CoinJoin} or \CryptoNote \cite{vanS2014}, that are based on mixing of a limited number of transactions and that therefore have smaller \noteTraceabilitySets. @@ -2680,7 +2680,7 @@ and \spendingKeys. Addresses and keys can be encoded as a byte sequence; this is called the \term{raw encoding}. This byte sequence can then be further encoded using Base58Check. The Base58Check layer is the same as for upstream \Bitcoin -addresses \cite{Bitcoin-Base58}. +addresses \cite{Bitc-Base58}. $\SHAName$ outputs are always represented as sequences of 32 bytes. @@ -2689,7 +2689,7 @@ The language consisting of the following encoding possibilities is prefix-free. \nsubsubsection{\Transparent{} Payment Addresses} \label{transparentaddrencoding} \xTransparent payment addresses are either P2SH (Pay to Script Hash) \cite{BIP-13} -or P2PKH (Pay to Public Key Hash) \cite{Bitcoin-P2PKH} addresses. +or P2PKH (Pay to Public Key Hash) \cite{Bitc-P2PKH} addresses. \introlist The raw encoding of a P2SH address consists of: @@ -2708,7 +2708,7 @@ The raw encoding of a P2SH address consists of: on the production network. (Addresses on the test network use $[\PtoSHAddressTestnetLeadByte, \PtoSHAddressTestnetSecondByte]$ instead.) - \item 160 bits specifying a script hash \cite{Bitcoin-P2SH}. + \item 160 bits specifying a script hash \cite{Bitc-P2SH}. \end{itemize} \introlist @@ -2747,7 +2747,7 @@ The raw encoding of a P2PKH address consists of: \nsubsubsection{\Transparent{} Private Keys} \label{transparentkeyencoding} -These are encoded in the same way as in \Bitcoin \cite{Bitcoin-Base58}, +These are encoded in the same way as in \Bitcoin \cite{Bitc-Base58}, for both the production and test networks. \nsubsubsection{\Shielded{} Payment Addresses} \label{paymentaddrencoding} @@ -3300,12 +3300,12 @@ rejected by this rule at a given point in time may later be accepted. filter, rather than only the single intended encoding. \item As in \Bitcoin, the $\nTimeField$ field \MUST represent a time \emph{strictly greater than} the median of the timestamps of the past $\PoWMedianBlockSpan$ \blocks. The - Bitcoin Developer Reference \cite{Bitcoin-Block} was previously in error on this point, + Bitcoin Developer Reference \cite{Bitc-Block} was previously in error on this point, but has now been corrected. \end{pnotes} \introlist -The changes relative to \Bitcoin version 4 blocks as described in \cite{Bitcoin-Block} are: +The changes relative to \Bitcoin version 4 blocks as described in \cite{Bitc-Block} are: \begin{itemize} \item \Blockversions less than 4 are not supported. @@ -3545,7 +3545,7 @@ the given \blockHeight. \nsubsubsection{nBits conversion} \label{nbits} Deterministic conversions between a \targetThreshold and a ``compact" nBits value are not -fully defined in the Bitcoin documentation \cite{Bitcoin-nBits}, and so we define them here: +fully defined in the Bitcoin documentation \cite{Bitc-nBits}, and so we define them here: \begin{formulae}[leftmargin=1.5em,label=] \item $\size(x) := \ceiling{\hfrac{\bitlength(x)}{8}}$ @@ -3685,7 +3685,7 @@ Define: \end{formulae} Let $\RedeemScriptHash(\BlockHeight)$ be the standard redeem script hash, as defined in -\cite{Bitcoin-Multisig}, for the P2SH multisig address with Base58Check representation +\cite{Bitc-Multisig}, for the P2SH multisig address with Base58Check representation given by $\FounderAddressList_{\,\FounderAddressIndex(\BlockHeight)}$. \consensusrule{ diff --git a/protocol/zcash.bib b/protocol/zcash.bib index e30cafac..783041ee 100644 --- a/protocol/zcash.bib +++ b/protocol/zcash.bib @@ -245,61 +245,61 @@ Received \mbox{April 13,} 2011.} urldate={2016-08-17}, } -@misc{Bitcoin-Base58, +@misc{Bitc-Base58, title={Base58{C}heck encoding --- {B}itcoin {W}iki}, url={https://en.bitcoin.it/wiki/Base58Check_encoding}, urldate={2016-01-26} } -@misc{Bitcoin-secp256k1, +@misc{Bitc-secp256k1, title={Secp256k1 --- {B}itcoin {W}iki}, url={https://en.bitcoin.it/wiki/Secp256k1}, urldate={2016-03-14} } -@misc{Bitcoin-CoinJoin, +@misc{Bitc-CoinJoin, title={Coin{J}oin --- {B}itcoin {W}iki}, url={https://en.bitcoin.it/wiki/CoinJoin}, urldate={2016-08-17} } -@misc{Bitcoin-Format, +@misc{Bitc-Format, title={Raw {T}ransaction {F}ormat --- {B}itcoin {D}eveloper {R}eference}, url={https://bitcoin.org/en/developer-reference#raw-transaction-format}, urldate={2016-03-15} } -@misc{Bitcoin-Block, +@misc{Bitc-Block, title={Block {H}eaders --- {B}itcoin {D}eveloper {R}eference}, url={https://bitcoin.org/en/developer-reference#block-headers}, urldate={2017-04-25} } -@misc{Bitcoin-nBits, +@misc{Bitc-nBits, title={Target n{B}its --- {B}itcoin {D}eveloper {R}eference}, url={https://bitcoin.org/en/developer-reference#target-nbits}, urldate={2016-08-13} } -@misc{Bitcoin-Multisig, +@misc{Bitc-Multisig, title={P2SH multisig (definition) --- {B}itcoin {D}eveloper {R}eference}, url={https://bitcoin.org/en/developer-guide#term-p2sh-multisig}, urldate={2016-08-19} } -@misc{Bitcoin-P2SH, +@misc{Bitc-P2SH, title={P2SH (definition) --- {B}itcoin {D}eveloper {R}eference}, url={https://bitcoin.org/en/developer-guide#term-p2sh}, urldate={2016-08-24} } -@misc{Bitcoin-P2PKH, +@misc{Bitc-P2PKH, title={P2PKH (definition) -- {B}itcoin {D}eveloper {R}eference}, url={https://bitcoin.org/en/developer-guide#term-p2pkh}, urldate={2016-08-24} } -@misc{Bitcoin-Protocol, +@misc{Bitc-Protocol, title={Protocol documentation --- {B}itcoin {W}iki}, url={https://en.bitcoin.it/wiki/Protocol_documentation}, urldate={2016-10-02} @@ -347,8 +347,8 @@ Received \mbox{April 13,} 2011.} @misc{BIP-31, author={Mike Hearn}, - title={Pong message}, - howpublished={Bitcoin Improvement Proposal 31. Created April 11, 2012}, + title={Pong\, message}, + howpublished={Bitcoin\, Improvement\, Proposal\, 31.\; Created\, April\, 11,\, 2012}, url={https://github.com/bitcoin/bips/blob/master/bip-0031.mediawiki}, urldate={2016-10-02} }