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

tx pool: always accept local transactions #10375

Merged
merged 2 commits into from Feb 20, 2019
Merged

Conversation

ascjones
Copy link
Contributor

@ascjones ascjones commented Feb 18, 2019

...unless sender and nonce are the same, in which case the the normal gas price comparison applies.

rel: #10344

@ascjones ascjones added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels Feb 18, 2019
miner/src/pool/scoring.rs Outdated Show resolved Hide resolved
@tomusdrw tomusdrw added A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. and removed A0-pleasereview 🤓 Pull request needs code review. labels Feb 18, 2019
@5chdn 5chdn added this to the 2.4 milestone Feb 19, 2019
@tomusdrw tomusdrw added A8-looksgood 🦄 Pull request is reviewed well. B1-patch-beta 🕷🕷 B0-patch-stable 🕷 Pull request should also be back-ported to the stable branch. and removed A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. labels Feb 19, 2019
@tomusdrw
Copy link
Collaborator

Looks good, marking as patch cause I consider this a bug (i.e. sending some transactions locally without high-enough limits can cause some transactions to be lost hence rendering the rest to be stuck forever).

@Pzixel
Copy link
Contributor

Pzixel commented Feb 19, 2019

Why not just check for both_local as first branch? Wouldn't require any changes in nonce matching branch then.

@tomusdrw
Copy link
Collaborator

@Pzixel the case where both sender and nonce is equal would be handled incorrectly. There can only be one transaction with given (sender, nonce) pair, so we can't return InsertNew there but rather need to choose either one.

@tomusdrw
Copy link
Collaborator

Closes #10344

@ascjones ascjones merged commit 4e0ec4e into master Feb 20, 2019
@ascjones ascjones deleted the aj-always-accept-local-txs branch February 20, 2019 16:49
HCastano pushed a commit to HCastano/parity-ethereum that referenced this pull request Feb 25, 2019
* tx pool: always accept local transactions

* tx pool: `choose` local txs with same sender and nonce
HCastano added a commit that referenced this pull request Feb 25, 2019
* no-git for publish jobs, empty artifacts dir (#10393)

* no-git for publish jobs, empty artifacts dir

* fix syntax

* prettiness

* fix prettiness

* should get rid of git in publishing

* snap: reenable i386, arm64, armhf architecture publishing (#10386)

* snap: reenable i386, arm64, armhf architecture publishing

* gitlab: fix indent

* gitlab: fix yml syntax

* Linker for crosscomile

* fix target to linker

* new docker image

* fix lint, add build to this PR

* calc SHA3 using rhash

* add new images for i386, armhf

* show snap target & artifacts

* set CARGO_TARGET for publish snap

* move detect Version to publish snap

* rm libc6 dep from snap-template up pub-snap script

* clean up cargo config before add linker

* move linker config to docker images

* tx pool: always accept local transactions (#10375)

* tx pool: always accept local transactions

* tx pool: `choose` local txs with same sender and nonce

* Fix to_pod storage trie value decoding (#10368)
ordian added a commit that referenced this pull request Apr 5, 2019
* master:
  fix #10390 (#10391)
  Fix to_pod storage trie value decoding (#10368)
  revert some changes, could be buggy (#10399)
  version: bump nightly to 2.5 (#10392)
  no-git for publish jobs, empty artifacts dir (#10393)
  fix(jni): bump to jni to 0.11 & remove unsafe impl (#10394)
  chore(bump ethereum-types) (#10396)
  Update to latest mem-db, hash-db and trie-db. (#10314)
  tx pool: always accept local transactions (#10375)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well. B0-patch-stable 🕷 Pull request should also be back-ported to the stable branch. M4-core ⛓ Core client code / Rust.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants