Ecosystem/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2024-12-22 19:49:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

interface: xmr.py - remove extra refreshs

Browse source
This commit is contained in:
nahuhh 2024-11-16 14:05:10 +00:00
parent 5bf20370eb
commit 8795ecc231
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
basicswap/interface/xmr.py
View file

@ -135,6 +135,7 @@ class XMRInterface(CoinInterface):
self._rpctimeout = coin_settings.get("rpctimeout", 60) self._rpctimeout = coin_settings.get("rpctimeout", 60)
self._walletrpctimeout = coin_settings.get("walletrpctimeout", 120) self._walletrpctimeout = coin_settings.get("walletrpctimeout", 120)
# walletrpctimeoutlong likely unneeded
self._walletrpctimeoutlong = coin_settings.get("walletrpctimeoutlong", 600) self._walletrpctimeoutlong = coin_settings.get("walletrpctimeoutlong", 600)
self.rpc = make_xmr_rpc_func( self.rpc = make_xmr_rpc_func(
@ -284,7 +285,6 @@ class XMRInterface(CoinInterface):
raise e raise e
rv = {} rv = {}
self.rpc_wallet("refresh")
balance_info = self.rpc_wallet("get_balance") balance_info = self.rpc_wallet("get_balance")
rv["balance"] = self.format_amount(balance_info["unlocked_balance"]) rv["balance"] = self.format_amount(balance_info["unlocked_balance"])
@ -385,7 +385,6 @@ class XMRInterface(CoinInterface):
) -> bytes: ) -> bytes:
with self._mx_wallet: with self._mx_wallet:
self.openWallet(self._wallet_filename) self.openWallet(self._wallet_filename)
self.rpc_wallet("refresh")
Kbv = self.getPubkey(kbv) Kbv = self.getPubkey(kbv)
shared_addr = xmr_util.encode_address(Kbv, Kbs, self._addr_prefix) shared_addr = xmr_util.encode_address(Kbv, Kbs, self._addr_prefix)
@ -425,8 +424,6 @@ class XMRInterface(CoinInterface):
self.createWallet(params) self.createWallet(params)
self.openWallet(address_b58) self.openWallet(address_b58)
self.rpc_wallet("refresh", timeout=self._walletrpctimeoutlong)
""" """
# Debug # Debug
try: try:
@ -478,7 +475,6 @@ class XMRInterface(CoinInterface):
def findTxnByHash(self, txid): def findTxnByHash(self, txid):
with self._mx_wallet: with self._mx_wallet:
self.openWallet(self._wallet_filename) self.openWallet(self._wallet_filename)
self.rpc_wallet("refresh", timeout=self._walletrpctimeoutlong)
try: try:
current_height = self.rpc2("get_height", timeout=self._rpctimeout)[ current_height = self.rpc2("get_height", timeout=self._rpctimeout)[
@ -547,7 +543,6 @@ class XMRInterface(CoinInterface):
self.createWallet(params) self.createWallet(params)
self.openWallet(wallet_filename) self.openWallet(wallet_filename)
self.rpc_wallet("refresh")
rv = self.rpc_wallet("get_balance") rv = self.rpc_wallet("get_balance")
if rv["balance"] < cb_swap_value: if rv["balance"] < cb_swap_value:
self._log.warning("Balance is too low, checking for existing spend.") self._log.warning("Balance is too low, checking for existing spend.")
@ -602,7 +597,6 @@ class XMRInterface(CoinInterface):
) -> str: ) -> str:
with self._mx_wallet: with self._mx_wallet:
self.openWallet(self._wallet_filename) self.openWallet(self._wallet_filename)
self.rpc_wallet("refresh")
if sweepall: if sweepall:
balance = self.rpc_wallet("get_balance") balance = self.rpc_wallet("get_balance")
@ -682,8 +676,6 @@ class XMRInterface(CoinInterface):
self.createWallet(params) self.createWallet(params)
self.openWallet(address_b58) self.openWallet(address_b58)
self.rpc_wallet("refresh")
rv = self.rpc_wallet( rv = self.rpc_wallet(
"get_transfers", "get_transfers",
{"in": True, "out": True, "pending": True, "failed": True}, {"in": True, "out": True, "pending": True, "failed": True},
@ -697,7 +689,6 @@ class XMRInterface(CoinInterface):
with self._mx_wallet: with self._mx_wallet:
self.openWallet(self._wallet_filename) self.openWallet(self._wallet_filename)
self.rpc_wallet("refresh")
balance_info = self.rpc_wallet("get_balance") balance_info = self.rpc_wallet("get_balance")
return balance_info["unlocked_balance"] return balance_info["unlocked_balance"]