Browse Source

set default fee to 0.5mBTC/kb

283
ThomasV 11 years ago
parent
commit
bde0ca3ea1
  1. 3
      gui/qt/main_window.py
  2. 4
      lib/bitcoin.py
  3. 5
      lib/wallet.py

3
gui/qt/main_window.py

@ -2570,7 +2570,8 @@ class ElectrumWindow(QMainWindow):
widgets.append((nz_label, nz, nz_help))
fee_label = QLabel(_('Transaction fee per kb') + ':')
fee_help = HelpButton(_('Fee per kilobyte of transaction.') + '\n' + _('Recommended value') + ': ' + self.format_amount(10000) + ' ' + self.base_unit())
fee_help = HelpButton(_('Fee per kilobyte of transaction.') + '\n' \
+ _('Recommended value') + ': ' + self.format_amount(bitcoin.RECOMMENDED_FEE) + ' ' + self.base_unit())
fee_e = BTCAmountEdit(self.get_decimal_point)
fee_e.setAmount(self.wallet.fee_per_kb)
if not self.config.is_modifiable('fee_per_kb'):

4
lib/bitcoin.py

@ -38,8 +38,10 @@ except ImportError:
################################## transactions
DUST_THRESHOLD = 5430
MIN_RELAY_TX_FEE = 1000
RECOMMENDED_FEE = 50000
COINBASE_MATURITY = 100
# AES encryption
EncodeAES = lambda secret, s: base64.b64encode(aes.encryptData(secret,s))

5
lib/wallet.py

@ -39,8 +39,6 @@ import bitcoin
from synchronizer import WalletSynchronizer
from mnemonic import Mnemonic
COINBASE_MATURITY = 100
DUST_THRESHOLD = 5430
# internal ID for imported account
@ -163,8 +161,7 @@ class Abstract_Wallet(object):
self.addressbook = storage.get('contacts', [])
self.history = storage.get('addr_history',{}) # address -> list(txid, height)
self.fee_per_kb = int(storage.get('fee_per_kb', 10000))
self.fee_per_kb = int(storage.get('fee_per_kb', RECOMMENDED_FEE))
# This attribute is set when wallet.start_threads is called.
self.synchronizer = None

Loading…
Cancel
Save