Hardfork the testnets (#9562)

* ethcore: propose hardfork block number 4230000 for ropsten

* ethcore: propose hardfork block number 9000000 for kovan

* ethcore: enable kip-4 and kip-6 on kovan

* etcore: bump kovan hardfork to block 9.2M

* ethcore: fix ropsten constantinople block number to 4.2M

* ethcore: disable difficulty_test_ropsten until ethereum/tests are updated upstream
This commit is contained in:
Afri Schoedon 2018-09-30 13:44:17 +01:00 committed by GitHub
parent 856bbfc9c8
commit 85a6dc5e8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 8 deletions

View File

@ -43,7 +43,13 @@
"eip211Transition": 5067000, "eip211Transition": 5067000,
"eip214Transition": 5067000, "eip214Transition": 5067000,
"eip658Transition": 5067000, "eip658Transition": 5067000,
"wasmActivationTransition": 6600000 "wasmActivationTransition": 6600000,
"eip145Transition": 9200000,
"eip1014Transition": 9200000,
"eip1052Transition": 9200000,
"eip1283Transition": 9200000,
"kip4Transition": 9200000,
"kip6Transition": 9200000
}, },
"genesis": { "genesis": {
"seal": { "seal": {

View File

@ -9,12 +9,14 @@
"durationLimit": "0x0d", "durationLimit": "0x0d",
"blockReward": { "blockReward": {
"0": "0x4563918244F40000", "0": "0x4563918244F40000",
"1700000": "0x29A2241AF62C0000" "1700000": "0x29A2241AF62C0000",
"4200000": "0x1BC16D674EC80000"
}, },
"homesteadTransition": 0, "homesteadTransition": 0,
"eip100bTransition": 1700000, "eip100bTransition": 1700000,
"difficultyBombDelays": { "difficultyBombDelays": {
"1700000": 3000000 "1700000": 3000000,
"4200000": 2000000
} }
} }
} }
@ -39,7 +41,11 @@
"eip140Transition": 1700000, "eip140Transition": 1700000,
"eip211Transition": 1700000, "eip211Transition": 1700000,
"eip214Transition": 1700000, "eip214Transition": 1700000,
"eip658Transition": 1700000 "eip658Transition": 1700000,
"eip145Transition": 4200000,
"eip1014Transition": 4200000,
"eip1052Transition": 4200000,
"eip1283Transition": 4200000
}, },
"genesis": { "genesis": {
"seal": { "seal": {

View File

@ -95,10 +95,11 @@ mod difficulty_test_foundation {
declare_test!{DifficultyTests_difficultyMainNetwork, "BasicTests/difficultyMainNetwork.json"} declare_test!{DifficultyTests_difficultyMainNetwork, "BasicTests/difficultyMainNetwork.json"}
} }
mod difficulty_test_ropsten { // Disabling Ropsten diff tests; waiting for upstream ethereum/tests Constantinople update
difficulty_json_test_nopath!(new_ropsten_test); //mod difficulty_test_ropsten {
declare_test!{DifficultyTests_difficultyRopsten, "BasicTests/difficultyRopsten.json"} // difficulty_json_test_nopath!(new_ropsten_test);
} // declare_test!{DifficultyTests_difficultyRopsten, "BasicTests/difficultyRopsten.json"}
//}
mod difficulty_test_frontier { mod difficulty_test_frontier {
difficulty_json_test_nopath!(new_frontier_test); difficulty_json_test_nopath!(new_frontier_test);