Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Upgrade to jsonrpc v14 #11151

Merged
merged 6 commits into from
Oct 10, 2019
Merged

Upgrade to jsonrpc v14 #11151

merged 6 commits into from
Oct 10, 2019

Conversation

dvdplm
Copy link
Collaborator

@dvdplm dvdplm commented Oct 9, 2019

Contains paritytech/jsonrpc#495 with good bugfixes to resource usage.

@dvdplm
Upgrade to jsonrpc v14
f8c3232 
Contains paritytech/jsonrpc#495 with good bugfixes to resource usage.
@dvdplm dvdplm self-assigned this Oct 9, 2019
@dvdplm dvdplm added A0-pleasereview 🤓 Pull request needs code review. A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). B0-patch-stable 🕷 Pull request should also be back-ported to the stable branch. B1-patch-beta 🕷🕷 labels Oct 9, 2019
@niklasad1 niklasad1 added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Oct 9, 2019
@niklasad1
Copy link
Collaborator

niklasad1 commented Oct 9, 2019 •
edited
Loading

hmm, I don't understand what caused the error:

impl PushWorkHandler for Stratum {
    |      ^^^^^^^^^^^^^^^ `(dyn jsonrpc_core::futures::Future<Error = (), Item = ()> + std::marker::Send + 'static)` cannot be shared between threads safely

do you know why?

@niklasad1 niklasad1 added A7-looksgoodtestsfail 🤖 Pull request is reviewed well, but cannot be merged due to tests failing. and removed A8-looksgood 🦄 Pull request is reviewed well. labels Oct 9, 2019
@dvdplm
Copy link
Collaborator Author

dvdplm commented Oct 9, 2019

do you know why?

No, it's a bit of a mystery. RpcEventLoop was not touched recently so it's a bit odd. See paritytech/jsonrpc#499

@dvdplm dvdplm added the A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. label Oct 9, 2019
tomusdrw and others added 5 commits October 10, 2019 10:41
@tomusdrw
Bump tokio & futures.
100907e
@tomusdrw
Bump even further.
583503f
@dvdplm
Upgrade tokio to 0.1.22
9f6d086
@dvdplm
Merge branch 'master' into dp/chore/upgrade-jsonrpc-to-v14
240ccd1 
* master:
  Secret store: fix Instant::now() related race in net_keep_alive (#11155)
  RPC method for clearing the engine signer (#10920)
  Use TryFrom instead of From+panic for Builtin (#11140)
@dvdplm
Partially revert "Bump tokio & futures."
b8e13ba 
This reverts commit 100907e.
@dvdplm
Copy link
Collaborator Author

dvdplm commented Oct 10, 2019

do you know why?

Turns out it was a tokio version thing.

@dvdplm dvdplm added A0-pleasereview 🤓 Pull request needs code review. and removed A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. labels Oct 10, 2019
@niklasad1 niklasad1 added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. A7-looksgoodtestsfail 🤖 Pull request is reviewed well, but cannot be merged due to tests failing. labels Oct 10, 2019
@seunlanlege seunlanlege merged commit 9d313e3 into master Oct 10, 2019
@niklasad1 niklasad1 deleted the dp/chore/upgrade-jsonrpc-to-v14 branch October 10, 2019 15:15
This was referenced Oct 10, 2019
Open
Closed
This was referenced Nov 5, 2019
Merged
Merged
dvdplm added a commit that referenced this pull request Nov 6, 2019
@dvdplm
Upgrade to jsonrpc v14 (#11151)
d3b7dd8 
* Upgrade to jsonrpc v14

Contains paritytech/jsonrpc#495 with good bugfixes to resource usage.

* Bump tokio & futures.

* Bump even further.

* Upgrade tokio to 0.1.22

* Partially revert "Bump tokio & futures."

This reverts commit 100907e.
niklasad1 pushed a commit that referenced this pull request Nov 6, 2019
@dvdplm @niklasad1
Upgrade to jsonrpc v14 (#11151)
6f2f1db 
* Upgrade to jsonrpc v14

Contains paritytech/jsonrpc#495 with good bugfixes to resource usage.

* Bump tokio & futures.

* Bump even further.

* Upgrade tokio to 0.1.22

* Partially revert "Bump tokio & futures."

This reverts commit 100907e.
s3krit pushed a commit that referenced this pull request Nov 11, 2019
@soc1c @s3krit
v2.5.10 stable (#11239)
f3cdd7b 
* ropsten #6631425 foundation #8798209 (#11201)
* [stable] builtin, istanbul and mordor testnet backports (#11234)
  * ethcore-builtin (#10850)
  * [builtin]: support `multiple prices and activations` in chain spec (#11039)
  * [chain specs]: activate `Istanbul` on mainnet (#11228)
  * ethcore/res: add mordor testnet configuration (#11200)
* Update list of bootnodes for xDai chain (#11236)
* ethcore: remove `test-helper feat` from build (#11047)
* Secret store: fix Instant::now() related race in net_keep_alive (#11155) (#11159)
* [stable]: backport #10691 and #10683 (#11143)
  * Fix compiler warning (that will become an error) (#10683)
  * Refactor Clique stepping (#10691)
* Add Constantinople eips to the dev (instant_seal) config (#10809)
* Add cargo-remote dir to .gitignore (?)
* Insert explicit warning into the panic hook (#11225)
* Fix docker centos build (#11226)
* Update MIX bootnodes. (#11203)
* Use provided usd-per-eth value if an endpoint is specified (#11209)
* Add new line after writing block to hex file. (#10984)
* Type annotation for next_key() matching of json filter options (#11192) (but no `FilterOption` in 2.5 so…)
* Upgrade jsonrpc to latest (#11206)
* [CI] check evmbin build (#11096)
* Correct EIP-712 encoding (#11092)
* [client]: Fix for incorrectly dropped consensus messages (#11086)
* Fix block detail updating (#11015)
* Switching sccache from local to Redis (#10971)
* Made ecrecover implementation trait public (#11188)
* [dependencies]: jsonrpc `14.0.1` (#11183)
* [receipt]: add `sender` & `receiver` to `RichReceipts` (#11179)
* [ethcore/builtin]: do not panic in blake2pricer on short input (#11180)
* util Host: fix a double Read Lock bug in fn Host::session_readable() (#11175)
* ethcore client: fix a double Read Lock bug in fn Client::logs() (#11172)
* Change how RPCs eth_call and eth_estimateGas handle "Pending" (#11127)
* Cleanup stratum a bit (#11161)
* Upgrade to jsonrpc v14 (#11151)
* SecretStore: expose restore_key_public in HTTP API (#10241)
s3krit pushed a commit that referenced this pull request Nov 11, 2019
@soc1c @s3krit
v2.6.5 beta (#11240)
bc90ba2 
* [CI] check evmbin build (#11096)
* Correct EIP-712 encoding (#11092)
* [client]: Fix for incorrectly dropped consensus messages (#11082) (#11086)
* Update hardcoded headers (foundation, classic, kovan, xdai, ewc, ...) (#11053)
* Add cargo-remote dir to .gitignore (?)
* Update light client headers: ropsten 6631425 foundation 8798209 (#11201)
* Update list of bootnodes for xDai chain (#11236)
* ethcore/res: add mordor testnet configuration (#11200)
* [chain specs]: activate Istanbul on mainnet (#11228)
* [builtin]: support multiple prices and activations in chain spec (#11039)
* [receipt]: add sender & receiver to RichReceipts (#11179)
* [ethcore/builtin]: do not panic in blake2pricer on short input (#11180)
* Made ecrecover implementation trait public (#11188)
* Fix docker centos build (#11226)
* Update MIX bootnodes. (#11203)
* Insert explicit warning into the panic hook (#11225)
* Use provided usd-per-eth value if an endpoint is specified (#11209)
* Cleanup stratum a bit (#11161)
* Add Constantinople EIPs to the dev (instant_seal) config (#10809) (already backported)
* util Host: fix a double Read Lock bug in fn Host::session_readable() (#11175)
* ethcore client: fix a double Read Lock bug in fn Client::logs() (#11172)
* Type annotation for next_key() matching of json filter options (#11192)
* Upgrade jsonrpc to latest (#11206)
* [dependencies]: jsonrpc 14.0.1 (#11183)
* Upgrade to jsonrpc v14 (#11151)
* Switching sccache from local to Redis (#10971)
* Snapshot restoration overhaul (#11219)
* Add new line after writing block to hex file. (#10984)
* Pause pruning while snapshotting (#11178)
* Change how RPCs eth_call and eth_estimateGas handle "Pending" (#11127)
* Fix block detail updating (#11015)
* Make InstantSeal Instant again #11186
* Filter out some bad ropsten warp snapshots (#11247)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@seunlanlege seunlanlege seunlanlege approved these changes

@niklasad1 niklasad1 niklasad1 approved these changes

Assignees

@dvdplm dvdplm

Labels
A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). A8-looksgood 🦄 Pull request is reviewed well. B0-patch-stable 🕷 Pull request should also be back-ported to the stable branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dvdplm @niklasad1 @seunlanlege @tomusdrw