Backports for beta 2.2.5 (#10047)
* bump beta to 2.2.5 * Fix empty steps (#9939) * Don't send empty step twice or empty step then block. * Perform basic validation of locally sealed blocks. * Don't include empty step twice. * Strict empty steps validation (#10041) * Add two failings tests for strict empty steps. * Implement strict validation of empty steps. * ethcore: enable constantinople on ethereum (#10031) * ethcore: change blockreward to 2e18 for foundation after constantinople * ethcore: delay diff bomb by 2e6 blocks for foundation after constantinople * ethcore: enable eip-{145,1014,1052,1283} for foundation after constantinople * Change test miner max memory to malloc reports. (#10024) * Fix: test corpus_inaccessible panic (#10019) If system uptime is less than the duration in the test, thread will panic due to: 'overflow when subtracting duration from instant'. Changed duration to 20 seconds to make it unlikely the test will fail due to this condition. Since no operations that carry a similar risk of panic occur outside of the tests, it doesn't seem warranted to depend on an external crate to fix this. * Bump crossbeam. (#10048)
This commit is contained in:
@@ -9,7 +9,8 @@
|
||||
"durationLimit": "0x0d",
|
||||
"blockReward": {
|
||||
"0": "0x4563918244F40000",
|
||||
"4370000": "0x29A2241AF62C0000"
|
||||
"4370000": "0x29A2241AF62C0000",
|
||||
"7080000": "0x1BC16D674EC80000"
|
||||
},
|
||||
"homesteadTransition": "0x118c30",
|
||||
"daoHardforkTransition": "0x1d4c00",
|
||||
@@ -134,7 +135,8 @@
|
||||
],
|
||||
"eip100bTransition": 4370000,
|
||||
"difficultyBombDelays": {
|
||||
"4370000": 3000000
|
||||
"4370000": 3000000,
|
||||
"7080000": 2000000
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -159,7 +161,11 @@
|
||||
"eip140Transition": 4370000,
|
||||
"eip211Transition": 4370000,
|
||||
"eip214Transition": 4370000,
|
||||
"eip658Transition": 4370000
|
||||
"eip658Transition": 4370000,
|
||||
"eip145Transition": 7080000,
|
||||
"eip1014Transition": 7080000,
|
||||
"eip1052Transition": 7080000,
|
||||
"eip1283Transition": 7080000
|
||||
},
|
||||
"genesis": {
|
||||
"seal": {
|
||||
|
||||
Reference in New Issue
Block a user