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

xmr: retry on transient error.

Browse Source 
alternative to #368
This commit is contained in:
tecnovert
2025-10-01 21:21:08 +02:00
parent 390fb71aa7
commit a4cc20022e
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
basicswap/interface/xmr.py
View File

@@ -8,6 +8,7 @@
import logging import logging
import os import os
import time
import basicswap.contrib.ed25519_fast as edf import basicswap.contrib.ed25519_fast as edf
import basicswap.ed25519_fast_util as edu import basicswap.ed25519_fast_util as edu
@@ -154,6 +155,8 @@ class XMRInterface(CoinInterface):
self._walletrpctimeout = coin_settings.get("walletrpctimeout", 120) self._walletrpctimeout = coin_settings.get("walletrpctimeout", 120)
# walletrpctimeoutlong likely unneeded # walletrpctimeoutlong likely unneeded
self._walletrpctimeoutlong = coin_settings.get("walletrpctimeoutlong", 600) self._walletrpctimeoutlong = coin_settings.get("walletrpctimeoutlong", 600)
self._num_chaininfo_retries = coin_settings.get("numchaininforetries", 20)
self._chaininfo_retry_delay = coin_settings.get("chaininforetrydelay", 1)
self.rpc = make_xmr_rpc_func( self.rpc = make_xmr_rpc_func(
coin_settings["rpcport"], coin_settings["rpcport"],
@@ -301,7 +304,7 @@ class XMRInterface(CoinInterface):
return self._core_version return self._core_version
def getBlockchainInfo(self): def getBlockchainInfo(self):
get_height = self.rpc2("get_height", timeout=self._rpctimeout) get_height = self.getChainHeight(full_output=True)
rv = { rv = {
"blocks": get_height["height"], "blocks": get_height["height"],
"verificationprogress": 0.0, "verificationprogress": 0.0,
@@ -330,8 +333,16 @@ class XMRInterface(CoinInterface):
return rv return rv
def getChainHeight(self): def getChainHeight(self, full_output: bool = False):
return self.rpc2("get_height", timeout=self._rpctimeout)["height"] for i in range(self._num_chaininfo_retries):
try:
get_height = self.rpc2("get_height", timeout=self._rpctimeout)
return get_height if full_output else get_height["height"]
except Exception as e:
if i < self._num_chaininfo_retries - 1 and self.is_transient_error(e):
time.sleep(self._chaininfo_retry_delay)
continue
raise (e)
def getWalletInfo(self): def getWalletInfo(self):
with self._mx_wallet: with self._mx_wallet:
@@ -554,16 +565,14 @@ class XMRInterface(CoinInterface):
rv = -1 rv = -1
return rv return rv
def findTxnByHash(self, txid): def findTxnByHash(self, txid: str):
with self._mx_wallet: with self._mx_wallet:
self.openWallet(self._wallet_filename) self.openWallet(self._wallet_filename)
self.rpc_wallet("refresh") self.rpc_wallet("refresh")
self._log.debug(f"Refreshing {self.coin_name()} wallet") self._log.debug(f"Refreshing {self.coin_name()} wallet")
try: try:
current_height = self.rpc2("get_height", timeout=self._rpctimeout)[ current_height: int = self.getChainHeight()
"height"
]
self._log.info( self._log.info(
f"findTxnByHash {self.ticker_str()} current_height {current_height}\nhash: {txid}" f"findTxnByHash {self.ticker_str()} current_height {current_height}\nhash: {txid}"
) )