Merge branch 'release-4.2.4' into CAKE-334-unspent-coins-control-application-logic

lib/view_model/contact_list/contact_list_view_model.dart

@@ -16,11 +16,22 @@ class ContactListViewModel = ContactListViewModelBase
 abstract class ContactListViewModelBase with Store {
   ContactListViewModelBase(this.contactSource, this.walletInfoSource)
       : contacts = ObservableList<ContactRecord>(),
-        walletContacts = walletInfoSource.values
-            .where((info) => info.address?.isNotEmpty ?? false)
-            .map((info) => WalletContact(
-                info.address, info.name, walletTypeToCryptoCurrency(info.type)))
-            .toList() {
+        walletContacts = [] {
+    walletInfoSource.values.forEach((info) {
+      if (info.addresses?.isNotEmpty ?? false) {
+        info.addresses?.forEach((address, label) {
+          final name = label.isNotEmpty
+            ? info.name + ' ($label)'
+            : info.name;
+
+          walletContacts.add(WalletContact(
+              address,
+              name,
+              walletTypeToCryptoCurrency(info.type)));
+        });
+      }
+    });
+
     _subscription = contactSource.bindToListWithTransform(
         contacts, (Contact contact) => ContactRecord(contactSource, contact),
         initialFire: true);

lib/view_model/dashboard/dashboard_view_model.dart

@@ -92,17 +92,17 @@ abstract class DashboardViewModelBase with Store {
     final _wallet = wallet;
 
     if (_wallet is MoneroWallet) {
-      subname = _wallet.account?.label;
+      subname = _wallet.walletAddresses.account?.label;
 
-      _onMoneroAccountChangeReaction = reaction((_) => _wallet.account,
-          (Account account) => _onMoneroAccountChange(_wallet));
+      _onMoneroAccountChangeReaction = reaction((_) => _wallet.walletAddresses
+          .account, (Account account) => _onMoneroAccountChange(_wallet));
 
       _onMoneroBalanceChangeReaction = reaction((_) => _wallet.balance,
           (MoneroBalance balance) => _onMoneroTransactionsUpdate(_wallet));
 
       final _accountTransactions = _wallet
           .transactionHistory.transactions.values
-          .where((tx) => tx.accountIndex == _wallet.account.id)
+          .where((tx) => tx.accountIndex == _wallet.walletAddresses.account.id)
           .toList();
 
       transactions = ObservableList.of(_accountTransactions.map((transaction) =>
@@ -131,7 +131,7 @@ abstract class DashboardViewModelBase with Store {
         filter: (TransactionInfo tx) {
       final wallet = _wallet;
       if (tx is MoneroTransactionInfo && wallet is MoneroWallet) {
-        return tx.accountIndex == wallet.account.id;
+        return tx.accountIndex == wallet.walletAddresses.account.id;
       }
 
       return true;
@@ -153,7 +153,7 @@ abstract class DashboardViewModelBase with Store {
   String subname;
 
   @computed
-  String get address => wallet.address;
+  String get address => wallet.walletAddresses.address;
 
   @computed
   SyncStatus get status => wallet.syncStatus;
@@ -251,13 +251,13 @@ abstract class DashboardViewModelBase with Store {
         wallet.type == WalletType.bitcoin && wallet.seed.split(' ').length < 24;
 
     if (wallet is MoneroWallet) {
-      subname = wallet.account?.label;
+      subname = wallet.walletAddresses.account?.label;
 
       _onMoneroAccountChangeReaction?.reaction?.dispose();
       _onMoneroBalanceChangeReaction?.reaction?.dispose();
 
-      _onMoneroAccountChangeReaction = reaction((_) => wallet.account,
-          (Account account) => _onMoneroAccountChange(wallet));
+      _onMoneroAccountChangeReaction = reaction((_) => wallet.walletAddresses
+          .account, (Account account) => _onMoneroAccountChange(wallet));
 
       _onMoneroBalanceChangeReaction = reaction((_) => wallet.balance,
           (MoneroBalance balance) => _onMoneroTransactionsUpdate(wallet));
@@ -284,7 +284,7 @@ abstract class DashboardViewModelBase with Store {
             settingsStore: appStore.settingsStore),
         filter: (TransactionInfo tx) {
       if (tx is MoneroTransactionInfo && wallet is MoneroWallet) {
-        return tx.accountIndex == wallet.account.id;
+        return tx.accountIndex == wallet.walletAddresses.account.id;
       }
 
       return true;
@@ -293,7 +293,7 @@ abstract class DashboardViewModelBase with Store {
 
   @action
   void _onMoneroAccountChange(MoneroWallet wallet) {
-    subname = wallet.account?.label;
+    subname = wallet.walletAddresses.account?.label;
     _onMoneroTransactionsUpdate(wallet);
   }
 
@@ -302,7 +302,7 @@ abstract class DashboardViewModelBase with Store {
     transactions.clear();
 
     final _accountTransactions = wallet.transactionHistory.transactions.values
-        .where((tx) => tx.accountIndex == wallet.account.id)
+        .where((tx) => tx.accountIndex == wallet.walletAddresses.account.id)
         .toList();
 
     transactions.addAll(_accountTransactions.map((transaction) =>

lib/view_model/exchange/exchange_view_model.dart

@@ -41,7 +41,8 @@ abstract class ExchangeViewModelBase with Store {
     depositAmount = '';
     receiveAmount = '';
     receiveAddress = '';
-    depositAddress = depositCurrency == wallet.currency ? wallet.address : '';
+    depositAddress = depositCurrency == wallet.currency
+        ? wallet.walletAddresses.address : '';
     limitsState = LimitsInitialState();
     tradeState = ExchangeTradeStateInitial();
     _cryptoNumberFormat = NumberFormat()..maximumFractionDigits = 12;
@@ -308,8 +309,10 @@ abstract class ExchangeViewModelBase with Store {
     isReceiveAmountEntered = false;
     depositAmount = '';
     receiveAmount = '';
-    depositAddress = depositCurrency == wallet.currency ? wallet.address : '';
-    receiveAddress = receiveCurrency == wallet.currency ? wallet.address : '';
+    depositAddress = depositCurrency == wallet.currency
+        ? wallet.walletAddresses.address : '';
+    receiveAddress = receiveCurrency == wallet.currency
+        ? wallet.walletAddresses.address : '';
     isDepositAddressEnabled = !(depositCurrency == wallet.currency);
     isReceiveAddressEnabled = !(receiveCurrency == wallet.currency);
     isFixedRateMode = false;

lib/view_model/monero_account_list/monero_account_edit_or_create_view_model.dart

@@ -1,3 +1,5 @@
+import 'package:cake_wallet/core/wallet_base.dart';
+import 'package:flutter/foundation.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/monero/monero_account_list.dart';
@@ -10,11 +12,12 @@ class MoneroAccountEditOrCreateViewModel = MoneroAccountEditOrCreateViewModelBas
 
 abstract class MoneroAccountEditOrCreateViewModelBase with Store {
   MoneroAccountEditOrCreateViewModelBase(this._moneroAccountList,
-      {AccountListItem accountListItem})
+      {@required WalletBase wallet, AccountListItem accountListItem})
       : state = InitialExecutionState(),
         isEdit = accountListItem != null,
         label = accountListItem?.label??'',
-        _accountListItem = accountListItem;
+        _accountListItem = accountListItem,
+        _wallet = wallet;
 
   final bool isEdit;
 
@@ -26,6 +29,7 @@ abstract class MoneroAccountEditOrCreateViewModelBase with Store {
 
   final MoneroAccountList _moneroAccountList;
   final AccountListItem _accountListItem;
+  final WalletBase _wallet;
 
   Future<void> save() async {
     try {
@@ -38,6 +42,7 @@ abstract class MoneroAccountEditOrCreateViewModelBase with Store {
         await _moneroAccountList.addAccount(label: label);
       }
 
+      await _wallet.save();
       state = ExecutedSuccessfullyState();
     } catch (e) {
       state = FailureState(e.toString());

lib/view_model/monero_account_list/monero_account_list_view_model.dart

@@ -20,15 +20,16 @@ abstract class MoneroAccountListViewModelBase with Store {
   }
 
   @computed
-  List<AccountListItem> get accounts => _moneroWallet.accountList.accounts
-      .map((acc) => AccountListItem(
+  List<AccountListItem> get accounts => _moneroWallet.walletAddresses
+      .accountList.accounts.map((acc) => AccountListItem(
           label: acc.label,
           id: acc.id,
-          isSelected: acc.id == _moneroWallet.account.id))
+          isSelected: acc.id == _moneroWallet.walletAddresses.account.id))
       .toList();
 
   final MoneroWallet _moneroWallet;
 
   void select(AccountListItem item) =>
-      _moneroWallet.account = Account(id: item.id, label: item.label);
+      _moneroWallet.walletAddresses.account =
+          Account(id: item.id, label: item.label);
 }

lib/view_model/send/send_view_model.dart

@@ -9,7 +9,6 @@ import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
 import 'package:hive/hive.dart';
 import 'package:intl/intl.dart';
 import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/entities/openalias_record.dart';
 import 'package:cake_wallet/entities/template.dart';
 import 'package:cake_wallet/store/templates/send_template_store.dart';
 import 'package:cake_wallet/core/template_validator.dart';
@@ -267,13 +266,6 @@ abstract class SendViewModelBase with Store {
   void setTransactionPriority(TransactionPriority priority) =>
       _settingsStore.priority[_wallet.type] = priority;
 
-  Future<OpenaliasRecord> decodeOpenaliasRecord(String name) async {
-    final record = await OpenaliasRecord.fetchAddressAndName(
-        OpenaliasRecord.formatDomainName(name));
-
-    return record.name != name ? record : null;
-  }
-
   @action
   void _updateFiatAmount() {
     try {

lib/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart

@@ -64,12 +64,15 @@ abstract class WalletAddressEditOrCreateViewModelBase with Store {
     final wallet = _wallet;
 
     if (wallet is ElectrumWallet) {
-      await wallet.generateNewAddress();
+      await wallet.walletAddresses.generateNewAddress();
+      await wallet.save();
     }
 
     if (wallet is MoneroWallet) {
-      await wallet.subaddressList
-          .addSubaddress(accountIndex: wallet.account.id, label: label);
+      await wallet.walletAddresses.subaddressList
+          .addSubaddress(
+          accountIndex: wallet.walletAddresses.account.id,
+          label: label);
       await wallet.save();
     }
   }
@@ -77,13 +80,14 @@ abstract class WalletAddressEditOrCreateViewModelBase with Store {
   Future<void> _update() async {
     final wallet = _wallet;
 
-    if (wallet is BitcoinWallet) {
-      await wallet.updateAddress(_item.address as String);
-    }
+    /*if (wallet is BitcoinWallet) {
+      await wallet.walletAddresses.updateAddress(_item.address as String);
+      await wallet.save();
+    }*/
 
     if (wallet is MoneroWallet) {
-      await wallet.subaddressList.setLabelSubaddress(
-          accountIndex: wallet.account.id,
+      await wallet.walletAddresses.subaddressList.setLabelSubaddress(
+          accountIndex: wallet.walletAddresses.account.id,
           addressIndex: _item.id as int,
           label: label);
       await wallet.save();

lib/view_model/wallet_address_list/wallet_address_list_view_model.dart

@@ -80,7 +80,7 @@ abstract class WalletAddressListViewModelBase with Store {
 
   @computed
   WalletAddressListItem get address =>
-      WalletAddressListItem(address: _wallet.address);
+      WalletAddressListItem(address: _wallet.walletAddresses.address);
 
   @computed
   PaymentURI get uri {
@@ -105,8 +105,10 @@ abstract class WalletAddressListViewModelBase with Store {
     final addressList = ObservableList<ListItem>();
 
     if (wallet is MoneroWallet) {
-      final primaryAddress = wallet.subaddressList.subaddresses.first;
-      addressList.addAll(wallet.subaddressList.subaddresses.map((subaddress) {
+      final primaryAddress =
+          wallet.walletAddresses.subaddressList.subaddresses.first;
+      addressList.addAll(wallet.walletAddresses.subaddressList.subaddresses
+          .map((subaddress) {
         final isPrimary = subaddress == primaryAddress;
 
         return WalletAddressListItem(
@@ -118,8 +120,8 @@ abstract class WalletAddressListViewModelBase with Store {
     }
 
     if (wallet is BitcoinWallet) {
-      final primaryAddress = wallet.addresses.first;
-      final bitcoinAddresses = wallet.addresses.map((addr) {
+      final primaryAddress = wallet.walletAddresses.addresses.first;
+      final bitcoinAddresses = wallet.walletAddresses.addresses.map((addr) {
         final isPrimary = addr == primaryAddress;
 
         return WalletAddressListItem(
@@ -139,7 +141,7 @@ abstract class WalletAddressListViewModelBase with Store {
     final wallet = _wallet;
 
     if (wallet is MoneroWallet) {
-      return wallet.account.label;
+      return wallet.walletAddresses.account.label;
     }
 
     return null;
@@ -160,7 +162,7 @@ abstract class WalletAddressListViewModelBase with Store {
 
   @action
   void setAddress(WalletAddressListItem address) =>
-      _wallet.address = address.address;
+      _wallet.walletAddresses.address = address.address;
 
   void _init() {
     _baseItems = [];
@@ -177,7 +179,8 @@ abstract class WalletAddressListViewModelBase with Store {
     final wallet = _wallet;
 
     if (wallet is ElectrumWallet) {
-      wallet.nextAddress();
+      wallet.walletAddresses.nextAddress();
+      wallet.save();
     }
   }
 }

lib/view_model/wallet_creation_vm.dart

@@ -50,7 +50,7 @@ abstract class WalletCreationVMBase with Store {
           dirPath: dirPath);
       credentials.walletInfo = walletInfo;
       final wallet = await process(credentials);
-      walletInfo.address = wallet.address;
+      walletInfo.address = wallet.walletAddresses.address;
       await _walletInfoSource.add(walletInfo);
       _appStore.changeCurrentWallet(wallet);
       _appStore.authenticationStore.allowed();