Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
pirapira authored Jan 30, 2018
2 parents a727e5a + b1bc8b1 commit 5c40b74
Show file tree
Hide file tree
Showing 4 changed files with 145 additions and 63 deletions.
12 changes: 12 additions & 0 deletions BRANCHES.md
Original file line number Diff line number Diff line change
@@ -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 |
38 changes: 37 additions & 1 deletion Biblio.bib
Original file line number Diff line number Diff line change
@@ -1,3 +1,39 @@
@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}},
Expand Down Expand Up @@ -141,4 +177,4 @@ @article{FowlerNollVo1991FNVHash
author = {Glenn Fowler, Landon Curt Noll, Phong Vo},
title = {{Fowler–Noll–Vo hash function}},
year = {{1991}},
}
}
Loading

0 comments on commit 5c40b74

Please sign in to comment.