Skip to content

chore: merge master 22.1.3 back into develop#6757

Merged
PastaPastaPasta merged 9 commits into
dashpay:developfrom
UdjinM6:merge_master_22.1.3
Jul 15, 2025
Merged

chore: merge master 22.1.3 back into develop#6757
PastaPastaPasta merged 9 commits into
dashpay:developfrom
UdjinM6:merge_master_22.1.3

Conversation

@UdjinM6
Copy link
Copy Markdown

@UdjinM6 UdjinM6 commented Jul 15, 2025

Issue being fixed or feature implemented

What was done?

How Has This Been Tested?

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 (for repository code-owners and collaborators only)

PastaPastaPasta and others added 9 commits July 8, 2025 20:11
… spent information

53a3415 fix: remove useless but alarming log record about spent information (Konstantin Akimov)

Pull request description:

  ## Issue being fixed or feature implemented

  dashpay#6539
  dashpay#6651

  These log records are useless because RPC can be called remotely for non-existing tx:

      2025-04-28T12:53:35Z ERROR: Unable to get spend information

  ## What was done?
  Just removed error log for it.

  ## How Has This Been Tested?
  Call RPC for non-existing transaction:

      getspentinfo '{"txid":"0437cd7f8525ceed2324359c2d0ba26006d92d856a9c20fa0241106ee5a597c9", "index":0}'

  ## Breaking Changes
  N/A

  Changes are only log-related

  ## Checklist:
  - [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

ACKs for top commit:
  PastaPastaPasta:
    utACK 53a3415
  UdjinM6:
    utACK 53a3415

Tree-SHA512: c671d41c17efd18c82d16e83104a62b1f736f599e1fe78ef021a45c112010c8898f0d00837599208238773751fb9f308f9eae41991ec02d6f73564f96f34cf5f
…s for masternode payment

e9f292d feat: improve logging of non-existing destinations for masternode payment (Konstantin Akimov)

Pull request description:

  ## Issue being fixed or feature implemented
  In case if destination is invalid for cbtx, the logs are missing

  ## What was done?
  Improved logs for case if invalid destination

  ## How Has This Been Tested?
  N/A

  ## Breaking Changes
  N/A

  ## Checklist:
  - [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

ACKs for top commit:
  UdjinM6:
    utACK e9f292d
  kwvg:
    utACK e9f292d

Tree-SHA512: 990aadceff00bd964dbe9b8da292779ac15bba347688b655a64250c257b137511afdc6301010459c5d6287f3464922fffb5745789633dd690778e8c770d8095c
…ons and a typo

b58d77a Fix broken links from translation instructions and a typo (Jorge Maldonado Ventura)

Pull request description:

  It fixes broken links from the translation instructions and a typo.

  ## Issue being fixed or feature implemented

  - Contributors won't be shown a broken link

  ## What was done?
  Just replace the links and fix the typo.

  ## How Has This Been Tested?
  I checked that the new links work fine.

  ## 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
  - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK b58d77a

Tree-SHA512: e8609605a326dd3f780eea0213dec949d4b163469c6171ce8336fcdbcc282932491b7cc36f40d2aa198c6ba25ace6ddba1fb2fd5fca0de396831d29f96eac6b5
…used

b622989 perf: optimize version bit calculation (Konstantin Akimov)

Pull request description:

  ## Issue being fixed or feature implemented
  It seems as there's O(N^2) for some certain situations when calling `invalidateblock`.

  See perf result during adding / removing blocks to chain:
  <img width="687" alt="image" src="https://github.com/user-attachments/assets/472e019e-905b-49b6-9786-aa7343eb5724" />

  ## What was done?
  Call `calculateStartHeight` only if its result is going to be used.

  ## How Has This Been Tested?
  ```
  $ getblockcount
  2255311
  $ getblockhash 2250000
  00000000000000062539a6cd3adece4a10598e729ef571bfded9d4b704af69f0
  $ invalidateblock 00000000000000062539a6cd3adece4a10598e729ef571bfded9d4b704af69f0
  null
  ```
  With changes in PR it takes 1minute, without them - 3 minutes.
  <img width="687" alt="image" src="https://github.com/user-attachments/assets/967cb943-429d-405d-8aa2-cb192e0d8317" />

  Mainnet re-indexed with no issues.

  ## Breaking Changes
  N/A

  ## Checklist:
  - [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:
  UdjinM6:
    light ACK b622989
  PastaPastaPasta:
    utACK b622989

Tree-SHA512: a165b96f8f1a1e2efa64e223639822c9690c0cfbc3c185925826b62ef9a2e92adb4e5913f6c904363fe2ef19e384674d4ab16f082c2a4b9c574ec4ea63747ce9
- Update mainnet nMinimumChainWork and defaultAssumeValid to block 2301632
- Update testnet nMinimumChainWork and defaultAssumeValid to block 1254997
- Both blocks are chainlocked and use matching chainwork values

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
Updates CLIENT_VERSION_BUILD from 2 to 3 in configure.ac

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
9ec8e66 docs: add v22.1.3 release notes and archive v22.1.2 (pasta)
95c2a0e chore: bump version to v22.1.3 (pasta)
3345046 chore: update chainparams for v22.1.3 release (pasta)
1db850a Merge dashpay#6632: perf: versionbits avoid calculation which is not used (pasta)
4173e3c Merge dashpay#6739: docs: Fix broken links from translation instructions and a typo (pasta)
9eda785 Merge dashpay#6740: feat: improve logging of non-existing destinations for masternode payment (pasta)
47b6826 Merge dashpay#6744: fix: remove useless but alarming log record about spent information (pasta)

Pull request description:

  ## Issue being fixed or feature implemented
  Backports for a new version, v22.1.3

  ## What was done?
  See release notes

  ## How Has This Been Tested?

  ## Breaking Changes
  None

  ## Checklist:
  - [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:
  UdjinM6:
    utACK 9ec8e66
  kwvg:
    utACK 9ec8e66

Tree-SHA512: 9e94b472c32f87c46d60fe53bcec59cb2ec1823e56cfbc2fe4a07d476e1c576c0d7f0c54115aeca902767651591556d68c8e81b81ac9bd12bc5291fa17f5a768
@UdjinM6 UdjinM6 added this to the 23 milestone Jul 15, 2025
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Jul 15, 2025

Walkthrough

The changes update the release notes to document the new version v22.1.3, reorganizing and renaming section headings for clarity and consolidating previous categories. The notes now focus on bug fixes, RPC and logging improvements, performance enhancements, and documentation updates, with specific details on each change. The credits section is revised, and a link to the previous v22.1.2 release notes is added. Additionally, a new markdown file is introduced containing the release notes for v22.1.2. In the source code, the minimum chain work and default assume valid block hashes are updated for both mainnet and testnet in the consensus parameters. No public code interfaces are modified.

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Copy Markdown

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (2)
doc/release-notes/dash/release-notes-22.1.2.md (1)

1-139: LGTM: Comprehensive release notes for v22.1.2.

The release notes provide a thorough documentation of the v22.1.2 release, including proper sections for upgrading instructions, detailed feature descriptions, credits, and historical references.

Consider addressing the markdown formatting consistency flagged by static analysis:

-Quorum Rotation Improvements
-----------------------------
+## Quorum Rotation Improvements

-Deployment and CI Fixes
------------------------
+## Deployment and CI Fixes

-Performance Improvements
-------------------------
+## Performance Improvements

-Coinjoin Tests Stability
-------------------------
+## Coinjoin Tests Stability

-Minor Build and Test Fixes
---------------------------
+## Minor Build and Test Fixes

-P2P Changes
------------
+## P2P Changes

This would make the heading styles consistent with the ATX format used elsewhere in the document.

doc/release-notes.md (1)

29-48: LGTM: Well-organized release notes sections.

The release notes provide clear categorization of changes with appropriate technical details for each improvement.

Consider addressing the markdown formatting consistency flagged by static analysis:

-Bug Fixes
-----------
+## Bug Fixes

-RPC and Logging Improvements
-----------------------------
+## RPC and Logging Improvements

-Performance Improvements
-------------------------
+## Performance Improvements

-Documentation Updates
----------------------
+## Documentation Updates

This would make the heading styles consistent with the ATX format used elsewhere in the document.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 1493f08 and 2527ca5.

📒 Files selected for processing (3)
  • doc/release-notes.md (4 hunks)
  • doc/release-notes/dash/release-notes-22.1.2.md (1 hunks)
  • src/chainparams.cpp (2 hunks)
🧰 Additional context used
📓 Path-based instructions (2)
src/**/*.{cpp,h,cc,cxx,hpp}

Instructions used from:

Sources:
📄 CodeRabbit Inference Engine

  • CLAUDE.md
doc/**

Instructions used from:

Sources:
📄 CodeRabbit Inference Engine

  • CLAUDE.md
🧠 Learnings (3)
📓 Common learnings
Learnt from: kwvg
PR: dashpay/dash#6543
File: src/wallet/receive.cpp:240-251
Timestamp: 2025-02-06T14:34:30.466Z
Learning: Pull request #6543 is focused on move-only changes and refactoring, specifically backporting from Bitcoin. Behavior changes should be proposed in separate PRs.
Learnt from: kwvg
PR: dashpay/dash#6718
File: test/functional/test_framework/test_framework.py:2102-2102
Timestamp: 2025-06-09T16:43:20.996Z
Learning: In the test framework consolidation PR (#6718), user kwvg prefers to limit functional changes to those directly related to MasternodeInfo, avoiding scope creep even for minor improvements like error handling consistency.
src/chainparams.cpp (4)
Learnt from: kwvg
PR: dashpay/dash#6718
File: test/functional/test_framework/test_framework.py:2102-2102
Timestamp: 2025-06-09T16:43:20.996Z
Learning: In the test framework consolidation PR (#6718), user kwvg prefers to limit functional changes to those directly related to MasternodeInfo, avoiding scope creep even for minor improvements like error handling consistency.
Learnt from: kwvg
PR: dashpay/dash#6543
File: src/wallet/receive.cpp:240-251
Timestamp: 2025-02-06T14:34:30.466Z
Learning: Pull request #6543 is focused on move-only changes and refactoring, specifically backporting from Bitcoin. Behavior changes should be proposed in separate PRs.
Learnt from: kwvg
PR: dashpay/dash#6530
File: src/validation.cpp:360-362
Timestamp: 2025-01-14T08:37:16.955Z
Learning: The UpdateTransactionsFromBlock() method in txmempool.cpp takes parameters in the order: vHashUpdate, ancestor_size_limit, ancestor_count_limit. The size limit comes before the count limit.
Learnt from: kwvg
PR: dashpay/dash#6665
File: src/evo/providertx.h:82-82
Timestamp: 2025-06-06T11:53:09.094Z
Learning: In ProTx serialization code (SERIALIZE_METHODS), version checks should use hardcoded maximum flags (/*is_basic_scheme_active=*/true, /*is_extended_addr=*/true) rather than deployment-based flags. This is because serialization code should be able to deserialize any structurally valid ProTx up to the maximum version the code knows how to handle, regardless of current consensus validity. Validation code, not serialization code, is responsible for checking whether a ProTx version is consensus-valid based on deployment status.
doc/release-notes.md (3)
Learnt from: kwvg
PR: dashpay/dash#6718
File: test/functional/test_framework/test_framework.py:2102-2102
Timestamp: 2025-06-09T16:43:20.996Z
Learning: In the test framework consolidation PR (#6718), user kwvg prefers to limit functional changes to those directly related to MasternodeInfo, avoiding scope creep even for minor improvements like error handling consistency.
Learnt from: kwvg
PR: dashpay/dash#6543
File: src/wallet/receive.cpp:240-251
Timestamp: 2025-02-06T14:34:30.466Z
Learning: Pull request #6543 is focused on move-only changes and refactoring, specifically backporting from Bitcoin. Behavior changes should be proposed in separate PRs.
Learnt from: PastaPastaPasta
PR: dashpay/dash#6564
File: contrib/containers/deploy/Dockerfile:1-1
Timestamp: 2025-02-11T19:25:05.487Z
Learning: The deploy container for Dash Core is designed to be minimal, requiring only basic container functionality without complex init systems or service management.
🪛 markdownlint-cli2 (0.17.2)
doc/release-notes.md

29-29: Heading style
Expected: atx; Actual: setext

(MD003, heading-style)


34-34: Heading style
Expected: atx; Actual: setext

(MD003, heading-style)


39-39: Heading style
Expected: atx; Actual: setext

(MD003, heading-style)


44-44: Heading style
Expected: atx; Actual: setext

(MD003, heading-style)

doc/release-notes/dash/release-notes-22.1.2.md

29-29: Heading style
Expected: atx; Actual: setext

(MD003, heading-style)


35-35: Heading style
Expected: atx; Actual: setext

(MD003, heading-style)


40-40: Heading style
Expected: atx; Actual: setext

(MD003, heading-style)


45-45: Heading style
Expected: atx; Actual: setext

(MD003, heading-style)


50-50: Heading style
Expected: atx; Actual: setext

(MD003, heading-style)


56-56: Heading style
Expected: atx; Actual: setext

(MD003, heading-style)

🪛 LanguageTool
doc/release-notes/dash/release-notes-22.1.2.md

[style] ~3-~3: This is not the usual sequence for adjectives that have no special emphasis.
Context: # Dash Core version v22.1.2 This is a new minor version release, bringing various bugfi...

(EN_ADJ_ORDER)

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (2)
  • GitHub Check: Build container / Build container
  • GitHub Check: check_merge
🔇 Additional comments (9)
src/chainparams.cpp (4)

222-222: LGTM: Mainnet minimum chain work updated.

The consensus parameter update advances the mainnet minimum chain work to block height 2301632.


225-225: LGTM: Mainnet assume valid block updated.

The consensus parameter update advances the mainnet assume valid block to block height 2301632.


420-420: LGTM: Testnet minimum chain work updated.

The consensus parameter update advances the testnet minimum chain work to block height 1254997.


423-423: LGTM: Testnet assume valid block updated.

The consensus parameter update advances the testnet assume valid block to block height 1254997.

doc/release-notes.md (5)

1-1: LGTM: Version updated to v22.1.3.

The release notes title correctly reflects the new version.


49-49: LGTM: Change log section updated.

The change log title correctly reflects the new version.


57-60: LGTM: Credits section updated.

The contributors list has been appropriately updated for the new release.


68-68: LGTM: Older releases section updated.

The v22.1.2 release has been properly added to the older releases list.


125-125: LGTM: Change log link updated.

The comparison link correctly reflects the version range from v22.1.2 to v22.1.3.

Copy link
Copy Markdown
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 2527ca5

Copy link
Copy Markdown
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 2527ca5

@PastaPastaPasta PastaPastaPasta merged commit 06d762b into dashpay:develop Jul 15, 2025
33 of 34 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.

3 participants