Configuration map of block reward contract addresses#10875
Conversation
|
It looks like @vkomenda hasn't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement at the following URL: https://cla.parity.io Once you've signed, please reply to this thread with Many thanks, Parity Technologies CLA Bot |
|
[clabot:check] |
|
It looks like @vkomenda signed our Contributor License Agreement. 👍 Many thanks, Parity Technologies CLA Bot |
a0dcdb8 to
774e998
Compare
|
Looks like that test is also failing on master. |
|
please revert submodules update (ethcore/res/ethereum/tests and ethcore/res/wasm-tests) |
811d07e to
d24a914
Compare
d24a914 to
07ee922
Compare
|
Please review. |
dvdplm
left a comment
There was a problem hiding this comment.
Code lgtm, and the feature seems useful to me.
A few things:
- a few tests to prove the overriding/merging logic of
block_reward_contract_transitionwithblock_reward_contract_transitionsso we don't accidentally mess this up in the future - docs with a recommendation to use
block_reward_contract_transitionsover the singular version? It would also be fantastic to have some docs hinting on the use case for multiple block reward transitions (or maybe it's just me being thick).
And thanks for the contribution!
|
@dvdplm, thanks for your feedback! I've added tests and docs. Please check if you are happy with them. |
917353f to
9fd2e52
Compare
| /// Block reward contract address (setting the block reward contract overrides the static block | ||
| /// reward definition). This option allows to add a single block reward contract address and is | ||
| /// compatible with the multiple address option `block_reward_contract_transitions` below. | ||
| /// Block reward contract address which overrides the `block_reward` setting. This option allows |
There was a problem hiding this comment.
This option allows to add
This provides the option to add
There was a problem hiding this comment.
I'm a bit mixed up. Can you clarify? The sentence loses its meaning after "and" if we rewrite it this way. Originally: this option allows and this option is compatible. With the change: this provides an option and this is compatible. In the latter case I'm not sure what "this" is referring to.
There was a problem hiding this comment.
Just attempting to make a complete sentence here rather than change the meaning- maybe would be better to say "this option allows for a single block reward contract..." or "this option allows adding" or another variation that completes the sentence and preserves the meaning?
There was a problem hiding this comment.
I think @andogro is saying that the wording "…allows to add…" is grammatically a bit off and that it'd improve the text if you reworded it with "…provides the option to add…" (or "set") here and on line 67 above. :)
There was a problem hiding this comment.
Would the issue be fixed by changing "...allows to add..." into "...allows one to add..."?
* master: Configuration map of block reward contract addresses (#10875)
…m-ethcore * dp/chore/extract-clique: Configuration map of block reward contract addresses (#10875) Update ethcore/src/snapshot/consensus/mod.rs Add a 2/3 quorum option to Authority Round. (#10909) Missing import Rename supports_warp to snapshot_mode Introduce Snapshotting enum to distinguish the type of snapshots a chain uses Add an EngineType enum to tighten up Engine.name() signers is already a ref Update ethcore/engines/clique/src/lib.rs Update ethcore/engines/ethash/Cargo.toml Update ethcore/engines/basic-authority/Cargo.toml Update ethcore/block-reward/Cargo.toml
…out-ClientIoMessage * dp/chore/extract-spec-from-ethcore: double semi Extract engines to own crates (#10966) Fix import missing import Configuration map of block reward contract addresses (#10875) Update ethcore/src/snapshot/consensus/mod.rs Add a 2/3 quorum option to Authority Round. (#10909) Missing import Rename supports_warp to snapshot_mode Introduce Snapshotting enum to distinguish the type of snapshots a chain uses Add an EngineType enum to tighten up Engine.name() signers is already a ref Update ethcore/engines/clique/src/lib.rs Update ethcore/engines/ethash/Cargo.toml Update ethcore/engines/basic-authority/Cargo.toml Update ethcore/block-reward/Cargo.toml
…1344-add-ChainID-opcode * dp/chore/sort-out-ClientIoMessage: Extract spec to own crate (#10978) EIP 2028: transaction gas lowered from 68 to 16 (#10987) Fix merge problem double semi Extract engines to own crates (#10966) Fix import missing import Configuration map of block reward contract addresses (#10875) Update ethcore/src/snapshot/consensus/mod.rs Add a 2/3 quorum option to Authority Round. (#10909) Missing import Rename supports_warp to snapshot_mode Introduce Snapshotting enum to distinguish the type of snapshots a chain uses Add an EngineType enum to tighten up Engine.name() signers is already a ref Update ethcore/engines/clique/src/lib.rs Update ethcore/engines/ethash/Cargo.toml Update ethcore/engines/basic-authority/Cargo.toml Update ethcore/block-reward/Cargo.toml
The original issue fixed by this PR's changeset: poanetwork#144.