Skip to content

Commit f72034a

Browse files
committed
fix: debugging keystone integration
feat: support for zpub view only restore
1 parent 9843c3c commit f72034a

File tree

4 files changed

+39
-31
lines changed

4 files changed

+39
-31
lines changed

cw_bitcoin/lib/bitcoin_wallet.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import 'package:cw_core/output_info.dart';
2626
import 'package:cw_core/payjoin_session.dart';
2727
import 'package:cw_core/pending_transaction.dart';
2828
import 'package:cw_core/unspent_coins_info.dart';
29+
import 'package:cw_core/utils/print_verbose.dart';
2930
import 'package:cw_core/utils/zpub.dart';
3031
import 'package:cw_core/wallet_info.dart';
3132
import 'package:cw_core/wallet_keys_file.dart';

cw_bitcoin/pubspec.lock

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ packages:
4242
dependency: transitive
4343
description:
4444
name: async
45-
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
45+
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
4646
url: "https://pub.dev"
4747
source: hosted
48-
version: "2.13.0"
48+
version: "2.11.0"
4949
bbqrdart:
5050
dependency: "direct main"
5151
description:
@@ -126,10 +126,10 @@ packages:
126126
dependency: transitive
127127
description:
128128
name: boolean_selector
129-
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
129+
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
130130
url: "https://pub.dev"
131131
source: hosted
132-
version: "2.1.2"
132+
version: "2.1.1"
133133
bs58check:
134134
dependency: transitive
135135
description:
@@ -223,10 +223,10 @@ packages:
223223
dependency: transitive
224224
description:
225225
name: characters
226-
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
226+
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
227227
url: "https://pub.dev"
228228
source: hosted
229-
version: "1.4.0"
229+
version: "1.3.0"
230230
checked_yaml:
231231
dependency: transitive
232232
description:
@@ -247,10 +247,10 @@ packages:
247247
dependency: transitive
248248
description:
249249
name: clock
250-
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
250+
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
251251
url: "https://pub.dev"
252252
source: hosted
253-
version: "1.1.2"
253+
version: "1.1.1"
254254
code_builder:
255255
dependency: transitive
256256
description:
@@ -263,10 +263,10 @@ packages:
263263
dependency: transitive
264264
description:
265265
name: collection
266-
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
266+
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
267267
url: "https://pub.dev"
268268
source: hosted
269-
version: "1.19.1"
269+
version: "1.19.0"
270270
convert:
271271
dependency: transitive
272272
description:
@@ -588,10 +588,10 @@ packages:
588588
dependency: transitive
589589
description:
590590
name: leak_tracker_flutter_testing
591-
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
591+
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
592592
url: "https://pub.dev"
593593
source: hosted
594-
version: "3.0.9"
594+
version: "3.0.8"
595595
leak_tracker_testing:
596596
dependency: transitive
597597
description:
@@ -654,10 +654,10 @@ packages:
654654
dependency: transitive
655655
description:
656656
name: matcher
657-
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
657+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
658658
url: "https://pub.dev"
659659
source: hosted
660-
version: "0.12.17"
660+
version: "0.12.16+1"
661661
material_color_utilities:
662662
dependency: transitive
663663
description:
@@ -670,10 +670,10 @@ packages:
670670
dependency: transitive
671671
description:
672672
name: meta
673-
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
673+
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
674674
url: "https://pub.dev"
675675
source: hosted
676-
version: "1.16.0"
676+
version: "1.15.0"
677677
mime:
678678
dependency: transitive
679679
description:
@@ -735,10 +735,10 @@ packages:
735735
dependency: transitive
736736
description:
737737
name: path
738-
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
738+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
739739
url: "https://pub.dev"
740740
source: hosted
741-
version: "1.9.1"
741+
version: "1.9.0"
742742
path_provider:
743743
dependency: "direct main"
744744
description:
@@ -1007,10 +1007,10 @@ packages:
10071007
dependency: transitive
10081008
description:
10091009
name: source_span
1010-
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
1010+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
10111011
url: "https://pub.dev"
10121012
source: hosted
1013-
version: "1.10.1"
1013+
version: "1.10.0"
10141014
sp_scanner:
10151015
dependency: "direct main"
10161016
description:
@@ -1032,18 +1032,18 @@ packages:
10321032
dependency: transitive
10331033
description:
10341034
name: stack_trace
1035-
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
1035+
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
10361036
url: "https://pub.dev"
10371037
source: hosted
1038-
version: "1.12.1"
1038+
version: "1.12.0"
10391039
stream_channel:
10401040
dependency: transitive
10411041
description:
10421042
name: stream_channel
1043-
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
1043+
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
10441044
url: "https://pub.dev"
10451045
source: hosted
1046-
version: "2.1.4"
1046+
version: "2.1.2"
10471047
stream_transform:
10481048
dependency: transitive
10491049
description:
@@ -1056,26 +1056,26 @@ packages:
10561056
dependency: transitive
10571057
description:
10581058
name: string_scanner
1059-
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
1059+
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
10601060
url: "https://pub.dev"
10611061
source: hosted
1062-
version: "1.4.1"
1062+
version: "1.3.0"
10631063
term_glyph:
10641064
dependency: transitive
10651065
description:
10661066
name: term_glyph
1067-
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
1067+
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
10681068
url: "https://pub.dev"
10691069
source: hosted
1070-
version: "1.2.2"
1070+
version: "1.2.1"
10711071
test_api:
10721072
dependency: transitive
10731073
description:
10741074
name: test_api
1075-
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
1075+
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
10761076
url: "https://pub.dev"
10771077
source: hosted
1078-
version: "0.7.4"
1078+
version: "0.7.3"
10791079
timing:
10801080
dependency: transitive
10811081
description:
@@ -1229,5 +1229,5 @@ packages:
12291229
source: hosted
12301230
version: "2.2.2"
12311231
sdks:
1232-
dart: ">=3.7.0-0 <4.0.0"
1232+
dart: ">=3.6.2 <4.0.0"
12331233
flutter: ">=3.27.0"

lib/di.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,6 +1603,7 @@ Future<void> setup({
16031603
getIt.registerFactory(() => DevQRToolsPage());
16041604

16051605
getIt.registerFactory(() => ExchangeProviderLogsViewModel());
1606+
16061607
getIt.registerFactory(() => DevExchangeProviderLogsPage(getIt.get<ExchangeProviderLogsViewModel>()));
16071608

16081609
getIt.registerFactory(() => StartTorPage(StartTorViewModel(),));

lib/src/screens/settings/other_settings_page.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,12 @@ class OtherSettingsPage extends BasePage {
138138
title: '[dev] *QR tools',
139139
handler: (context) => Navigator.of(context).pushNamed(Routes.devQRTools),
140140
),
141+
if (FeatureFlag.hasDevOptions)
142+
SettingsCellWithArrow(
143+
title: '[dev] *QR tools',
144+
handler: (BuildContext context) =>
145+
Navigator.of(context).pushNamed(Routes.devQRTools),
146+
),
141147
Spacer(),
142148
SettingsVersionCell(
143149
title: S.of(context).version(_otherSettingsViewModel.currentVersion),

0 commit comments

Comments
 (0)