AaronFiore/electrum
1
0
Fork 0
Code Activity

swapserver: reduce refund delay to 70 blocks

Browse Source 
if a refund occurs, it needs to be done before the cltv expiration
of the htlc, or the channel might be force closed.
This commit is contained in:
ThomasV
2023-08-27 14:05:16 +02:00
parent 5e09a416a7
commit e06df2cb69
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electrum/submarine_swaps.py
View File

@@ -42,6 +42,7 @@ CLAIM_FEE_SIZE = 136
LOCKUP_FEE_SIZE = 153 # assuming 1 output, 2 outputs LOCKUP_FEE_SIZE = 153 # assuming 1 output, 2 outputs
MIN_LOCKTIME_DELTA = 60 MIN_LOCKTIME_DELTA = 60
LOCKTIME_DELTA_REFUND = 70
WITNESS_TEMPLATE_SWAP = [ WITNESS_TEMPLATE_SWAP = [
opcodes.OP_HASH160, opcodes.OP_HASH160,
@@ -369,7 +370,7 @@ class SwapManager(Logger):
def create_normal_swap(self, *, lightning_amount_sat=None, payment_hash=None, their_pubkey=None): def create_normal_swap(self, *, lightning_amount_sat=None, payment_hash=None, their_pubkey=None):
""" server method """ """ server method """
locktime = self.network.get_local_height() + 140 locktime = self.network.get_local_height() + LOCKTIME_DELTA_REFUND
our_privkey = os.urandom(32) our_privkey = os.urandom(32)
our_pubkey = ECPrivkey(our_privkey).get_public_key_bytes(compressed=True) our_pubkey = ECPrivkey(our_privkey).get_public_key_bytes(compressed=True)
onchain_amount_sat = self._get_recv_amount(lightning_amount_sat, is_reverse=True) # what the client is going to receive onchain_amount_sat = self._get_recv_amount(lightning_amount_sat, is_reverse=True) # what the client is going to receive
@@ -451,7 +452,7 @@ class SwapManager(Logger):
def create_reverse_swap(self, *, lightning_amount_sat=None, payment_hash=None, their_pubkey=None): def create_reverse_swap(self, *, lightning_amount_sat=None, payment_hash=None, their_pubkey=None):
""" server method. payment_hash is not None for old clients """ """ server method. payment_hash is not None for old clients """
locktime = self.network.get_local_height() + 140 locktime = self.network.get_local_height() + LOCKTIME_DELTA_REFUND
privkey = os.urandom(32) privkey = os.urandom(32)
our_pubkey = ECPrivkey(privkey).get_public_key_bytes(compressed=True) our_pubkey = ECPrivkey(privkey).get_public_key_bytes(compressed=True)
onchain_amount_sat = self._get_send_amount(lightning_amount_sat, is_reverse=False) onchain_amount_sat = self._get_send_amount(lightning_amount_sat, is_reverse=False)