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

2.4.4 more beta backports #10554

Merged
merged 8 commits into from
Apr 1, 2019
Merged

2.4.4 more beta backports #10554

merged 8 commits into from
Apr 1, 2019

Conversation

niklasad1
Copy link
Collaborator

@niklasad1 niklasad1 commented Apr 1, 2019

)

* fix(rpc-types): remove uint and hash wrappers

* fix(tests)

* fix(cleanup)

* grumbles(rpc-api): revert `verify_signature`

* revert change of `U64` -> `u64`

* fix(cleanup after bad merge)

* chore(bump ethereum-types)

* fix(bad merge)

* feat(tests ethereum-types): add tests

* chore(update `ethereum-types` to 0.4.2)

* feat(tests for h256)

* chore(rpc): remove `ethbloom` import

Use re-export from `ethereum-types` instead

* fix(bad merge): remove `DefaultAccount` type

* doc(add TODO with issue link)
Fixes a de-serialization bug in `ethereum-tyes`
* fix(light eth_gasPrice): ask N/W if not in cache

* fix(bad rebase)
@soc1c soc1c added A8-backport 🕸 Pull request is already reviewed well in another branch. M4-core ⛓ Core client code / Rust. M5-dependencies 🖇 Dependencies. labels Apr 1, 2019
@soc1c soc1c added this to the Patch milestone Apr 1, 2019
niklasad1 and others added 4 commits April 1, 2019 10:35
* cargo update -p log:0.4.5

* cargo update -p regex:1.0.5

* cargo update -p parking_lot

* cargo update -p serde_derive

* cargo update -p serde_json

* cargo update -p serde

* cargo update -p lazy_static

* cargo update -p num_cpus

* cargo update -p toml

# Conflicts:
#	Cargo.lock
* Update to vanilla tx pool error

* Prevent a non ready tx replacing a ready tx

* Make tests compile

* Test ready tx not replaced by future tx

* Transaction indirection

* Use StateReadiness to calculate Ready in `should_replace`

* Test existing txs from same sender are used to compute Readiness

* private-tx: Wire up ShouldReplace

* Revert "Use StateReadiness to calculate Ready in `should_replace`"

This reverts commit af9e69c

* Make replace generic so it works with private-tx

* Rename Replace and add missing docs

* ShouldReplace no longer mutable

* tx-pool: update to transaction-pool 2.0 from crates.io

* tx-pool: generic error type alias

* Exit early for first unmatching nonce

* Fix private-tx test, use existing write lock

* Use read lock for pool scoring
* Update to vanilla tx pool error

* private-tx: remove error-chain, implement Error, derive Display

* private-tx: replace ErrorKind and bail!

* private-tx: add missing From impls and other compiler errors

* private-tx: use original tx-pool error

* Don't be silly cargo
@soc1c soc1c merged commit 8f6911a into beta Apr 1, 2019
@soc1c soc1c deleted the na-beta branch April 1, 2019 15:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-backport 🕸 Pull request is already reviewed well in another branch. M4-core ⛓ Core client code / Rust. M5-dependencies 🖇 Dependencies.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants