AaronFiore/electrum
1
0
Fork 0
Code Activity

support new protocol (minerFeeInvoice)

Browse Source
This commit is contained in:
ThomasV
2020-06-06 19:37:53 +02:00
parent bcf2246633
commit ee59ad13c4
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
electrum/lnaddr.py
View File

@@ -274,6 +274,9 @@ class LnAddr(object):
self.amount = amount # in bitcoins self.amount = amount # in bitcoins
self._min_final_cltv_expiry = 9 self._min_final_cltv_expiry = 9
def get_amount_sat(self):
return self.amount * COIN
def __str__(self): def __str__(self):
return "LnAddr[{}, amount={}{} tags=[{}]]".format( return "LnAddr[{}, amount={}{} tags=[{}]]".format(
hexlify(self.pubkey.serialize()).decode('utf-8') if self.pubkey else None, hexlify(self.pubkey.serialize()).decode('utf-8') if self.pubkey else None,

17
electrum/submarine_swaps.py
View File

@@ -239,6 +239,7 @@ class SwapManager(Logger):
timeout=30) timeout=30)
data = json.loads(response) data = json.loads(response)
invoice = data['invoice'] invoice = data['invoice']
fee_invoice = data.get('minerFeeInvoice')
lockup_address = data['lockupAddress'] lockup_address = data['lockupAddress']
redeem_script = data['redeemScript'] redeem_script = data['redeemScript']
locktime = data['timeoutBlockHeight'] locktime = data['timeoutBlockHeight']
@@ -252,19 +253,26 @@ class SwapManager(Logger):
assert hash_160(preimage) == parsed_script[5][1] assert hash_160(preimage) == parsed_script[5][1]
assert pubkey == parsed_script[7][1] assert pubkey == parsed_script[7][1]
assert locktime == int.from_bytes(parsed_script[10][1], byteorder='little') assert locktime == int.from_bytes(parsed_script[10][1], byteorder='little')
# check that the amount is what we expected # check that the onchain amount is what we expected
assert onchain_amount >= expected_amount, (onchain_amount, expected_amount) assert onchain_amount >= expected_amount, (onchain_amount, expected_amount)
# verify that we will have enought time to get our tx confirmed # verify that we will have enought time to get our tx confirmed
assert locktime - self.network.get_local_height() > 10 assert locktime - self.network.get_local_height() > 10
# verify invoice preimage_hash # verify invoice preimage_hash
lnaddr = self.lnworker._check_invoice(invoice, amount_sat) lnaddr = self.lnworker._check_invoice(invoice)
invoice_amount = lnaddr.get_amount_sat()
assert lnaddr.paymenthash == preimage_hash assert lnaddr.paymenthash == preimage_hash
# check that the lightning amount is what we requested
if fee_invoice:
fee_lnaddr = self.lnworker._check_invoice(fee_invoice)
invoice_amount += fee_lnaddr.get_amount_sat()
assert int(invoice_amount) == amount_sat, (invoice_amount, amount_sat)
# save swap data to wallet file # save swap data to wallet file
swap = SwapData( swap = SwapData(
redeem_script = redeem_script, redeem_script = redeem_script,
locktime = locktime, locktime = locktime,
privkey = privkey, privkey = privkey,
preimage = preimage, preimage = preimage,
# save the rhash of the mining fee invoice
lockup_address = lockup_address, lockup_address = lockup_address,
onchain_amount = onchain_amount, onchain_amount = onchain_amount,
lightning_amount = amount_sat, lightning_amount = amount_sat,
@@ -277,6 +285,11 @@ class SwapManager(Logger):
# add callback to lnwatcher # add callback to lnwatcher
self.add_lnwatcher_callback(swap) self.add_lnwatcher_callback(swap)
# initiate payment. # initiate payment.
if fee_invoice:
success, log = await self.lnworker._pay(fee_invoice, attempts=10)
if not success:
return False
# initiate payment.
success, log = await self.lnworker._pay(invoice, attempts=10) success, log = await self.lnworker._pay(invoice, attempts=10)
return success return success