Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-12-22 19:49:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CW-371-Restore-height-issue-with-QR-code-Wallet-incorrectly-assigns-today's-restore-height-to-legacy-wallets (#925)

Browse source 
* fix height for legacy wallets

* get height by first tx under singular seed
This commit is contained in:
Serhii 2023-05-25 00:00:54 +03:00 committed by GitHub
parent 18ba724009
commit c835059d13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cw_core/lib/get_height_by_date.dart
View file

@ -122,6 +122,8 @@ int getMoneroHeigthByDate({required DateTime date}) {
}
const havenDates = {
"2023-05": 1352995,
"2023-04": 1331460,
"2023-03": 1309180,
"2023-01": 1266810,
"2022-12": 1244510,

59
lib/view_model/wallet_keys_view_model.dart
View file

@ -1,4 +1,6 @@
import 'package:cake_wallet/store/app_store.dart';
import 'package:cw_core/transaction_direction.dart';
import 'package:cw_core/transaction_info.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:mobx/mobx.dart';
import 'package:cake_wallet/generated/i18n.dart';
@ -19,12 +21,26 @@ abstract class WalletKeysViewModelBase with Store {
? S.current.wallet_seed
: S.current.wallet_keys,
_restoreHeight = _appStore.wallet!.walletInfo.restoreHeight,
_restoreHeightByTransactions = 0,
items = ObservableList<StandartListItem>() {
_populateItems();
reaction((_) => _appStore.wallet, (WalletBase? _wallet) {
_populateItems();
});
if (_appStore.wallet!.type == WalletType.monero || _appStore.wallet!.type == WalletType.haven) {
final accountTransactions = _getWalletTransactions(_appStore.wallet!);
if (accountTransactions.isNotEmpty) {
final incomingAccountTransactions =
accountTransactions.where((tx) => tx.direction == TransactionDirection.incoming);
if (incomingAccountTransactions.isNotEmpty) {
incomingAccountTransactions.toList().sort((a, b) => a.date.compareTo(b.date));
_restoreHeightByTransactions = _getRestoreHeightByTransactions(
_appStore.wallet!.type, incomingAccountTransactions.first.date);
}
}
}
}
final ObservableList<StandartListItem> items;
@ -35,6 +51,8 @@ abstract class WalletKeysViewModelBase with Store {
final int _restoreHeight;
int _restoreHeightByTransactions;
void _populateItems() {
items.clear();
@ -78,7 +96,7 @@ abstract class WalletKeysViewModelBase with Store {
}
}
Future<int?> currentHeight() async {
Future<int?> _currentHeight() async {
if (_appStore.wallet!.type == WalletType.haven) {
return await haven!.getCurrentHeight();
}
@ -88,7 +106,6 @@ abstract class WalletKeysViewModelBase with Store {
return null;
}
String get _scheme {
switch (_appStore.wallet!.type) {
case WalletType.monero:
@ -105,14 +122,14 @@ abstract class WalletKeysViewModelBase with Store {
}
Future<String?> get restoreHeight async {
if (_restoreHeight != 0) {
return _restoreHeight.toString();
}
final _currentHeight = await currentHeight();
if (_currentHeight == null) {
return null;
}
return ((_currentHeight / 1000).floor() * 1000).toString();
if (_restoreHeightByTransactions != 0)
return getRoundedRestoreHeight(_restoreHeightByTransactions);
if (_restoreHeight != 0) return _restoreHeight.toString();
final currentHeight = await _currentHeight();
if (currentHeight == null) return null;
return getRoundedRestoreHeight(currentHeight);
}
Future<Map<String, String>> get _queryParams async {
@ -123,10 +140,28 @@ abstract class WalletKeysViewModelBase with Store {
};
}
Future<Uri> get url async {
return Uri(
Future<Uri> get url async => Uri(
scheme: _scheme,
queryParameters: await _queryParams,
);
List<TransactionInfo> _getWalletTransactions(WalletBase wallet) {
if (wallet.type == WalletType.monero) {
return monero!.getTransactionHistory(wallet).transactions.values.toList();
} else if (wallet.type == WalletType.haven) {
return haven!.getTransactionHistory(wallet).transactions.values.toList();
}
return [];
}
int _getRestoreHeightByTransactions(WalletType type, DateTime date) {
if (type == WalletType.monero) {
return monero!.getHeigthByDate(date: date);
} else if (type == WalletType.haven) {
return haven!.getHeightByDate(date: date);
}
return 0;
}
String getRoundedRestoreHeight(int height) => ((height / 1000).floor() * 1000).toString();
}