make estimated fee higher than MIN_RELAY

2014-09-13 15:25:26 +02:00 · 2014-09-13 15:25:26 +02:00 · 5c5bb6ae3a
parent 81c00956e8
commit 5c5bb6ae3a
1 changed files with 4 additions and 2 deletions
--- 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