Merge branch 'breez' of https://github.com/cake-tech/cake_wallet into breez

.gitignore

@@ -86,6 +86,7 @@ cw_monero/cw_monero/android/.cxx/
 **/*.g.dart
 
 android/key.properties
+android/app/key.jks
 
 **/tool/.secrets-prod.json
 **/tool/.secrets-test.json

cw_bitcoin/lib/bitcoin_wallet_service.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
-import 'package:cw_bitcoin/bitcoin_mnemonic_is_incorrect_exception.dart';
+import 'package:cw_bitcoin/mnemonic_is_incorrect_exception.dart';
 import 'package:cw_bitcoin/bitcoin_wallet_creation_credentials.dart';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:cw_core/wallet_base.dart';

cw_bitcoin/lib/litecoin_wallet_service.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:hive/hive.dart';
 import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
-import 'package:cw_bitcoin/bitcoin_mnemonic_is_incorrect_exception.dart';
+import 'package:cw_bitcoin/mnemonic_is_incorrect_exception.dart';
 import 'package:cw_bitcoin/bitcoin_wallet_creation_credentials.dart';
 import 'package:cw_bitcoin/litecoin_wallet.dart';
 import 'package:cw_core/wallet_service.dart';
@@ -101,7 +101,7 @@ class LitecoinWalletService extends WalletService<
   Future<LitecoinWallet> restoreFromSeed(
       BitcoinRestoreWalletFromSeedCredentials credentials, {bool? isTestnet}) async {
     if (!validateMnemonic(credentials.mnemonic)) {
-      throw BitcoinMnemonicIsIncorrectException();
+      throw LitecoinMnemonicIsIncorrectException();
     }
 
     final wallet = await LitecoinWalletBase.create(

cw_bitcoin/lib/mnemonic_is_incorrect_exception.dart

@@ -3,3 +3,9 @@ class BitcoinMnemonicIsIncorrectException implements Exception {
   String toString() =>
       'Bitcoin mnemonic has incorrect format. Mnemonic should contain 12 or 24 words separated by space.';
 }
+
+class LitecoinMnemonicIsIncorrectException implements Exception {
+  @override
+  String toString() =>
+      'Litecoin mnemonic has incorrect format. Mnemonic should contain 24 words separated by space.';
+}

cw_core/lib/crypto_currency.dart

@@ -9,7 +9,8 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
     required this.decimals,
     this.fullName,
     this.iconPath,
-    this.tag, this.enabled = false,
+    this.tag,
+    this.enabled = false,
     })
       : super(title: title, raw: raw);
 
@@ -100,6 +101,7 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
     CryptoCurrency.usdtPoly,
     CryptoCurrency.usdcEPoly,
     CryptoCurrency.kaspa,
+    CryptoCurrency.digibyte,
   ];
 
   static const havenCurrencies = [
@@ -211,7 +213,8 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
   static const banano = CryptoCurrency(title: 'BAN', fullName: 'Banano', raw: 86, name: 'banano', iconPath: 'assets/images/nano_icon.png', decimals: 29);
   static const usdtPoly = CryptoCurrency(title: 'USDT', tag: 'POLY', fullName: 'Tether USD (PoS)', raw: 87, name: 'usdtpoly', iconPath: 'assets/images/usdt_icon.png', decimals: 6);
   static const usdcEPoly = CryptoCurrency(title: 'USDC.E', tag: 'POLY', fullName: 'USD Coin (PoS)', raw: 88, name: 'usdcepoly', iconPath: 'assets/images/usdc_icon.png', decimals: 6);
-  static const kaspa = CryptoCurrency(title: 'KAS', fullName: 'Kaspa', raw: 89, name: 'kaspa', iconPath: 'assets/images/kaspa_icon.png', decimals: 8);
+  static const kaspa = CryptoCurrency(title: 'KAS', fullName: 'Kaspa', raw: 89, name: 'kas', iconPath: 'assets/images/kaspa_icon.png', decimals: 8);
+  static const digibyte = CryptoCurrency(title: 'DGB', fullName: 'DigiByte', raw: 90, name: 'dgb', iconPath: 'assets/images/digibyte.png', decimals: 8);
   static const usdtSol = CryptoCurrency(title: 'USDT', tag: 'SOL', fullName: 'USDT Tether', raw: 90, name: 'usdtsol', iconPath: 'assets/images/usdt_icon.png', decimals: 6);
 
 

cw_evm/lib/evm_chain_wallet_addresses.dart

@@ -14,6 +14,7 @@ abstract class EVMChainWalletAddressesBase extends WalletAddresses with Store {
         super(walletInfo);
 
   @override
+  @observable
   String address;
 
   @override

cw_monero/lib/monero_wallet.dart

@@ -576,15 +576,19 @@ abstract class MoneroWalletBase
       return;
     }
 
-    final height = _getHeightByDate(walletInfo.date);
+    int height = 0;
-
+    try {
-    if (height > MIN_RESTORE_HEIGHT) {
+      height = _getHeightByDate(walletInfo.date);
-      monero_wallet.setRecoveringFromSeed(isRecovery: true);
+    } catch (e, s) {
-      monero_wallet.setRefreshFromBlockHeight(height: height);
+      onError?.call(FlutterErrorDetails(
-      return;
+        exception: e,
+        stack: s,
+        library: this.runtimeType.toString(),
+      ));
     }
 
-    throw Exception("height isn't > $MIN_RESTORE_HEIGHT!");
+    monero_wallet.setRecoveringFromSeed(isRecovery: true);
+    monero_wallet.setRefreshFromBlockHeight(height: height);
   }
 
   int _getHeightDistance(DateTime date) {
@@ -600,7 +604,7 @@ abstract class MoneroWalletBase
     final heightDistance = _getHeightDistance(date);
 
     if (nodeHeight <= 0) {
-      // the node returned 0 (an error state), so lets just restore from cache:
+      // the node returned 0 (an error state)
       throw Exception("nodeHeight is <= 0!");
     }
 

cw_solana/lib/default_spl_tokens.dart

@@ -25,7 +25,6 @@ class DefaultSPLTokens {
       mintAddress: '2FPyTwcZLUg1MDrwsyoP4D6s1tM7hAkHYRjkNb5w6Pxk',
       decimal: 6,
       mint: 'soEth',
-      enabled: true,
       iconPath: 'assets/images/eth_icon.png',
     ),
     SPLToken(
@@ -34,7 +33,6 @@ class DefaultSPLTokens {
       mintAddress: 'So11111111111111111111111111111111111111112',
       decimal: 9,
       mint: 'WSOL',
-      enabled: true,
       iconPath: 'assets/images/sol_icon.png',
     ),
     SPLToken(

lib/bitcoin_cash/cw_bitcoin_cash.dart

@@ -1,12 +1,6 @@
 part of 'bitcoin_cash.dart';
 
 class CWBitcoinCash extends BitcoinCash {
-  @override
-  String getMnemonic(int? strength) => Mnemonic.generate();
-
-  @override
-  Uint8List getSeedFromMnemonic(String seed) => Mnemonic.toSeed(seed);
-
   @override
   String getCashAddrFormat(String address) => AddressUtils.getCashAddrFormat(address);
 

lib/core/address_validator.dart

@@ -257,9 +257,9 @@ class AddressValidator extends TextValidator {
       case CryptoCurrency.near:
         return [64];
       case CryptoCurrency.btcln:
-        return null;
+      case CryptoCurrency.kaspa:
       default:
-        return [];
+        return null;
     }
   }
 

lib/entities/provider_types.dart

@@ -67,7 +67,7 @@ class ProvidersHelper {
       case WalletType.bitcoinCash:
         return [ProviderType.askEachTime, ProviderType.onramper, ProviderType.robinhood];
       case WalletType.polygon:
-        return [ProviderType.askEachTime, ProviderType.dfx];
+        return [ProviderType.askEachTime, ProviderType.onramper, ProviderType.dfx];
       case WalletType.solana:
         return [ProviderType.askEachTime, ProviderType.onramper, ProviderType.robinhood];
       case WalletType.none:
@@ -91,7 +91,7 @@ class ProvidersHelper {
       case WalletType.bitcoinCash:
         return [ProviderType.askEachTime, ProviderType.moonpaySell];
       case WalletType.polygon:
-        return [ProviderType.askEachTime, ProviderType.dfx];
+        return [ProviderType.askEachTime, ProviderType.onramper, ProviderType.dfx];
       case WalletType.solana:
         return [
           ProviderType.askEachTime,

lib/src/screens/send/send_page.dart

@@ -1,6 +1,7 @@
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/entities/template.dart';
+import 'package:cake_wallet/reactions/wallet_connect.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator_icon.dart';
 import 'package:cake_wallet/src/screens/send/widgets/send_card.dart';
 import 'package:cake_wallet/src/widgets/add_template_button.dart';
@@ -420,7 +421,9 @@ class SendPage extends BasePage {
                       amount: S.of(_dialogContext).send_amount,
                       amountValue: sendViewModel.pendingTransaction!.amountFormatted,
                       fiatAmountValue: sendViewModel.pendingTransactionFiatAmountFormatted,
-                      fee: S.of(_dialogContext).send_fee,
+                      fee: isEVMCompatibleChain(sendViewModel.walletType)
+                          ? S.of(_dialogContext).send_estimated_fee
+                          : S.of(_dialogContext).send_fee,
                       feeValue: sendViewModel.pendingTransaction!.feeFormatted,
                       feeFiatAmount: sendViewModel.pendingTransactionFeeFiatAmountFormatted,
                       outputs: sendViewModel.outputs,

lib/src/widgets/scollable_with_bottom_section.dart

@@ -14,37 +14,28 @@ class ScrollableWithBottomSection extends StatefulWidget {
   final EdgeInsets? bottomSectionPadding;
 
   @override
-  ScrollableWithBottomSectionState createState() =>
+  ScrollableWithBottomSectionState createState() => ScrollableWithBottomSectionState();
-      ScrollableWithBottomSectionState();
 }
 
-class ScrollableWithBottomSectionState
+class ScrollableWithBottomSectionState extends State<ScrollableWithBottomSection> {
-    extends State<ScrollableWithBottomSection> {
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(builder: (context, constraints) {
+    return Column(
-      return SingleChildScrollView(
+      children: [
-        // physics:
+        Expanded(
-        //     const AlwaysScrollableScrollPhysics(), //  const NeverScrollableScrollPhysics(), //
+          child: SingleChildScrollView(
-        child: ConstrainedBox(
+            child: Padding(
-          constraints: BoxConstraints(
+              padding: widget.contentPadding ?? EdgeInsets.only(left: 20, right: 20),
-              minHeight: constraints.heightConstraints().maxHeight),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: <Widget>[
-              Padding(
-                padding: widget.contentPadding ??
-                    EdgeInsets.only(left: 20, right: 20),
               child: widget.content,
             ),
+          ),
+        ),
         Padding(
-                  padding: widget.bottomSectionPadding ??
+          padding: widget.bottomSectionPadding?.copyWith(top: 10) ??
-                      EdgeInsets.only(bottom: 20, right: 20, left: 20),
+              EdgeInsets.only(top: 10, bottom: 20, right: 20, left: 20),
-                  child: widget.bottomSection)
+          child: widget.bottomSection,
+        ),
       ],
-          ),
-        ),
     );
-    });
   }
 }

lib/view_model/advanced_privacy_settings_view_model.dart

@@ -27,11 +27,25 @@ abstract class AdvancedPrivacySettingsViewModelBase with Store {
 
   final SettingsStore _settingsStore;
 
-  bool get hasSeedPhraseLengthOption =>
+  bool get hasSeedPhraseLengthOption {
-      type == WalletType.bitcoinCash ||
+    // convert to switch case so that it give a syntax error when adding a new wallet type
-      type == WalletType.ethereum ||
+    // thus we don't forget about it
-      type == WalletType.polygon ||
+    switch (type) {
-      type == WalletType.solana;
+      case WalletType.ethereum:
+      case WalletType.bitcoinCash:
+      case WalletType.polygon:
+      case WalletType.solana:
+        return true;
+      case WalletType.monero:
+      case WalletType.none:
+      case WalletType.bitcoin:
+      case WalletType.litecoin:
+      case WalletType.haven:
+      case WalletType.nano:
+      case WalletType.banano:
+        return false;
+    }
+  }
 
   bool get hasSeedTypeOption => type == WalletType.monero;
 

lib/view_model/unspent_coins/unspent_coins_list_view_model.dart

@@ -15,7 +15,8 @@ class UnspentCoinsListViewModel = UnspentCoinsListViewModelBase with _$UnspentCo
 abstract class UnspentCoinsListViewModelBase with Store {
   UnspentCoinsListViewModelBase(
       {required this.wallet, required Box<UnspentCoinsInfo> unspentCoinsInfo})
-      : _unspentCoinsInfo = unspentCoinsInfo {
+      : _unspentCoinsInfo = unspentCoinsInfo,
+        _items = ObservableList<UnspentCoinsItem>() {
     _updateUnspentCoinsInfo();
     _updateUnspents();
   }
@@ -23,7 +24,8 @@ abstract class UnspentCoinsListViewModelBase with Store {
   WalletBase wallet;
   final Box<UnspentCoinsInfo> _unspentCoinsInfo;
 
-  final ObservableList<UnspentCoinsItem> _items = ObservableList();
+  @observable
+  ObservableList<UnspentCoinsItem> _items;
 
   @computed
   ObservableList<UnspentCoinsItem> get items => _items;

lib/view_model/wallet_keys_view_model.dart

@@ -21,9 +21,7 @@ abstract class WalletKeysViewModelBase with Store {
       : title = _appStore.wallet!.type == WalletType.bitcoin ||
                 _appStore.wallet!.type == WalletType.lightning ||
                 _appStore.wallet!.type == WalletType.litecoin ||
-                _appStore.wallet!.type == WalletType.bitcoinCash ||
+                _appStore.wallet!.type == WalletType.bitcoinCash
-                _appStore.wallet!.type == WalletType.ethereum ||
-                _appStore.wallet!.type == WalletType.polygon
             ? S.current.wallet_seed
             : S.current.wallet_keys,
         _restoreHeight = _appStore.wallet!.walletInfo.restoreHeight,

tool/configure.dart

@@ -824,10 +824,6 @@ import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
   const bitcoinCashCwPart = "part 'cw_bitcoin_cash.dart';";
   const bitcoinCashContent = """
 abstract class BitcoinCash {
-  String getMnemonic(int? strength);
-
-  Uint8List getSeedFromMnemonic(String seed);
-
   String getCashAddrFormat(String address);
 
   WalletService createBitcoinCashWalletService(