set default fee to 200 uBTC

[electrum-nvc.git] / lib / wallet.py

diff --git a/lib/wallet.py b/lib/wallet.py
index da44b7d..c64813b 100644 (file)
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -74,7 +74,7 @@ class Wallet:
         self.seed_version          = config.get('seed_version', SEED_VERSION)
         self.gap_limit             = config.get('gap_limit', 5)
         self.use_change            = config.get('use_change',True)
-        self.fee                   = int(config.get('fee_per_kb',10000))
+        self.fee                   = int(config.get('fee_per_kb',20000))
         self.num_zeros             = int(config.get('num_zeros',0))
         self.use_encryption        = config.get('use_encryption', False)
         self.seed                  = config.get('seed', '')               # encrypted
@@ -859,6 +859,12 @@ class Wallet:
                     self.verifier.add(tx_hash, tx_height)
 
 
+        # if we are on a pruning server, remove unverified transactions
+        vr = self.verifier.transactions.keys() + self.verifier.verified_tx.keys()
+        for tx_hash in self.transactions.keys():
+            if tx_hash not in vr:
+                self.transactions.pop(tx_hash)
+
 
 
     def check_new_history(self, addr, hist):
@@ -906,6 +912,7 @@ class Wallet:
                 height = None
                 for h in ext_h:
                     if h == ['*']: continue
+                    print_error(h)
                     for item in h:
                         if item.get('tx_hash') == tx_hash:
                             height = item.get('height')