From 3508efb1672dedba27d16cb745dd57182af878f2 Mon Sep 17 00:00:00 2001 From: Konstantin Ullrich Date: Mon, 22 Sep 2025 06:47:00 +0200 Subject: [PATCH] Cw 1220 fix payjoin dependency issues (#2519) * feat: use latest payjoin deps * build(cw_bitcoin_cash): bump required dart sdk for * chore: update PR test build workflow container image to latest version * chore: update container images in PR test build workflows to Flutter 3.29.0 * chore: update container images in PR test build workflows to Flutter 3.29.3 * chore: update uni_links dependency to latest commit hash [skip-ci] * chore: remove unused PluginRegistrantCallback implementation from Application classes * fix: CakeTor for PayJoin workers and add retry delay --- .github/workflows/pr_test_build_android.yml | 2 +- .github/workflows/pr_test_build_linux.yml | 2 +- .../cakewallet/cake_wallet/Application.java | 9 +- .../com/cakewallet/haven/Application.java | 9 +- .../main/java/com/monero/app/Application.java | 9 +- .../lib/payjoin/payjoin_receive_worker.dart | 3 + .../lib/payjoin/payjoin_send_worker.dart | 3 + cw_bitcoin/pubspec.lock | 104 +++++++++++------- cw_bitcoin/pubspec.yaml | 4 +- cw_bitcoin_cash/pubspec.yaml | 2 +- pubspec_base.yaml | 2 +- 11 files changed, 82 insertions(+), 67 deletions(-) diff --git a/.github/workflows/pr_test_build_android.yml b/.github/workflows/pr_test_build_android.yml index 3122965d0..a8d8cb6a1 100644 --- a/.github/workflows/pr_test_build_android.yml +++ b/.github/workflows/pr_test_build_android.yml @@ -9,7 +9,7 @@ jobs: PR_test_build: runs-on: linux-amd64 container: - image: ghcr.io/cake-tech/cake_wallet:debian12-flutter3.27.4-ndkr28-go1.24.1-ruststablenightly + image: ghcr.io/cake-tech/cake_wallet:debian12-flutter3.29.3-ndkr28-go1.24.1-ruststablenightly env: STORE_PASS: test@cake_wallet KEY_PASS: test@cake_wallet diff --git a/.github/workflows/pr_test_build_linux.yml b/.github/workflows/pr_test_build_linux.yml index 329c4275e..6c312a72d 100644 --- a/.github/workflows/pr_test_build_linux.yml +++ b/.github/workflows/pr_test_build_linux.yml @@ -9,7 +9,7 @@ jobs: PR_test_build: runs-on: linux-amd64 container: - image: ghcr.io/cake-tech/cake_wallet:debian12-flutter3.27.4-ndkr28-go1.24.1-ruststablenightly + image: ghcr.io/cake-tech/cake_wallet:debian12-flutter3.29.3-ndkr28-go1.24.1-ruststablenightly env: STORE_PASS: test@cake_wallet KEY_PASS: test@cake_wallet diff --git a/android/app/src/main/java/com/cakewallet/cake_wallet/Application.java b/android/app/src/main/java/com/cakewallet/cake_wallet/Application.java index e14d413bb..d3eb70ba6 100644 --- a/android/app/src/main/java/com/cakewallet/cake_wallet/Application.java +++ b/android/app/src/main/java/com/cakewallet/cake_wallet/Application.java @@ -1,11 +1,6 @@ package com.cakewallet.cake_wallet; import io.flutter.app.FlutterApplication; -import io.flutter.plugin.common.PluginRegistry; -import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback; -import io.flutter.plugins.GeneratedPluginRegistrant; -public class Application extends FlutterApplication implements PluginRegistrantCallback { - @Override - public void registerWith(PluginRegistry registry) {} -} \ No newline at end of file +public class Application extends FlutterApplication { +} diff --git a/android/app/src/main/java/com/cakewallet/haven/Application.java b/android/app/src/main/java/com/cakewallet/haven/Application.java index d88eb66b4..0eb2c3cab 100644 --- a/android/app/src/main/java/com/cakewallet/haven/Application.java +++ b/android/app/src/main/java/com/cakewallet/haven/Application.java @@ -1,11 +1,6 @@ package com.cakewallet.haven; import io.flutter.app.FlutterApplication; -import io.flutter.plugin.common.PluginRegistry; -import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback; -import io.flutter.plugins.GeneratedPluginRegistrant; -public class Application extends FlutterApplication implements PluginRegistrantCallback { - @Override - public void registerWith(PluginRegistry registry) {} -} \ No newline at end of file +public class Application extends FlutterApplication { +} diff --git a/android/app/src/main/java/com/monero/app/Application.java b/android/app/src/main/java/com/monero/app/Application.java index b085171e5..0c7cc14dd 100644 --- a/android/app/src/main/java/com/monero/app/Application.java +++ b/android/app/src/main/java/com/monero/app/Application.java @@ -1,11 +1,6 @@ package com.monero.app; import io.flutter.app.FlutterApplication; -import io.flutter.plugin.common.PluginRegistry; -import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback; -import io.flutter.plugins.GeneratedPluginRegistrant; -public class Application extends FlutterApplication implements PluginRegistrantCallback { - @Override - public void registerWith(PluginRegistry registry) {} -} \ No newline at end of file +public class Application extends FlutterApplication { +} diff --git a/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart b/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart index c56148de2..ba0d8d0fb 100644 --- a/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart +++ b/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart @@ -9,6 +9,7 @@ import 'package:cw_bitcoin/payjoin/payjoin_session_errors.dart'; import 'package:cw_bitcoin/psbt/signer.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_core/utils/proxy_wrapper.dart'; +import 'package:cw_core/utils/tor/abstract.dart'; import 'package:payjoin_flutter/bitcoin_ffi.dart'; import 'package:payjoin_flutter/common.dart'; import 'package:payjoin_flutter/receive.dart'; @@ -32,6 +33,7 @@ class PayjoinReceiverWorker { static final client = ProxyWrapper().getHttpIOClient(); static Future run(List args) async { await pj.core.init(); + CakeTor.instance = await CakeTorInstance.getInstance(); final sendPort = args[0] as SendPort; final receiverJson = args[1] as String; @@ -113,6 +115,7 @@ class PayjoinReceiverWorker { final proposal = await session.processRes( body: httpRequest.bodyBytes, ctx: extractReq.$2); if (proposal != null) return proposal; + sleep(Duration(seconds: 2)); } } diff --git a/cw_bitcoin/lib/payjoin/payjoin_send_worker.dart b/cw_bitcoin/lib/payjoin/payjoin_send_worker.dart index 7e85cc773..75f58a4e3 100644 --- a/cw_bitcoin/lib/payjoin/payjoin_send_worker.dart +++ b/cw_bitcoin/lib/payjoin/payjoin_send_worker.dart @@ -6,6 +6,7 @@ import 'package:cw_bitcoin/payjoin/manager.dart'; import 'package:cw_bitcoin/payjoin/payjoin_session_errors.dart'; import 'package:cw_core/utils/print_verbose.dart'; import 'package:cw_core/utils/proxy_wrapper.dart'; +import 'package:cw_core/utils/tor/abstract.dart'; import 'package:payjoin_flutter/common.dart'; import 'package:payjoin_flutter/send.dart'; import 'package:payjoin_flutter/src/generated/frb_generated.dart' as pj; @@ -26,6 +27,7 @@ class PayjoinSenderWorker { static Future run(List args) async { await pj.core.init(); + CakeTor.instance = await CakeTorInstance.getInstance(); final sendPort = args[0] as SendPort; final senderJson = args[1] as String; @@ -91,6 +93,7 @@ class PayjoinSenderWorker { ); printV("$proposalPsbt"); if (proposalPsbt != null) return proposalPsbt; + sleep(Duration(seconds: 2)); } } catch (e) { rethrow; diff --git a/cw_bitcoin/pubspec.lock b/cw_bitcoin/pubspec.lock index 139088655..49ee880dc 100644 --- a/cw_bitcoin/pubspec.lock +++ b/cw_bitcoin/pubspec.lock @@ -42,10 +42,10 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" bbqrdart: dependency: "direct main" description: @@ -119,10 +119,10 @@ packages: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" bs58check: dependency: transitive description: @@ -216,10 +216,10 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -240,10 +240,10 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" code_builder: dependency: transitive description: @@ -256,10 +256,10 @@ packages: dependency: transitive description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.19.1" convert: dependency: transitive description: @@ -350,10 +350,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" ffi: dependency: "direct overridden" description: @@ -573,18 +573,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -647,10 +647,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -663,10 +663,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" mime: dependency: transitive description: @@ -691,6 +691,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.7.1" + mockito: + dependency: transitive + description: + name: mockito + sha256: f99d8d072e249f719a5531735d146d8cf04c580d93920b04de75bef6dfb2daf6 + url: "https://pub.dev" + source: hosted + version: "5.4.5" nested: dependency: transitive description: @@ -720,10 +728,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_provider: dependency: "direct main" description: @@ -776,9 +784,9 @@ packages: dependency: "direct main" description: path: "." - ref: da83a23f3a011cb49eb3b6513cd485b3fb8867ff - resolved-ref: da83a23f3a011cb49eb3b6513cd485b3fb8867ff - url: "https://github.com/OmarHatem28/payjoin-flutter" + ref: "01ba81f6d9ba063fd1902a7fd1e185c2d56f6002" + resolved-ref: "01ba81f6d9ba063fd1902a7fd1e185c2d56f6002" + url: "https://github.com/LtbLightning/payjoin-flutter" source: git version: "0.23.0" petitparser: @@ -992,10 +1000,10 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" sp_scanner: dependency: "direct main" description: @@ -1005,22 +1013,30 @@ packages: url: "https://github.com/cake-tech/sp_scanner" source: git version: "0.0.1" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" stream_transform: dependency: transitive description: @@ -1033,26 +1049,26 @@ packages: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.4" timing: dependency: transitive description: @@ -1117,6 +1133,14 @@ packages: url: "https://github.com/bukata-sa/bc-ur-dart" source: git version: "0.1.0" + uuid: + dependency: transitive + description: + name: uuid + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff + url: "https://pub.dev" + source: hosted + version: "4.5.1" vector_math: dependency: transitive description: @@ -1129,10 +1153,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.3.1" watcher: dependency: "direct overridden" description: @@ -1198,5 +1222,5 @@ packages: source: hosted version: "2.2.2" sdks: - dart: ">=3.6.2 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.27.0" diff --git a/cw_bitcoin/pubspec.yaml b/cw_bitcoin/pubspec.yaml index 8bad17c44..e25d7ba93 100644 --- a/cw_bitcoin/pubspec.yaml +++ b/cw_bitcoin/pubspec.yaml @@ -42,8 +42,8 @@ dependencies: url: https://github.com/cake-tech/bech32.git payjoin_flutter: git: - url: https://github.com/OmarHatem28/payjoin-flutter - ref: da83a23f3a011cb49eb3b6513cd485b3fb8867ff #cake-v2 + url: https://github.com/LtbLightning/payjoin-flutter + ref: 01ba81f6d9ba063fd1902a7fd1e185c2d56f6002 ledger_flutter_plus: ^1.4.1 ledger_bitcoin: git: diff --git a/cw_bitcoin_cash/pubspec.yaml b/cw_bitcoin_cash/pubspec.yaml index 585a4ab08..7ddecdf94 100644 --- a/cw_bitcoin_cash/pubspec.yaml +++ b/cw_bitcoin_cash/pubspec.yaml @@ -6,7 +6,7 @@ author: Cake Wallet homepage: https://cakewallet.com environment: - sdk: '>=2.19.0 <3.0.0' + sdk: ">=2.17.5 <3.0.0" flutter: ">=1.20.0" dependencies: diff --git a/pubspec_base.yaml b/pubspec_base.yaml index d9409e3c3..7de916c18 100644 --- a/pubspec_base.yaml +++ b/pubspec_base.yaml @@ -43,7 +43,7 @@ dependencies: uni_links: git: url: https://github.com/MrCyjaneK/uni_links - ref: 8e9efa4d9beb19e4ac44009576337f1ce51c22e2 + ref: 1989db3f5d625e2fffbad7b85a3b1b8c78c6dfa1 path: uni_links lottie: ^3.3.1 animate_do: ^2.1.0