electrum

commit 3ad453fafbfbeafedfa1181800099148cabf530f
parent 29b9ffac4a3c7d4b353559cd5e580879f0fb17c7
Author: ecdsa <ecdsa@github>
Date:   Sun, 24 Mar 2013 09:24:45 +0100

rename fee to fee_per_kb

Diffstat:
M
gui/gui_classic.py
 | 
2
+-
M
gui/gui_text.py
 | 
4
++--
M
lib/wallet.py
 | 
4
++--

3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gui/gui_classic.py b/gui/gui_classic.py
@@ -1936,7 +1936,7 @@ class ElectrumWindow(QMainWindow):
             + _('Recommended value') + ': 0.0001'
         grid_wallet.addWidget(HelpButton(msg), 0, 3)
         fee_e.textChanged.connect(lambda: numbify(fee_e,False))
-        if not self.config.is_modifiable('fee'):
+        if not self.config.is_modifiable('fee_per_kb'):
             for w in [fee_e, fee_label]: w.setEnabled(False)
 
         usechange_label = QLabel(_('Use change addresses'))
diff --git a/gui/gui_text.py b/gui/gui_text.py
@@ -318,14 +318,14 @@ class ElectrumGui:
     def settings_dialog(self):
         out = self.run_dialog('Settings', [
             {'label':'Default GUI', 'type':'list', 'choices':['classic','lite','gtk','text'], 'value':self.config.get('gui')},
-            {'label':'Default fee', 'type':'satoshis', 'value': format_satoshis(self.config.get('fee')).strip() }
+            {'label':'Default fee', 'type':'satoshis', 'value': format_satoshis(self.config.get('fee_per_kb')).strip() }
             ], buttons = 1)
         if out:
             if out.get('Default GUI'):
                 self.config.set_key('gui', out['Default GUI'], True)
             if out.get('Default fee'):
                 fee = int ( Decimal( out['Default fee']) *10000000 )
-                self.config.set_key('fee', fee, True)
+                self.config.set_key('fee_per_kb', fee, True)
 
 
     def password_dialog(self):
diff --git 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',10000))
+        self.fee                   = int(config.get('fee_per_kb',10000))
         self.num_zeros             = int(config.get('num_zeros',0))
         self.use_encryption        = config.get('use_encryption', False)
         self.seed                  = config.get('seed', '')               # encrypted
@@ -831,7 +831,7 @@ class Wallet:
         s = {
             'use_encryption': self.use_encryption,
             'use_change': self.use_change,
-            'fee': self.fee,
+            'fee_per_kb': self.fee,
             'accounts': self.accounts,
             'addr_history': self.history, 
             'labels': self.labels,