grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable St-Peters-Fork ("Constantinople Fix") (#10223)

Browse Source 
* ethcore: disable eip-1283 on kovan block 10255201

* ethcore: disable eip-1283 on ropsten block 4939394

* ethcore: enable st-peters-fork on mainnet block 7280000

* ethcore: fix kovan chain spec

* version: update fork blocks

* ethcore: disable eip-1283 on sokol block 7026400
This commit is contained in:
Afri Schoedon 2019-01-21 22:55:44 +01:00 committed by GitHub
parent fb07ffa676
commit a9a278a6e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ethcore/res/ethereum/foundation.json
View File

@ -9,7 +9,8 @@
"durationLimit": "0xd", "durationLimit": "0xd",
"blockReward": { "blockReward": {
"0x0": "0x4563918244f40000", "0x0": "0x4563918244f40000",
"0x42ae50": "0x29a2241af62c0000" "0x42ae50": "0x29a2241af62c0000",
"0x6f1580": "0x1bc16d674ec80000"
}, },
"homesteadTransition": "0x118c30", "homesteadTransition": "0x118c30",
"daoHardforkTransition": "0x1d4c00", "daoHardforkTransition": "0x1d4c00",
@ -134,7 +135,8 @@
], ],
"eip100bTransition": "0x42ae50", "eip100bTransition": "0x42ae50",
"difficultyBombDelays": { "difficultyBombDelays": {
"0x42ae50": "0x2dc6c0" "0x42ae50": "0x2dc6c0",
"0x6f1580": "0x1e8480"
} }
} }
} }
@ -158,7 +160,10 @@
"eip140Transition": "0x42ae50", "eip140Transition": "0x42ae50",
"eip211Transition": "0x42ae50", "eip211Transition": "0x42ae50",
"eip214Transition": "0x42ae50", "eip214Transition": "0x42ae50",
"eip658Transition": "0x42ae50" "eip658Transition": "0x42ae50",
"eip145Transition": "0x6f1580",
"eip1014Transition": "0x6f1580",
"eip1052Transition": "0x6f1580"
}, },
"genesis": { "genesis": {
"seal": { "seal": {

1
ethcore/res/ethereum/kovan.json
View File

@ -49,6 +49,7 @@
"eip1014Transition": "0x8c6180", "eip1014Transition": "0x8c6180",
"eip1052Transition": "0x8c6180", "eip1052Transition": "0x8c6180",
"eip1283Transition": "0x8c6180", "eip1283Transition": "0x8c6180",
"eip1283DisableTransition": "0x9c7b61",
"kip4Transition": "0x8c6180", "kip4Transition": "0x8c6180",
"kip6Transition": "0x8c6180" "kip6Transition": "0x8c6180"
}, },

3
ethcore/res/ethereum/poasokol.json
View File

@ -41,7 +41,8 @@
"eip145Transition": 6464300, "eip145Transition": 6464300,
"eip1014Transition": 6464300, "eip1014Transition": 6464300,
"eip1052Transition": 6464300, "eip1052Transition": 6464300,
"eip1283Transition": 6464300 "eip1283Transition": 6464300,
"eip1283DisableTransition": 7026400
}, },
"genesis": { "genesis": {
"seal": { "seal": {

3
ethcore/res/ethereum/ropsten.json
View File

@ -44,7 +44,8 @@
"eip145Transition": "0x408b70", "eip145Transition": "0x408b70",
"eip1014Transition": "0x408b70", "eip1014Transition": "0x408b70",
"eip1052Transition": "0x408b70", "eip1052Transition": "0x408b70",
"eip1283Transition": "0x408b70" "eip1283Transition": "0x408b70",
"eip1283DisableTransition": "0x4b5e82"
}, },
"genesis": { "genesis": {
"seal": { "seal": {

6
util/version/Cargo.toml
View File

@ -16,9 +16,9 @@ track = "nightly"
# Latest supported fork blocks. # Latest supported fork blocks.
# Indicates a critical release in this track (i.e. consensus issue). # Indicates a critical release in this track (i.e. consensus issue).
[package.metadata.networks] [package.metadata.networks]
foundation = { forkBlock = 4370000, critical = true } foundation = { forkBlock = 7280000, critical = false }
ropsten = { forkBlock = 4230000, critical = false } ropsten = { forkBlock = 4939394, critical = false }
kovan = { forkBlock = 9200000, critical = true } kovan = { forkBlock = 10255201, critical = false }
[dependencies] [dependencies]
parity-bytes = "0.1" parity-bytes = "0.1"