Skip to content

fix: use GetTxDepthInMainChain for CoinJoin depth checks#6660

Merged
PastaPastaPasta merged 1 commit intodashpay:developfrom
kwvg:fix_cj_depth
May 7, 2025
Merged

fix: use GetTxDepthInMainChain for CoinJoin depth checks#6660
PastaPastaPasta merged 1 commit intodashpay:developfrom
kwvg:fix_cj_depth

Conversation

@kwvg
Copy link
Collaborator

@kwvg kwvg commented May 6, 2025

Motivation

When testing CoinJoin on dash#6654, it was found that CoinJoin on develop (fc96190) had stopped working as expected. The regression was traced back to 9a5dc62 in dash#6633.

Specifically, erroneous substitution of GetDepthInMainChain() calls with GetTxBlocksToMaturity(). This has been resolved by changing them to the intended substitution, GetTxDepthInMainChain() and now CoinJoin should work as intended.

How Has This Been Tested?

A full CoinJoin session run on 2b3d4a5

CoinJoin session run on build 2b3d4a57

Breaking Changes

None expected.

Checklist

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

@kwvg kwvg added this to the 23 milestone May 6, 2025
@kwvg kwvg marked this pull request as ready for review May 6, 2025 22:28
@kwvg kwvg requested review from PastaPastaPasta, UdjinM6 and knst May 6, 2025 22:28
@coderabbitai
Copy link

coderabbitai bot commented May 6, 2025

Walkthrough

The code update in src/wallet/coinjoin.cpp replaces the use of wallet.GetTxBlocksToMaturity(wtx) with wallet.GetTxDepthInMainChain(wtx) within the functions CachedTxGetAnonymizedCredit and CachedTxGetAvailableCoinJoinCredits. This change adjusts the logic for filtering out coinbase or conflicted transactions and alters the criteria for determining transaction eligibility for credit calculations by checking transaction depth in the main chain instead of blocks to maturity. No changes were made to the declarations or signatures of exported or public entities.

📜 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 50db326 and 2b3d4a5.

📒 Files selected for processing (1)
  • src/wallet/coinjoin.cpp (2 hunks)
🧰 Additional context used
🧬 Code Graph Analysis (1)
src/wallet/coinjoin.cpp (1)
src/wallet/wallet.h (12)
  • wtx (292-292)
  • wtx (499-499)
  • wtx (507-507)
  • wtx (508-508)
  • wtx (514-514)
  • wtx (515-515)
  • wtx (522-522)
  • wtx (523-523)
  • wtx (594-594)
  • wtx (691-691)
  • wtx (693-693)
  • wallet (399-399)
⏰ Context from checks skipped due to timeout of 90000ms (6)
  • GitHub Check: linux64_tsan-test / Test source
  • GitHub Check: linux64_ubsan-test / Test source
  • GitHub Check: linux64_sqlite-test / Test source
  • GitHub Check: linux64_nowallet-test / Test source
  • GitHub Check: linux64-test / Test source
  • GitHub Check: linux64_multiprocess-build / Build source
🔇 Additional comments (2)
src/wallet/coinjoin.cpp (2)

500-501: Fixed critical CoinJoin regression

The change from GetTxBlocksToMaturity to GetTxDepthInMainChain correctly restores the original behavior for CoinJoin depth checks. This function properly filters out conflicted transactions (those with negative depth) rather than incorrectly using maturity logic.

536-537: Correct function usage for transaction depth checking

This change properly uses GetTxDepthInMainChain to determine if the transaction is in the main blockchain instead of the previously incorrect GetTxBlocksToMaturity. This restores the correct behavior for CoinJoin functionality.

✨ 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.
    • 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.

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.

PastaPastaPasta
PastaPastaPasta approved these changes May 7, 2025
View reviewed changes
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 2b3d4a5

UdjinM6
UdjinM6 approved these changes May 7, 2025
View reviewed changes
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 2b3d4a5

knst
knst approved these changes May 7, 2025
View reviewed changes
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 2b3d4a5

@PastaPastaPasta PastaPastaPasta merged commit e14a8bd into dashpay:develop May 7, 2025
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@knst knst knst approved these changes

@UdjinM6 UdjinM6 UdjinM6 approved these changes

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

23

Development

Successfully merging this pull request may close these issues.

4 participants

@kwvg @knst @UdjinM6 @PastaPastaPasta