implement-payjoin #1949
Merged
implement-payjoin #1949
+2,622
−198
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # cw_bitcoin/lib/electrum_wallet.dart # lib/src/screens/dashboard/pages/balance_page.dart
# Conflicts: # cw_bitcoin/pubspec.lock # lib/di.dart # lib/locales/hausa_intl.dart # lib/locales/yoruba_intl.dart # lib/store/settings_store.dart # lib/view_model/dashboard/dashboard_view_model.dart # lib/view_model/settings/privacy_settings_view_model.dart
OmarHatem28
reviewed
Apr 17, 2025
Comment on lines
+45
to
+46
| url: https://github.com/konstantinullrich/payjoin-flutter | ||
| ref: 6a3eb32fb9467ac12e7b75d3de47de4ca44fd88c #cake-v1 |
There was a problem hiding this comment.
can we make the fork in Cake org please
There was a problem hiding this comment.
even better if changes can be upstreamed. payjoin-flutter is going to get regular updates and it'd be better than nice to maintain compatibility
There was a problem hiding this comment.
Agreed,
@konstantinullrich I see that the fork only bumps the rust bridge version, if that is all that is needed, then we can just override it in our project, or open a PR on upstream to update it
…aner code Removed unnecessary `CakeHive` dependency and refactored `BitcoinWallet` initialization to use `payjoinSessionSource`. Improved code readability in `PsbtSigner` by reformatting lines and simplifying constructor methods for `UtxoWithPrivateKey`.
# Conflicts: # cw_monero/pubspec.lock # lib/src/screens/send/widgets/send_card.dart
# Conflicts: # res/values/strings_ko.arb
OmarHatem28
reviewed
May 8, 2025
| return P2pkhAddress.fromScriptPubkey( | ||
| script: script, network: BitcoinNetwork.mainnet); | ||
| case P2shAddressType.p2pkhInP2sh: | ||
| return P2shAddress.fromScriptPubkey( |
There was a problem hiding this comment.
this should also have p2pkInP2sh right?
OmarHatem28
approved these changes
May 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue Number (if Applicable): Fixes #
Description
Please include a summary of the changes and which issue is fixed / feature is added.
Pull Request - Checklist