Skip to content

Conversation

@UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Feb 12, 2025

Issue being fixed or feature implemented

Mixing with p2p v2 protocol enabled on p2p v1 masternodes triggers reconnection which "forgets" about Dash-specific flags so these connections aren't dropped on mixing session timeouts like they should. Most nodes on testnet are upgraded so the issue wasn't noticeable there unfortunately.

What was done?

Store Dash-specific flags in ReconnectionInfo and use them in PerformReconnections() later

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)

@coderabbitai
Copy link

coderabbitai bot commented Feb 12, 2025

Walkthrough

The changes update the network connection management by modifying function signatures and data structures related to connection handling. In the network connection manager, methods such as OpenNetworkConnection, PerformReconnections, and DisconnectNodes have been updated to include two new parameters that differentiate between regular connections and those intended for masternodes and probes. A new method, OpenMasternodeConnection, has also been introduced to specifically manage masternode connections. Additionally, the ReconnectionInfo structure in the header file has been expanded with two boolean fields to track whether a connection is for a masternode or a probe. These adjustments allow the system to manage and monitor specialized connection types within the application.


📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between b115fc7 and 17f0aa3.

📒 Files selected for processing (2)
  • src/net.cpp (2 hunks)
  • src/net.h (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: Build Image
🔇 Additional comments (3)
src/net.cpp (1)

2250-2253: Forces v1 fallback with consistent masternode settings.

These lines correctly preserve the masternode-related flags and set use_v2transport to false when reconnecting via v1. This ensures that:

  • The same masternode flags (masternode_connection, masternode_probe_connection) are copied from the preceding connection.
  • Future attempts will bypass v2 transport, avoiding repeated handshakes with a peer that might not have compatible v2 support.
src/net.h (2)

1977-1986: LGTM! The new fields will help retain masternode connection states during reconnections.

The addition of masternode_connection and masternode_probe_connection fields to the ReconnectionInfo struct aligns with the PR objective and follows consistent naming with similar fields in the CNode class.


1991-1991: LGTM! The list is properly protected for thread-safe reconnection queuing.

The m_reconnections list is appropriately guarded by a mutex and well-documented.

✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ 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.
    • Generate unit testing code for this file.
    • 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 generate unit testing code for this file.
    • @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 generate unit testing code.
    • @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.

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. (Beta)
  • @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.

@kxcd
Copy link

kxcd commented Feb 12, 2025

Will this solve my problem with not being able to mix with any V2 MN? Currently my 22.1 client connects to such MNs and after about 30 seconds the connection is dropped. This happens during mixing. The error appears to be,

2025-02-12T12:14:38Z [mixing] DSCOMPLETE -- message doesn't match current Masternode: infoMixingMasternode=82.211.25.170:9999  addr=85.209.241.23:9999

I see lots of these just before the node is kicked.

@UdjinM6
Copy link
Author

UdjinM6 commented Feb 12, 2025

@kxcd No, this fixes another issue.

Will this solve my problem with not being able to mix with any V2 MN? Currently my 22.1 client connects to such MNs and after about 30 seconds the connection is dropped.

This is expected to happen if there is no mixing progress being made on that masternode.

This happens during mixing. The error appears to be,

2025-02-12T12:14:38Z [mixing] DSCOMPLETE -- message doesn't match current Masternode: infoMixingMasternode=82.211.25.170:9999  addr=85.209.241.23:9999

I see lots of these just before the node is kicked.

This is not an error actually, it's just an indication that this specific dsc message is not meant to be processed by that specific mixing session. It's going to be processed by the session that has the right address.

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.

ACK 17f0aa3


Tested by funding new wallet and mixing ~1 tDASH

Build mixing tDASH

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 17f0aa3

@UdjinM6 UdjinM6 added this to the 23 milestone Feb 13, 2025
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.

LGTM 17f0aa3

@PastaPastaPasta PastaPastaPasta merged commit b3a5103 into dashpay:develop Feb 14, 2025
27 checks passed
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Feb 14, 2025
…ific flags

17f0aa3 fix: ReconnectionInfo should also store Dash-specific flags (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented
  Mixing with p2p v2 protocol enabled on p2p v1 masternodes triggers reconnection which "forgets" about Dash-specific flags so these connections aren't dropped on mixing session timeouts like they should. Most nodes on testnet are upgraded so the issue wasn't noticeable there unfortunately.

  ## What was done?
  Store Dash-specific flags in `ReconnectionInfo` and use them in `PerformReconnections()` later

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

ACKs for top commit:
  kwvg:
    ACK 17f0aa3
  PastaPastaPasta:
    utACK 17f0aa3

Tree-SHA512: eb69716e79acc29529b900900d284ddd2d6565d847b1039194c8764fa4575a7a8f51e95b733dc58a550819f9cf5be11de759ceb6884ce44723ede912231cc574
@UdjinM6 UdjinM6 modified the milestones: 23, 22.1.1 Feb 14, 2025
PastaPastaPasta added a commit that referenced this pull request Feb 14, 2025
4298d73 chore: bump to 22.1.1 (pasta)
fc65a16 chore: release notes for 22.1.1 (pasta)
38762f7 Merge #6574: fix: ReconnectionInfo should also store Dash-specific flags (pasta)
580b74c Merge #6566: fix(qt): avoid leaking balance and CJ info in GUI when in discreet mode (pasta)

Pull request description:

  ## Issue being fixed or feature implemented
  See commits; backport to and prep for release 22.1.1

  ## What was done?

  ## How Has This Been Tested?
  built locally

  ## 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
  - [x] I have assigned this pull request to a milestone

ACKs for top commit:
  UdjinM6:
    LGTM, utACK 4298d73
  kwvg:
    utACK 4298d73

Tree-SHA512: 4e07dd80cfda8c05645a2089fdffe1ddccc6179283c2b2448292fa8d8577a6db794cc46a389a401e7a8a14ac987ebea9e76330c78c7efc08cb4c4bd9a7a91cf2
PastaPastaPasta added a commit that referenced this pull request Apr 23, 2025
8b4ab03 fix: suppress MIN_MASTERNODE_PROTO_VERSION bump in 6608 (pasta)
aca04d1 chore: bump build to 22.1.2 (pasta)
d9d8c24 docs: add release notes for 22.1.2 (pasta)
fb45240 Merge #6608: fix: `cycleHash` should represent a cycle starting block of the signing quorum (pasta)
9d1498c Merge #6625: fix: adjust quorum rotation data results in some edge cases, add tests (pasta)
dfc1119 Merge #6622: fix: efficient build mnlistdiffs in rotation info (pasta)
6fd626b Merge #6586: fix: revert deployment images back to Ubuntu 22.04 LTS (`jammy`), pin QEMU to avoid segfault (pasta)
affa9d1 Merge #6599: fix: follow-up #6546 to bump copyright year in COPYING and debian's package (pasta)
f6163a2 Merge #6593: fix: resolve potential deadlock in coinjoin_tests (pasta)
243e0ab Merge #6585: fix: Do not assert special tx type for cbtx in simplified mn list diff output (pasta)
497f95c Merge #6581: perf: speedup of CBLSLazyPublicKey::operator== when comparing to the default / null object; speedup CDeterministicMNList::AddMN by avoiding check to IsValid when a nullcheck is sufficient (pasta)
4298d73 chore: bump to 22.1.1 (pasta)
fc65a16 chore: release notes for 22.1.1 (pasta)
38762f7 Merge #6574: fix: ReconnectionInfo should also store Dash-specific flags (pasta)
580b74c Merge #6566: fix(qt): avoid leaking balance and CJ info in GUI when in discreet mode (pasta)

Pull request description:

  ## Issue being fixed or feature implemented

  ## What was done?
  ff-ed `master` 21.1.0 -> 21.1.2, merging it back into `develop` now

  ## 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 73fa780; gonna merge as this changes docs only

Tree-SHA512: f04fe461edc05c38771d684bd5d60327076251b8004723027276b104989ea6d84f7f77cce31f310f058e81f2c25411ab5a15b563cd3db66091ccaf33da459e3c
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.

5 participants