From 2377a344bd8cce394006edb9bd1cb4cdc0190034 Mon Sep 17 00:00:00 2001
From: Matthew Fosse <matt@fosse.co>
Date: Thu, 30 May 2024 09:09:29 -0700
Subject: [PATCH] [skip ci] minor fixes
---
cw_bitcoin/lib/electrum_wallet.dart | 26 ++++++++++++--------------
cw_bitcoin/lib/litecoin_wallet.dart | 5 ++++-
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/cw_bitcoin/lib/electrum_wallet.dart b/cw_bitcoin/lib/electrum_wallet.dart
index 8b15b97af..79a98b37d 100644
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@@ -420,15 +420,13 @@ abstract class ElectrumWalletBase
await _subscribeForUpdates();
await updateTransactions();
- _subscribeForUpdates();
if (this is! LitecoinWallet) {
await updateAllUnspents();
await updateBalance();
}
- _feeRates = await electrumClient.feeRates(network: network);
-
+ await updateFeeRates();
Timer.periodic(const Duration(minutes: 1), (timer) async => await updateFeeRates());
if (alwaysScan == true) {
@@ -820,15 +818,14 @@ abstract class ElectrumWalletBase
}
Future<int> calcFee({
- required List<UtxoWithAddress> utxos,
- required List<BitcoinBaseOutput> outputs,
- required BasedUtxoNetwork network,
- String? memo,
- required int feeRate,
- List<ECPrivateInfo>? inputPrivKeyInfos,
- List<Outpoint>? vinOutpoints,
- }) async {
-
+ required List<UtxoWithAddress> utxos,
+ required List<BitcoinBaseOutput> outputs,
+ required BasedUtxoNetwork network,
+ String? memo,
+ required int feeRate,
+ List<ECPrivateInfo>? inputPrivKeyInfos,
+ List<Outpoint>? vinOutpoints,
+ }) async {
int estimatedSize;
if (network is BitcoinCashNetwork) {
estimatedSize = ForkedTransactionBuilder.estimateTransactionSize(
@@ -1707,8 +1704,9 @@ abstract class ElectrumWalletBase
}
Future<ElectrumBalance> fetchBalances() async {
- final addresses = walletAddresses.allAddresses.where((address) =>
- addressTypeFromStr(address.address, network) is! MwebAddress).toList();
+ final addresses = walletAddresses.allAddresses
+ .where((address) => addressTypeFromStr(address.address, network) is! MwebAddress)
+ .toList();
final balanceFutures = <Future<Map<String, dynamic>>>[];
for (var i = 0; i < addresses.length; i++) {
final addressRecord = addresses[i];
diff --git a/cw_bitcoin/lib/litecoin_wallet.dart b/cw_bitcoin/lib/litecoin_wallet.dart
index d5c70bd44..2b670600e 100644
--- a/cw_bitcoin/lib/litecoin_wallet.dart
+++ b/cw_bitcoin/lib/litecoin_wallet.dart
@@ -149,10 +149,13 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
final stub = await CwMweb.stub();
_syncTimer?.cancel();
_syncTimer = Timer.periodic(const Duration(milliseconds: 1500), (timer) async {
- print(syncStatus);
if (syncStatus is FailedSyncStatus) return;
final height = await electrumClient.getCurrentBlockChainTip() ?? 0;
final resp = await stub.status(StatusRequest());
+ print("stats:");
+ print(resp.mwebHeaderHeight);
+ print(resp.mwebUtxosHeight);
+ print(height);
if (resp.blockHeaderHeight < height) {
int h = resp.blockHeaderHeight;
syncStatus = SyncingSyncStatus(height - h, h / height);