backports from upstream #3

5chdn · 2018-09-09T14:16:24Z

backports from upstream:

rpc(debug_getBadBlocks): fix test (rpc(debug_getBadBlocks): fix test openethereum/parity-ethereum#9502)
Generalized blockReward and difficultyBombDelays config (Generalized blockReward and difficultyBombDelays config openethereum/parity-ethereum#9480)
parity: print correct keys path on startup (parity: print correct keys path on startup openethereum/parity-ethereum#9501)

…#9480) * Implement multi blockReward * Implement difficultyBombDelays * Fix json crate compile * json keys can only be string

ordian and others added 3 commits September 8, 2018 17:34

rpc(debug_getBadBlocks): fix test (openethereum#9502)

4040d73

Generalized blockReward and difficultyBombDelays config (openethereum…

e1f3330

…#9480) * Implement multi blockReward * Implement difficultyBombDelays * Fix json crate compile * json keys can only be string

parity: print correct keys path on startup (openethereum#9501)

2177a01

5chdn added A8-backport 🕸 M4-core ⛓ labels Sep 9, 2018

5chdn added this to the 0.1 consensus engine milestone Sep 9, 2018

5chdn self-assigned this Sep 9, 2018

5chdn changed the title ~~A5 upstream~~ backports from upstream Sep 9, 2018

ChainSafeSystems approved these changes Sep 9, 2018

View reviewed changes

ChainSafeSystems merged commit 5db7277 into master Sep 9, 2018

ChainSafeSystems deleted the a5-upstream branch September 9, 2018 14:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

backports from upstream #3

backports from upstream #3

5chdn commented Sep 9, 2018

backports from upstream #3

backports from upstream #3

Conversation

5chdn commented Sep 9, 2018