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

fix erc20 tokens transactions

Browse source
This commit is contained in:
Serhii 2024-06-12 18:21:56 +03:00
parent ffa0b416e9
commit 4b5eef9072
2 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cw_ethereum/lib/ethereum_client.dart
View file

@ -29,6 +29,11 @@ class EthereumClient extends EVMChainClient {
final jsonResponse = json.decode(response.body) as Map<String, dynamic>; final jsonResponse = json.decode(response.body) as Map<String, dynamic>;
if (jsonResponse['result'] is String && jsonResponse['result'].contains("Max rate limit reached")) {
log("Fetch EVM transactions exception: Max rate limit reached");
return [];
}
if (response.statusCode >= 200 && response.statusCode < 300 && jsonResponse['status'] != 0) { if (response.statusCode >= 200 && response.statusCode < 300 && jsonResponse['status'] != 0) {
return (jsonResponse['result'] as List) return (jsonResponse['result'] as List)
.map((e) => EVMChainTransactionModel.fromJson(e as Map<String, dynamic>, 'ETH')) .map((e) => EVMChainTransactionModel.fromJson(e as Map<String, dynamic>, 'ETH'))

37
cw_evm/lib/evm_chain_wallet.dart
View file

@ -338,9 +338,6 @@ abstract class EVMChainWalletBase
@override @override
Future<Map<String, EVMChainTransactionInfo>> fetchTransactions() async { Future<Map<String, EVMChainTransactionInfo>> fetchTransactions() async {
final address = _evmChainPrivateKey.address.hex; final address = _evmChainPrivateKey.address.hex;
final transactions = await _client.fetchTransactions(address);
final internalTransactions = await _client.fetchInternalTransactions(address);
final List<Future<List<EVMChainTransactionModel>>> erc20TokensTransactions = []; final List<Future<List<EVMChainTransactionModel>>> erc20TokensTransactions = [];
for (var token in balance.keys) { for (var token in balance.keys) {
@ -352,18 +349,38 @@ abstract class EVMChainWalletBase
} }
} }
final tokensTransaction = await Future.wait(erc20TokensTransactions); final tokensTransaction = await Future.wait(erc20TokensTransactions)
transactions.addAll(tokensTransaction.expand((element) => element)); .then((value) => value.expand((element) => element).toList());
transactions.addAll(internalTransactions);
final Map<String, EVMChainTransactionInfo> result = {}; final Map<String, EVMChainTransactionInfo> result = {};
List<EVMChainTransactionModel> transactionsList = [];
Set<String> transactionHashes = {};
for (var transactionModel in transactions) { for (var transaction in tokensTransaction) {
if (transactionModel.isError) { transactionsList.add(transaction);
continue; transactionHashes.add(transaction.hash);
}
final internalTransactions = await _client.fetchInternalTransactions(address);
for (var transaction in internalTransactions) {
if (!transactionHashes.contains(transaction.hash)) {
transactionsList.add(transaction);
transactionHashes.add(transaction.hash);
} }
}
result[transactionModel.hash] = getTransactionInfo(transactionModel, address); final transactions = await _client.fetchTransactions(address);
for (var transaction in transactions) {
if (!transactionHashes.contains(transaction.hash)) {
transactionsList.add(transaction);
transactionHashes.add(transaction.hash);
}
}
for (var transactionModel in transactionsList) {
if (!transactionModel.isError) {
result[transactionModel.hash] = getTransactionInfo(transactionModel, address);
}
} }
return result; return result;