Automatically merged updates to draft EIP(s) 1588

Hi, I'm a bot! This change was automatically merged because:

 - It only modifies existing Draft or Last Call EIP(s)
 - The PR was approved or written by at least one author of each modified EIP
 - The build is passing
This commit is contained in:
Ikmyeong Na 2018-12-23 17:05:53 +09:00 committed by EIP Automerge Bot
parent 38aa52e046
commit a6d1d94971

View File

@ -17,8 +17,7 @@ This meta-EIP specifies the changes included in the alternative Ethereum hardfor
- Codename: Ethereum ProgPoW
- Aliases: N/A
- Activation:
- `Block >= TBD` on the Ethereum mainnet
- `Block >= TBD` on the Ropsten testnet
- `Block >= 7080000` on the Ethereum mainnet
- Included EIPs:
- [EIP 1057](./eip-1057.md): ProgPoW, a Programmatic Proof-of-Work