AaronFiore/electrum
1
0
Fork 0
Code Activity

show swaps as single line in history

Browse Source 
main_window.run_coroutine_from_thread
This commit is contained in:
ThomasV
2020-05-26 10:02:27 +02:00
parent 46770bfd71
commit f8dd62aec0
6 changed files with 65 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
electrum/submarine_swaps.py
View File

@@ -96,6 +96,9 @@ class SwapManager(Logger):
address = self.wallet.get_unused_address()
tx = create_claim_tx(txin, redeem_script, preimage, privkey, address, amount_sat, locktime)
await self.network.broadcast_transaction(tx)
# save txid
what = 'claim_txid' if preimage else 'refund_txid'
self.swaps[preimage.hex()][what] = tx.txid()
def get_tx_fee(self):
return self.lnwatcher.config.estimate_fee(136, allow_fallback_to_static_rates=True)
@@ -106,8 +109,8 @@ class SwapManager(Logger):
self.wallet = wallet
self.lnworker = wallet.lnworker
self.lnwatcher = self.wallet.lnworker.lnwatcher
swaps = self.wallet.db.get_dict('submarine_swaps')
for key, data in swaps.items():
self.swaps = self.wallet.db.get_dict('submarine_swaps')
for data in self.swaps.values():
redeem_script = bytes.fromhex(data['redeemScript'])
locktime = data['timeoutBlockHeight']
privkey = bytes.fromhex(data['privkey'])
@@ -121,6 +124,9 @@ class SwapManager(Logger):
preimage = 0
self.add_lnwatcher_callback(lockup_address, onchain_amount, redeem_script, preimage, privkey, locktime)
def get_swap(self, preimage_hex):
return self.swaps.get(preimage_hex)
def add_lnwatcher_callback(self, lockup_address, onchain_amount, redeem_script, preimage, privkey, locktime):
callback = lambda: self._claim_swap(lockup_address, onchain_amount, redeem_script, preimage, privkey, locktime)
self.lnwatcher.add_callback(lockup_address, callback)
@@ -166,14 +172,16 @@ class SwapManager(Logger):
assert onchain_amount <= expected_onchain_amount, (onchain_amount, expected_onchain_amount)
# verify that they are not locking up funds for more than a day
assert locktime - self.network.get_local_height() < 144
# create funding tx
outputs = [PartialTxOutput.from_address_and_value(lockup_address, onchain_amount)]
tx = self.wallet.create_transaction(outputs=outputs, rbf=False, password=password)
# save swap data in wallet in case we need a refund
data['privkey'] = privkey.hex()
data['preimage'] = preimage.hex()
swaps = self.wallet.db.get_dict('submarine_swaps')
swaps[response_id] = data
data['lightning_amount'] = lightning_amount
data['funding_txid'] = tx.txid()
self.swaps[preimage.hex()] = data
self.add_lnwatcher_callback(lockup_address, onchain_amount, redeem_script, 0, privkey, locktime)
outputs = [PartialTxOutput.from_address_and_value(lockup_address, onchain_amount)]
tx = self.wallet.create_transaction(outputs=outputs, rbf=False, password=password)
await self.network.broadcast_transaction(tx)
#
attempt = await self.lnworker.await_payment(payment_hash)
@@ -226,9 +234,9 @@ class SwapManager(Logger):
# save swap data in wallet in case payment fails
data['privkey'] = privkey.hex()
data['preimage'] = preimage.hex()
data['lightning_amount'] = amount_sat
# save data to wallet file
swaps = self.wallet.db.get_dict('submarine_swaps')
swaps[response_id] = data
self.swaps[preimage.hex()] = data
# add callback to lnwatcher
self.add_lnwatcher_callback(lockup_address, onchain_amount, redeem_script, preimage, privkey, locktime)
# initiate payment.