estimate fee using number of outputs
This commit is contained in:
parent
05dba32315
commit
029e0b8b0d
|
@ -876,16 +876,21 @@ class ElectrumWindow(QMainWindow):
|
||||||
|
|
||||||
amount = self.amount_e.get_amount()
|
amount = self.amount_e.get_amount()
|
||||||
fee = self.fee_e.get_amount()
|
fee = self.fee_e.get_amount()
|
||||||
|
outputs = self.payto_e.get_outputs()
|
||||||
|
|
||||||
|
if not is_fee:
|
||||||
|
fee = None
|
||||||
|
|
||||||
if not is_fee: fee = None
|
|
||||||
if amount is None:
|
if amount is None:
|
||||||
self.fee_e.setAmount(None)
|
self.fee_e.setAmount(None)
|
||||||
return
|
not_enough_funds = False
|
||||||
# assume that there will be 2 outputs (one for change)
|
else:
|
||||||
inputs, total, fee = self.wallet.choose_tx_inputs(amount, fee, 2, coins = self.get_coins())
|
inputs, total, fee = self.wallet.choose_tx_inputs(amount, fee, len(outputs), coins = self.get_coins())
|
||||||
|
not_enough_funds = len(inputs) == 0
|
||||||
if not is_fee:
|
if not is_fee:
|
||||||
self.fee_e.setAmount(fee)
|
self.fee_e.setAmount(fee)
|
||||||
if inputs:
|
|
||||||
|
if not not_enough_funds:
|
||||||
palette = QPalette()
|
palette = QPalette()
|
||||||
palette.setColor(self.amount_e.foregroundRole(), QColor('black'))
|
palette.setColor(self.amount_e.foregroundRole(), QColor('black'))
|
||||||
text = ""
|
text = ""
|
||||||
|
|
|
@ -47,6 +47,7 @@ class PayToEdit(QRTextEdit):
|
||||||
self.is_pr = False
|
self.is_pr = False
|
||||||
self.scan_f = self.win.pay_from_URI
|
self.scan_f = self.win.pay_from_URI
|
||||||
self.update_size()
|
self.update_size()
|
||||||
|
self.payto_address = None
|
||||||
|
|
||||||
def lock_amount(self):
|
def lock_amount(self):
|
||||||
self.amount_edit.setFrozen(True)
|
self.amount_edit.setFrozen(True)
|
||||||
|
|
Loading…
Reference in New Issue