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

fix: Add another node, handle errors gracefully (#1433)

Browse source
This commit is contained in:
Adegoke David 2024-05-06 20:11:18 +01:00 committed by GitHub
parent 55cdec810e
commit 2a88b32eee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assets/tron_node_list.yml
View file

@ -2,3 +2,7 @@
uri: api.trongrid.io uri: api.trongrid.io
is_default: true is_default: true
useSSL: true useSSL: true
-
uri: tron-rpc.publicnode.com:443
is_default: false
useSSL: true

11
cw_tron/lib/tron_client.dart
View file

@ -367,7 +367,7 @@ class TronClient {
) async { ) async {
// This is introduce to server as a limit in cases where feeLimit is 0 // This is introduce to server as a limit in cases where feeLimit is 0
// The transaction signing will fail if the feeLimit is explicitly 0. // The transaction signing will fail if the feeLimit is explicitly 0.
int defaultFeeLimit = 100000; int defaultFeeLimit = 269000;
final block = await _provider!.request(TronRequestGetNowBlock()); final block = await _provider!.request(TronRequestGetNowBlock());
// Create the transfer contract // Create the transfer contract
@ -401,8 +401,9 @@ class TronClient {
final tronBalanceInt = tronBalance.toInt(); final tronBalanceInt = tronBalance.toInt();
if (feeLimit > tronBalanceInt) { if (feeLimit > tronBalanceInt) {
final feeInTrx = TronHelper.fromSun(BigInt.parse(feeLimit.toString()));
throw Exception( throw Exception(
'You don\'t have enough TRX to cover the transaction fee for this transaction. Kindly top up.', 'You don\'t have enough TRX to cover the transaction fee for this transaction. Kindly top up.\nTransaction fee: $feeInTrx TRX',
); );
} }
@ -442,6 +443,9 @@ class TronClient {
if (!request.isSuccess) { if (!request.isSuccess) {
log("Tron TRC20 error: ${request.error} \n ${request.respose}"); log("Tron TRC20 error: ${request.error} \n ${request.respose}");
throw Exception(
'An error occured while creating the transfer request. Please try again.',
);
} }
final feeLimit = await getFeeLimit( final feeLimit = await getFeeLimit(
@ -454,8 +458,9 @@ class TronClient {
final tronBalanceInt = tronBalance.toInt(); final tronBalanceInt = tronBalance.toInt();
if (feeLimit > tronBalanceInt) { if (feeLimit > tronBalanceInt) {
final feeInTrx = TronHelper.fromSun(BigInt.parse(feeLimit.toString()));
throw Exception( throw Exception(
'You don\'t have enough TRX to cover the transaction fee for this transaction. Kindly top up.', 'You don\'t have enough TRX to cover the transaction fee for this transaction. Kindly top up. Transaction fee: $feeInTrx TRX',
); );
} }

18
lib/view_model/send/send_view_model.dart
View file

@ -363,7 +363,8 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
} catch (e) { } catch (e) {
if (e is LedgerException) { if (e is LedgerException) {
final errorCode = e.errorCode.toRadixString(16); final errorCode = e.errorCode.toRadixString(16);
final fallbackMsg = e.message.isNotEmpty ? e.message : "Unexpected Ledger Error Code: $errorCode"; final fallbackMsg =
e.message.isNotEmpty ? e.message : "Unexpected Ledger Error Code: $errorCode";
final errorMsg = ledgerViewModel.interpretErrorCode(errorCode) ?? fallbackMsg; final errorMsg = ledgerViewModel.interpretErrorCode(errorCode) ?? fallbackMsg;
state = FailureState(errorMsg); state = FailureState(errorMsg);
@ -444,7 +445,10 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
Object _credentials() { Object _credentials() {
final priority = _settingsStore.priority[wallet.type]; final priority = _settingsStore.priority[wallet.type];
if (priority == null && wallet.type != WalletType.nano && wallet.type != WalletType.banano && wallet.type != WalletType.solana && if (priority == null &&
wallet.type != WalletType.nano &&
wallet.type != WalletType.banano &&
wallet.type != WalletType.solana &&
wallet.type != WalletType.tron) { wallet.type != WalletType.tron) {
throw Exception('Priority is null for wallet type: ${wallet.type}'); throw Exception('Priority is null for wallet type: ${wallet.type}');
} }
@ -570,6 +574,16 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
return errorMessage; return errorMessage;
} }
if (walletType == WalletType.tron) {
if (errorMessage.contains('balance is not sufficient')) {
return S.current.do_not_have_enough_gas_asset(currency.toString());
}
if (errorMessage.contains('Transaction expired')) {
return 'An error occurred while processing the transaction. Kindly retry the transaction';
}
}
if (walletType == WalletType.bitcoin || if (walletType == WalletType.bitcoin ||
walletType == WalletType.litecoin || walletType == WalletType.litecoin ||
walletType == WalletType.bitcoinCash) { walletType == WalletType.bitcoinCash) {