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.

Sign up for GitHub

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

Jump to bottom

core/txpool: fix isGapped implementation #27404

Merged
merged 2 commits into from
Jun 6, 2023
Merged

core/txpool: fix isGapped implementation #27404

merged 2 commits into from
Jun 6, 2023

Conversation

dkatzan
Copy link
Contributor

@dkatzan dkatzan commented Jun 1, 2023

This fix a minor implementation issue with the newly introduced isGapped function
and it is described in this ticket: #27401

holiman
holiman approved these changes Jun 2, 2023
View reviewed changes
Copy link
Contributor

@holiman holiman left a comment

Choose a reason for hiding this comment

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

LGTM

@holiman holiman added this to the 1.12.1 milestone Jun 2, 2023
@holiman
Copy link
Contributor

holiman commented Jun 2, 2023

Thanks!

@holiman holiman linked an issue Jun 2, 2023 that may be closed by this pull request
error replacing a transaction if queue is full #27401
Closed
@dkatzan
Copy link
Contributor Author

dkatzan commented Jun 3, 2023

Thx for the approval @holiman
I'm not familiar enough with the merging and release process of geth?
How can I get this PR merged?
and when is it expected to be released?

@rjl493456442 rjl493456442 self-assigned this Jun 5, 2023
rjl493456442
rjl493456442 approved these changes Jun 5, 2023
View reviewed changes
Copy link
Member

@rjl493456442 rjl493456442 left a comment

Choose a reason for hiding this comment

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

Thanks for the fix.

	// Short circuit if transaction falls within the scope of the pending list
	// or matches the next pending nonce which can be promoted as an executable
	// transaction afterwards. Note, the tx staleness is already checked in
	// 'validateTx' function previously.

I would prefer to update the comment above.

@dkatzan dkatzan force-pushed the danielk/txpool-isgapped-fix branch from c2686d5 to 910431b Compare June 5, 2023 09:08
@dkatzan
Copy link
Contributor Author

dkatzan commented Jun 5, 2023

Thx @rjl493456442 , I have updated the comment

@holiman holiman merged commit b8ee287 into ethereum:master Jun 6, 2023
devopsbo3 pushed a commit to HorizenOfficial/go-ethereum that referenced this pull request Nov 10, 2023
@dkatzan @devopsbo3
core/txpool: fix minor flaw in isGapped check (ethereum#27404)
210e688 
This fix a minor implementation issue with the newly introduced isGapped function and it is described in ticket: ethereum#27401
devopsbo3 added a commit to HorizenOfficial/go-ethereum that referenced this pull request Nov 10, 2023
@devopsbo3
Revert "core/txpool: fix minor flaw in isGapped check (ethereum#27404)"
812add1 
This reverts commit 210e688.
devopsbo3 added a commit to HorizenOfficial/go-ethereum that referenced this pull request Nov 10, 2023
@devopsbo3
Revert "core/txpool: fix minor flaw in isGapped check (ethereum#27404)"
fa93e85 
This reverts commit 210e688.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rjl493456442 rjl493456442 rjl493456442 approved these changes

@holiman holiman holiman approved these changes

@karalabe karalabe Awaiting requested review from karalabe karalabe is a code owner

Assignees

@rjl493456442 rjl493456442

Labels
None yet
Projects
None yet
Milestone
1.12.1
Development

Successfully merging this pull request may close these issues.

error replacing a transaction if queue is full
3 participants
@dkatzan @holiman @rjl493456442