Browse Source

Merge branch 'zips115.update-testnet-fr-addresses.1'

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
master
Daira Hopwood 7 years ago
parent
commit
1cb178753b
  1. 52
      protocol/protocol.tex
  2. 7
      protocol/zcash.bib

52
protocol/protocol.tex

@ -3552,33 +3552,37 @@ For the test network, $\FounderAddressList_{\mathrm{1}..\NumFounderAddresses}$ i
\begin{tabular}{@{\hskip 2.5em}l@{\;}l}
[& \ascii{t2UNzUUx8mWBCRYPRezvA363EYXyEpHokyi}, \ascii{t2N9PH9Wk9xjqYg9iin1Ua3aekJqfAtE543}, \\
& \ascii{t2NGQjYMQhFndDHguvUw4wZdNdsssA6K7x2}, \ascii{t27ktmq1kbeCWiQ5TZ7w5npSzcdbBmTB7v6}, \\
& \ascii{t2GcBttAKD2WTHka8HyGc2dfvVTKYZUfHmJ}, \ascii{t2Q3vxWaD9LrdqUE8Xd9Ddjpr9pUQ2aGotK}, \\
& \ascii{t2TTfWDsYu998fHWzVP9Gns4fgxXXRi1Wzu}, \ascii{t2KS6R4MMWdSBMjLCiw2iMyhWGRQPmyRqDn}, \\
& \ascii{t2Q2ELrgotWv3Eec6LEtMMiiQ8dtW38u8Tj}, \ascii{t2AEgJA88vTWAKqxJDFUEJWyHUtQAZi5G1D}, \\
& \ascii{t2HCSdmpq1TQKksuwPQevwAzPTgfJ2rkMbG}, \ascii{t2HQCPFAUQaUdJWHPhg5pPBxit7inaJzubE}, \\
& \ascii{t2Fzqvq8Y9e6Mn3JNPb982aYsLmq4b5HmhH}, \ascii{t2HEz7YZQqDUgC5h4y2WSD3mWneqJNVRjjJ}, \\
& \ascii{t2GCR1SCk687Eeo5NEZ23MLsms7JjVWBgfG}, \ascii{t2KyiPR9Lztq2w1w747X6W4nkUMAGL8M9KN}, \\
& \ascii{t2UxymadyxSyVihmbq7S1yxw5dCBqJ1S4jT}, \ascii{t2AVeMy7fdmTcJhckqiKRG8B7F1vccEhSqU}, \\
& \ascii{t26m7LwihQzD2sH7ZVhYpPJM5j7kzwbfKW9}, \ascii{t2DgwUNTe7NxuyPU6fxsB5xJXap3E4yWXrN}, \\
& \ascii{t2U6funcXA11fC9SZehyvUL3rk3Vhuh7fzS}, \ascii{t284JhyS8LGM72Tx1porSqwrcq3CejthP1p}, \\
& \ascii{t29egu8QcpzKeLoPLqWS6QVMnUUPQdF6eNm}, \ascii{t29LqD9p9D3B26euBwFi6mfcWu8HPA38VNs}, \\
& \ascii{t28GsAMCxAyLy85XaasddDzaYFTtfewr86y}, \ascii{t2GV44QyaikQPLUfm6oTfZnw71LLjnR7gDG}, \\
& \ascii{t2U2QzNLQ1jtAu4L6xxVnRXLBsQpQvGRR2g}, \ascii{t2QKGr5PNan7nrwDgseyHMN9NFeeuUjCh8b}, \\
& \ascii{t2AfS8u6HwBeJpKpbuxztvRjupKQDXqnrwa}, \ascii{t2CTRQUViQd3CWMhnKhFnUHqDLUyTxmWhJs}, \\
& \ascii{t2CbM9EqszNURqh1UXZBXYhwp1R4GwEhWRE}, \ascii{t2LM7uYiAsKDU42GNSnMwDxbZ8s1DowQzYH}, \\
& \ascii{t2AgvT35LHR378AE3ouz6xKMhkTLHLJC6nD}, \ascii{t285EAQXUVyi4NMddJv2QqTrnv45GRMbP8e}, \\
& \ascii{t2EpMRCD5b8f2DCQ37npNULcpZhkjC8muqA}, \ascii{t2BCmWXrRPiCeQTpizSWKKRPM5X6PS7umDY}, \\
& \ascii{t2DN7X6wDFn5hYKBiBmn3Z98st419yaTVTH}, \ascii{t2QJj8HeCwQ6mHwqekxxDLZntYpZTHNU62t}, \\
& \ascii{t2QdHBR1Yciqn4j8gpS8DcQZZtYetKvfNj3}, \ascii{t2E5cpLA1ey5VNxFNcuopeQMq2rH2NHiPdu}, \\
& \ascii{t2EVRGtzjFAyz8CF8ndvLuiJu7qZUfDa93H}, \ascii{t2KoQDk3BSFadBkuaWdLwchFuQamzw9RE4L}, \\
& \ascii{t2FnR3yhTmuiejEJeu6qpidWTghRd1HpjLt}, \ascii{t2BAuBAAospDc9d1u5nNGEi6x4NRJBD2PQ2}, \\
& \ascii{t2RtKrLCGcyPkm4a4APg1YY9Wu2m4R2PgrB}, \ascii{t28aUbSteZzBq2pFgj1K1XNZRZP5mMMyakV}, \\
& \ascii{t2Urdy1ERfkvsFuy6Z4BkhvYGzWdmivfAFR}, \ascii{t2ADinR4JrvCMd4Q1XGALPajzFrirqvhED6}\, ]
& \ascii{t2NGQjYMQhFndDHguvUw4wZdNdsssA6K7x2}, \ascii{t2ENg7hHVqqs9JwU5cgjvSbxnT2a9USNfhy}, \\
& \ascii{t2BkYdVCHzvTJJUTx4yZB8qeegD8QsPx8bo}, \ascii{t2J8q1xH1EuigJ52MfExyyjYtN3VgvshKDf}, \\
& \ascii{t2Crq9mydTm37kZokC68HzT6yez3t2FBnFj}, \ascii{t2EaMPUiQ1kthqcP5UEkF42CAFKJqXCkXC9}, \\
& \ascii{t2F9dtQc63JDDyrhnfpzvVYTJcr57MkqA12}, \ascii{t2LPirmnfYSZc481GgZBa6xUGcoovfytBnC}, \\
& \ascii{t26xfxoSw2UV9Pe5o3C8V4YybQD4SESfxtp}, \ascii{t2D3k4fNdErd66YxtvXEdft9xuLoKD7CcVo}, \\
& \ascii{t2DWYBkxKNivdmsMiivNJzutaQGqmoRjRnL}, \ascii{t2C3kFF9iQRxfc4B9zgbWo4dQLLqzqjpuGQ}, \\
& \ascii{t2MnT5tzu9HSKcppRyUNwoTp8MUueuSGNaB}, \ascii{t2AREsWdoW1F8EQYsScsjkgqobmgrkKeUkK}, \\
& \ascii{t2Vf4wKcJ3ZFtLj4jezUUKkwYR92BLHn5UT}, \ascii{t2K3fdViH6R5tRuXLphKyoYXyZhyWGghDNY}, \\
& \ascii{t2VEn3KiKyHSGyzd3nDw6ESWtaCQHwuv9WC}, \ascii{t2F8XouqdNMq6zzEvxQXHV1TjwZRHwRg8gC}, \\
& \ascii{t2BS7Mrbaef3fA4xrmkvDisFVXVrRBnZ6Qj}, \ascii{t2FuSwoLCdBVPwdZuYoHrEzxAb9qy4qjbnL}, \\
& \ascii{t2SX3U8NtrT6gz5Db1AtQCSGjrpptr8JC6h}, \ascii{t2V51gZNSoJ5kRL74bf9YTtbZuv8Fcqx2FH}, \\
& \ascii{t2FyTsLjjdm4jeVwir4xzj7FAkUidbr1b4R}, \ascii{t2EYbGLekmpqHyn8UBF6kqpahrYm7D6N1Le}, \\
& \ascii{t2NQTrStZHtJECNFT3dUBLYA9AErxPCmkka}, \ascii{t2GSWZZJzoesYxfPTWXkFn5UaxjiYxGBU2a}, \\
& \ascii{t2RpffkzyLRevGM3w9aWdqMX6bd8uuAK3vn}, \ascii{t2JzjoQqnuXtTGSN7k7yk5keURBGvYofh1d}, \\
& \ascii{t2AEefc72ieTnsXKmgK2bZNckiwvZe3oPNL}, \ascii{t2NNs3ZGZFsNj2wvmVd8BSwSfvETgiLrD8J}, \\
& \ascii{t2ECCQPVcxUCSSQopdNquguEPE14HsVfcUn}, \ascii{t2JabDUkG8TaqVKYfqDJ3rqkVdHKp6hwXvG}, \\
& \ascii{t2FGzW5Zdc8Cy98ZKmRygsVGi6oKcmYir9n}, \ascii{t2DUD8a21FtEFn42oVLp5NGbogY13uyjy9t}, \\
& \ascii{t2UjVSd3zheHPgAkuX8WQW2CiC9xHQ8EvWp}, \ascii{t2TBUAhELyHUn8i6SXYsXz5Lmy7kDzA1uT5}, \\
& \ascii{t2Tz3uCyhP6eizUWDc3bGH7XUC9GQsEyQNc}, \ascii{t2NysJSZtLwMLWEJ6MH3BsxRh6h27mNcsSy}, \\
& \ascii{t2KXJVVyyrjVxxSeazbY9ksGyft4qsXUNm9}, \ascii{t2J9YYtH31cveiLZzjaE4AcuwVho6qjTNzp}, \\
& \ascii{t2QgvW4sP9zaGpPMH1GRzy7cpydmuRfB4AZ}, \ascii{t2NDTJP9MosKpyFPHJmfjc5pGCvAU58XGa4}, \\
& \ascii{t29pHDBWq7qN4EjwSEHg8wEqYe9pkmVrtRP}, \ascii{t2Ez9KM8VJLuArcxuEkNRAkhNvidKkzXcjJ}, \\
& \ascii{t2D5y7J5fpXajLbGrMBQkFg2mFN8fo3n8cX}, \ascii{t2UV2wr1PTaUiybpkV3FdSdGxUJeZdZztyt}\, ]
\end{tabular}
\renewcommand{\arraystretch}{1}
\pnote{For the test network only, the addresses from index 4 onward have been changed from
what was implemented at launch. This reflects a hard fork on the test network, starting
from \blockHeight 53127. \cite{ZcashIssue-2113}}
Each address representation in $\FounderAddressList$ denotes a \transparent
P2SH multisig address.
@ -4136,6 +4140,8 @@ The errors in the proof of Ledger Indistinguishability mentioned in
\item Clarify what a \noteCommitment opens to in \crossref{crprf}.
\item Correct the order of arguments to $\Commit{}$ in \crossref{concretecomm}.
\item Correct a statement about indistinguishability of \joinSplitDescriptions.
\item Change the \foundersReward addresses, for the test network only, to
reflect the hard fork described in \cite{ZcashIssue-2113}.
\end{itemize}
\introlist

7
protocol/zcash.bib

@ -438,6 +438,13 @@ Received \mbox{April 13,} 2011.}
urldate={2017-01-06}
}
@misc{ZcashIssue-2113,
author={Simon Liu},
title={GitHub repository `\hairspace zcash/zcash'\hairspace: Issue 2113},
url={https://github.com/zcash/zcash/issues/2113},
urldate={2017-02-20}
}
@book{IEEE2000,
author={IEEE Computer Society},
publisher={IEEE},

Loading…
Cancel
Save