Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-04-04 13:37:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge fixes [skip ci]

Browse source
This commit is contained in:
Matthew Fosse 2024-05-29 09:18:21 -07:00
parent ac1fe6b221
commit 4e1b96e99b
2 changed files with 19 additions and 9 deletions

2
cw_bitcoin/lib/electrum_wallet.dart
View file

@ -835,7 +835,7 @@ abstract class ElectrumWalletBase
required int feeRate,
List<ECPrivateInfo>? inputPrivKeyInfos,
List<Outpoint>? vinOutpoints,
}) async {
}) async {
int estimatedSize;
if (network is BitcoinCashNetwork) {

26
cw_bitcoin/lib/litecoin_wallet.dart
View file

@ -370,18 +370,28 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
}
@override
Future<int> calcFee(
{required List<UtxoWithAddress> utxos,
required List<BitcoinBaseOutput> outputs,
required BasedUtxoNetwork network,
String? memo,
required int feeRate}) async {
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 {
final spendsMweb = utxos.any((utxo) => utxo.utxo.scriptType == SegwitAddresType.mweb);
final paysToMweb = outputs
.any((output) => output.toOutput.scriptPubKey.getAddressType() == SegwitAddresType.mweb);
if (!spendsMweb && !paysToMweb) {
return await super
.calcFee(utxos: utxos, outputs: outputs, network: network, memo: memo, feeRate: feeRate);
return await super.calcFee(
utxos: utxos,
outputs: outputs,
network: network,
memo: memo,
feeRate: feeRate,
inputPrivKeyInfos: inputPrivKeyInfos,
vinOutpoints: vinOutpoints,
);
}
if (outputs.length == 1 && outputs[0].toOutput.amount == BigInt.zero) {
outputs = [