Check if synced when using eth_getWork (#9193) #9210

mttmartin · 2018-07-24T04:21:10Z

This should fix #9193.

parity-cla-bot · 2018-07-24T04:21:12Z

It looks like @mttmartin signed our Contributor License Agreement. 👍

Many thanks,

Parity Technologies CLA Bot

andresilva

Thanks for the PR. Just a minor change needed.

andresilva · 2018-07-25T16:24:09Z

rpc/src/v1/impls/eth.rs

-			//let sync = self.sync;
-			if /*sync.status().state != SyncState::Idle ||*/ self.client.queue_info().total_queue_size() > MAX_QUEUE_SIZE_TO_MINE_ON {
+			let sync = self.syncing();
+			if sync != Ok(SyncStatus::None) || self.client.queue_info().total_queue_size() > MAX_QUEUE_SIZE_TO_MINE_ON {


You could use is_major_importing here instead like it's done in fn syncing.

Thanks for the reivew @andresilva. I updated my PR so that it uses is_major_importing.

sorpaas · 2018-07-27T04:21:42Z

rpc/src/v1/impls/eth.rs

-			//let sync = self.sync;
-			if /*sync.status().state != SyncState::Idle ||*/ self.client.queue_info().total_queue_size() > MAX_QUEUE_SIZE_TO_MINE_ON {
+			let status = self.sync.status();
+	                let client = &self.client;


Please fix indentation, parity uses tabs.

andresilva · 2018-07-30T17:07:51Z

rpc/src/v1/impls/eth.rs

-			if /*sync.status().state != SyncState::Idle ||*/ self.client.queue_info().total_queue_size() > MAX_QUEUE_SIZE_TO_MINE_ON {
+			let status = self.sync.status();
+			let client = &self.client;
+			let warping = match self.snapshot.status() {


I don't think you need to check for this, I think is_major_importing should already return true if we're warping (although would be nice if you could test this).

Thanks for the review. I tested this and it appears you were correct, so I've removed the extra check for warping.

andresilva

LGTM! I just pushed a minor change to avoid calling queue_info twice, hope you don't mind. Thanks for the PR! 🙂

…rp_sync_on_light_client * 'master' of https://github.com/paritytech/parity: Propagate transactions for next 4 blocks. (openethereum#9265) decode block rlp less often (openethereum#9252) Fix eternalities tests can_create (missing parameter) (openethereum#9270) Update ref to `parity-common` and update `seek` behaviour (openethereum#9257) Comply EIP-86 with the new definition (openethereum#9140) Check if synced when using eth_getWork (openethereum#9193) (openethereum#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

* 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

Check if synced when using eth_getWork (openethereum#9193)

54ed242

5chdn added this to the 2.1 milestone Jul 24, 2018

5chdn added A0-pleasereview 🤓 Pull request needs code review. M6-rpcapi 📣 RPC API. B0-patchthis labels Jul 24, 2018

This was referenced Jul 24, 2018

Backports to 2.0.1-beta #9145

Merged

Backports to 1.11.8-stable #9144

Merged

andresilva suggested changes Jul 25, 2018

View reviewed changes

This was referenced Jul 26, 2018

stable backports for 1.11.10 #9228

Merged

beta backports for 2.0.3 #9229

Merged

5chdn added A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jul 26, 2018

Don't use fn syncing

7c1f2c8

sorpaas reviewed Jul 27, 2018

View reviewed changes

mttmartin added 2 commits July 26, 2018 21:39

Fix identation

21c6bf3

Fix typo

8195ec7

5chdn added A0-pleasereview 🤓 Pull request needs code review. and removed A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. labels Jul 30, 2018

dvdplm approved these changes Jul 30, 2018

View reviewed changes

andresilva reviewed Jul 30, 2018

View reviewed changes

mttmartin and others added 2 commits July 30, 2018 20:27

Don't check for warping

436e94e

rpc: avoid calling queue_info twice on eth_getWork

e84e693

andresilva approved these changes Jul 31, 2018

View reviewed changes

andresilva merged commit f0c0da8 into openethereum:master Jul 31, 2018

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

sorpaas mentioned this pull request Sep 6, 2018

Only check warp syncing for eth_getWorks #9484

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Check if synced when using eth_getWork (#9193) #9210

Check if synced when using eth_getWork (#9193) #9210

mttmartin commented Jul 24, 2018

parity-cla-bot commented Jul 24, 2018

andresilva left a comment

andresilva Jul 25, 2018

mttmartin Jul 27, 2018

sorpaas Jul 27, 2018

andresilva Jul 30, 2018

mttmartin Jul 31, 2018

andresilva left a comment

Check if synced when using eth_getWork (#9193) #9210

Check if synced when using eth_getWork (#9193) #9210

Conversation

mttmartin commented Jul 24, 2018

parity-cla-bot commented Jul 24, 2018

andresilva left a comment

Choose a reason for hiding this comment

andresilva Jul 25, 2018

Choose a reason for hiding this comment

mttmartin Jul 27, 2018

Choose a reason for hiding this comment

sorpaas Jul 27, 2018

Choose a reason for hiding this comment

andresilva Jul 30, 2018

Choose a reason for hiding this comment

mttmartin Jul 31, 2018

Choose a reason for hiding this comment

andresilva left a comment

Choose a reason for hiding this comment