LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-10 20:49:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fee belongs in wallet storage

Browse source
This commit is contained in:
ThomasV 2013-09-01 23:09:27 +02:00
parent 7ba686e16f
commit 7b4046cf68
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gui/gui_classic.py
View file

@ -249,7 +249,6 @@ class ElectrumWindow(QMainWindow):
self.expert_mode = config.get('classic_expert_mode', False) self.expert_mode = config.get('classic_expert_mode', False)
self.decimal_point = config.get('decimal_point', 8) self.decimal_point = config.get('decimal_point', 8)
self.num_zeros = int(config.get('num_zeros',0)) self.num_zeros = int(config.get('num_zeros',0))
self.fee = int(config.get('fee_per_kb',20000))
set_language(config.get('language')) set_language(config.get('language'))
@ -522,11 +521,6 @@ class ElectrumWindow(QMainWindow):
return return
def set_fee(self, fee):
if self.fee != fee:
self.fee = fee
self.config.set_key('fee_per_kb', self.fee, True)
def set_label(self, name, text = None): def set_label(self, name, text = None):
changed = False changed = False
@ -534,7 +528,7 @@ class ElectrumWindow(QMainWindow):
if text: if text:
if old_text != text: if old_text != text:
self.wallet.labels[name] = text self.wallet.labels[name] = text
self.wallet.storage.set_key('labels', self.wallet.labels) self.wallet.storage.put('labels', self.wallet.labels)
changed = True changed = True
else: else:
if old_text: if old_text:
@ -2027,7 +2021,7 @@ class ElectrumWindow(QMainWindow):
fee_label = QLabel(_('Transaction fee')) fee_label = QLabel(_('Transaction fee'))
grid_wallet.addWidget(fee_label, 0, 0) grid_wallet.addWidget(fee_label, 0, 0)
fee_e = AmountEdit(self.base_unit) fee_e = AmountEdit(self.base_unit)
fee_e.setText(self.format_amount(self.fee).strip()) fee_e.setText(self.format_amount(self.wallet.fee).strip())
grid_wallet.addWidget(fee_e, 0, 2) grid_wallet.addWidget(fee_e, 0, 2)
msg = _('Fee per kilobyte of transaction.') + ' ' \ msg = _('Fee per kilobyte of transaction.') + ' ' \
+ _('Recommended value') + ': ' + self.format_amount(50000) + _('Recommended value') + ': ' + self.format_amount(50000)
@ -2117,7 +2111,7 @@ class ElectrumWindow(QMainWindow):
QMessageBox.warning(self, _('Error'), _('Invalid value') +': %s'%fee, _('OK')) QMessageBox.warning(self, _('Error'), _('Invalid value') +': %s'%fee, _('OK'))
return return
self.set_fee(fee) self.wallet.set_fee(fee)
nz = unicode(nz_e.text()) nz = unicode(nz_e.text())
try: try:

6
lib/wallet.py
View file

@ -156,6 +156,7 @@ class Wallet:
self.imported_keys = storage.get('imported_keys',{}) self.imported_keys = storage.get('imported_keys',{})
self.history = storage.get('addr_history',{}) # address -> list(txid, height) self.history = storage.get('addr_history',{}) # address -> list(txid, height)
self.fee = int(storage.get('fee_per_kb',20000))
self.master_public_keys = storage.get('master_public_keys',{}) self.master_public_keys = storage.get('master_public_keys',{})
self.master_private_keys = storage.get('master_private_keys', {}) self.master_private_keys = storage.get('master_private_keys', {})
@ -921,6 +922,11 @@ class Wallet:
return inputs, total, fee return inputs, total, fee
def set_fee(self, fee):
if self.fee != fee:
self.fee = fee
self.storage.put('fee_per_kb', self.fee, True)
def estimated_fee(self, inputs): def estimated_fee(self, inputs):
estimated_size = len(inputs) * 180 + 80 # this assumes non-compressed keys estimated_size = len(inputs) * 180 + 80 # this assumes non-compressed keys
fee = self.fee * int(round(estimated_size/1024.)) fee = self.fee * int(round(estimated_size/1024.))