Browse Source

coinchooser: small clean-up (use TxOutput.value)

3.2.x
SomberNight 6 years ago
parent
commit
b7178f2d21
No known key found for this signature in database GPG Key ID: B33B5F232C6271E9
  1. 8
      electrum/coinchooser.py

8
electrum/coinchooser.py

@ -117,7 +117,7 @@ class CoinChooserBase(PrintError):
def change_amounts(self, tx, count, fee_estimator, dust_threshold): def change_amounts(self, tx, count, fee_estimator, dust_threshold):
# Break change up if bigger than max_change # Break change up if bigger than max_change
output_amounts = [o[2] 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(max(output_amounts) * 1.25, 0.02 * COIN)
@ -354,9 +354,9 @@ class CoinChooserPrivacy(CoinChooserRandom):
return [coin['address'] for coin in coins] return [coin['address'] for coin in coins]
def penalty_func(self, tx): def penalty_func(self, tx):
min_change = min(o[2] for o in tx.outputs()) * 0.75 min_change = min(o.value for o in tx.outputs()) * 0.75
max_change = max(o[2] for o in tx.outputs()) * 1.33 max_change = max(o.value for o in tx.outputs()) * 1.33
spent_amount = sum(o[2] for o in tx.outputs()) spent_amount = sum(o.value for o in tx.outputs())
def penalty(buckets): def penalty(buckets):
badness = len(buckets) - 1 badness = len(buckets) - 1

Loading…
Cancel
Save