Skip to content

instantsend: Do not consider islocks with unknown txes as complete#4147

Merged
UdjinM6 merged 4 commits into
dashpay:developfrom
UdjinM6:no_notx_islocks
Nov 30, 2021
Merged

instantsend: Do not consider islocks with unknown txes as complete#4147
UdjinM6 merged 4 commits into
dashpay:developfrom
UdjinM6:no_notx_islocks

Conversation

@UdjinM6

@UdjinM6 UdjinM6 commented May 10, 2021

Copy link
Copy Markdown

Store incomplete islocks separately (mem only), allow competing txes until the corresponding tx is known.

Based on #4146 atm.

@UdjinM6 UdjinM6 added this to the 17.1 milestone May 10, 2021
@UdjinM6 UdjinM6 changed the title instantsend: Do not consider islocks with no known txes as complete instantsend: Do not consider islocks with unknown txes as complete May 10, 2021
@UdjinM6
UdjinM6 force-pushed the no_notx_islocks branch from 85fdbc9 to ca0485f Compare May 11, 2021 20:27
@PastaPastaPasta

Copy link
Copy Markdown
Member

Removed backport candidate label, I don't think this is a suitable change for 0.17 this close to release

@UdjinM6
UdjinM6 force-pushed the no_notx_islocks branch 2 times, most recently from 7fc32fd to 2aa7697 Compare May 19, 2021 12:19
@github-actions

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@UdjinM6
UdjinM6 force-pushed the no_notx_islocks branch 2 times, most recently from 17897b8 to 6fa6b79 Compare October 14, 2021 19:50
@github-actions

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

1 similar comment
@github-actions

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@UdjinM6
UdjinM6 force-pushed the no_notx_islocks branch 2 times, most recently from e5a0772 to c404b0c Compare October 21, 2021 21:42
Comment thread src/llmq/instantsend.cpp Outdated
@UdjinM6
UdjinM6 marked this pull request as ready for review October 24, 2021 10:57

@PastaPastaPasta PastaPastaPasta left a comment

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.

utACK for squash merge

@UdjinM6
UdjinM6 merged commit 3b8b3e2 into dashpay:develop Nov 30, 2021
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Nov 11, 2023
…ashpay#4147)

* instantsend: Avoid writing IS locks for unknown txes

* instantsend: Allow a competing tx into mempool if there is an islock waiting for it

* use try_emplace

* Hold cs_main while calling ResetBlockFailureFlags
gades pushed a commit to piratecash/pirate that referenced this pull request Dec 9, 2023
…ashpay#4147)

* instantsend: Avoid writing IS locks for unknown txes

* instantsend: Allow a competing tx into mempool if there is an islock waiting for it

* use try_emplace

* Hold cs_main while calling ResetBlockFailureFlags
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants