Skip to content

fix: do not check chainlock state in IsTxSafeForMining#5444

Merged
PastaPastaPasta merged 4 commits into
dashpay:developfrom
UdjinM6:cl_dis_non_safe
Jun 21, 2023
Merged

fix: do not check chainlock state in IsTxSafeForMining#5444
PastaPastaPasta merged 4 commits into
dashpay:developfrom
UdjinM6:cl_dis_non_safe

Conversation

@UdjinM6

@UdjinM6 UdjinM6 commented Jun 19, 2023

Copy link
Copy Markdown

Issue being fixed or feature implemented

Disabled or non-enforced Chainlocks does not mean you can safely mine non-locked txes, you could end up mining a block that is going to be rejected by everyone else if a conflicting tx (missing on your node) would be IS-locked. I can't find any reason why we have this besides "if Chainlocks are disabled then smth is wrong so let them all be mined" but we have spork_2 and spork_3 to control IS behaviour and we check them in IsTxSafeForMining already, that would be a much more straightforward way to deal with a potential issue.

Noticed this while reviewing #5150 and also while testing v19.2 during recent testnet v19 re-fork.

What was done?

Drop this check, adjust tests

How Has This Been Tested?

Run tests locally

Breaking Changes

Not quote breaking changes but a change in behaviour: with CLs disabled it will now take 10 minutes for non-locked txes to be mined, same as when CLs are enabled.

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation
  • I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

@UdjinM6 UdjinM6 added this to the 20 milestone Jun 19, 2023
@UdjinM6
UdjinM6 requested review from PastaPastaPasta and knst June 19, 2023 17:02
Comment thread test/functional/p2p_instantsend.py Outdated

@knst knst left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM

@UdjinM6
UdjinM6 requested a review from ogabrielides June 20, 2023 09:53

@ogabrielides ogabrielides left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

utACK

@PastaPastaPasta

PastaPastaPasta commented Jun 20, 2023

Copy link
Copy Markdown
Member

Adding guix-build to this PR to ensure that guix-2 didn't break guix CI somehow; didn't break

@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

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.

4 participants