Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Hardfork the testnets #9562

Merged
merged 8 commits into from
Sep 30, 2018
Merged

Hardfork the testnets #9562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb6de8e
ethcore: propose hardfork block number 4230000 for ropsten
5chdn Sep 14, 2018
f8d91b8
ethcore: propose hardfork block number 9000000 for kovan
5chdn Sep 14, 2018
e086bac
Merge branch 'master' into a5-config-constantinople
5chdn Sep 17, 2018
44b76c2
Merge branch 'master' into a5-config-constantinople
5chdn Sep 30, 2018
a7d862a
ethcore: enable kip-4 and kip-6 on kovan
5chdn Sep 30, 2018
b64220c
etcore: bump kovan hardfork to block 9.2M
5chdn Sep 30, 2018
72bd5a9
ethcore: fix ropsten constantinople block number to 4.2M
5chdn Sep 30, 2018
2377c51
ethcore: disable difficulty_test_ropsten until ethereum/tests are upd…
5chdn Sep 30, 2018
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: 7 additions & 1 deletion ethcore/res/ethereum/kovan.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@
"eip211Transition": 5067000,
"eip214Transition": 5067000,
"eip658Transition": 5067000,
"wasmActivationTransition": 6600000
"wasmActivationTransition": 6600000,
"eip145Transition": 9200000,
"eip1014Transition": 9200000,
"eip1052Transition": 9200000,
"eip1283Transition": 9200000,
"kip4Transition": 9200000,
"kip6Transition": 9200000
},
"genesis": {
"seal": {
Expand Down
12 changes: 9 additions & 3 deletions ethcore/res/ethereum/ropsten.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@
"durationLimit": "0x0d",
"blockReward": {
"0": "0x4563918244F40000",
"1700000": "0x29A2241AF62C0000"
"1700000": "0x29A2241AF62C0000",
"4200000": "0x1BC16D674EC80000"
},
"homesteadTransition": 0,
"eip100bTransition": 1700000,
"difficultyBombDelays": {
"1700000": 3000000
"1700000": 3000000,
"4200000": 2000000
}
}
}
Expand All @@ -39,7 +41,11 @@
"eip140Transition": 1700000,
"eip211Transition": 1700000,
"eip214Transition": 1700000,
"eip658Transition": 1700000
"eip658Transition": 1700000,
"eip145Transition": 4200000,
"eip1014Transition": 4200000,
"eip1052Transition": 4200000,
"eip1283Transition": 4200000
},
"genesis": {
"seal": {
Expand Down
9 changes: 5 additions & 4 deletions ethcore/src/json_tests/difficulty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,11 @@ mod difficulty_test_foundation {
declare_test!{DifficultyTests_difficultyMainNetwork, "BasicTests/difficultyMainNetwork.json"}
}

mod difficulty_test_ropsten {
difficulty_json_test_nopath!(new_ropsten_test);
declare_test!{DifficultyTests_difficultyRopsten, "BasicTests/difficultyRopsten.json"}
}
// Disabling Ropsten diff tests; waiting for upstream ethereum/tests Constantinople update
//mod difficulty_test_ropsten {
// difficulty_json_test_nopath!(new_ropsten_test);
// declare_test!{DifficultyTests_difficultyRopsten, "BasicTests/difficultyRopsten.json"}
//}

mod difficulty_test_frontier {
difficulty_json_test_nopath!(new_frontier_test);
Expand Down