Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-02-03 03:36:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix estimating gas for priority

Browse source
This commit is contained in:
OmarHatem 2023-01-13 19:10:38 +02:00
parent d12e874b75
commit 95abe7c8ec
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cw_ethereum/lib/ethereum_client.dart
View file

@ -6,7 +6,7 @@ import 'package:web3dart/web3dart.dart';
class EthereumClient {
Web3Client? _client;
Future<bool> connect(Node node) async {
bool connect(Node node) {
try {
_client = Web3Client(node.uri.toString(), Client());
@ -28,9 +28,13 @@ class EthereumClient {
}
Future<List<int>> getEstimatedGasForPriorities() async {
final result = await Future.wait(EthereumTransactionPriority.all.map((priority) => _client!
.estimateGas(
maxPriorityFeePerGas: EtherAmount.fromUnitAndValue(EtherUnit.gwei, priority.tip))));
final result = await Future.wait(EthereumTransactionPriority.all.map(
(priority) => _client!.estimateGas(
maxPriorityFeePerGas: EtherAmount.fromUnitAndValue(EtherUnit.gwei, priority.tip),
maxFeePerGas: EtherAmount.fromUnitAndValue(EtherUnit.gwei, 100),
),
));
return result.map((e) => e.toInt()).toList();
}

22
cw_ethereum/lib/ethereum_wallet.dart
View file

@ -38,7 +38,7 @@ abstract class EthereumWalletBase
}) : syncStatus = NotConnectedSyncStatus(),
_password = password,
_mnemonic = mnemonic,
_feeRates = [],
_priorityFees = [],
_client = EthereumClient(),
walletAddresses = EthereumWalletAddresses(walletInfo),
balance = ObservableMap<CryptoCurrency, EthereumBalance>.of(
@ -54,7 +54,7 @@ abstract class EthereumWalletBase
late EthereumClient _client;
List<int> _feeRates;
List<int> _priorityFees;
int? _gasPrice;
@override
@ -76,7 +76,15 @@ abstract class EthereumWalletBase
@override
int calculateEstimatedFee(TransactionPriority priority, int? amount) {
throw UnimplementedError("calculateEstimatedFee");
try {
if (priority is EthereumTransactionPriority) {
return _gasPrice! * _priorityFees[priority.raw];
}
return 0;
} catch (e) {
return 0;
}
}
@override
@ -93,7 +101,7 @@ abstract class EthereumWalletBase
try {
syncStatus = ConnectingSyncStatus();
final isConnected = await _client.connect(node);
final isConnected = _client.connect(node);
if (!isConnected) {
throw Exception("Ethereum Node connection failed");
@ -142,12 +150,12 @@ abstract class EthereumWalletBase
syncStatus = AttemptingSyncStatus();
await _updateBalance();
_gasPrice = await _client.getGasUnitPrice();
_feeRates = await _client.getEstimatedGasForPriorities();
_priorityFees = await _client.getEstimatedGasForPriorities();
Timer.periodic(
const Duration(minutes: 1), (timer) async => _gasPrice = await _client.getGasUnitPrice());
Timer.periodic(const Duration(minutes: 1),
(timer) async => _feeRates = await _client.getEstimatedGasForPriorities());
(timer) async => _priorityFees = await _client.getEstimatedGasForPriorities());
syncStatus = SyncedSyncStatus();
} catch (e, stacktrace) {
@ -160,7 +168,7 @@ abstract class EthereumWalletBase
int feeRate(TransactionPriority priority) {
try {
if (priority is EthereumTransactionPriority) {
return _feeRates[priority.raw] * _gasPrice!;
return _priorityFees[priority.raw];
}
return 0;