Skip to content
This repository was archived by the owner on Oct 28, 2021. It is now read-only.

Commit 937236d

Browse files
authored
Merge pull request #5547 from ethereum/fix-eth-flush
Improve eth_flush performance by disabling wait in Client::doWork
2 parents ad7204c + 68622b9 commit 937236d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
- Fixed: [#5452](https://github.com/ethereum/aleth/pull/5452) Correctly handle Discovery messages when the peer changes public key.
1515
- Fixed: [#5519](https://github.com/ethereum/aleth/pull/5519) Correctly handle Discovery messages with known public key but unknown endpoint.
1616
- Fixed: [#5523](https://github.com/ethereum/aleth/pull/5523) [#5533](https://github.com/ethereum/aleth/pull/5533) Fix syncing terminating prematurely because of race condition.
17-
- Fixed: [#5539](https://github.com/ethereum/aleth/pull/5539) Fix logic for determining if dao hard fork block header should be requested
17+
- Fixed: [#5539](https://github.com/ethereum/aleth/pull/5539) Fix logic for determining if dao hard fork block header should be requested.
18+
- Fixed: [#5547](https://github.com/ethereum/aleth/pull/5547) Fix unnecessary slow-down of eth_flush RPC method.
1819

1920
[1.6.0]: https://github.com/ethereum/aleth/compare/v1.6.0-alpha.1...master

libethereum/Client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ Block Client::block(h256 const& _blockHash, PopulationStatistics* o_stats) const
791791

792792
void Client::flushTransactions()
793793
{
794-
doWork();
794+
doWork(false);
795795
}
796796

797797
Transactions Client::pending() const

0 commit comments

Comments
 (0)