electrum

commit 5c5bb6ae3a724b0c74ab987351ffb5cf81119079
parent 81c00956e86fb0649fc03ff72545e12702222619
Author: ThomasV <thomasv@gitorious>
Date:   Sat, 13 Sep 2014 15:25:26 +0200

make estimated fee higher than MIN_RELAY

Diffstat:
M
lib/wallet.py
 | 
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -698,8 +698,10 @@ class Abstract_Wallet(object):
 
     def estimated_fee(self, tx):
         estimated_size = len(tx.serialize(-1))/2
-        #print_error('estimated_size', estimated_size)
-        return int(self.fee_per_kb*estimated_size/1024.)
+        fee = int(self.fee_per_kb*estimated_size/1024.)
+        if fee < MIN_RELAY_TX_FEE: # and tx.requires_fee(self.verifier):
+            fee = MIN_RELAY_TX_FEE
+        return fee
 
     def make_unsigned_transaction(self, outputs, fixed_fee=None, change_addr=None, domain=None, coins=None ):
         # check outputs