AaronFiore/electrum
1
0
Fork 0
Code Activity

coin_chooser: allow to pass empty outputs to make_tx.

Browse Source 
coins will be sent to a change address if there are no outputs.
This commit is contained in:
ThomasV
2024-12-01 09:34:34 +01:00
parent 9aa7222c5c
commit 8bf505fc4b
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
electrum/coinchooser.py
View File

@@ -160,7 +160,7 @@ class CoinChooserBase(Logger):
# Break change up if bigger than max_change # Break change up if bigger than max_change
output_amounts = [o.value for o in tx.outputs()] output_amounts = [o.value for o in tx.outputs()]
# Don't split change of less than 0.02 BTC # Don't split change of less than 0.02 BTC
max_change = max(max(output_amounts) * 1.25, 0.02 * COIN) max_change = max([0.02 * COIN] + output_amounts) * 1.25
# Use N change outputs # Use N change outputs
for n in range(1, count + 1): for n in range(1, count + 1):
@@ -176,8 +176,8 @@ class CoinChooserBase(Logger):
return len(s) - len(s.rstrip('0')) return len(s) - len(s.rstrip('0'))
zeroes = [trailing_zeroes(i) for i in output_amounts] zeroes = [trailing_zeroes(i) for i in output_amounts]
min_zeroes = min(zeroes) min_zeroes = min([8] + zeroes)
max_zeroes = max(zeroes) max_zeroes = max([0] + zeroes)
if n > 1: if n > 1:
zeroes = range(max(0, min_zeroes - 1), (max_zeroes + 1) + 1) zeroes = range(max(0, min_zeroes - 1), (max_zeroes + 1) + 1)
@@ -284,8 +284,6 @@ class CoinChooserBase(Logger):
Note: fee_estimator_vb expects virtual bytes Note: fee_estimator_vb expects virtual bytes
""" """
assert outputs, 'tx outputs cannot be empty'
# Deterministic randomness from coins # Deterministic randomness from coins
utxos = [c.prevout.serialize_to_network() for c in coins] utxos = [c.prevout.serialize_to_network() for c in coins]
self.p = PRNG(b''.join(sorted(utxos))) self.p = PRNG(b''.join(sorted(utxos)))
@@ -460,8 +458,12 @@ class CoinChooserPrivacy(CoinChooserRandom):
return [coin.scriptpubkey.hex() for coin in coins] return [coin.scriptpubkey.hex() for coin in coins]
def penalty_func(self, base_tx, *, tx_from_buckets): def penalty_func(self, base_tx, *, tx_from_buckets):
min_change = min(o.value for o in base_tx.outputs()) * 0.75 if _outputs := base_tx.outputs():
max_change = max(o.value for o in base_tx.outputs()) * 1.33 min_change = min(o.value for o in _outputs) * 0.75
max_change = max(o.value for o in _outputs) * 1.33
else:
min_change = 0
max_change = 0.02 * COIN
def penalty(buckets: List[Bucket]) -> ScoredCandidate: def penalty(buckets: List[Bucket]) -> ScoredCandidate:
# Penalize using many buckets (~inputs) # Penalize using many buckets (~inputs)