Merge branch 'master' into a5-eip-649

EIPS/eip-160.md

@@ -0,0 +1,21 @@
+```
+EIP: 160
+Title: EXP cost increase
+Author: Vitalik Buterin
+Type: Standard Track
+Category: Core
+Status: Final
+Created: 2016-10-20
+```
+
+### Specification
+
+If `block.number >= FORK_BLKNUM`, increase the gas cost of EXP from 10 + 10 per byte in the exponent to 10 + 50 per byte in the exponent.
+
+### Rationale
+
+Benchmarks suggest that EXP is currently underpriced by a factor of about 4-8.
+
+### References
+
+1. EIP-160 issue and discussion: https://github.com/ethereum/EIPs/issues/160

EIPS/eip-606.md

@@ -0,0 +1,32 @@
+## Preamble
+
+    EIP: 606
+    Title: Hardfork Meta: Homestead
+    Author: Alex Beregszaszi
+    Type: Meta
+    Status: Final
+    Created: 2017-04-23
+    Requires: 2, 7
+
+## Abstract
+
+This specifies the changes included in the hard fork named Homestead.
+
+## Specification
+
+- Codename: Homestead
+- Activation:
+  - Block >= 1,150,000 on Mainnet
+  - Block >= 494,000 on Morden
+  - Block >= 0 on future testnets
+- Included EIPs:
+  - [EIP 2](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2.md) (Homestead Hard-fork Changes)
+  - [EIP 7](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-7.md) (DELEGATECALL)
+  
+## References
+
+1. https://blog.ethereum.org/2016/02/29/homestead-release/
+
+## Copyright
+
+Copyright and related rights waived via [CC0](https://creativecommons.org/publicdomain/zero/1.0/).

EIPS/eip-607.md

@@ -0,0 +1,35 @@
+
+## Preamble
+
+    EIP: 607
+    Title: Hardfork Meta: Spurious Dragon
+    Author: Alex Beregszaszi
+    Type: Meta
+    Status: Final
+    Created: 2017-04-23
+    Requires: 155, 160, 161, 170
+
+## Abstract
+
+This specifies the changes included in the hard fork named Spurious Dragon.
+
+## Specification
+
+- Codename: Spurious Dragon
+- Aliases: State-clearing
+- Activation:
+  - Block >= 2,675,000 on Mainnet
+  - Block >= 1,885,000 on Morden
+- Included EIPs:
+  - [EIP 155](eip-155.md) (Simple replay attack protection)
+  - [EIP 160](eip-160.md) (EXP cost increase)
+  - [EIP 161](eip-161.md) (State trie clearing)
+  - [EIP 170](eip-170.md) (Contract code size limit)
+  
+## References
+
+1. https://blog.ethereum.org/2016/11/18/hard-fork-no-4-spurious-dragon/
+
+## Copyright
+
+Copyright and related rights waived via [CC0](https://creativecommons.org/publicdomain/zero/1.0/).

EIPS/eip-608.md

@@ -0,0 +1,31 @@
+## Preamble
+
+    EIP: 608
+    Title: Hardfork Meta: Tangerine Whistle
+    Author: Alex Beregszaszi
+    Type: Meta
+    Status: Final
+    Created: 2017-04-23
+    Requires: 150
+
+## Abstract
+
+This specifies the changes included in the hard fork named Tangerine Whistle (EIP 150).
+
+## Specification
+
+- Codename: Tangerine Whistle
+- Aliases: EIP 150, Anti-DoS
+- Activation:
+  - Block >= 2,463,000 on Mainnet
+- Included EIPs:
+  - [EIP 150](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-150.md) (Gas cost changes for IO-heavy operations)
+  
+## References
+
+1. https://blog.ethereum.org/2016/10/13/announcement-imminent-hard-fork-eip150-gas-cost-changes/
+2. https://blog.ethereum.org/2016/10/18/faq-upcoming-ethereum-hard-fork/
+
+## Copyright
+
+Copyright and related rights waived via [CC0](https://creativecommons.org/publicdomain/zero/1.0/).

EIPS/eip-609.md

@@ -0,0 +1,34 @@
+## Preamble
+
+    EIP: 609
+    Title: Hardfork Meta: Byzantium
+    Author: Alex Beregszaszi
+    Type: Standard Track
+    Category: Core
+    Status: Draft
+    Created: 2017-04-23
+    Requires: 100, 140, 196, 197, 198, 211, 214
+
+## Abstract
+
+This specifies the changes included in the hard fork named Byzantium.
+
+## Specification
+
+- Codename: Byzantium
+- Aliases: Metropolis/Byzantium, Metropolis part 1
+- Activation:
+  - Block not specified yet
+- Included EIPs:
+  - EIP 100 (Change difficulty adjustment to target mean block time including uncles)
+  - EIP 140 (REVERT instruction in the Ethereum Virtual Machine)
+  - EIP 196 (Precompiled contracts for addition and scalar multiplication on the elliptic curve alt_bn128)
+  - EIP 197 (Precompiled contracts for optimal ate pairing check on the elliptic curve alt_bn128)
+  - EIP 198 (Precompiled contract for bigint modular exponentiation)
+  - EIP 211 (New opcodes: RETURNDATASIZE and RETURNDATACOPY)
+  - EIP 214 (New opcode STATICCALL)
+  - EIP 658 (Embedding transaction return data in receipts)
+
+## Copyright
+
+Copyright and related rights waived via [CC0](https://creativecommons.org/publicdomain/zero/1.0/).

README.md

@@ -13,9 +13,6 @@ First review [EIP-1](EIPS/eip-1.md). Then clone the repository and add your EIP
 # Accepted EIPs (planned for adoption)
 | Number                                                  |Title                                                                                | Author                | Layer       | Status    |
 | ------------------------------------------------------- | ----------------------------------------------------------------------------------- | --------------------  | ------------| ----------|
-| [86](https://github.com/ethereum/EIPs/pull/208)         | Abstraction of transaction origin and signature                                     | Vitalik Buterin       | Core        | Accepted  |
-| [96](https://github.com/ethereum/EIPs/pull/210)         | Blockhash refactoring                                                               | Vitalik Buterin       | Core        | Accepted  |
-| [98](https://github.com/ethereum/EIPs/pull/98)          | Removal of intermediate state roots from receipts                                   | Vitalik Buterin       | Core        | Accepted  |
 | [100](https://github.com/ethereum/EIPs/issues/100)      | Change difficulty adjustment to target mean block time including uncles	            | Vitalik Buterin       | Core        | Accepted  |
 | [140](https://github.com/ethereum/EIPs/pull/206)        | REVERT instruction in the Ethereum Virtual Machine                                  | Beregszaszi, Mushegian| Core        | Accepted  |
 | [196](https://github.com/ethereum/EIPs/pull/213)        | Precompiled contracts for addition and scalar multiplication on the elliptic curve alt_bn128 | Reitwiessner | Core        | Accepted  |
@@ -23,8 +20,14 @@ First review [EIP-1](EIPS/eip-1.md). Then clone the repository and add your EIP
 | [198](https://github.com/ethereum/EIPs/pull/198)        | Precompiled contract for bigint modular exponentiation				                      | Vitalik Buterin       | Core        | Accepted  |
 | [211](https://github.com/ethereum/EIPs/pull/211)        | New opcodes: RETURNDATASIZE and RETURNDATACOPY                                      | Christian Reitwiessner| Core        | Accepted  |
 | [214](https://github.com/ethereum/EIPs/pull/214)        | New opcode STATICCALL                                                               | Buterin, Reitwiessner | Core        | Accepted  |
-| [649](https://github.com/ethereum/EIPs/pull/669)        | Metropolis Difficulty Bomb Delay and Issuance Reduction                             | Schoedon, Buterin     | Core        | Draft     |
+| [649](https://github.com/ethereum/EIPs/pull/669)        | Metropolis Difficulty Bomb Delay and Issuance Reduction                             | Schoedon, Buterin     | Core        | Accepted  |
+| [658](https://github.com/ethereum/EIPs/pull/658)        | Embedding transaction return data in receipts                                       | Nick Johnson          | Core        | Accepted  |
 
+# Deferred EIPs (adoption postponed)
+| Number                                                  |Title                                                                                | Author                | Layer       | Status    |
+| ------------------------------------------------------- | ----------------------------------------------------------------------------------- | --------------------  | ------------| ----------|
+| [86](https://github.com/ethereum/EIPs/pull/208)         | Abstraction of transaction origin and signature                                     | Vitalik Buterin       | Core        | Deferred  |
+| [96](https://github.com/ethereum/EIPs/pull/210)         | Blockhash refactoring                                                               | Vitalik Buterin       | Core        | Deferred  |
 
 # Finalized EIPs (standards that have been adopted)
 | Number                                                  |Title                                                        | Author          | Layer       | Status  |