mirror of
https://github.com/LBRYFoundation/LBRY-Vault.git
synced 2025-08-23 17:47:31 +00:00
d0a43662bd
There are now two internal strategies to bump the fee of a txn.
bump fee method 1: keep all inputs, keep all not is_mine outputs,
allow adding new inputs
bump fee method 2: keep all inputs, no new inputs are added,
allow decreasing and removing outputs (change is decreased first)
Method 2 is less "safe" as it might end up decreasing e.g. a payment to a merchant;
but e.g. if the user has sent "Max" previously, this is the only way to RBF.
We try method 1 first, and fail-over to method 2.
Previous versions always used method 2.
fixes #3652
113 lines
3.4 KiB
Python
113 lines
3.4 KiB
Python
from kivy.app import App
|
|
from kivy.factory import Factory
|
|
from kivy.properties import ObjectProperty
|
|
from kivy.lang import Builder
|
|
|
|
from electrum.gui.kivy.i18n import _
|
|
|
|
Builder.load_string('''
|
|
<BumpFeeDialog@Popup>
|
|
title: _('Bump fee')
|
|
size_hint: 0.8, 0.8
|
|
pos_hint: {'top':0.9}
|
|
BoxLayout:
|
|
orientation: 'vertical'
|
|
padding: '10dp'
|
|
|
|
GridLayout:
|
|
height: self.minimum_height
|
|
size_hint_y: None
|
|
cols: 1
|
|
spacing: '10dp'
|
|
BoxLabel:
|
|
id: old_fee
|
|
text: _('Current Fee')
|
|
value: ''
|
|
BoxLabel:
|
|
id: old_feerate
|
|
text: _('Current Fee rate')
|
|
value: ''
|
|
Label:
|
|
id: tooltip1
|
|
text: ''
|
|
size_hint_y: None
|
|
Label:
|
|
id: tooltip2
|
|
text: ''
|
|
size_hint_y: None
|
|
Slider:
|
|
id: slider
|
|
range: 0, 4
|
|
step: 1
|
|
on_value: root.on_slider(self.value)
|
|
BoxLayout:
|
|
orientation: 'horizontal'
|
|
size_hint: 1, 0.2
|
|
Label:
|
|
text: _('Final')
|
|
CheckBox:
|
|
id: final_cb
|
|
Widget:
|
|
size_hint: 1, 1
|
|
BoxLayout:
|
|
orientation: 'horizontal'
|
|
size_hint: 1, 0.5
|
|
Button:
|
|
text: 'Cancel'
|
|
size_hint: 0.5, None
|
|
height: '48dp'
|
|
on_release: root.dismiss()
|
|
Button:
|
|
text: 'OK'
|
|
size_hint: 0.5, None
|
|
height: '48dp'
|
|
on_release:
|
|
root.dismiss()
|
|
root.on_ok()
|
|
''')
|
|
|
|
class BumpFeeDialog(Factory.Popup):
|
|
|
|
def __init__(self, app, fee, size, callback):
|
|
Factory.Popup.__init__(self)
|
|
self.app = app
|
|
self.init_fee = fee
|
|
self.tx_size = size
|
|
self.callback = callback
|
|
self.config = app.electrum_config
|
|
self.mempool = self.config.use_mempool_fees()
|
|
self.dynfees = self.config.is_dynfee() and bool(self.app.network) and self.config.has_dynamic_fees_ready()
|
|
self.ids.old_fee.value = self.app.format_amount_and_units(self.init_fee)
|
|
self.ids.old_feerate.value = self.app.format_fee_rate(fee / self.tx_size * 1000)
|
|
self.update_slider()
|
|
self.update_text()
|
|
|
|
def update_text(self):
|
|
pos = int(self.ids.slider.value)
|
|
new_fee_rate = self.get_fee_rate()
|
|
text, tooltip = self.config.get_fee_text(pos, self.dynfees, self.mempool, new_fee_rate)
|
|
self.ids.tooltip1.text = text
|
|
self.ids.tooltip2.text = tooltip
|
|
|
|
def update_slider(self):
|
|
slider = self.ids.slider
|
|
maxp, pos, fee_rate = self.config.get_fee_slider(self.dynfees, self.mempool)
|
|
slider.range = (0, maxp)
|
|
slider.step = 1
|
|
slider.value = pos
|
|
|
|
def get_fee_rate(self):
|
|
pos = int(self.ids.slider.value)
|
|
if self.dynfees:
|
|
fee_rate = self.config.depth_to_fee(pos) if self.mempool else self.config.eta_to_fee(pos)
|
|
else:
|
|
fee_rate = self.config.static_fee(pos)
|
|
return fee_rate # sat/kbyte
|
|
|
|
def on_ok(self):
|
|
new_fee_rate = self.get_fee_rate() / 1000
|
|
is_final = self.ids.final_cb.active
|
|
self.callback(new_fee_rate, is_final)
|
|
|
|
def on_slider(self, value):
|
|
self.update_text()
|