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

Beta: 1.11.6 backports #9015

Merged
merged 15 commits into from Jul 9, 2018
Merged

Beta: 1.11.6 backports #9015

merged 15 commits into from Jul 9, 2018

Conversation

5chdn
Copy link
Contributor

@5chdn 5chdn commented Jun 29, 2018

@5chdn 5chdn added A8-backport 🕸 Pull request is already reviewed well in another branch. M1-ci 🙉 Continuous integration. labels Jun 29, 2018
@5chdn 5chdn added this to the Patch milestone Jun 29, 2018
@5chdn 5chdn added A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. M4-core ⛓ Core client code / Rust. M6-rpcapi 📣 RPC API. labels Jun 30, 2018
maciejhirsz and others added 11 commits July 4, 2018 15:24
* aura: only report after checking for repeated skipped primaries

* aura: refactor duplicate code for getting epoch validator set

* aura: verify_external: report on validator set contract instance

* aura: use correct validator set epoch number when reporting

* aura: use epoch set when verifying blocks

* aura: report skipped primaries when generating seal

* aura: handle immediate transitions

* aura: don't report skipped steps from genesis to first block

* aura: fix reporting test

* aura: refactor duplicate code to handle immediate_transitions

* aura: let reporting fail on verify_block_basic

* aura: add comment about possible failure of reporting
* Don't use ethereum_types in transaction pool.

* Hide internal insertion_id.

* Fix tests.

* Review grumbles.
* Additional tests for NonceAndGasPrice::should_replace.

* Fix should_replace in the distinct sender case.

* Use natural priority ordering to simplify should_replace.
* Minimal effective gas price.

* Fix naming, add test

* Fix minimal entry score and add test.

* Fix worst_transaction.

* Remove effective gas price threshold.

* Don't leak gas_price decisions out of Scoring.
* Store recently rejected transactions.

* Don't cache AlreadyImported rejections.

* Make the size of transaction verification queue dependent on pool size.

* Add a test for recently rejected.

* Fix logging for recently rejected.

* Make rejection cache smaller.

* obsolete test removed

* obsolete test removed

* Construct cache with_capacity.
* rpc: return unordered transactions in pending transactions filter

* ethcore: use LruCache for nonce cache

Only clear the nonce cache when a block is retracted

* Revert "ethcore: use LruCache for nonce cache"

This reverts commit b382c19.

* Use only cached nonces when computing pending hashes.

* Give filters their own locks, so that they don't block one another.

* Fix pending transaction count if not sealing.

* Clear cache only when block is enacted.

* Fix RPC tests.

* Address review comments.
* Clear cache only when block is enacted.

* Add tracing for cull.

* Cull split.

* Cull after creating pending block.

* Add constant, remove sync::read tracing.

* Reset debug.

* Remove excessive tracing.

* Use struct for NonceCache.

* Fix build

* Remove warnings.

* Fix build again.
@andresilva
Copy link
Contributor

Everything backported, added some more stuff.

Not sure if we should also add:

@5chdn 5chdn added A0-pleasereview 🤓 Pull request needs code review. and removed A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. labels Jul 7, 2018
@5chdn 5chdn requested a review from tomusdrw July 7, 2018 16:00
@5chdn
Copy link
Contributor Author

5chdn commented Jul 7, 2018

^ @tomusdrw can you take a look at this?

thanks andre

@ghost
Copy link

ghost commented Jul 7, 2018

I would like to suggest adding #9038 also 😄

@5chdn 5chdn merged commit 4ba600f into beta Jul 9, 2018
@5chdn 5chdn deleted the a5-beta-md5 branch July 9, 2018 06:39
@5chdn 5chdn removed the A0-pleasereview 🤓 Pull request needs code review. label Jul 9, 2018
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. M1-ci 🙉 Continuous integration. M4-core ⛓ Core client code / Rust. M6-rpcapi 📣 RPC API.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants