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

2.6.1-beta#10973

Merged
s3krit merged 11 commits into
betafrom
v2.6.1-beta
Aug 14, 2019
Merged

2.6.1-beta#10973
s3krit merged 11 commits into
betafrom
v2.6.1-beta

Conversation

@s3krit
Copy link
Copy Markdown
Contributor

@s3krit s3krit commented Aug 14, 2019

TriplEight and others added 11 commits August 13, 2019 16:09
* docker images renaming [skip ci]
* Add Avast AV whitelisting publish script

* Update gitlab-ci.yml, publish-av-whitelists.sh

* remove debug print
* tx-pool: accept local tx with higher gas price when pool full

* Revert "tx-pool: accept local tx with higher gas price when pool full"

This reverts commit 9d4adc5

* tx-pool: new tx with same nonce as existing is ready

* tx-pool: explicit check for replacement tx (same sender & nonce)

* Update comment

Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com>

* Replace `ReplaceOld` with `InsertNew` for replacement txs
* Add Kaspersky's FTP to AV Whitelisting release script

* Uncommented lines commented for debugging
* Change the return type of step_inner function.

* Fix indention.
* add(chain-support): new ewf chains support added

- volta test network
- ewc production chain

* remove(tobalaba): ewf chain tobalaba support removal

- tobalaba is deprecated so not officially supported by ewf any more
@ordian ordian added this to the Patch milestone Aug 14, 2019
@ordian ordian added the A8-backport 🕸 Pull request is already reviewed well in another branch. label Aug 14, 2019
Comment thread miner/src/pool/replace.rs
//
// With replacement transactions we can safely return `InsertNew` here, because
// we don't need to remove `old` (worst transaction in the pool) since `new` will replace
// some other transaction in the pool so we will never go above limit anyway.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh no, some spaces snuck into the master!

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😱

@s3krit s3krit merged commit 7bfbe41 into beta Aug 14, 2019
@s3krit s3krit deleted the v2.6.1-beta branch August 14, 2019 16:29
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants