core: more efficient nonce-update in txpool #22231

holiman · 2021-01-25T15:14:37Z

This PR supersedes #21164 by @WeiLoy . The original PR was based off a fork of geth but on master , and I was not able to push the rebased + fixed version onto a master branch.

I believe that the original implementation by @WeiLoy was correct, but it had been a bit bitrotted, the PR is quite old.
Here are the benchmarks compared to current master:

benchstat before.txt after3.txt 
name                           old time/op  new time/op  delta
PoolMultiAccountBatchInsert-6   993µs ±11%   281µs ± 7%  -71.72%  (p=0.008 n=5+5)

holiman · 2021-01-26T08:38:00Z

Pushed a fix to make the benchmarks call the ..Sync methods. Stats basically the same:

name                           old time/op  new time/op  delta
PoolMultiAccountBatchInsert-6  1.61ms ±15%  0.35ms ± 9%  -78.14%  (p=0.008 n=5+5)

MariusVanDerWijden · 2021-10-29T09:01:24Z

@holiman this looks pretty good, should we rebase and merge it?

Benchmark the speed of transaction insertion under multiple accounts core: fix rebase issues + docstring core: make benchmark test use sync:ed method

holiman · 2021-10-29T09:18:16Z

@MariusVanDerWijden yes, I'd almost forgotten about this. Rebased, ptal

karalabe · 2021-11-02T09:53:39Z

core/tx_noncer.go

@@ -77,3 +77,11 @@ func (txn *txNoncer) setIfLower(addr common.Address, nonce uint64) {
 	}
 	txn.nonces[addr] = nonce
 }
+
+// resetAll sets the nonces for all accounts to the given map.
+func (txn *txNoncer) resetAll(all map[common.Address]uint64) {


Perhaps call it setAll, since it doesn't really reset it.

karalabe · 2021-11-02T09:55:09Z

core/tx_pool.go

@@ -1182,16 +1182,18 @@ func (pool *TxPool) runReorg(done chan struct{}, reset *txpoolResetRequest, dirt
 			pendingBaseFee := misc.CalcBaseFee(pool.chainconfig, reset.newHead)
 			pool.priced.SetBaseFee(pendingBaseFee)
 		}
+		// Update all accounts to the latest known pending nonce
+		nonces := make(map[common.Address]uint64)


If we want to ensure allocs are low, add len(pool.pending) to the end of the map make

karalabe · 2021-11-02T09:56:23Z

Pls add the allocs to the benchmark, just as sanity

fjl

I think this is OK, and may even resolve some consistency bugs in nonce management.

holiman · 2021-11-02T10:17:56Z

name                           old time/op    new time/op    delta
PoolMultiAccountBatchInsert-6     930µs ±11%     313µs ± 7%  -66.35%  (p=0.008 n=5+5)

name                           old alloc/op   new alloc/op   delta
PoolMultiAccountBatchInsert-6    19.0kB ± 9%    19.7kB ± 8%     ~     (p=0.222 n=5+5)

name                           old allocs/op  new allocs/op  delta
PoolMultiAccountBatchInsert-6      95.6 ± 5%      92.4 ± 4%     ~     (p=0.063 n=5+5)

* Adjust pending nonce update operation Benchmark the speed of transaction insertion under multiple accounts core: fix rebase issues + docstring core: make benchmark test use sync:ed method * core: address review comments * core: add memreport to benchmark Co-authored-by: WeiLoy <wei_loy@163.com>

holiman requested review from karalabe and rjl493456442 as code owners January 25, 2021 15:14

holiman mentioned this pull request Jan 25, 2021

Adjust pending nonce update operation #21164

Closed

Adjust pending nonce update operation

5c67d39

Benchmark the speed of transaction insertion under multiple accounts core: fix rebase issues + docstring core: make benchmark test use sync:ed method

holiman force-pushed the weiloyfix branch from bba3963 to 5c67d39 Compare October 29, 2021 09:17

holiman added the status:triage label Nov 2, 2021

karalabe reviewed Nov 2, 2021

View reviewed changes

fjl removed the status:triage label Nov 2, 2021

fjl approved these changes Nov 2, 2021

View reviewed changes

holiman added 2 commits November 2, 2021 11:06

core: address review comments

0eb0005

core: add memreport to benchmark

c5722dd

holiman added this to the 1.10.12 milestone Nov 2, 2021

holiman merged commit 03bc8b7 into ethereum:master Nov 2, 2021

holiman deleted the weiloyfix branch November 10, 2021 18:32

This was referenced Sep 23, 2022

Metadium to master METADIUM/go-metadium#24

Closed

Metadium to master METADIUM/go-metadium#25

Merged

gzliudan mentioned this pull request May 17, 2024

implement EIP-1559 XinFinOrg/XDPoSChain#527

Merged

19 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

core: more efficient nonce-update in txpool #22231

core: more efficient nonce-update in txpool #22231

holiman commented Jan 25, 2021

holiman commented Jan 26, 2021

MariusVanDerWijden commented Oct 29, 2021

holiman commented Oct 29, 2021

karalabe Nov 2, 2021

karalabe Nov 2, 2021

karalabe commented Nov 2, 2021

fjl left a comment

holiman commented Nov 2, 2021

core: more efficient nonce-update in txpool #22231

core: more efficient nonce-update in txpool #22231

Conversation

holiman commented Jan 25, 2021

holiman commented Jan 26, 2021

MariusVanDerWijden commented Oct 29, 2021

holiman commented Oct 29, 2021

karalabe Nov 2, 2021

Choose a reason for hiding this comment

karalabe Nov 2, 2021

Choose a reason for hiding this comment

karalabe commented Nov 2, 2021

fjl left a comment

Choose a reason for hiding this comment

holiman commented Nov 2, 2021