ethcore: fix pow difficulty validation #9328

andresilva · 2018-08-09T12:04:58Z

debris

I'm good with either solution. LGTM!

andresilva · 2018-08-09T22:15:20Z

I moved these methods to the ethash crate, this way we can remove a duplicate definition from miner (since it already depends on ethash crate).

andresilva · 2018-08-09T22:18:19Z

ethash/src/lib.rs

+pub fn boundary_to_difficulty(boundary: &ethereum_types::H256) -> U256 {
+	assert!(!boundary.is_zero());
+
+	let d = U512::from(&**boundary);


This method could be rewritten to use difficulty_to_boundary but we would have to do an extra conversion. Still, both definitions are next to another and are tested in relation to one another, so I think it's fine to have this duplicated.

I think something like fn(n: impl Into<U512>) -> U256 could work (w/o extra conversion)

ordian · 2018-08-10T06:55:03Z

ethash/src/lib.rs

+pub fn boundary_to_difficulty(boundary: &ethereum_types::H256) -> U256 {
+	assert!(!boundary.is_zero());
+
+	let d = U512::from(&**boundary);


I think something like fn(n: impl Into<U512>) -> U256 could work (w/o extra conversion)

debris · 2018-08-10T09:02:58Z

miner/src/work_notify.rs

@@ -67,19 +67,10 @@ impl WorkPoster {
 	}
 }

-/// Convert an Ethash difficulty to the target boundary. Basically just `f(x) = 2^256 / x`.
-fn difficulty_to_boundary(difficulty: &U256) -> H256 {


good catch! I didn't know that we have it in more than 1 place

debris · 2018-08-10T09:03:17Z

please merge with master :)

ordian · 2018-08-10T12:11:56Z

ethash/src/lib.rs

+	assert!(!difficulty.is_zero());
+
+	if difficulty == U512::one() {
+		U256::max_value().into()


nit: we don't need that .into()

ordian · 2018-08-10T12:12:19Z

ethash/src/lib.rs

+	if difficulty == U512::one() {
+		U256::max_value().into()
+	} else {
+		// d > 1, so result should never overflow 256 bits


nit: s/d/difficulty

* ethcore: fix pow difficulty validation * ethcore: validate difficulty is not zero * ethcore: add issue link to regression test * ethcore: fix tests * ethcore: move difficulty_to_boundary to ethash crate * ethcore: reuse difficulty_to_boundary and boundary_to_difficulty * ethcore: fix grumbles in difficulty_to_boundary_aux

* parity-version: bump stable to 1.11.9 * Fix compilation error on nightly rust (#8707) On nightly rust passing `public_url` works but that breaks on stable. This works for both. * parity-version: bump stable to 1.11.10 * Check if synced when using eth_getWork (#9193) (#9210) * Check if synced when using eth_getWork (#9193) * Don't use fn syncing * Fix identation * Fix typo * Don't check for warping * rpc: avoid calling queue_info twice on eth_getWork * Fix potential as_usize overflow when casting from U256 in miner (#9221) * Allow old blocks from peers with lower difficulty (#9226) Previously we only allow downloading of old blocks if the peer difficulty was greater than our syncing difficulty. This change allows downloading of blocks from peers where the difficulty is greater then the last downloaded old block. * Update Dockerfile (#9242) * Update Dockerfile fix Docker build * fix dockerfile paths: parity -> parity-ethereum (#9248) * Update tobalaba.json (#9313) * Light client `Provide default nonce in transactions when it´s missing` (#9370) * Provide `default_nonce` in tx`s when it´s missing When `nonce` is missing in a `EthTransaction` will cause it to fall in these cases provide `default_nonce` value instead! * Changed http:// to https:// on Yasm link (#9369) Changed http:// to https:// on Yasm link in README.md * Provide `default_nonce` in tx`s when it´s missing When `nonce` is missing in a `EthTransaction` will cause it to fall in these cases provide `default_nonce` value instead! * Address grumbles * ethcore: kovan: delay activation of strict score validation (#9406) * Use impl Future in the light client RPC helpers (#8628) * Better support for eth_getLogs in light mode (#9186) * Light client on-demand request for headers range. * Cache headers in HeaderWithAncestors response. Also fulfills request locally if all headers are in cache. * LightFetch::logs fetches missing headers on demand. * LightFetch::logs limit the number of headers requested at a time. * LightFetch::logs refactor header fetching logic. * Enforce limit on header range length in light client logs request. * Fix light request tests after struct change. * Respond to review comments. * Propagate transactions for next 4 blocks. (#9265) Closes #9255 This PR also removes the limit of max 64 transactions per packet, currently we only attempt to prevent the packet size to go over 8MB. This will only be the case for super-large transactions or high-block-gas-limit chains. Patching this is important only for chains that have blocks that can fit more than 4k transactions (over 86M block gas limit) For mainnet, we should actually see a tiny bit faster propagation since instead of computing 4k pending set, we only need `4 * 8M / 21k = 1523` transactions. Running some tests on `dekompile` node right now, to check how it performs in the wild. * ethcore: fix pow difficulty validation (#9328) * ethcore: fix pow difficulty validation * ethcore: validate difficulty is not zero * ethcore: add issue link to regression test * ethcore: fix tests * ethcore: move difficulty_to_boundary to ethash crate * ethcore: reuse difficulty_to_boundary and boundary_to_difficulty * ethcore: fix grumbles in difficulty_to_boundary_aux

* parity-version: bump beta to 2.0.2 * remove ssl from dockerfiles, closes #8880 (#9195) * snap: remove ssl dependencies from snapcraft definition (#9222) * parity-version: bump beta to 2.0.3 * Remove all dapp permissions related settings (#9120) * Completely remove all dapps struct from rpc * Remove unused pub use * Remove dapp policy/permission func in ethcore * Remove all dapps settings from rpc * Fix rpc tests * Use both origin and user_agent * Address grumbles * Address grumbles * Fix tests * Check if synced when using eth_getWork (#9193) (#9210) * Check if synced when using eth_getWork (#9193) * Don't use fn syncing * Fix identation * Fix typo * Don't check for warping * rpc: avoid calling queue_info twice on eth_getWork * Fix potential as_usize overflow when casting from U256 in miner (#9221) * Allow old blocks from peers with lower difficulty (#9226) Previously we only allow downloading of old blocks if the peer difficulty was greater than our syncing difficulty. This change allows downloading of blocks from peers where the difficulty is greater then the last downloaded old block. * Update Dockerfile (#9242) * Update Dockerfile fix Docker build * fix dockerfile paths: parity -> parity-ethereum (#9248) * Propagate transactions for next 4 blocks. (#9265) Closes #9255 This PR also removes the limit of max 64 transactions per packet, currently we only attempt to prevent the packet size to go over 8MB. This will only be the case for super-large transactions or high-block-gas-limit chains. Patching this is important only for chains that have blocks that can fit more than 4k transactions (over 86M block gas limit) For mainnet, we should actually see a tiny bit faster propagation since instead of computing 4k pending set, we only need `4 * 8M / 21k = 1523` transactions. Running some tests on `dekompile` node right now, to check how it performs in the wild. * Update tobalaba.json (#9313) * Fix load share (#9321) * fix(light_sync): calculate `load_share` properly * refactor(api.rs): extract `light_params` fn, add test * style(api.rs): add trailing commas * ethcore: fix pow difficulty validation (#9328) * ethcore: fix pow difficulty validation * ethcore: validate difficulty is not zero * ethcore: add issue link to regression test * ethcore: fix tests * ethcore: move difficulty_to_boundary to ethash crate * ethcore: reuse difficulty_to_boundary and boundary_to_difficulty * ethcore: fix grumbles in difficulty_to_boundary_aux * Light client `Provide default nonce in transactions when it´s missing` (#9370) * Provide `default_nonce` in tx`s when it´s missing When `nonce` is missing in a `EthTransaction` will cause it to fall in these cases provide `default_nonce` value instead! * Changed http:// to https:// on Yasm link (#9369) Changed http:// to https:// on Yasm link in README.md * Provide `default_nonce` in tx`s when it´s missing When `nonce` is missing in a `EthTransaction` will cause it to fall in these cases provide `default_nonce` value instead! * Address grumbles * ethcore: kovan: delay activation of strict score validation (#9406) * Better support for eth_getLogs in light mode (#9186) * Light client on-demand request for headers range. * Cache headers in HeaderWithAncestors response. Also fulfills request locally if all headers are in cache. * LightFetch::logs fetches missing headers on demand. * LightFetch::logs limit the number of headers requested at a time. * LightFetch::logs refactor header fetching logic. * Enforce limit on header range length in light client logs request. * Fix light request tests after struct change. * Respond to review comments. * Add update docs script to CI (#9219) * Add update docs script to CI Added a script to CI that will use the jsonrpc tool to update rpc documentation then commit and push those to the wiki repo. * fix gitlab ci lint * Only apply jsonrpc docs update on tags * Update gitlab-rpc-docs.sh * Copy correct parity repo to jsonrpc folder Copy correct parity repo to jsonrpc folder before attempting to build docs since the CI runner clones the repo as parity and not parity-ethereum. * Fix JSONRPC docs CI job Update remote config in wiki repo before pushing changes using a github token for authentication. Add message to wiki tag when pushing changes. Use project directory to correctly copy parity code base into the jsonrpc repo for doc generation. * Fix set_remote_wiki function call in CI * Prevent blockchain & miner racing when accessing pending block. (#9310) * Prevent blockchain & miner racing when accessing pending block. * Fix unavailability of pending block during reseal. * Prevent sync restart if import queue full (#9381) * Add POA Networks: Core and Sokol (#9413) * ethcore: add poa network and sokol chainspecs * rpc: simplify chain spec docs * cli: rearrange networks by main/test and size/range * parity: don't blacklist 0x00a328 on sokol testnet * parity: add sokol and poanet to params and clean up a bit, add tests * ethcore: add the poa networks and clean up a bit * ethcore: fix path to poacore chain spec * parity: rename poa networks to poacore and poasokol * parity: fix configuration tests * parity: fix parameter tests * ethcore: rename POA Core and POA Sokol * Update tobalaba.json (#9419) * Update hardcoded sync (#9421) - Update foundation hardcoded header to block 6219777 - Update ropsten hardcoded header to block 3917825 - Update kovan hardcoded header to block 8511489

andresilva added A0-pleasereview 🤓 Pull request needs code review. B0-patchthis M4-core ⛓ Core client code / Rust. labels Aug 9, 2018

andresilva mentioned this pull request Aug 9, 2018

fixed PoW difficulty validation #9326

Closed

ethcore: fix pow difficulty validation

b96c802

andresilva force-pushed the andre/fix-pow-boundary branch from 891615e to b96c802 Compare August 9, 2018 13:18

andresilva added 3 commits August 9, 2018 20:37

ethcore: validate difficulty is not zero

1cec79b

ethcore: add issue link to regression test

7c6f350

ethcore: fix tests

06d763b

debris approved these changes Aug 9, 2018

View reviewed changes

debris added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Aug 9, 2018

ethcore: move difficulty_to_boundary to ethash crate

359ddca

andresilva commented Aug 9, 2018

View reviewed changes

ordian approved these changes Aug 10, 2018

View reviewed changes

debris reviewed Aug 10, 2018

View reviewed changes

andresilva added 2 commits August 10, 2018 10:43

Merge branch 'master' into andre/fix-pow-boundary

35a2ca4

ethcore: reuse difficulty_to_boundary and boundary_to_difficulty

1a9889c

ordian reviewed Aug 10, 2018

View reviewed changes

ethcore: fix grumbles in difficulty_to_boundary_aux

4cd8cae

ordian merged commit 4eab867 into master Aug 10, 2018

ordian deleted the andre/fix-pow-boundary branch August 10, 2018 13:36

5chdn added this to the 2.1 milestone Aug 21, 2018

This was referenced Aug 23, 2018

beta backports for 2.0.3 #9229

Merged

stable backports for 1.11.10 #9228

Merged

jam10o-new mentioned this pull request Dec 31, 2018

Error in Ethereum Classic difficulty calculation? #10118

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ethcore: fix pow difficulty validation #9328

ethcore: fix pow difficulty validation #9328

andresilva commented Aug 9, 2018

debris left a comment

andresilva commented Aug 9, 2018

andresilva Aug 9, 2018

ordian Aug 10, 2018 •

edited

Loading

ordian Aug 10, 2018 •

edited

Loading

debris Aug 10, 2018

debris commented Aug 10, 2018

ordian Aug 10, 2018

ordian Aug 10, 2018

ethcore: fix pow difficulty validation #9328

ethcore: fix pow difficulty validation #9328

Conversation

andresilva commented Aug 9, 2018

debris left a comment

Choose a reason for hiding this comment

andresilva commented Aug 9, 2018

andresilva Aug 9, 2018

Choose a reason for hiding this comment

ordian Aug 10, 2018 • edited Loading

Choose a reason for hiding this comment

ordian Aug 10, 2018 • edited Loading

Choose a reason for hiding this comment

debris Aug 10, 2018

Choose a reason for hiding this comment

debris commented Aug 10, 2018

ordian Aug 10, 2018

Choose a reason for hiding this comment

ordian Aug 10, 2018

Choose a reason for hiding this comment

ordian Aug 10, 2018 •

edited

Loading

ordian Aug 10, 2018 •

edited

Loading