AaronFiore/electrum
1
0
Fork 0
Code Activity

swaps: check_invoice_amount (fixes #6217)

Browse Source
This commit is contained in:
ThomasV
2020-06-26 09:19:40 +02:00
parent 5f40414bd2
commit abac4a4340
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
electrum/submarine_swaps.py
View File

@@ -387,21 +387,24 @@ class SwapManager(Logger):
def get_max_amount(self): def get_max_amount(self):
return min(self._max_amount, LN_MAX_HTLC_VALUE_MSAT // 1000) return min(self._max_amount, LN_MAX_HTLC_VALUE_MSAT // 1000)
def check_invoice_amount(self, x):
return x >= self.min_amount and x <= self._max_amount
def get_recv_amount(self, send_amount: Optional[int], is_reverse: bool) -> Optional[int]: def get_recv_amount(self, send_amount: Optional[int], is_reverse: bool) -> Optional[int]:
if send_amount is None: if send_amount is None:
return return
if send_amount < self.min_amount or send_amount > self._max_amount:
return
x = send_amount x = send_amount
if is_reverse: if is_reverse:
if not self.check_invoice_amount(x):
return
x = int(x * (100 - self.percentage) / 100) x = int(x * (100 - self.percentage) / 100)
x -= self.lockup_fee x -= self.lockup_fee
x -= self.get_claim_fee() x -= self.get_claim_fee()
else: else:
x -= self.normal_fee x -= self.normal_fee
x = int(x * (100 - self.percentage) / 100) x = int(x * (100 - self.percentage) / 100)
if x < 0: if not self.check_invoice_amount(x):
return return
return x return x
def get_send_amount(self, recv_amount: Optional[int], is_reverse: bool) -> Optional[int]: def get_send_amount(self, recv_amount: Optional[int], is_reverse: bool) -> Optional[int]:
@@ -412,7 +415,11 @@ class SwapManager(Logger):
x += self.lockup_fee x += self.lockup_fee
x += self.get_claim_fee() x += self.get_claim_fee()
x = int(x * 100 / (100 - self.percentage)) + 1 x = int(x * 100 / (100 - self.percentage)) + 1
if not self.check_invoice_amount(x):
return
else: else:
if not self.check_invoice_amount(x):
return
x = int(x * 100 / (100 - self.percentage)) + 1 x = int(x * 100 / (100 - self.percentage)) + 1
x += self.normal_fee x += self.normal_fee
return x return x