AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet.get_max_amount method, used by qt and kivy

Browse Source
This commit is contained in:
ThomasV
2015-10-30 14:10:41 +01:00
parent 525e08af54
commit 2a3c97813d
4 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gui/kivy/main_window.py
View File

@@ -440,6 +440,11 @@ class ElectrumWindow(App):
status_card.uncomfirmed = unconfirmed.strip()
def get_max_amount(self):
inputs = self.wallet.get_spendable_coins(None)
amount, fee = self.wallet.get_max_amount(self.electrum_config, inputs, None)
return self.format_amount(amount)
def update_amount(self, amount, c):
if c == '<':
return amount[:-1]

5
gui/kivy/uix/ui_screens/amount.kv
View File

@@ -22,8 +22,9 @@ Popup:
Button:
size_hint_x: 1
height: '48dp'
text: ''
on_release: a.value = "max"
amount: app.get_max_amount()
text: self.amount + ' ' + app.base_unit
on_release: a.amount = self.amount
BoxLayout:
size_hint: 1, None

17
gui/qt/main_window.py
View File

@@ -965,22 +965,15 @@ class ElectrumWindow(QMainWindow, PrintError):
grid.addLayout(buttons, 6, 1, 1, 2)
def on_shortcut():
sendable = self.get_sendable_balance()
inputs = self.get_coins()
for i in inputs:
self.wallet.add_input_info(i)
addr = self.payto_e.payto_address if self.payto_e.payto_address else self.dummy_address
output = ('address', addr, sendable)
dummy_tx = Transaction.from_io(inputs, [output])
amount, fee = self.wallet.get_max_amount(self.config, inputs, self.fee_e.get_amount())
if self.fee_e.get_amount() is None:
fee_per_kb = self.wallet.fee_per_kb(self.config)
self.fee_e.setAmount(self.wallet.estimated_fee(dummy_tx, fee_per_kb))
self.amount_e.setAmount(max(0, sendable - self.fee_e.get_amount()))
self.fee_e.setAmount(fee)
self.amount_e.setAmount(max(0, amount))
# emit signal for fiat_amount update
self.amount_e.textEdited.emit("")
self.amount_e.shortcut.connect(on_shortcut)
self.payto_e.textChanged.connect(self.update_fee)
self.amount_e.textEdited.connect(self.update_fee)
self.fee_e.textEdited.connect(self.update_fee)
@@ -1539,10 +1532,6 @@ class ElectrumWindow(QMainWindow, PrintError):
menu.exec_(self.address_list.viewport().mapToGlobal(position))
def get_sendable_balance(self):
return sum(map(lambda x:x['value'], self.get_coins()))
def get_coins(self):
if self.pay_from:
return self.pay_from