midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-11-06 10:48:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add timeouts to all requests.

Browse Source
This commit is contained in:
tecnovert
2020-12-31 17:30:14 +02:00
parent 2049fcef3d
commit 0ad3856460
3 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
basicswap/basicswap.py
View File

@@ -1821,6 +1821,11 @@ class BasicSwap(BaseApp):
xmr_swap.dest_af = msg_buf.dest_af
xmr_swap.start_chain_a_height = ci_from.getChainHeight()
xmr_swap.b_restore_height = ci_to.getChainHeight()
if xmr_swap.b_restore_height < ci_to._restore_height:
xmr_swap.b_restore_height = ci_to._restore_height
self.log.warning('XMR swap restore height clamped to {}'.format(ci_to._restore_height))
kbvf = self.getPathKey(coin_from, coin_to, bid_created_at, xmr_swap.contract_count, 1, for_ed25519=True)
kbsf = self.getPathKey(coin_from, coin_to, bid_created_at, xmr_swap.contract_count, 2, for_ed25519=True)
@@ -3751,6 +3756,9 @@ class BasicSwap(BaseApp):
b_restore_height=ci_to.getChainHeight(),
start_chain_a_height=ci_from.getChainHeight(),
)
if xmr_swap.b_restore_height < ci_to._restore_height:
xmr_swap.b_restore_height = ci_to._restore_height
self.log.warning('XMR swap restore height clamped to {}'.format(ci_to._restore_height))
else:
bid.created_at = msg['sent']
bid.expire_at = msg['sent'] + bid_data.time_valid