LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-27 07:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

submarine swaps: fix refund tx (p2wsh-in-p2sh, locktime)

Browse source
This commit is contained in:
ThomasV 2020-05-23 11:47:09 +02:00
parent 10fa11267d
commit eb9f6ce293
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
electrum/submarine_swaps.py
View file

@ -3,7 +3,7 @@ import json
import os import os
from .crypto import sha256, hash_160 from .crypto import sha256, hash_160
from .ecc import ECPrivkey from .ecc import ECPrivkey
from .bitcoin import address_to_script, script_to_p2wsh, redeem_script_to_address, opcodes, p2wsh_nested_script from .bitcoin import address_to_script, script_to_p2wsh, redeem_script_to_address, opcodes, p2wsh_nested_script, push_script, is_segwit_address
from .transaction import TxOutpoint, PartialTxInput, PartialTxOutput, PartialTransaction, construct_witness from .transaction import TxOutpoint, PartialTxInput, PartialTxOutput, PartialTransaction, construct_witness
from .transaction import script_GetOp, match_script_against_template, OPPushDataGeneric, OPPushDataPubkey from .transaction import script_GetOp, match_script_against_template, OPPushDataGeneric, OPPushDataPubkey
from .transaction import Transaction from .transaction import Transaction
@ -50,24 +50,22 @@ WITNESS_TEMPLATE_REVERSE_SWAP = [
] ]
def create_claim_tx(txin, witness_script, preimage, privkey:bytes, address, amount_sat, is_refund): def create_claim_tx(txin, witness_script, preimage, privkey:bytes, address, amount_sat, locktime, is_refund):
pubkey = ECPrivkey(privkey).get_public_key_bytes(compressed=True) pubkey = ECPrivkey(privkey).get_public_key_bytes(compressed=True)
print(txin.to_json()) if is_segwit_address(txin.address):
if is_refund: txin.script_type = 'p2wsh'
txin.script_sig = b''
else:
txin.script_type = 'p2wsh-p2sh' txin.script_type = 'p2wsh-p2sh'
txin.redeem_script = bytes.fromhex(p2wsh_nested_script(witness_script.hex())) txin.redeem_script = bytes.fromhex(p2wsh_nested_script(witness_script.hex()))
else: txin.script_sig = bytes.fromhex(push_script(txin.redeem_script.hex()))
txin.script_type = 'p2wsh'
txin.script_sig = b''
txin.pubkeys = [pubkey]
txin.num_sig = 1
txin.witness_script = witness_script txin.witness_script = witness_script
txout = PartialTxOutput(scriptpubkey=bytes.fromhex(address_to_script(address)), value=amount_sat) txout = PartialTxOutput(scriptpubkey=bytes.fromhex(address_to_script(address)), value=amount_sat)
tx = PartialTransaction.from_io([txin], [txout], version=2) tx = PartialTransaction.from_io([txin], [txout], version=2, locktime=(locktime if is_refund else None))
tx.set_rbf(True)
sig = bytes.fromhex(tx.sign_txin(0, privkey)) sig = bytes.fromhex(tx.sign_txin(0, privkey))
witness = [sig, witness_script] if is_refund else [sig, preimage, witness_script] witness = [sig, 0, witness_script] if is_refund else [sig, preimage, witness_script]
tx.inputs()[0].witness = bytes.fromhex(construct_witness(witness)) txin.witness = bytes.fromhex(construct_witness(witness))
assert tx.is_complete()
return tx return tx
@ -82,7 +80,7 @@ async def _claim_swap(lnworker, lockup_address, redeem_script, preimage, privkey
if amount_sat < dust_threshold(): if amount_sat < dust_threshold():
print('dust') print('dust')
continue continue
tx = create_claim_tx(txin, redeem_script, preimage, privkey, address, amount_sat, is_refund) tx = create_claim_tx(txin, redeem_script, preimage, privkey, address, amount_sat, locktime, is_refund)
if is_refund and delta < 0: if is_refund and delta < 0:
print('height not reached for refund', delta, locktime) print('height not reached for refund', delta, locktime)
print(tx.serialize()) print(tx.serialize())