AaronFiore/electrum
1
0
Fork 0
Code Activity

submarine swaps: set rbf for CLI transactions

Browse Source 
(it was already the case with GUI)
This commit is contained in:
ThomasV
2022-12-07 13:26:21 +01:00
parent f86229f169
commit 3131fde97b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/submarine_swaps.py
View File

@@ -323,14 +323,16 @@ class SwapManager(Logger):
if locktime - self.network.get_local_height() >= 144: if locktime - self.network.get_local_height() >= 144:
raise Exception("fswap check failed: locktime too far in future") raise Exception("fswap check failed: locktime too far in future")
# create funding tx # create funding tx
# note: rbf must not decrease payment
# this is taken care of in wallet._is_rbf_allowed_to_touch_tx_output
funding_output = PartialTxOutput.from_address_and_value(lockup_address, onchain_amount) funding_output = PartialTxOutput.from_address_and_value(lockup_address, onchain_amount)
if tx is None: if tx is None:
tx = self.wallet.create_transaction(outputs=[funding_output], rbf=False, password=password) tx = self.wallet.create_transaction(outputs=[funding_output], rbf=True, password=password)
else: else:
dummy_output = PartialTxOutput.from_address_and_value(ln_dummy_address(), expected_onchain_amount_sat) dummy_output = PartialTxOutput.from_address_and_value(ln_dummy_address(), expected_onchain_amount_sat)
tx.outputs().remove(dummy_output) tx.outputs().remove(dummy_output)
tx.add_outputs([funding_output]) tx.add_outputs([funding_output])
tx.set_rbf(True) # note: rbf must not decrease payment tx.set_rbf(True)
self.wallet.sign_transaction(tx, password) self.wallet.sign_transaction(tx, password)
# save swap data in wallet in case we need a refund # save swap data in wallet in case we need a refund
receive_address = self.wallet.get_receiving_address() receive_address = self.wallet.get_receiving_address()