Linter errors fixes. Move secrandom native to cw_core
M committed
Jan 14, 2022 at 14:19 UTC
30b77ebd584af402552ccb05c803f276236019b9
13 files changed
+89
-29
cw_bitcoin/lib/bitcoin_amount_format.dart
-2
@@ -1,5 +1,3 @@
1
-import 'dart:math';
2
-
1
import 'package:intl/intl.dart';
2
import 'package:cw_core/crypto_amount_format.dart';
3
cw_bitcoin/lib/bitcoin_mnemonic.dart
+1
-1
@@ -4,7 +4,7 @@ import 'dart:typed_data';
4
import 'package:crypto/crypto.dart';
5
import 'package:unorm_dart/unorm_dart.dart' as unorm;
6
import 'package:cryptography/cryptography.dart' as cryptography;
7
-import 'package:cake_wallet/core/sec_random_native.dart';
7
+import 'package:cw_core/sec_random_native.dart';
8
9
const segwit = '100';
10
final wordlist = englishWordlist;
cw_bitcoin/lib/bitcoin_transaction_priority.dart
+7
-7
@@ -1,5 +1,5 @@
1
import 'package:cw_core/transaction_priority.dart';
2
-import 'package:cake_wallet/generated/i18n.dart';
2
+//import 'package:cake_wallet/generated/i18n.dart';
3
4
class BitcoinTransactionPriority extends TransactionPriority {
5
const BitcoinTransactionPriority({String title, int raw})
@@ -34,13 +34,13 @@ class BitcoinTransactionPriority extends TransactionPriority {
34
35
switch (this) {
36
case BitcoinTransactionPriority.slow:
37
- label = '${S.current.transaction_priority_slow} ~24hrs';
37
+ label = 'Slow ~24hrs'; // '${S.current.transaction_priority_slow} ~24hrs';
38
break;
39
case BitcoinTransactionPriority.medium:
40
- label = S.current.transaction_priority_medium;
40
+ label = 'Medium'; // S.current.transaction_priority_medium;
41
break;
42
case BitcoinTransactionPriority.fast:
43
- label = S.current.transaction_priority_fast;
43
+ label = 'Fast'; // S.current.transaction_priority_fast;
44
break;
45
default:
46
break;
@@ -86,13 +86,13 @@ class LitecoinTransactionPriority extends BitcoinTransactionPriority {
86
87
switch (this) {
88
case LitecoinTransactionPriority.slow:
89
- label = S.current.transaction_priority_slow;
89
+ label = 'Slow'; // S.current.transaction_priority_slow;
90
break;
91
case LitecoinTransactionPriority.medium:
92
- label = S.current.transaction_priority_medium;
92
+ label = 'Medium'; // S.current.transaction_priority_medium;
93
break;
94
case LitecoinTransactionPriority.fast:
95
- label = S.current.transaction_priority_fast;
95
+ label = 'Fast'; // S.current.transaction_priority_fast;
96
break;
97
default:
98
break;
cw_bitcoin/lib/electrum.dart
+1
@@ -326,6 +326,7 @@ class ElectrumClient {
326
return subscription;
327
} catch(e) {
328
print(e.toString());
329
+ return null;
330
}
331
}
332
cw_bitcoin/lib/electrum_wallet.dart
-1
@@ -12,7 +12,6 @@ import 'package:cw_bitcoin/electrum_transaction_info.dart';
12
import 'package:cw_core/pathForWallet.dart';
13
import 'package:cw_bitcoin/address_to_output_script.dart';
14
import 'package:cw_bitcoin/bitcoin_address_record.dart';
15
-import 'package:cw_bitcoin/bitcoin_amount_format.dart';
15
import 'package:cw_bitcoin/electrum_balance.dart';
16
import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
17
import 'package:cw_bitcoin/bitcoin_transaction_credentials.dart';
cw_bitcoin/lib/litecoin_wallet_addresses.dart
-1
@@ -1,5 +1,4 @@
1
import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
2
-import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
2
import 'package:cw_bitcoin/utils.dart';
3
import 'package:cw_bitcoin/bitcoin_address_record.dart';
4
import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
cw_bitcoin/pubspec.lock
+39
-4
@@ -21,7 +21,14 @@ packages:
21
name: args
22
url: "https://pub.dartlang.org"
23
source: hosted
24
- version: "2.3.0"
24
+ version: "1.6.0"
25
+ asn1lib:
26
+ dependency: transitive
27
+ description:
28
+ name: asn1lib
29
+ url: "https://pub.dartlang.org"
30
+ source: hosted
31
+ version: "0.6.5"
32
async:
33
dependency: transitive
34
description:
@@ -123,14 +130,14 @@ packages:
130
name: built_collection
131
url: "https://pub.dartlang.org"
132
source: hosted
126
- version: "5.1.1"
133
+ version: "4.3.2"
134
built_value:
135
dependency: transitive
136
description:
137
name: built_value
138
url: "https://pub.dartlang.org"
139
source: hosted
133
- version: "8.1.3"
140
+ version: "7.1.0"
141
characters:
142
dependency: transitive
143
description:
@@ -194,6 +201,13 @@ packages:
201
url: "https://pub.dartlang.org"
202
source: hosted
203
version: "2.1.5"
204
+ cryptography:
205
+ dependency: "direct main"
206
+ description:
207
+ name: cryptography
208
+ url: "https://pub.dartlang.org"
209
+ source: hosted
210
+ version: "1.4.1"
211
cw_core:
212
dependency: "direct main"
213
description:
@@ -215,6 +229,13 @@ packages:
229
url: "https://pub.dartlang.org"
230
source: hosted
231
version: "0.5.0"
232
+ encrypt:
233
+ dependency: "direct main"
234
+ description:
235
+ name: encrypt
236
+ url: "https://pub.dartlang.org"
237
+ source: hosted
238
+ version: "4.0.3"
239
fake_async:
240
dependency: transitive
241
description:
@@ -242,7 +263,7 @@ packages:
263
name: fixnum
264
url: "https://pub.dartlang.org"
265
source: hosted
245
- version: "1.0.0"
266
+ version: "0.10.11"
267
flutter:
268
dependency: "direct main"
269
description: flutter
@@ -491,6 +512,13 @@ packages:
512
url: "https://pub.dartlang.org"
513
source: hosted
514
version: "0.1.8"
515
+ quiver:
516
+ dependency: transitive
517
+ description:
518
+ name: quiver
519
+ url: "https://pub.dartlang.org"
520
+ source: hosted
521
+ version: "2.1.5"
522
rxdart:
523
dependency: "direct main"
524
description:
@@ -594,6 +622,13 @@ packages:
622
url: "https://pub.dartlang.org"
623
source: hosted
624
version: "1.3.0"
625
+ unorm_dart:
626
+ dependency: "direct main"
627
+ description:
628
+ name: unorm_dart
629
+ url: "https://pub.dartlang.org"
630
+ source: hosted
631
+ version: "0.2.0"
632
vector_math:
633
dependency: transitive
634
description:
cw_bitcoin/pubspec.yaml
+6
-2
@@ -1,8 +1,9 @@
1
name: cw_bitcoin
2
description: A new Flutter package project.
3
version: 0.0.1
4
-author:
5
-homepage:
4
+publish_to: none
5
+author: Cake Wallet
6
+homepage: https://cakewallet.com
7
8
environment:
9
sdk: ">=2.7.0 <3.0.0"
@@ -23,6 +24,9 @@ dependencies:
24
url: https://github.com/cake-tech/bitcoin_flutter.git
25
ref: cake
26
rxdart: ^0.26.0
27
+ unorm_dart: ^0.2.0
28
+ cryptography: ^1.4.0
29
+ encrypt: ^4.0.0
30
31
dev_dependencies:
32
flutter_test:
cw_core/lib/sec_random_native.dart
renamed
cw_core/lib/transaction_info.dart
+1
-1
@@ -1,5 +1,5 @@
1
import 'package:cw_core/transaction_direction.dart';
2
-import 'package:cake_wallet/utils/mobx.dart';
2
+//import 'package:cake_wallet/utils/mobx.dart';
3
import 'package:cw_core/keyable.dart';
4
5
abstract class TransactionInfo extends Object with Keyable {
cw_core/pubspec.lock
+27
-6
@@ -21,7 +21,14 @@ packages:
21
name: args
22
url: "https://pub.dartlang.org"
23
source: hosted
24
- version: "2.3.0"
24
+ version: "1.6.0"
25
+ asn1lib:
26
+ dependency: transitive
27
+ description:
28
+ name: asn1lib
29
+ url: "https://pub.dartlang.org"
30
+ source: hosted
31
+ version: "0.8.1"
32
async:
33
dependency: transitive
34
description:
@@ -147,14 +154,14 @@ packages:
154
name: convert
155
url: "https://pub.dartlang.org"
156
source: hosted
150
- version: "3.0.1"
157
+ version: "2.1.1"
158
crypto:
159
dependency: transitive
160
description:
161
name: crypto
162
url: "https://pub.dartlang.org"
163
source: hosted
157
- version: "3.0.1"
164
+ version: "2.1.5"
165
dart_style:
166
dependency: transitive
167
description:
@@ -168,7 +175,14 @@ packages:
175
name: dartx
176
url: "https://pub.dartlang.org"
177
source: hosted
171
- version: "0.8.0"
178
+ version: "0.5.0"
179
+ encrypt:
180
+ dependency: "direct main"
181
+ description:
182
+ name: encrypt
183
+ url: "https://pub.dartlang.org"
184
+ source: hosted
185
+ version: "4.1.0"
186
fake_async:
187
dependency: transitive
188
description:
@@ -234,7 +248,7 @@ packages:
248
name: hive
249
url: "https://pub.dartlang.org"
250
source: hosted
237
- version: "1.6.0-nullsafety.2"
251
+ version: "1.4.4+1"
252
hive_generator:
253
dependency: "direct dev"
254
description:
@@ -403,6 +417,13 @@ packages:
417
url: "https://pub.dartlang.org"
418
source: hosted
419
version: "1.0.3"
420
+ pointycastle:
421
+ dependency: transitive
422
+ description:
423
+ name: pointycastle
424
+ url: "https://pub.dartlang.org"
425
+ source: hosted
426
+ version: "2.0.1"
427
pool:
428
dependency: transitive
429
description:
@@ -512,7 +533,7 @@ packages:
533
name: time
534
url: "https://pub.dartlang.org"
535
source: hosted
515
- version: "2.1.0"
536
+ version: "1.4.1"
537
timing:
538
dependency: transitive
539
description:
cw_core/pubspec.yaml
+4
-2
@@ -1,8 +1,9 @@
1
name: cw_core
2
description: A new Flutter package project.
3
version: 0.0.1
4
-author:
5
-homepage:
4
+publish_to: none
5
+author: Cake Wallet
6
+homepage: https://cakewallet.com
7
8
environment:
9
sdk: ">=2.7.0 <3.0.0"
@@ -16,6 +17,7 @@ dependencies:
17
mobx: ^1.2.1+2
18
flutter_mobx: ^1.1.0+2
19
intl: ^0.17.0
20
+ encrypt: ^4.0.0
21
22
dev_dependencies:
23
flutter_test:
cw_monero/pubspec.yaml
+3
-2
@@ -1,8 +1,9 @@
1
name: cw_monero
2
description: A new flutter plugin project.
3
version: 0.0.1
4
-author:
5
-homepage:
4
+publish_to: none
5
+author: Cake Wallet
6
+homepage: https://cakewallet.com
7
8
environment:
9
sdk: ">=2.6.0 <3.0.0"