Flutter upgrade

analysis_options.yaml

@@ -1,51 +1,73 @@
+include: package:lints/recommended.yaml
+
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: false
-  exclude: [build/**, lib/generated/*.dart, lib/**.g.dart, cw_monero/ios/External/**, cw_shared_external/**, shared_external/**]
+  exclude: [
+    build/**,
+    lib/**.g.dart,
+    cw_core/lib/**.g.dart,
+    cw_haven/lib/**.g.dart,
+    cw_monero/lib/**.g.dart,
+    lib/generated/*.dart,
+    cw_monero/ios/External/**,
+    cw_shared_external/**,
+    shared_external/**]
+  language:
+    strict-casts: true
+    strict-raw-types: true
 
 linter:
   rules:
-    - always_declare_return_types
-    - annotate_overrides
-    - avoid_empty_else
-    - avoid_init_to_null
-    - avoid_return_types_on_setters
-    - await_only_futures
-    - camel_case_types
     - cancel_subscriptions
-    - close_sinks
-    - comment_references
-    - constant_identifier_names
-    - control_flow_in_finally
-    - empty_catches
-    - empty_constructor_bodies
-    - empty_statements
-    - hash_and_equals
-    - invariant_booleans
-    - iterable_contains_unrelated_type
-    - library_names
-    - library_prefixes
-    - list_remove_unrelated_type
-    - literal_only_boolean_expressions
-    - non_constant_identifier_names
-    - one_member_abstracts
-    - only_throw_errors
-    - overridden_fields
-    - package_api_docs
-    - package_names
-    - package_prefixed_library_names
-    - parameter_assignments
-    - prefer_final_fields
-    - prefer_final_locals
-    - prefer_is_not_empty
-    - slash_for_doc_comments
-    - sort_constructors_first
-    - sort_unnamed_constructors_first
-    - test_types_in_equals
-    - throw_in_finally
-    - type_init_formals
-    - unawaited_futures
-    - unnecessary_getters_setters
-    - unrelated_type_equality_checks
-    - valid_regexps
+
+
+# analyzer:
+#   strong-mode:
+#     implicit-casts: false
+#     implicit-dynamic: false
+#   exclude: [build/**, lib/generated/*.dart, lib/**.g.dart, cw_monero/ios/External/**, cw_shared_external/**, shared_external/**]
+
+# linter:
+#   rules:
+#     - always_declare_return_types
+#     - annotate_overrides
+#     - avoid_empty_else
+#     - avoid_init_to_null
+#     - avoid_return_types_on_setters
+#     - await_only_futures
+#     - camel_case_types
+#     - cancel_subscriptions
+#     - close_sinks
+#     - comment_references
+#     - constant_identifier_names
+#     - control_flow_in_finally
+#     - empty_catches
+#     - empty_constructor_bodies
+#     - empty_statements
+#     - hash_and_equals
+#     - invariant_booleans
+#     - iterable_contains_unrelated_type
+#     - library_names
+#     - library_prefixes
+#     - list_remove_unrelated_type
+#     - literal_only_boolean_expressions
+#     - non_constant_identifier_names
+#     - one_member_abstracts
+#     - only_throw_errors
+#     - overridden_fields
+#     - package_api_docs
+#     - package_names
+#     - package_prefixed_library_names
+#     - parameter_assignments
+#     - prefer_final_fields
+#     - prefer_final_locals
+#     - prefer_is_not_empty
+#     - slash_for_doc_comments
+#     - sort_constructors_first
+#     - sort_unnamed_constructors_first
+#     - test_types_in_equals
+#     - throw_in_finally
+#     - type_init_formals
+#     - unawaited_futures
+#     - unnecessary_getters_setters
+#     - unrelated_type_equality_checks
+#     - valid_regexps

cw_bitcoin/lib/address_from_output.dart

@@ -8,16 +8,16 @@ String addressFromOutput(Uint8List script, bitcoin.NetworkType networkType) {
         data: PaymentData(output: script),
         network: networkType)
       .data
-      .address;
+      .address!;
   } catch (_) {}
 
   try {
     return bitcoin.P2WPKH(
         data: PaymentData(output: script),
         network: networkType)
       .data
-      .address;
+      .address!;
   } catch(_) {}
 
-  return null;
+  return '';
 }

cw_bitcoin/lib/bitcoin_address_record.dart

@@ -2,7 +2,7 @@ import 'dart:convert';
 
 class BitcoinAddressRecord {
   BitcoinAddressRecord(this.address,
-    {this.index, this.isHidden = false, bool isUsed = false})
+    {required this.index, this.isHidden = false, bool isUsed = false})
    : _isUsed = isUsed;
 
   factory BitcoinAddressRecord.fromJSON(String jsonSource) {
@@ -11,8 +11,8 @@ class BitcoinAddressRecord {
     return BitcoinAddressRecord(
       decoded['address'] as String,
       index: decoded['index'] as int,
-      isHidden: decoded['isHidden'] as bool ?? false,
-      isUsed: decoded['isUsed'] as bool ?? false);
+      isHidden: decoded['isHidden'] as bool? ?? false,
+      isUsed: decoded['isUsed'] as bool? ?? false);
   }
 
   @override

cw_bitcoin/lib/bitcoin_amount_format.dart

@@ -7,10 +7,10 @@ final bitcoinAmountFormat = NumberFormat()
   ..maximumFractionDigits = bitcoinAmountLength
   ..minimumFractionDigits = 1;
 
-String bitcoinAmountToString({int amount}) => bitcoinAmountFormat.format(
+String bitcoinAmountToString({required int amount}) => bitcoinAmountFormat.format(
     cryptoAmountToDouble(amount: amount, divider: bitcoinAmountDivider));
 
-double bitcoinAmountToDouble({int amount}) =>
+double bitcoinAmountToDouble({required int amount}) =>
     cryptoAmountToDouble(amount: amount, divider: bitcoinAmountDivider);
 
 int stringDoubleToBitcoinAmount(String amount) {

cw_bitcoin/lib/bitcoin_mnemonic.dart

@@ -106,15 +106,18 @@ Future<String> generateMnemonic(
   return result;
 }
 
-Uint8List mnemonicToSeedBytes(String mnemonic, {String prefix = segwit}) {
+Future<Uint8List> mnemonicToSeedBytes(String mnemonic, {String prefix = segwit}) async {
   final pbkdf2 = cryptography.Pbkdf2(
-      macAlgorithm: cryptography.Hmac(cryptography.sha512),
+      macAlgorithm: cryptography.Hmac.sha512(),
       iterations: 2048,
       bits: 512);
   final text = normalizeText(mnemonic);
-
-  return pbkdf2.deriveBitsSync(text.codeUnits,
-      nonce: cryptography.Nonce('electrum'.codeUnits));
+  // pbkdf2.deriveKey(secretKey: secretKey, nonce: nonce)
+  final key = await pbkdf2.deriveKey(
+      secretKey: cryptography.SecretKey(text.codeUnits),
+      nonce: 'electrum'.codeUnits);
+  final bytes = await key.extractBytes();
+  return Uint8List.fromList(bytes);
 }
 
 bool matchesAnyPrefix(String mnemonic) =>

cw_bitcoin/lib/bitcoin_transaction_credentials.dart

@@ -2,9 +2,9 @@ import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
 import 'package:cw_core/output_info.dart';
 
 class BitcoinTransactionCredentials {
-  BitcoinTransactionCredentials(this.outputs, {this.priority, this.feeRate});
+  BitcoinTransactionCredentials(this.outputs, {required this.priority, this.feeRate});
 
   final List<OutputInfo> outputs;
-  final BitcoinTransactionPriority priority;
-  final int feeRate;
+  final BitcoinTransactionPriority? priority;
+  final int? feeRate;
 }

cw_bitcoin/lib/bitcoin_transaction_priority.dart

@@ -2,7 +2,7 @@ import 'package:cw_core/transaction_priority.dart';
 //import 'package:cake_wallet/generated/i18n.dart';
 
 class BitcoinTransactionPriority extends TransactionPriority {
-  const BitcoinTransactionPriority({String title, int raw})
+  const BitcoinTransactionPriority({required String title, required int raw})
       : super(title: title, raw: raw);
 
   static const List<BitcoinTransactionPriority> all = [fast, medium, slow];
@@ -13,7 +13,7 @@ class BitcoinTransactionPriority extends TransactionPriority {
   static const BitcoinTransactionPriority fast =
       BitcoinTransactionPriority(title: 'Fast', raw: 2);
 
-  static BitcoinTransactionPriority deserialize({int raw}) {
+  static BitcoinTransactionPriority deserialize({required int raw}) {
     switch (raw) {
       case 0:
         return slow;
@@ -22,7 +22,7 @@ class BitcoinTransactionPriority extends TransactionPriority {
       case 2:
         return fast;
       default:
-        return null;
+        throw Exception('Unexpected token: $raw for BitcoinTransactionPriority deserialize');
     }
   }
 
@@ -53,7 +53,7 @@ class BitcoinTransactionPriority extends TransactionPriority {
 }
 
 class LitecoinTransactionPriority extends BitcoinTransactionPriority {
-  const LitecoinTransactionPriority({String title, int raw})
+  const LitecoinTransactionPriority({required String title, required int raw})
       : super(title: title, raw: raw);
 
   static const List<LitecoinTransactionPriority> all = [fast, medium, slow];
@@ -64,7 +64,7 @@ class LitecoinTransactionPriority extends BitcoinTransactionPriority {
   static const LitecoinTransactionPriority fast =
       LitecoinTransactionPriority(title: 'Fast', raw: 2);
 
-  static LitecoinTransactionPriority deserialize({int raw}) {
+  static LitecoinTransactionPriority deserialize({required int raw}) {
     switch (raw) {
       case 0:
         return slow;
@@ -73,7 +73,7 @@ class LitecoinTransactionPriority extends BitcoinTransactionPriority {
       case 2:
         return fast;
       default:
-        return null;
+        throw Exception('Unexpected token: $raw for LitecoinTransactionPriority deserialize');
     }
   }
 

cw_bitcoin/lib/bitcoin_wallet.dart

@@ -1,4 +1,5 @@
 import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
+import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
@@ -17,12 +18,13 @@ class BitcoinWallet = BitcoinWalletBase with _$BitcoinWallet;
 
 abstract class BitcoinWalletBase extends ElectrumWallet with Store {
   BitcoinWalletBase(
-      {@required String mnemonic,
-      @required String password,
-      @required WalletInfo walletInfo,
-      @required Box<UnspentCoinsInfo> unspentCoinsInfo,
-      List<BitcoinAddressRecord> initialAddresses,
-      ElectrumBalance initialBalance,
+      {required String mnemonic,
+      required String password,
+      required WalletInfo walletInfo,
+      required Box<UnspentCoinsInfo> unspentCoinsInfo,
+      required Uint8List seedBytes,
+      List<BitcoinAddressRecord>? initialAddresses,
+      ElectrumBalance? initialBalance,
       int initialRegularAddressIndex = 0,
       int initialChangeAddressIndex = 0})
       : super(
@@ -32,35 +34,58 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
             unspentCoinsInfo: unspentCoinsInfo,
             networkType: bitcoin.bitcoin,
             initialAddresses: initialAddresses,
-            initialBalance: initialBalance) {
+            initialBalance: initialBalance,
+            seedBytes: seedBytes,
+            currency: CryptoCurrency.btc) {
     walletAddresses = BitcoinWalletAddresses(
         walletInfo,
         electrumClient: electrumClient,
         initialAddresses: initialAddresses,
         initialRegularAddressIndex: initialRegularAddressIndex,
         initialChangeAddressIndex: initialChangeAddressIndex,
         mainHd: hd,
-        sideHd: bitcoin.HDWallet.fromSeed(
-                mnemonicToSeedBytes(mnemonic), network: networkType)
+        sideHd: bitcoin.HDWallet.fromSeed(seedBytes, network: networkType)
               .derivePath("m/0'/1"),
         networkType: networkType);
   }
 
+  static Future<BitcoinWallet> create({
+    required String mnemonic,
+    required String password,
+    required WalletInfo walletInfo,
+    required Box<UnspentCoinsInfo> unspentCoinsInfo,
+    List<BitcoinAddressRecord>? initialAddresses,
+    ElectrumBalance? initialBalance,
+    int initialRegularAddressIndex = 0,
+    int initialChangeAddressIndex = 0
+  }) async {
+    return BitcoinWallet(
+        mnemonic: mnemonic,
+        password: password,
+        walletInfo: walletInfo,
+        unspentCoinsInfo: unspentCoinsInfo,
+        initialAddresses: initialAddresses,
+        initialBalance: initialBalance,
+        seedBytes: await mnemonicToSeedBytes(mnemonic),
+        initialRegularAddressIndex: initialRegularAddressIndex,
+        initialChangeAddressIndex: initialChangeAddressIndex);
+  }
+
   static Future<BitcoinWallet> open({
-    @required String name,
-    @required WalletInfo walletInfo,
-    @required Box<UnspentCoinsInfo> unspentCoinsInfo,
-    @required String password,
+    required String name,
+    required WalletInfo walletInfo,
+    required Box<UnspentCoinsInfo> unspentCoinsInfo,
+    required String password,
   }) async {
-    final snp = ElectrumWallletSnapshot(name, walletInfo.type, password);
-    await snp.load();
+    final snp = await ElectrumWallletSnapshot.load(name, walletInfo.type, password);
     return BitcoinWallet(
         mnemonic: snp.mnemonic,
         password: password,
         walletInfo: walletInfo,
         unspentCoinsInfo: unspentCoinsInfo,
         initialAddresses: snp.addresses,
         initialBalance: snp.balance,
+        seedBytes: await mnemonicToSeedBytes(snp.mnemonic),
         initialRegularAddressIndex: snp.regularAddressIndex,
         initialChangeAddressIndex: snp.changeAddressIndex);
   }

cw_bitcoin/lib/bitcoin_wallet_addresses.dart

@@ -16,13 +16,13 @@ abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses
     with Store {
   BitcoinWalletAddressesBase(
       WalletInfo walletInfo,
-      {@required List<BitcoinAddressRecord> initialAddresses,
+      {required bitcoin.HDWallet mainHd,
+        required bitcoin.HDWallet sideHd,
+        required bitcoin.NetworkType networkType,
+        required ElectrumClient electrumClient,
+        List<BitcoinAddressRecord>? initialAddresses,
         int initialRegularAddressIndex = 0,
-        int initialChangeAddressIndex = 0,
-        ElectrumClient electrumClient,
-        @required bitcoin.HDWallet mainHd,
-        @required bitcoin.HDWallet sideHd,
-        @required bitcoin.NetworkType networkType})
+        int initialChangeAddressIndex = 0})
       : super(
         walletInfo,
         initialAddresses: initialAddresses,
@@ -34,6 +34,6 @@ abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses
         networkType: networkType);
 
   @override
-  String getAddress({@required int index, @required bitcoin.HDWallet hd}) =>
+  String getAddress({required int index, required bitcoin.HDWallet hd}) =>
       generateP2WPKHAddress(hd: hd, index: index, networkType: networkType);
 }