Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reject aztlan and pull phoenix #297

Merged
merged 4 commits into from
Feb 26, 2020
Merged

reject aztlan and pull phoenix #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf2e440
ecip-1061: reject aztlan and pull phoenix
soc1c Feb 21, 2020
98ecc1a
ecip-1071: reject aztlan and pull phoenix
soc1c Feb 21, 2020
5221762
ecip-1086: reject sload testnet fix and pull aztlan
soc1c Feb 21, 2020
d967e0b
Update ecip-1086.md
soc1c Feb 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions _specs/ecip-1061.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
lang: en
ecip: 1061
title: Aztlán EVM and Protocol Upgrades (Yingchun Edition)
status: Accepted
status: Rejected
type: Meta
author: Talha Cross (@soc1c), Wei Tang (@sorpaas)
created: 2019-06-06
Expand Down Expand Up @@ -31,9 +31,9 @@ _Istanbul_ hardforks. The proposed changes for Ethereum Classic's _Aztlán_ upgr

This document proposes the following blocks at which to implement these changes in the Classic networks:

- `778_507` on Mordor Classic PoW-testnet (activated on Jan 30th, 2020)
- `2_058_191` on Kotti Classic PoA-testnet (approx Feb 12th, 2020)
- `10_500_839` on Ethereum Classic PoW-mainnet (approx Jun 10th, 2020)
- ~~`778_507` on Mordor Classic PoW-testnet (activated on Jan 30th, 2020)~~
- ~~`2_058_191` on Kotti Classic PoA-testnet (approx Feb 12th, 2020)~~
- ~~`10_500_839` on Ethereum Classic PoW-mainnet (approx Jun 10th, 2020)~~

For more information on the opcodes and their respective EIPs and implementations, please see the _Specification_
section of this document.
Expand Down
9 changes: 4 additions & 5 deletions _specs/ecip-1078.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ lang: en
ecip: 1078
title: Phoenix EVM and Protocol Upgrades ("Aztlán fix")
author: Bob Summerwill (@bobsummerwill)
status: Last Call
review-period-end: 2020-03-30
status: Rejected
type: Meta
created: 2020-01-19
license: Apache-2.0
Expand Down Expand Up @@ -39,9 +38,9 @@ would result in protocol changes which met the original intent.

This document proposes the following blocks at which to implement these changes in the Classic networks:

- `976_231` on Mordor Classic PoW-testnet (approx March 4th, 2020)
- `2_208_203` on Kotti Classic PoA-testnet (approx March 11st, 2020)
- `10_500_839` on Ethereum Classic PoW-mainnet (approx June 10th, 2020)
- ~~`976_231` on Mordor Classic PoW-testnet (approx March 4th, 2020)~~
- ~~`2_208_203` on Kotti Classic PoA-testnet (approx March 11st, 2020)~~
- ~~`10_500_839` on Ethereum Classic PoW-mainnet (approx June 10th, 2020)~~

At HARD_FORK_BLOCK, apply the following changes:

Expand Down
6 changes: 3 additions & 3 deletions _specs/ecip-1086.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
lang: en
ecip: 1086
title: SLOAD Gas Patch for the Classic Testnets
status: Draft
status: Reject
type: Standards Track
category: Core
author: Talha Cross <no-reply@soc1.cz>
Expand Down Expand Up @@ -38,8 +38,8 @@ A subsequent protocol upgrade disabling [EIP-2200](https://eips.ethereum.org/EIP

This document proposes the following `BLOCK_NUMBER` at which to implement these changes in the Classic test networks:

- `778_507` on _Mordor_ Classic PoW-testnet (Jan 30th, 2020)
- `2_058_191` on _Kotti_ Classic PoA-testnet (Feb 12th, 2020)
- ~~`778_507` on _Mordor_ Classic PoW-testnet (Jan 30th, 2020)~~
- ~~`2_058_191` on _Kotti_ Classic PoA-testnet (Feb 12th, 2020)~~


### Rationale
Expand Down