AaronFiore/electrum
1
0
Fork 0
Code Activity

Simplify RBF user experience:

Browse Source 
- replace complex strategies with a simpler choice,
   between preserving or decreasing the payment.
 - Always expose that choice to the user.
 - Show the resulting fees to the user before they click OK
This commit is contained in:
ThomasV
2022-09-26 14:40:28 +02:00
parent 4d3f50e80d
commit a383f56909
4 changed files with 132 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/tests/test_wallet_vertical.py
View File

@@ -12,7 +12,7 @@ from electrum import SimpleConfig
from electrum import util
from electrum.address_synchronizer import TX_HEIGHT_UNCONFIRMED, TX_HEIGHT_UNCONF_PARENT
from electrum.wallet import (sweep, Multisig_Wallet, Standard_Wallet, Imported_Wallet,
restore_wallet_from_text, Abstract_Wallet, BumpFeeStrategy)
restore_wallet_from_text, Abstract_Wallet)
from electrum.util import (
bfh, bh2u, NotEnoughFunds, UnrelatedTransactionException,
UserFacingException)
@@ -1199,7 +1199,7 @@ class TestWalletSending(TestCaseForTestnet):
tx = wallet.bump_fee(
tx=tx_from_any(orig_rbf_tx.serialize()),
new_fee_rate=60,
strategies=[BumpFeeStrategy.DECREASE_PAYMENT],
decrease_payment=True,
)
tx.locktime = 1936085
tx.version = 2
@@ -1241,7 +1241,7 @@ class TestWalletSending(TestCaseForTestnet):
tx = wallet.bump_fee(
tx=tx_from_any(orig_rbf_tx.serialize()),
new_fee_rate=60,
strategies=[BumpFeeStrategy.DECREASE_PAYMENT],
decrease_payment=True,
)
tx.locktime = 1936095
tx.version = 2
@@ -1574,7 +1574,7 @@ class TestWalletSending(TestCaseForTestnet):
self.assertEqual((0, 0, 0), wallet.get_balance())
# bump tx
tx = wallet.bump_fee(tx=tx_from_any(tx.serialize()), new_fee_rate=70.0)
tx = wallet.bump_fee(tx=tx_from_any(tx.serialize()), new_fee_rate=70.0, decrease_payment=True)
tx.locktime = 1325500
tx.version = 1
if simulate_moving_txs: