Skip to content

feat: merge dashpay / coinjoin#595

Merged
pankcuf merged 39 commits intodevelopfrom
feat/merge-with-coinjoin
Mar 25, 2025
Merged

feat: merge dashpay / coinjoin#595
pankcuf merged 39 commits intodevelopfrom
feat/merge-with-coinjoin

Conversation

@pankcuf
Copy link
Copy Markdown
Contributor

@pankcuf pankcuf commented Mar 25, 2025

This pull request includes multiple changes across various files to improve the DashSync codebase. The most important changes involve dashpay + ferment + coinjoin integration, removing a submodule, updating dependencies, and refactoring code (see also dash-shared-core changes).

Submodule Removal:

Dependency Updates:

  • DashSync.podspec: Updated the source URL for dashsync-iOS and downgraded the DashSharedCore dependency version. Removed dependencies on DAPI-GRPC and TinyCborObjc. [1] [2]

Code Refactoring:

Header and Import Adjustments:

  • DashSync/shared/Categories/NSData/NSData+DSHash.m: Replaced dash_shared_core.h with dash_spv_apple_bindings.h and updated the blake3Data method.
  • DashSync/shared/Categories/NSData/NSData+DSMerkAVLTree.h and DashSync/shared/Categories/NSData/NSData+DSMerkAVLTree.m: Commented out imports and method implementations related to DSPlatformTreeQuery and NSData+DSCborDecoding. [1] [2]

These changes collectively aim to streamline the codebase, update dependencies, and improve maintainability.

# Conflicts:
#	DashSync.podspec
#	DashSync/shared/DashSync.m
#	DashSync/shared/Models/Chain/DSChain.m
#	DashSync/shared/Models/DAPI/DSPlatformDocumentsRequest.m
#	DashSync/shared/Models/DAPI/Networking/DSDAPIPlatformNetworkService.m
#	DashSync/shared/Models/DAPI/Networking/DSDAPIPlatformNetworkServiceProtocol.h
#	DashSync/shared/Models/Derivation Paths/DSFundsDerivationPath.m
#	DashSync/shared/Models/Identity/DSBlockchainIdentity.m
#	DashSync/shared/Models/Managers/Chain Managers/DSKeyManager.m
#	DashSync/shared/Models/Managers/Chain Managers/DSMasternodeManager.m
#	DashSync/shared/Models/Managers/Chain Managers/DSTransactionManager.m
#	DashSync/shared/Models/Masternode/DSMasternodeListDiffService.m
#	DashSync/shared/Models/Masternode/DSMasternodeListService.h
#	DashSync/shared/Models/Masternode/DSMasternodeListService.m
#	DashSync/shared/Models/Platform/Transitions/BlockchainIdentity/DSBlockchainIdentityCloseTransition.m
#	DashSync/shared/Models/Platform/Transitions/BlockchainIdentity/DSBlockchainIdentityUpdateTransition.m
#	DashSync/shared/Models/Transactions/Base/DSAssetLockTransaction.m
#	DashSync/shared/Models/Transactions/Base/DSTransaction.h
#	DashSync/shared/Models/Transactions/Base/DSTransaction.m
#	DashSync/shared/Models/Transactions/Provider/DSProviderRegistrationTransaction.m
#	DashSync/shared/Models/Wallet/DSAccount.h
#	DashSync/shared/Models/Wallet/DSAccount.m
#	DashSync/shared/Models/Wallet/DSWallet+Protected.h
#	DashSync/shared/Models/Wallet/DSWallet.h
#	DashSync/shared/Models/Wallet/DSWallet.m
#	Example/DashSync.xcodeproj/project.pbxproj
#	Example/DashSync/Base.lproj/Main.storyboard
#	Example/Podfile.lock
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Mar 25, 2025

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


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.

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 resolve resolve all the CodeRabbit review comments.
  • @coderabbitai plan to trigger planning for file edits and PR creation.
  • @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.

pankcuf added 6 commits March 25, 2025 17:28
# Conflicts:
#	DashSync/shared/Models/Identity/DSBlockchainIdentity.h
#	DashSync/shared/Models/Identity/DSBlockchainIdentity.m
#	DashSync/shared/Models/Identity/DSBlockchainInvitation.m
#	DashSync/shared/Models/Identity/DSInvitation.h
@pankcuf pankcuf changed the title Feat/merge with coinjoin feat: merge dashpay / coinjoin Mar 25, 2025
@pankcuf pankcuf marked this pull request as ready for review March 25, 2025 10:11
@pankcuf pankcuf requested a review from Syn-McJ March 25, 2025 10:11
Copy link
Copy Markdown
Member

@Syn-McJ Syn-McJ left a comment

Choose a reason for hiding this comment

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

Looks good. Some build issues in the wallet with this version of DashSync, but they don't look too bad.

@pankcuf pankcuf merged commit 3468a89 into develop Mar 25, 2025
@pankcuf pankcuf deleted the feat/merge-with-coinjoin branch April 23, 2025 06:16
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.

2 participants