tincrease min_relay_tx_fee, and make dust_threshold a function - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 86a0103a7f381ff499ade89e42f86023b6ad7e08
DIR parent d6126841966e6ed3f6ffc9ba5ab24b1c520db77b
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 12 Nov 2015 14:31:17 +0100
increase min_relay_tx_fee, and make dust_threshold a function
Diffstat:
M lib/bitcoin.py | 3 +--
M lib/wallet.py | 7 +++++--
2 files changed, 6 insertions(+), 4 deletions(-)
---
DIR diff --git a/lib/bitcoin.py b/lib/bitcoin.py
t@@ -30,8 +30,7 @@ import aes
################################## transactions
-DUST_THRESHOLD = 546
-MIN_RELAY_TX_FEE = 1000
+MIN_RELAY_TX_FEE = 5000
RECOMMENDED_FEE = 50000
COINBASE_MATURITY = 100
COIN = 100000000
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -897,6 +897,9 @@ class Abstract_Wallet(PrintError):
# this method can be overloaded
return tx.get_fee()
+ def dust_threshold(self):
+ return 182 * 3 * MIN_RELAY_TX_FEE/1000
+
@profiler
def estimated_fee(self, tx, fee_per_kb):
estimated_size = len(tx.serialize(-1))/2
t@@ -975,7 +978,7 @@ class Abstract_Wallet(PrintError):
change_amount = total - ( amount + fee )
if fixed_fee is not None and change_amount > 0:
tx.outputs.append(('address', change_addr, change_amount))
- elif change_amount > DUST_THRESHOLD:
+ elif change_amount > self.dust_threshold():
tx.outputs.append(('address', change_addr, change_amount))
# recompute fee including change output
fee = self.estimated_fee(tx, fee_per_kb)
t@@ -983,7 +986,7 @@ class Abstract_Wallet(PrintError):
tx.outputs.pop()
# if change is still above dust threshold, re-add change output.
change_amount = total - ( amount + fee )
- if change_amount > DUST_THRESHOLD:
+ if change_amount > self.dust_threshold():
tx.outputs.append(('address', change_addr, change_amount))
self.print_error('change', change_amount)
else: