Skip to content

Conversation

@UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Aug 5, 2024

Issue being fixed or feature implemented

Masternodes keep trying to sign txes they received initially even after these txes were replaced by is/chain-locked txes later.

What was done?

Remove entries from pendingRetryTxs when txes are removed from nonLockedTxs set (as either already locked or as conflicted, doesn't matter).

How Has This Been Tested?

Breaking Changes

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 21 milestone Aug 5, 2024
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK d8449ae

Copy link
Collaborator

@knst knst left a comment

Choose a reason for hiding this comment

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

utACK d8449ae

@PastaPastaPasta PastaPastaPasta merged commit 46b5113 into dashpay:develop Aug 5, 2024
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Aug 7, 2024
…re no longer non-locked

d8449ae fix: stop trying to sign pending txes when they are no longer non-locked (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented
  Masternodes keep trying to sign txes they received initially even after these txes were replaced by is/chain-locked txes later.

  ## What was done?
  Remove entries from `pendingRetryTxs` when txes are removed from `nonLockedTxs` set (as either already locked or as conflicted, doesn't matter).

  ## How Has This Been Tested?

  ## Breaking Changes

  ## Checklist:
  - [x] I have performed a self-review of my own code
  - [x] 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
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  PastaPastaPasta:
    utACK d8449ae
  knst:
    utACK d8449ae

Tree-SHA512: 45983faad6d590d4e44fc195c77d73d216e3d0bebef963fe556688773c82c07a118916f56fde7f1213df19d4fb9b7d82d8fd51abecd8e6c2108c27d62d0426c1
PastaPastaPasta added a commit that referenced this pull request Aug 7, 2024
8e9dd12 chore: bump version in configure.ac (pasta)
afb8dc0 docs: add v21.1.0 release notes and archive v21.0.2 (pasta)
269dd02 Merge #6179: chore: update manpages v21.1 (pasta)
a8cb643 Merge #6175: feat: allow resigning for EHF (pasta)
de5cc22 Merge #6178: chore: bump protocol version to 70233 (pasta)
2de4ce5 Merge #6176: test: reduce BRRHeight in regtest (pasta)
840175e Merge #6174: fix: stop trying to sign pending txes when they are no longer non-locked (pasta)

Pull request description:

  ## Issue being fixed or feature implemented
  Backports for v21.1.0, add release notes and

  ## What was done?
  See commits

  ## How Has This Been Tested?
  Been on devnet

  ## Breaking Changes
  None

  ## Checklist:
    _Go over all the following points, and put an `x` in all the boxes that apply._
  - [x] 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
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  knst:
    utACK  8e9dd12

Tree-SHA512: 3c968c4f0e06bc88f63bf10f742d39595c45c7fcd4aef1891d2e76d9f443cae1ddd3cb84c787faa189ef3a189a9dd63a7f75e69f5787a47d1281d5b6a445a2a6
@UdjinM6 UdjinM6 modified the milestones: 21, 21.1 Aug 8, 2024
PastaPastaPasta added a commit that referenced this pull request Aug 9, 2024
8e9dd12 chore: bump version in configure.ac (pasta)
afb8dc0 docs: add v21.1.0 release notes and archive v21.0.2 (pasta)
269dd02 Merge #6179: chore: update manpages v21.1 (pasta)
a8cb643 Merge #6175: feat: allow resigning for EHF (pasta)
de5cc22 Merge #6178: chore: bump protocol version to 70233 (pasta)
2de4ce5 Merge #6176: test: reduce BRRHeight in regtest (pasta)
840175e Merge #6174: fix: stop trying to sign pending txes when they are no longer non-locked (pasta)

Pull request description:

  ## Issue being fixed or feature implemented

  ## What was done?

  ## How Has This Been Tested?

  ## Breaking Changes

  ## 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)_

ACKs for top commit:
  PastaPastaPasta:
    utACK 058ff45
  kwvg:
    utACK 058ff45

Tree-SHA512: b619f9754258cece012f817a523f5849128e044ffbe17a28e12f1e8424d11f6a4c8d011a554fce0b106e1d6efee2aa306befdc034b8e47be077ad28c7f39c975
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