refactor: Make db mutex non-recursive.

basicswap/base.py

@@ -46,7 +46,7 @@ class BaseApp:
         self.settings = settings
         self.coin_clients = {}
         self.coin_interfaces = {}
-        self.mxDB = threading.RLock()
+        self.mxDB = threading.Lock()
         self.debug = self.settings.get('debug', False)
         self.delay_event = threading.Event()
         self.chainstate_delay_event = threading.Event()

basicswap/db_upgrades.py

@@ -93,7 +93,7 @@ def upgradeDatabaseData(self, data_version):
                         created_at=now))
 
             self.db_data_version = CURRENT_DB_DATA_VERSION
-            self.setIntKVInSession('db_data_version', self.db_data_version, session)
+            self.setIntKV('db_data_version', self.db_data_version, session)
             session.commit()
             self.log.info('Upgraded database records to version {}'.format(self.db_data_version))
         finally:
@@ -314,7 +314,7 @@ def upgradeDatabase(self, db_version):
             session.execute('ALTER TABLE bids ADD COLUMN pkhash_buyer_to BLOB')
         if current_version != db_version:
             self.db_version = db_version
-            self.setIntKVInSession('db_version', db_version, session)
+            self.setIntKV('db_version', db_version, session)
             session.commit()
             session.close()
             session.remove()

basicswap/protocols/atomic_swap_1.py

@@ -105,7 +105,7 @@ def redeemITx(self, bid_id: bytes, session):
     bid, offer = self.getBidAndOffer(bid_id, session)
     ci_from = self.ci(offer.coin_from)
 
-    txn = self.createRedeemTxn(ci_from.coin_type(), bid, for_txn_type='initiate')
+    txn = self.createRedeemTxn(ci_from.coin_type(), bid, for_txn_type='initiate', session=session)
     txid = ci_from.publishTx(bytes.fromhex(txn))
 
     bid.initiate_tx.spend_txid = bytes.fromhex(txid)

basicswap/protocols/xmr_swap_1.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2020-2023 tecnovert
+# Copyright (c) 2020-2024 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
-from sqlalchemy.orm import scoped_session
-
 from basicswap.util import (
     ensure,
 )
@@ -45,7 +43,7 @@ def addLockRefundSigs(self, xmr_swap, ci):
 def recoverNoScriptTxnWithKey(self, bid_id: bytes, encoded_key):
     self.log.info('Manually recovering %s', bid_id.hex())
     # Manually recover txn if other key is known
-    session = scoped_session(self.session_factory)
+    session = self.openSession()
     try:
         bid, xmr_swap = self.getXmrBidFromSession(session, bid_id)
         ensure(bid, 'Bid not found: {}.'.format(bid_id.hex()))
@@ -86,8 +84,7 @@ def recoverNoScriptTxnWithKey(self, bid_id: bytes, encoded_key):
 
         return txid
     finally:
-        session.close()
-        session.remove()
+        self.closeSession(session, commit=False)
 
 
 def getChainBSplitKey(swap_client, bid, xmr_swap, offer):

tests/basicswap/extended/test_dcr.py

@@ -345,9 +345,8 @@ def run_test_ads_both_refund(self, coin_from: Coins, coin_to: Coins, lock_value:
     ci_from = swap_clients[id_offerer].ci(coin_from)
     ci_to = swap_clients[id_offerer].ci(coin_to)
 
-    if reverse_bid:
-        self.prepare_balance(coin_to, 100.0, 1801, 1800)
-        self.prepare_balance(coin_from, 100.0, 1800, 1801)
+    self.prepare_balance(coin_to, 100.0, 1801, 1800)
+    self.prepare_balance(coin_from, 100.0, 1800, 1801)
 
     id_leader: int = id_bidder if reverse_bid else id_offerer
     id_follower: int = id_offerer if reverse_bid else id_bidder

tests/basicswap/test_xmr.py

@@ -1388,9 +1388,13 @@ class Test(BaseTest):
         js_0 = read_json_api(1800, 'wallets/part')
         node0_blind_before = js_0['blind_balance'] + js_0['blind_unconfirmed']
 
-        amt_swap = make_int(random.uniform(0.1, 2.0), scale=8, r=1)
-        rate_swap = make_int(random.uniform(2.0, 20.0), scale=8, r=1)
-        offer_id = swap_clients[0].postOffer(Coins.PART_BLIND, Coins.XMR, amt_swap, rate_swap, amt_swap, SwapTypes.XMR_SWAP)
+        coin_from = Coins.PART_BLIND
+        coin_to = Coins.XMR
+        ci_from = swap_clients[0].ci(coin_from)
+        ci_to = swap_clients[0].ci(coin_to)
+        amt_swap = ci_from.make_int(random.uniform(0.1, 2.0), r=1)
+        rate_swap = ci_to.make_int(random.uniform(0.2, 20.0), r=1)
+        offer_id = swap_clients[0].postOffer(coin_from, coin_to, amt_swap, rate_swap, amt_swap, SwapTypes.XMR_SWAP)
         wait_for_offer(test_delay_event, swap_clients[1], offer_id)
         offers = swap_clients[0].listOffers(filters={'offer_id': offer_id})
         offer = offers[0]