From f556603392914658339f593d6029202dacae8d2a Mon Sep 17 00:00:00 2001 From: OmarHatem Date: Sat, 9 Aug 2025 04:58:47 +0300 Subject: [PATCH] update bitcoin_base to fix version conflict issue --- cw_bitcoin/pubspec.lock | 44 +++++++++---------- cw_bitcoin/pubspec.yaml | 2 +- cw_bitcoin_cash/pubspec.yaml | 2 +- cw_dogecoin/pubspec.yaml | 2 +- .../components/common_test_flows.dart | 2 + macos/Podfile.lock | 11 +++++ 6 files changed, 38 insertions(+), 25 deletions(-) diff --git a/cw_bitcoin/pubspec.lock b/cw_bitcoin/pubspec.lock index 58eb5e7f7..4b77435fb 100644 --- a/cw_bitcoin/pubspec.lock +++ b/cw_bitcoin/pubspec.lock @@ -34,10 +34,10 @@ packages: dependency: transitive description: name: asn1lib - sha256: "1c296cd268f486cabcc3930e9b93a8133169305f18d722916e675959a88f6d2c" + sha256: "9a8f69025044eb466b9b60ef3bc3ac99b4dc6c158ae9c56d25eeccf5bc56d024" url: "https://pub.dev" source: hosted - version: "1.5.9" + version: "1.6.5" async: dependency: transitive description: @@ -93,8 +93,8 @@ packages: dependency: "direct overridden" description: path: "." - ref: cake-update-v10 - resolved-ref: "545bcade1e8c7691553bbd811f51bc54c333b19f" + ref: cake-update-v11 + resolved-ref: "46e5a2d8a5438cb523a6104b70f5e5125a5663b3" url: "https://github.com/cake-tech/bitcoin_base" source: git version: "4.7.0" @@ -199,10 +199,10 @@ packages: dependency: transitive description: name: built_value - sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27" + sha256: ba95c961bafcd8686d1cf63be864eb59447e795e124d98d6a27d91fcd13602fb url: "https://pub.dev" source: hosted - version: "8.10.1" + version: "8.11.1" cake_backup: dependency: transitive description: @@ -429,10 +429,10 @@ packages: dependency: transitive description: name: freezed_annotation - sha256: c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b + sha256: "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8" url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.1.0" frontend_server_client: dependency: transitive description: @@ -477,10 +477,10 @@ packages: dependency: "direct main" description: name: grpc - sha256: "30e1edae6846b163a64f6d8716e3443980fe1f7d2d1f086f011d24ea186f2582" + sha256: "2dde469ddd8bbd7a33a0765da417abe1ad2142813efce3a86c512041294e2b26" url: "https://pub.dev" source: hosted - version: "4.0.4" + version: "4.1.0" hex: dependency: transitive description: @@ -509,10 +509,10 @@ packages: dependency: "direct main" description: name: http - sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b" + sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007 url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.5.0" http2: dependency: transitive description: @@ -615,7 +615,7 @@ packages: description: path: "packages/ledger-litecoin" ref: HEAD - resolved-ref: e93254f3ff3f996fb91f65a1e7ceffb9f510b4c8 + resolved-ref: e8ab1a98493dfdd2277edde07a66b8d378ca70f6 url: "https://github.com/cake-tech/ledger-flutter-plus-plugins" source: git version: "0.0.2" @@ -704,7 +704,7 @@ packages: description: path: "." ref: cake-update-v2 - resolved-ref: "93440dc5126369b873ca1fccc13c3c1240b1c5c2" + resolved-ref: "096865a8c6b89c260beadfec04f7e184c40a3273" url: "https://github.com/cake-tech/on_chain.git" source: git version: "3.7.0" @@ -889,10 +889,10 @@ packages: dependency: transitive description: name: shared_preferences_android - sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac" + sha256: "5bcf0772a761b04f8c6bf814721713de6f3e5d9d89caf8d3fe031b02a342379e" url: "https://pub.dev" source: hosted - version: "2.4.10" + version: "2.4.11" shared_preferences_foundation: dependency: transitive description: @@ -1057,10 +1057,10 @@ packages: dependency: transitive description: name: timing - sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" tor_binary: dependency: transitive description: @@ -1106,10 +1106,10 @@ packages: dependency: transitive description: name: unorm_dart - sha256: "23d8bf65605401a6a32cff99435fed66ef3dab3ddcad3454059165df46496a3b" + sha256: "8e3870a1caa60bde8352f9597dd3535d8068613269444f8e35ea8925ec84c1f5" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.3.1+1" ur: dependency: "direct main" description: @@ -1139,10 +1139,10 @@ packages: dependency: "direct overridden" description: name: watcher - sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" + sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" web: dependency: transitive description: diff --git a/cw_bitcoin/pubspec.yaml b/cw_bitcoin/pubspec.yaml index 062ac025b..d1f9ddaf3 100644 --- a/cw_bitcoin/pubspec.yaml +++ b/cw_bitcoin/pubspec.yaml @@ -81,7 +81,7 @@ dependency_overrides: bitcoin_base: git: url: https://github.com/cake-tech/bitcoin_base - ref: cake-update-v10 + ref: cake-update-v11 pointycastle: 3.7.4 ffi: 2.1.0 diff --git a/cw_bitcoin_cash/pubspec.yaml b/cw_bitcoin_cash/pubspec.yaml index bd5a30cbb..585a4ab08 100644 --- a/cw_bitcoin_cash/pubspec.yaml +++ b/cw_bitcoin_cash/pubspec.yaml @@ -42,7 +42,7 @@ dependency_overrides: bitcoin_base: git: url: https://github.com/cake-tech/bitcoin_base - ref: cake-update-v10 + ref: cake-update-v11 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/cw_dogecoin/pubspec.yaml b/cw_dogecoin/pubspec.yaml index 599a76429..97b58a285 100644 --- a/cw_dogecoin/pubspec.yaml +++ b/cw_dogecoin/pubspec.yaml @@ -39,7 +39,7 @@ dependency_overrides: bitcoin_base: git: url: https://github.com/cake-tech/bitcoin_base - ref: cake-update-v10 + ref: cake-update-v11 # For information on the generic Dart part of this file, see the diff --git a/integration_test/components/common_test_flows.dart b/integration_test/components/common_test_flows.dart index 5229df3a2..9cd3b3627 100644 --- a/integration_test/components/common_test_flows.dart +++ b/integration_test/components/common_test_flows.dart @@ -363,6 +363,8 @@ class CommonTestFlows { return secrets.zanoTestWalletSeeds; case WalletType.decred: return secrets.decredTestWalletSeeds; + case WalletType.dogecoin: + return secrets.dogeTestWalletSeeds; case WalletType.none: case WalletType.haven: case WalletType.banano: diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 5b209b0cf..f6c94ccf3 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -7,8 +7,11 @@ PODS: - FlutterMacOS - devicelocale (0.0.1): - FlutterMacOS + - dnssec_proof (0.0.1) - fast_scanner (5.1.1): - FlutterMacOS + - file_selector_macos (0.0.1): + - FlutterMacOS - flutter_inappwebview_macos (0.0.1): - FlutterMacOS - OrderedSet (~> 6.0.3) @@ -47,7 +50,9 @@ DEPENDENCIES: - cw_mweb (from `Flutter/ephemeral/.symlinks/plugins/cw_mweb/macos`) - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`) - devicelocale (from `Flutter/ephemeral/.symlinks/plugins/devicelocale/macos`) + - dnssec_proof (from `Flutter/ephemeral/.symlinks/plugins/dnssec_proof/macos`) - fast_scanner (from `Flutter/ephemeral/.symlinks/plugins/fast_scanner/macos`) + - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`) - flutter_inappwebview_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos`) - flutter_local_authentication (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_authentication/macos`) - flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`) @@ -76,8 +81,12 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos devicelocale: :path: Flutter/ephemeral/.symlinks/plugins/devicelocale/macos + dnssec_proof: + :path: Flutter/ephemeral/.symlinks/plugins/dnssec_proof/macos fast_scanner: :path: Flutter/ephemeral/.symlinks/plugins/fast_scanner/macos + file_selector_macos: + :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos flutter_inappwebview_macos: :path: Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos flutter_local_authentication: @@ -112,7 +121,9 @@ SPEC CHECKSUMS: cw_mweb: 7440b12ead811dda972a9918442ea2a458e8742c device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225 + dnssec_proof: d461cac7bd3301eb7447f87936745a0c1ae0a67e fast_scanner: d31bae07e2653403a69dac99fb710c1722b16a97 + file_selector_macos: cc3858c981fe6889f364731200d6232dac1d812d flutter_inappwebview_macos: bdf207b8f4ebd58e86ae06cd96b147de99a67c9b flutter_local_authentication: 85674893931e1c9cfa7c9e4f5973cb8c56b018b0 flutter_local_notifications: 4ccab5b7a22835214a6672e3f9c5e8ae207dab36