Skip to content

backport: cherry-pick #7191 and #7193 into v23.1.x#7195

Merged
PastaPastaPasta merged 2 commits intodashpay:v23.1.xfrom
thepastaclaw:backport/v23.1.x-7191-7193
Mar 3, 2026
Merged

backport: cherry-pick #7191 and #7193 into v23.1.x#7195
PastaPastaPasta merged 2 commits intodashpay:v23.1.xfrom
thepastaclaw:backport/v23.1.x-7191-7193

Conversation

@thepastaclaw
Copy link

@thepastaclaw thepastaclaw commented Mar 3, 2026

Backport

Cherry-picks of #7191 and #7193 into v23.1.x.

Included

@github-actions
Copy link

github-actions bot commented Mar 3, 2026

✅ No Merge Conflicts Detected

This PR currently has no conflicts with other open PRs.

@thepastaclaw thepastaclaw force-pushed the backport/v23.1.x-7191-7193 branch from 9785f09 to 9608b1d Compare March 3, 2026 14:49
@thepastaclaw thepastaclaw changed the title backport: cherry-pick #7193 into v23.1.x backport: cherry-pick #7191 and #7193 into v23.1.x Mar 3, 2026
@PastaPastaPasta PastaPastaPasta requested review from knst and kwvg March 3, 2026 14:57
@PastaPastaPasta PastaPastaPasta marked this pull request as ready for review March 3, 2026 17:41
Copy link
Collaborator

@kwvg kwvg left a comment

Choose a reason for hiding this comment

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

utACK 9608b1d

@UdjinM6
Copy link

UdjinM6 commented Mar 3, 2026

Picked the wrong commits, should be merge commits i.e. 358cca5 and 11c2565

…inserted

641b3ea fix(qt): reseat quorum labels when new types are inserted (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented
  When new quorum types appear during reindexing, existing labels that follow the insertion point in the grid were not being repositioned, causing overlapping text in the Information tab's Quorums section.

  before:
  <img width="292" height="173" alt="Screenshot 2026-03-01 at 13 56 12" src="https://github.com/user-attachments/assets/54daacde-6e44-4771-8478-00d11d93944a" />

  after:
  <img width="282" height="188" alt="Screenshot 2026-03-02 at 19 07 23" src="https://github.com/user-attachments/assets/ed1f74c1-9c16-498b-ac7e-147f9601ba88" />

  ## What was done?

  ## How Has This Been Tested?
  reindex with and without the patch on testnet

  ## Breaking Changes
  n/a
  ## 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

ACKs for top commit:
  kwvg:
    utACK 641b3ea

Tree-SHA512: 6ab68bbda76975a2c2cec8a85e85c6ebc0a580dbf8012761a42c8d8d61e318d830bad47375a8af2d0c1754ef6c485f9204aa0e6d2f6898438d0699ebfbeadfa5
…and key generation

42b707b fix: reject identity elements in deserialization and key generation (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented
  Identity elements are mathematically valid curve points but have no legitimate use in the protocol.

  ## What was done?
  Reject BLS identity elements (point at infinity for G1/G2) at the deserialization boundary in SetBytes(). Also reject zero private keys in MakeNewKey(). Identity elements would not pass further validation anyway, reject them early.

  ## How Has This Been Tested?
  Run tests

  ## Breaking Changes
  n/a

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

ACKs for top commit:
  PastaPastaPasta:
    utACK 42b707b

Tree-SHA512: 047b098fd56b5da07099fde9b03ada7dd4b42698f47cdc84d3c855c11b0122d46a74765fcaaad5d73465abd0d19605445c9e4b6ab6182cf2b318bfe695d2ef0a
@thepastaclaw thepastaclaw force-pushed the backport/v23.1.x-7191-7193 branch from 9608b1d to 240a95f Compare March 3, 2026 20:34
@thepastaclaw
Copy link
Author

Fixed — rebased on latest v23.1.x and cherry-picked the merge commits (-m 1) instead:

Thanks for catching that.

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK 240a95f

@UdjinM6 UdjinM6 added this to the 23.1.1 milestone Mar 3, 2026
@PastaPastaPasta PastaPastaPasta merged commit 1c2db87 into dashpay:v23.1.x Mar 3, 2026
34 of 38 checks passed
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