Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

client: Provide txPool.txsByPriceAndNonce with correct vm for fetching txs to build block #2333

Merged
merged 1 commit into from
Oct 6, 2022

Conversation

g11tech
Copy link
Contributor

@g11tech g11tech commented Oct 6, 2022

Currently the txpool.txsByPriceAndNonce filter transaction based on txpool's vm's eei, which could be different from the eei/statemanager which is building the block (and set to different root).

This lead to exclusion of subsequent transactions build on top of previous one in the shandong testnet experiments (#2316)

This PR passes the correct vm to apply to filter the transactions from the pool.

Test case for this will be automatically included in the shandong sim test which builds consecutive transactions on same address.

@g11tech g11tech added PR state: merge ready package: client target: master Work to be done towards master branch labels Oct 6, 2022
@g11tech g11tech force-pushed the g11tech/fix-txsBy-vm branch from 354ad75 to 54a623d Compare October 6, 2022 16:24
@codecov
Copy link

codecov bot commented Oct 6, 2022

Codecov Report

Merging #2333 (54a623d) into master (1fbc077) will increase coverage by 0.52%.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

Flag Coverage Δ
block 92.86% <ø> (ø)
blockchain 90.21% <ø> (ø)
client 87.00% <100.00%> (+0.02%) ⬆️
common 98.39% <ø> (ø)
devp2p 92.40% <ø> (?)
ethash ∅ <ø> (∅)
evm 79.23% <ø> (ø)
rlp ?
statemanager 88.43% <ø> (ø)
trie 90.23% <ø> (-0.09%) ⬇️
tx 98.02% <ø> (ø)
util 88.99% <ø> (ø)
vm 85.31% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link
Member

@jochem-brouwer jochem-brouwer left a comment

Choose a reason for hiding this comment

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

LGTM!

@g11tech g11tech merged commit 284d4c1 into master Oct 6, 2022
@holgerd77 holgerd77 deleted the g11tech/fix-txsBy-vm branch October 6, 2022 19:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants