mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2024-12-23 03:49:22 +00:00
token wallet info cache and contract addresses provider usages
This commit is contained in:
parent
61e687585e
commit
baea4923dd
9 changed files with 168 additions and 122 deletions
|
@ -180,10 +180,7 @@ class _EditWalletTokensViewState extends ConsumerState<EditWalletTokensView> {
|
|||
|
||||
tokenEntities.addAll(contracts.map((e) => AddTokenListElementData(e)));
|
||||
|
||||
final walletContracts =
|
||||
(ref.read(pWallets).getWallet(widget.walletId) as EthereumWallet)
|
||||
.info
|
||||
.tokenContractAddresses;
|
||||
final walletContracts = ref.read(pWalletTokenAddresses(widget.walletId));
|
||||
|
||||
final shouldMarkAsSelectedContracts = [
|
||||
...walletContracts,
|
||||
|
|
|
@ -15,14 +15,12 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:stackwallet/pages/add_wallet_views/add_token_view/edit_wallet_tokens_view.dart';
|
||||
import 'package:stackwallet/pages/token_view/sub_widgets/my_tokens_list.dart';
|
||||
import 'package:stackwallet/providers/global/wallets_provider.dart';
|
||||
import 'package:stackwallet/themes/stack_colors.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/util.dart';
|
||||
import 'package:stackwallet/wallets/isar/providers/wallet_info_provider.dart';
|
||||
import 'package:stackwallet/wallets/wallet/impl/ethereum_wallet.dart';
|
||||
import 'package:stackwallet/widgets/background.dart';
|
||||
import 'package:stackwallet/widgets/conditional_parent.dart';
|
||||
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
|
||||
|
@ -233,11 +231,7 @@ class _MyTokensViewState extends ConsumerState<MyTokensView> {
|
|||
child: MyTokensList(
|
||||
walletId: widget.walletId,
|
||||
searchTerm: _searchString,
|
||||
tokenContracts: ref
|
||||
.watch(pWallets.select((value) =>
|
||||
value.getWallet(widget.walletId) as EthereumWallet))
|
||||
.info
|
||||
.tokenContractAddresses,
|
||||
tokenContracts: ref.watch(pWalletTokenAddresses(widget.walletId)),
|
||||
),
|
||||
),
|
||||
],
|
||||
|
|
|
@ -13,6 +13,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||
import 'package:stackwallet/models/isar/models/ethereum/eth_contract.dart';
|
||||
import 'package:stackwallet/pages/token_view/token_view.dart';
|
||||
import 'package:stackwallet/pages_desktop_specific/my_stack_view/wallet_view/desktop_token_view.dart';
|
||||
import 'package:stackwallet/providers/db/main_db_provider.dart';
|
||||
import 'package:stackwallet/providers/global/secure_store_provider.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/services/ethereum/cached_eth_token_balance.dart';
|
||||
|
@ -25,6 +26,7 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
|||
import 'package:stackwallet/utilities/show_loading.dart';
|
||||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/util.dart';
|
||||
import 'package:stackwallet/wallets/isar/providers/eth/token_balance_provider.dart';
|
||||
import 'package:stackwallet/wallets/isar/providers/wallet_info_provider.dart';
|
||||
import 'package:stackwallet/wallets/wallet/impl/ethereum_wallet.dart';
|
||||
import 'package:stackwallet/widgets/desktop/primary_button.dart';
|
||||
|
@ -116,11 +118,14 @@ class _MyTokenSelectItemState extends ConsumerState<MyTokenSelectItem> {
|
|||
cachedBalance = CachedEthTokenBalance(widget.walletId, widget.token);
|
||||
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) async {
|
||||
if (mounted) {
|
||||
final address = ref.read(pWalletReceivingAddress(widget.walletId));
|
||||
await cachedBalance.fetchAndUpdateCachedBalance(address);
|
||||
await cachedBalance.fetchAndUpdateCachedBalance(
|
||||
address, ref.read(mainDBProvider));
|
||||
if (mounted) {
|
||||
setState(() {});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
super.initState();
|
||||
|
@ -172,7 +177,14 @@ class _MyTokenSelectItemState extends ConsumerState<MyTokenSelectItem> {
|
|||
const Spacer(),
|
||||
Text(
|
||||
ref.watch(pAmountFormatter(Coin.ethereum)).format(
|
||||
cachedBalance.getCachedBalance().total,
|
||||
ref
|
||||
.watch(pTokenBalance(
|
||||
(
|
||||
walletId: widget.walletId,
|
||||
contractAddress: widget.token.address
|
||||
),
|
||||
))
|
||||
.total,
|
||||
ethContract: widget.token,
|
||||
),
|
||||
style: isDesktop
|
||||
|
|
|
@ -25,7 +25,7 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart';
|
|||
import 'package:stackwallet/utilities/text_styles.dart';
|
||||
import 'package:stackwallet/utilities/util.dart';
|
||||
import 'package:stackwallet/wallets/isar/models/wallet_info.dart';
|
||||
import 'package:stackwallet/wallets/wallet/impl/ethereum_wallet.dart';
|
||||
import 'package:stackwallet/wallets/isar/providers/wallet_info_provider.dart';
|
||||
import 'package:stackwallet/wallets/wallet/wallet.dart';
|
||||
import 'package:stackwallet/widgets/background.dart';
|
||||
import 'package:stackwallet/widgets/conditional_parent.dart';
|
||||
|
@ -119,9 +119,8 @@ class _EthWalletsOverviewState extends ConsumerState<WalletsOverview> {
|
|||
if (widget.coin == Coin.ethereum) {
|
||||
for (final data in walletsData) {
|
||||
final List<EthContract> contracts = [];
|
||||
final wallet = ref.read(pWallets).getWallet(data.walletId);
|
||||
final contractAddresses =
|
||||
(wallet as EthereumWallet).info.tokenContractAddresses;
|
||||
ref.read(pWalletTokenAddresses(data.walletId));
|
||||
|
||||
// fetch each contract
|
||||
for (final contractAddress in contractAddresses) {
|
||||
|
|
|
@ -8,29 +8,37 @@
|
|||
*
|
||||
*/
|
||||
|
||||
import 'package:isar/isar.dart';
|
||||
import 'package:stackwallet/db/isar/main_db.dart';
|
||||
import 'package:stackwallet/models/balance.dart';
|
||||
import 'package:stackwallet/models/isar/models/ethereum/eth_contract.dart';
|
||||
import 'package:stackwallet/services/ethereum/ethereum_api.dart';
|
||||
import 'package:stackwallet/services/mixins/eth_token_cache.dart';
|
||||
import 'package:stackwallet/utilities/amount/amount.dart';
|
||||
import 'package:stackwallet/utilities/logger.dart';
|
||||
import 'package:stackwallet/wallets/isar/models/token_wallet_info.dart';
|
||||
|
||||
class CachedEthTokenBalance with EthTokenCache {
|
||||
class CachedEthTokenBalance {
|
||||
final String walletId;
|
||||
final EthContract token;
|
||||
|
||||
CachedEthTokenBalance(this.walletId, this.token) {
|
||||
initCache(walletId, token);
|
||||
}
|
||||
CachedEthTokenBalance(this.walletId, this.token);
|
||||
|
||||
Future<void> fetchAndUpdateCachedBalance(String address) async {
|
||||
Future<void> fetchAndUpdateCachedBalance(
|
||||
String address,
|
||||
MainDB mainDB,
|
||||
) async {
|
||||
final response = await EthereumAPI.getWalletTokenBalance(
|
||||
address: address,
|
||||
contractAddress: token.address,
|
||||
);
|
||||
|
||||
if (response.value != null) {
|
||||
await updateCachedBalance(
|
||||
final info = await mainDB.isar.tokenWalletInfo
|
||||
.where()
|
||||
.walletIdTokenAddressEqualTo(walletId, token.address)
|
||||
.findFirst();
|
||||
|
||||
if (response.value != null && info != null) {
|
||||
await info.updateCachedBalance(
|
||||
Balance(
|
||||
total: response.value!,
|
||||
spendable: response.value!,
|
||||
|
@ -43,6 +51,7 @@ class CachedEthTokenBalance with EthTokenCache {
|
|||
fractionDigits: token.decimals,
|
||||
),
|
||||
),
|
||||
isar: mainDB.isar,
|
||||
);
|
||||
} else {
|
||||
Logging.instance.log(
|
||||
|
|
|
@ -1,70 +1,70 @@
|
|||
/*
|
||||
* This file is part of Stack Wallet.
|
||||
*
|
||||
* Copyright (c) 2023 Cypher Stack
|
||||
* All Rights Reserved.
|
||||
* The code is distributed under GPLv3 license, see LICENSE file for details.
|
||||
* Generated by Cypher Stack on 2023-05-26
|
||||
*
|
||||
*/
|
||||
|
||||
import 'package:stackwallet/db/hive/db.dart';
|
||||
import 'package:stackwallet/models/balance.dart';
|
||||
import 'package:stackwallet/models/isar/models/ethereum/eth_contract.dart';
|
||||
import 'package:stackwallet/utilities/amount/amount.dart';
|
||||
|
||||
abstract class TokenCacheKeys {
|
||||
static String tokenBalance(String contractAddress) {
|
||||
return "tokenBalanceCache_$contractAddress";
|
||||
}
|
||||
}
|
||||
|
||||
mixin EthTokenCache {
|
||||
late final String _walletId;
|
||||
late final EthContract _token;
|
||||
|
||||
void initCache(String walletId, EthContract token) {
|
||||
_walletId = walletId;
|
||||
_token = token;
|
||||
}
|
||||
|
||||
// token balance cache
|
||||
Balance getCachedBalance() {
|
||||
final jsonString = DB.instance.get<dynamic>(
|
||||
boxName: _walletId,
|
||||
key: TokenCacheKeys.tokenBalance(_token.address),
|
||||
) as String?;
|
||||
if (jsonString == null) {
|
||||
return Balance(
|
||||
total: Amount(
|
||||
rawValue: BigInt.zero,
|
||||
fractionDigits: _token.decimals,
|
||||
),
|
||||
spendable: Amount(
|
||||
rawValue: BigInt.zero,
|
||||
fractionDigits: _token.decimals,
|
||||
),
|
||||
blockedTotal: Amount(
|
||||
rawValue: BigInt.zero,
|
||||
fractionDigits: _token.decimals,
|
||||
),
|
||||
pendingSpendable: Amount(
|
||||
rawValue: BigInt.zero,
|
||||
fractionDigits: _token.decimals,
|
||||
),
|
||||
);
|
||||
}
|
||||
return Balance.fromJson(
|
||||
jsonString,
|
||||
_token.decimals,
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> updateCachedBalance(Balance balance) async {
|
||||
await DB.instance.put<dynamic>(
|
||||
boxName: _walletId,
|
||||
key: TokenCacheKeys.tokenBalance(_token.address),
|
||||
value: balance.toJsonIgnoreCoin(),
|
||||
);
|
||||
}
|
||||
}
|
||||
// /*
|
||||
// * This file is part of Stack Wallet.
|
||||
// *
|
||||
// * Copyright (c) 2023 Cypher Stack
|
||||
// * All Rights Reserved.
|
||||
// * The code is distributed under GPLv3 license, see LICENSE file for details.
|
||||
// * Generated by Cypher Stack on 2023-05-26
|
||||
// *
|
||||
// */
|
||||
//
|
||||
// import 'package:stackwallet/db/hive/db.dart';
|
||||
// import 'package:stackwallet/models/balance.dart';
|
||||
// import 'package:stackwallet/models/isar/models/ethereum/eth_contract.dart';
|
||||
// import 'package:stackwallet/utilities/amount/amount.dart';
|
||||
//
|
||||
// abstract class TokenCacheKeys {
|
||||
// static String tokenBalance(String contractAddress) {
|
||||
// return "tokenBalanceCache_$contractAddress";
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// mixin EthTokenCache {
|
||||
// late final String _walletId;
|
||||
// late final EthContract _token;
|
||||
//
|
||||
// void initCache(String walletId, EthContract token) {
|
||||
// _walletId = walletId;
|
||||
// _token = token;
|
||||
// }
|
||||
//
|
||||
// // token balance cache
|
||||
// Balance getCachedBalance() {
|
||||
// final jsonString = DB.instance.get<dynamic>(
|
||||
// boxName: _walletId,
|
||||
// key: TokenCacheKeys.tokenBalance(_token.address),
|
||||
// ) as String?;
|
||||
// if (jsonString == null) {
|
||||
// return Balance(
|
||||
// total: Amount(
|
||||
// rawValue: BigInt.zero,
|
||||
// fractionDigits: _token.decimals,
|
||||
// ),
|
||||
// spendable: Amount(
|
||||
// rawValue: BigInt.zero,
|
||||
// fractionDigits: _token.decimals,
|
||||
// ),
|
||||
// blockedTotal: Amount(
|
||||
// rawValue: BigInt.zero,
|
||||
// fractionDigits: _token.decimals,
|
||||
// ),
|
||||
// pendingSpendable: Amount(
|
||||
// rawValue: BigInt.zero,
|
||||
// fractionDigits: _token.decimals,
|
||||
// ),
|
||||
// );
|
||||
// }
|
||||
// return Balance.fromJson(
|
||||
// jsonString,
|
||||
// _token.decimals,
|
||||
// );
|
||||
// }
|
||||
//
|
||||
// Future<void> updateCachedBalance(Balance balance) async {
|
||||
// await DB.instance.put<dynamic>(
|
||||
// boxName: _walletId,
|
||||
// key: TokenCacheKeys.tokenBalance(_token.address),
|
||||
// value: balance.toJsonIgnoreCoin(),
|
||||
// );
|
||||
// }
|
||||
// }
|
||||
|
|
40
lib/wallets/isar/providers/eth/token_balance_provider.dart
Normal file
40
lib/wallets/isar/providers/eth/token_balance_provider.dart
Normal file
|
@ -0,0 +1,40 @@
|
|||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:isar/isar.dart';
|
||||
import 'package:stackwallet/models/balance.dart';
|
||||
import 'package:stackwallet/providers/db/main_db_provider.dart';
|
||||
import 'package:stackwallet/wallets/isar/models/token_wallet_info.dart';
|
||||
import 'package:stackwallet/wallets/isar/providers/util/watcher.dart';
|
||||
|
||||
final _twiProvider = ChangeNotifierProvider.family<Watcher,
|
||||
({String walletId, String contractAddress})>(
|
||||
(ref, data) {
|
||||
final collection = ref.watch(mainDBProvider).isar.tokenWalletInfo;
|
||||
|
||||
final watcher = Watcher(
|
||||
collection
|
||||
.where()
|
||||
.walletIdTokenAddressEqualTo(data.walletId, data.contractAddress)
|
||||
.findFirstSync()!,
|
||||
collection: collection,
|
||||
);
|
||||
|
||||
ref.onDispose(() => watcher.dispose());
|
||||
|
||||
return watcher;
|
||||
},
|
||||
);
|
||||
|
||||
final pTokenWalletInfo = Provider.family<TokenWalletInfo,
|
||||
({String walletId, String contractAddress})>(
|
||||
(ref, data) {
|
||||
return ref.watch(_twiProvider(data)).value as TokenWalletInfo;
|
||||
},
|
||||
);
|
||||
|
||||
final pTokenBalance =
|
||||
Provider.family<Balance, ({String walletId, String contractAddress})>(
|
||||
(ref, data) {
|
||||
return ref.watch(_twiProvider(data).select(
|
||||
(value) => (value.value as TokenWalletInfo).getCachedBalance()));
|
||||
},
|
||||
);
|
|
@ -82,3 +82,10 @@ final pWalletReceivingAddress = Provider.family<String, String>(
|
|||
.select((value) => (value.value as WalletInfo).cachedReceivingAddress));
|
||||
},
|
||||
);
|
||||
|
||||
final pWalletTokenAddresses = Provider.family<List<String>, String>(
|
||||
(ref, walletId) {
|
||||
return ref.watch(_wiProvider(walletId)
|
||||
.select((value) => (value.value as WalletInfo).tokenContractAddresses));
|
||||
},
|
||||
);
|
||||
|
|
|
@ -11,12 +11,11 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:stackwallet/providers/providers.dart';
|
||||
import 'package:stackwallet/themes/stack_colors.dart';
|
||||
import 'package:stackwallet/utilities/assets.dart';
|
||||
import 'package:stackwallet/utilities/constants.dart';
|
||||
import 'package:stackwallet/utilities/util.dart';
|
||||
import 'package:stackwallet/wallets/wallet/impl/ethereum_wallet.dart';
|
||||
import 'package:stackwallet/wallets/isar/providers/wallet_info_provider.dart';
|
||||
import 'package:stackwallet/widgets/animated_widgets/rotate_icon.dart';
|
||||
import 'package:stackwallet/widgets/expandable.dart';
|
||||
import 'package:stackwallet/widgets/rounded_white_container.dart';
|
||||
|
@ -40,17 +39,6 @@ class MasterWalletCard extends ConsumerStatefulWidget {
|
|||
class _MasterWalletCardState extends ConsumerState<MasterWalletCard> {
|
||||
final expandableController = ExpandableController();
|
||||
final rotateIconController = RotateIconController();
|
||||
late final List<String> tokenContractAddresses;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
final ethWallet =
|
||||
ref.read(pWallets).getWallet(widget.walletId) as EthereumWallet;
|
||||
|
||||
tokenContractAddresses = ethWallet.info.tokenContractAddresses;
|
||||
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
|
@ -130,7 +118,7 @@ class _MasterWalletCardState extends ConsumerState<MasterWalletCard> {
|
|||
popPrevious: true,
|
||||
),
|
||||
),
|
||||
...tokenContractAddresses.map(
|
||||
...ref.watch(pWalletTokenAddresses(widget.walletId)).map(
|
||||
(e) => Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 7,
|
||||
|
|
Loading…
Reference in a new issue