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

Commit 12b7cd3

Browse files
5chdnandresilva
authored andcommitted
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
1 parent 5f07055 commit 12b7cd3

File tree

3 files changed

+21
-8
lines changed

3 files changed

+21
-8
lines changed

ethcore/res/ethereum/kovan.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@
4343
"eip211Transition": 5067000,
4444
"eip214Transition": 5067000,
4545
"eip658Transition": 5067000,
46-
"wasmActivationTransition": 6600000
46+
"wasmActivationTransition": 6600000,
47+
"eip145Transition": 9200000,
48+
"eip1014Transition": 9200000,
49+
"eip1052Transition": 9200000,
50+
"eip1283Transition": 9200000,
51+
"kip4Transition": 9200000,
52+
"kip6Transition": 9200000
4753
},
4854
"genesis": {
4955
"seal": {

ethcore/res/ethereum/ropsten.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
"durationLimit": "0x0d",
1010
"blockReward": "0x4563918244F40000",
1111
"homesteadTransition": 0,
12-
"eip649Reward": "0x29A2241AF62C0000",
1312
"eip100bTransition": 1700000,
14-
"eip649Transition": 1700000
13+
"eip649Transition": 1700000,
14+
"eip649Reward": "0x29A2241AF62C0000",
15+
"eip1234Transition": 4200000,
16+
"eip1234Reward": "0x1BC16D674EC80000"
1517
}
1618
}
1719
},
@@ -35,7 +37,11 @@
3537
"eip140Transition": 1700000,
3638
"eip211Transition": 1700000,
3739
"eip214Transition": 1700000,
38-
"eip658Transition": 1700000
40+
"eip658Transition": 1700000,
41+
"eip145Transition": 4200000,
42+
"eip1014Transition": 4200000,
43+
"eip1052Transition": 4200000,
44+
"eip1283Transition": 4200000
3945
},
4046
"genesis": {
4147
"seal": {

ethcore/src/json_tests/difficulty.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,11 @@ mod difficulty_test_foundation {
9595
declare_test!{DifficultyTests_difficultyMainNetwork, "BasicTests/difficultyMainNetwork.json"}
9696
}
9797

98-
mod difficulty_test_ropsten {
99-
difficulty_json_test_nopath!(new_ropsten_test);
100-
declare_test!{DifficultyTests_difficultyRopsten, "BasicTests/difficultyRopsten.json"}
101-
}
98+
// Disabling Ropsten diff tests; waiting for upstream ethereum/tests Constantinople update
99+
//mod difficulty_test_ropsten {
100+
// difficulty_json_test_nopath!(new_ropsten_test);
101+
// declare_test!{DifficultyTests_difficultyRopsten, "BasicTests/difficultyRopsten.json"}
102+
//}
102103

103104
mod difficulty_test_frontier {
104105
difficulty_json_test_nopath!(new_frontier_test);

0 commit comments

Comments
 (0)