Merge branch 'master' into patch-8

.gitignore

@@ -3,6 +3,7 @@ Paper.aux
 Paper.bbl
 Paper.blg
 Paper.log
+Paper.out
 Paper.pdf
 Version.tex
 

.travis.yml

@@ -2,6 +2,7 @@ sudo: required
 before_install:
 - sudo apt-get -qq update
 - sudo apt-get install texlive texlive-latex3
+- sudo apt install texlive-latex-extra
 script:
 - ./build.sh
 deploy:

BRANCHES.md

@@ -0,0 +1,12 @@
+## Protocol Versions
+
+Each protocol version is specified in `Paper.tex` found in a branch of this repository.
+
+| Branch            | Version                                                                           | Applicable Block Numbers        |
+|-------------------|-----------------------------------------------------------------------------------|---------------------------------|
+| master            | [Byzantium](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-609.md)         | Since 4,370,000 and onwards     |
+| spurious-dragon   | [Spurious Dragon](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-607.md)   | Since 2,675,000 until 4,369,999 |
+| tangerine-whistle | [Tangerine Whistle](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-608.md) | Since 2,463,000 until 2,674,999 |
+| dao-fork          | [DAO Fork](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-779.md)          | Since 1,920,000 until 2,462,000 |
+| homestead         | [Homestead](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-606.md)         | Since 1,150,000 until 1,919,999         |
+| frontier         | [Frontier](https://github.com/ethereum/yellowpaper/)         | Since 1 until 1,149,999         |

Biblio.bib

@@ -1,35 +1,83 @@
+@misc{Keccak,
+	url = "https://keccak.team/keccak.html",
+	note = "Accessed 6 October 2017. Unable to be archived by the Wayback Machine.",
+	author = "Guido Bertoni
+and Joan Daemen
+and Michaël Peeters
+and Gilles Van Assche
+and Ronny Van Keer",
+	title = {{KECCAK}},
+	year = "2017",
+}
+
+@Book{Davey2002_zbMATH01748069,
+    Author = "B.A. {Davey} and H.A. {Priestley}",
+    Title = "Introduction to lattices and order. 2nd ed.",
+    Edition = "2nd ed.",
+    ISBN = "0-521-78451-4/pbk",
+    Pages = "xii + 298",
+    Year = "2002",
+    Publisher = "Cambridge: Cambridge University Press",
+    Language = "English",
+    MSC2010 = "06-01",
+    Zbl = "1002.06001",
+}
+
+@Misc{EIP-100,
+	url = "https://github.com/ethereum/EIPs/blob/master/EIPS/eip-100.md",
+	author = "Vitalik Buterin",
+	title = "{EIP}-100: Change difficulty adjustment to target mean block time including uncles",
+	year = "2016",
+	month = "April",
+}
+
+@Misc{EIP-649,
+	url = "https://github.com/ethereum/EIPs/blob/master/EIPS/eip-649.md",
+	author = "Afri Schoedon and Vitalik Buterin",
+	title = "{EIP}-649: Metropolis Difficulty Bomb Delay and Block Reward Reduction",
+	year = "2017",
+	month = "June",
+}
+
+@Misc{EIP-2,
+	url = "https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2.md",
+	title = "{EIP}-2: Homestead Hard-fork Changes",
+	author = "Vitalik Buterin",
+	year = "2015",
+}
+
 @Misc{cryptoeprint:2013:881,
-	Note = {{http://eprint.iacr.org/}},
-	Url = {{Cryptology ePrint Archive, Report 2013/881}},
-	author = {Sompolinsky, Yonatan and Zohar, Aviv},
-	title = {{Accelerating Bitcoin{'}s Transaction Processing. Fast Money Grows on Trees, Not Chains}},
-	year = {{2013}},
+	Note = "\url{http://eprint.iacr.org/}",
+	Url = "Cryptology ePrint Archive, Report 2013/881",
+	author = "Sompolinsky, Yonatan and Zohar, Aviv",
+	title = "Accelerating Bitcoin{'}s Transaction Processing. Fast Money Grows on Trees, Not Chains",
+	year = "2013",
 }
 
 @InCollection{gura2004comparing,
-	BookTitle = {{Cryptographic Hardware and Embedded Systems-CHES 2004}},
-	Publisher = {{Springer}},
-	author = {Gura, Nils and Patel, Arun and Wander, Arvinderpal and Eberle, Hans and Shantz, Sheueling Chang},
-	title = {{Comparing elliptic curve cryptography and RSA on 8-bit CPUs}},
-	pages = {119-132},
-	year = {{2004}},
+	BookTitle = "Cryptographic Hardware and Embedded Systems-CHES 2004",
+	Publisher = "Springer",
+	author = "Gura, Nils and Patel, Arun and Wander, Arvinderpal and Eberle, Hans and Shantz, Sheueling Chang",
+	title = "Comparing elliptic curve cryptography and {RSA} on 8-bit {CPUs}",
+	pages = "119-132",
+	year = "2004",
 }
 
 @InProceedings{laurie2004proof,
-	BookTitle = {{Workshop on Economics and Information, Security}},
-	author = {Laurie, Ben and Clayton, Richard},
-	title = {{Proof-of-Work{''} proves not to work; version 0.2}},
-	year = {{2004}},
+	BookTitle = "Workshop on Economics and Information, Security",
+	author = "Laurie, Ben and Clayton, Richard",
+	title = "{``}Proof-of-Work{''} proves not to work; version 0.2",
+	year = "2004",
 }
 
 @Misc{vishnumurthy03karma:a,
-    author = {Vivek Vishnumurthy and Sangeeth Chandrakumar and Emin Gün Sirer},
-    title = {KARMA: A Secure Economic Framework for Peer-to-Peer Resource Sharing},
-    year = {2003}
+    author = "Vivek Vishnumurthy and Sangeeth Chandrakumar and Emin Gün Sirer",
+    title = "{KARMA}: A Secure Economic Framework for Peer-to-Peer Resource Sharing",
+    year = "2003"
 }
 
 @InProceedings{dwork92pricingvia,
-    author = {Cynthia Dwork and Moni Naor},
+    author = "Cynthia Dwork and Moni Naor",
     title = {Pricing via processing or combatting junk mail},
     booktitle = {In 12th Annual International Cryptology Conference},
     year = {1992},
@@ -62,14 +110,14 @@ @Article{aron2012bitcoin
 	year = {{2012}},
 }
 
-@article{mastercoin2013willett,
+@misc{mastercoin2013willett,
 	url = {{https://github.com/mastercoin-MSC/spec}},
 	author = {J. R. Willett},
 	title = {{MasterCoin Complete Specification}},
 	year = {{2013}},
 }
 
-@article{colouredcoins2012rosenfeld,
+@misc{colouredcoins2012rosenfeld,
 	url = {{https://bitcoil.co.il/BitcoinX.pdf}},
 	author = {Meni Rosenfeld},
 	title = {{Overview of Colored Coins}},
@@ -101,44 +149,44 @@ @InProceedings{miller1997future
 	year = {{1997}},
 }
 
-@article{buterin2013ethereum,
+@misc{buterin2013ethereum,
 	url = {{https://github.com/ethereum/wiki/wiki/White-Paper}},
 	author = {Vitalik Buterin},
 	title = {{Ethereum: A Next-Generation Smart Contract and Decentralized Application Platform}},
 	year = {{2013}},
 }
 
-@article{back2002hashcash,
+@misc{back2002hashcash,
 	url = {{http://www.hashcash.org/papers/amortizable.pdf}},
 	author = {Adam Back},
 	title = {{Hashcash - Amortizable Publicly Auditable Cost-Functions}},
 	year = {{2002}},
 }
 
-@article{hashimoto,
+@misc{hashimoto,
 	url = {{https://mirrorx.com/files/hashimoto.pdf}},
 	author = {Thaddeus Dryja},
 	title = {{Hashimoto: I/O bound proof of work}},
 	year = {{2014}},
 }
 
-@article{dagger,
+@misc{dagger,
 	url = {{http://vitalik.ca/ethereum/dagger.html}},
 	author = {Vitalik Buterin},
 	title = {{Dagger: A Memory-Hard to Compute, Memory-Easy to Verify Scrypt Alternative}},
 	year = {{2013}},
 }
 
-@article{lerner2014randmemohash,
+@misc{lerner2014randmemohash,
 	url = {{http://www.hashcash.org/papers/memohash.pdf}},
 	author = {Sergio Demian Lerner},
 	title = {{Strict Memory Hard Hashing Functions}},
 	year = {{2014}},
 }
 
-@article{FowlerNollVo1991FNVHash,
+@misc{FowlerNollVo1991FNVHash,
 	url = {{https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function#cite_note-2}},
 	author = {Glenn Fowler, Landon Curt Noll, Phong Vo},
 	title = {{Fowler–Noll–Vo hash function}},
 	year = {{1991}},
-}
+}