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

refactor: Add queryOne
Some checks are pending
lint / build (3.12) (push) Waiting to run
Details

Browse source
This commit is contained in:
tecnovert 2024-11-26 11:28:37 +02:00
parent e90800884a
commit 26de907185
No known key found for this signature in database
GPG key ID: 8ED6D8750C4E3F93
2 changed files with 108 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
basicswap/basicswap.py
View file

@ -92,7 +92,6 @@ from .db import (
create_db, create_db,
CURRENT_DB_VERSION, CURRENT_DB_VERSION,
EventLog, EventLog,
firstOrNone,
getOrderByStr, getOrderByStr,
KnownIdentity, KnownIdentity,
MessageLink, MessageLink,
@ -1316,9 +1315,7 @@ class BasicSwap(BaseApp):
self.closeDB(cursor) self.closeDB(cursor)
def updateIdentityBidState(self, cursor, address: str, bid) -> None: def updateIdentityBidState(self, cursor, address: str, bid) -> None:
identity_stats = firstOrNone( identity_stats = self.queryOne(KnownIdentity, cursor, {"address": address})
self.query(KnownIdentity, cursor, {"address": address})
)
if not identity_stats: if not identity_stats:
identity_stats = KnownIdentity( identity_stats = KnownIdentity(
active_ind=1, address=address, created_at=self.getTime() active_ind=1, address=address, created_at=self.getTime()
@ -1357,8 +1354,7 @@ class BasicSwap(BaseApp):
) -> Optional[bytes]: ) -> Optional[bytes]:
try: try:
use_cursor = self.openDB(cursor) use_cursor = self.openDB(cursor)
tx = firstOrNone( tx = self.queryOne(
self.query(
PrefundedTx, PrefundedTx,
use_cursor, use_cursor,
{ {
@ -1368,7 +1364,6 @@ class BasicSwap(BaseApp):
"used_by": None, "used_by": None,
}, },
) )
)
if tx is None: if tx is None:
return None return None
tx.used_by = linked_id tx.used_by = linked_id
@ -1398,7 +1393,7 @@ class BasicSwap(BaseApp):
ci_to = self.ci(offer.coin_from if reverse_bid else offer.coin_to) ci_to = self.ci(offer.coin_from if reverse_bid else offer.coin_to)
if offer.swap_type == SwapTypes.XMR_SWAP: if offer.swap_type == SwapTypes.XMR_SWAP:
xmr_swap = firstOrNone(self.query(XmrSwap, cursor, {"bid_id": bid.bid_id})) xmr_swap = self.queryOne(XmrSwap, cursor, {"bid_id": bid.bid_id})
self.watchXmrSwap(bid, offer, xmr_swap, cursor) self.watchXmrSwap(bid, offer, xmr_swap, cursor)
if ( if (
ci_to.watch_blocks_for_scripts() ci_to.watch_blocks_for_scripts()
@ -1556,9 +1551,11 @@ class BasicSwap(BaseApp):
return return
self.log.info("Loading data from db") self.log.info("Loading data from db")
self.swaps_in_progress.clear() self.swaps_in_progress.clear()
bid_cursor = None
try: try:
cursor = self.openDB() cursor = self.openDB()
for bid in self.query(Bid, cursor): bid_cursor = self.getNewDBCursor()
for bid in self.query(Bid, bid_cursor):
if bid.in_progress == 1 or ( if bid.in_progress == 1 or (
bid.state bid.state
and bid.state > BidStates.BID_RECEIVED and bid.state > BidStates.BID_RECEIVED
@ -1571,14 +1568,15 @@ class BasicSwap(BaseApp):
try: try:
bid.setState(BidStates.BID_ERROR, "Failed to activate") bid.setState(BidStates.BID_ERROR, "Failed to activate")
offer = firstOrNone( offer = self.queryOne(
self.query(Offer, cursor, {"offer_id": bid.offer_id}) Offer, cursor, {"offer_id": bid.offer_id}
) )
self.deactivateBid(cursor, offer, bid) self.deactivateBid(cursor, offer, bid)
except Exception as ex: except Exception as ex:
self.logException(f"Further error deactivating: {ex}") self.logException(f"Further error deactivating: {ex}")
self.buildNotificationsCache(cursor) self.buildNotificationsCache(cursor)
finally: finally:
self.closeDBCursor(bid_cursor)
self.closeDB(cursor) self.closeDB(cursor)
def getActiveBidMsgValidTime(self) -> int: def getActiveBidMsgValidTime(self) -> int:
@ -2172,7 +2170,7 @@ class BasicSwap(BaseApp):
cursor = self.openDB() cursor = self.openDB()
try: try:
offer = firstOrNone(self.query(Offer, cursor, {"offer_id": offer_id})) offer = self.queryOne(Offer, cursor, {"offer_id": offer_id})
if ( if (
offer.security_token is not None offer.security_token is not None
@ -2206,7 +2204,7 @@ class BasicSwap(BaseApp):
self.log.info("Archiving offer %s", offer_id.hex()) self.log.info("Archiving offer %s", offer_id.hex())
cursor = self.openDB() cursor = self.openDB()
try: try:
offer = firstOrNone(self.query(Offer, cursor, {"offer_id": offer_id})) offer = self.queryOne(Offer, cursor, {"offer_id": offer_id})
if offer.active_ind != 1: if offer.active_ind != 1:
raise ValueError("Offer is not active") raise ValueError("Offer is not active")
@ -2226,12 +2224,11 @@ class BasicSwap(BaseApp):
self.log.info("Editing offer %s", offer_id.hex()) self.log.info("Editing offer %s", offer_id.hex())
cursor = self.openDB() cursor = self.openDB()
try: try:
offer = firstOrNone(self.query(Offer, cursor, {"offer_id": offer_id})) offer = self.queryOne(Offer, cursor, {"offer_id": offer_id})
ensure(offer, f"Offer not found: {offer_id.hex()}.") ensure(offer, f"Offer not found: {offer_id.hex()}.")
if "automation_strat_id" in data: if "automation_strat_id" in data:
new_automation_strat_id = data["automation_strat_id"] new_automation_strat_id = data["automation_strat_id"]
link = firstOrNone( link = self.queryOne(
self.query(
Offer, Offer,
cursor, cursor,
{ {
@ -2239,7 +2236,6 @@ class BasicSwap(BaseApp):
"linked_id": offer.offer_id, "linked_id": offer.offer_id,
}, },
) )
)
if not link: if not link:
if new_automation_strat_id > 0: if new_automation_strat_id > 0:
link = AutomationLink( link = AutomationLink(
@ -2414,13 +2410,11 @@ class BasicSwap(BaseApp):
try: try:
use_cursor = self.openDB(cursor) use_cursor = self.openDB(cursor)
record = firstOrNone( record = self.queryOne(
self.query(
PooledAddress, PooledAddress,
use_cursor, use_cursor,
{"coin_type": int(coin_type), "bid_id": None}, {"coin_type": int(coin_type), "bid_id": None},
) )
)
if not record: if not record:
address = self.getReceiveAddressForCoin(coin_type) address = self.getReceiveAddressForCoin(coin_type)
record = PooledAddress(addr=address, coin_type=int(coin_type)) record = PooledAddress(addr=address, coin_type=int(coin_type))
@ -2445,13 +2439,11 @@ class BasicSwap(BaseApp):
try: try:
cursor = self.openDB() cursor = self.openDB()
try: try:
record = firstOrNone( record = self.queryOne(
self.query(
PooledAddress, PooledAddress,
cursor, cursor,
{"tx_type": int(tx_type), "bid_id": bid_id}, {"tx_type": int(tx_type), "bid_id": bid_id},
) )
)
self.log.debug("Returning address to pool addr {}".format(record.addr)) self.log.debug("Returning address to pool addr {}".format(record.addr))
# unset PooledAddress.bid_id # unset PooledAddress.bid_id
@ -3077,7 +3069,7 @@ class BasicSwap(BaseApp):
def getOffer(self, offer_id: bytes, cursor=None): def getOffer(self, offer_id: bytes, cursor=None):
try: try:
use_cursor = self.openDB(cursor) use_cursor = self.openDB(cursor)
return firstOrNone(self.query(Offer, use_cursor, {"offer_id": offer_id})) return self.queryOne(Offer, use_cursor, {"offer_id": offer_id})
finally: finally:
if cursor is None: if cursor is None:
self.closeDB(use_cursor, commit=False) self.closeDB(use_cursor, commit=False)
@ -3108,10 +3100,10 @@ class BasicSwap(BaseApp):
bid.txns[stx.tx_type] = stx bid.txns[stx.tx_type] = stx
def getXmrBidFromSession(self, cursor, bid_id: bytes): def getXmrBidFromSession(self, cursor, bid_id: bytes):
bid = firstOrNone(self.query(Bid, cursor, {"bid_id": bid_id})) bid = self.queryOne(Bid, cursor, {"bid_id": bid_id})
xmr_swap = None xmr_swap = None
if bid: if bid:
xmr_swap = firstOrNone(self.query(XmrSwap, cursor, {"bid_id": bid_id})) xmr_swap = self.queryOne(XmrSwap, cursor, {"bid_id": bid_id})
self.loadBidTxns(bid, cursor) self.loadBidTxns(bid, cursor)
return bid, xmr_swap return bid, xmr_swap
@ -3123,12 +3115,10 @@ class BasicSwap(BaseApp):
self.closeDB(cursor, commit=False) self.closeDB(cursor, commit=False)
def getXmrOfferFromSession(self, cursor, offer_id: bytes): def getXmrOfferFromSession(self, cursor, offer_id: bytes):
offer = firstOrNone(self.query(Offer, cursor, {"offer_id": offer_id})) offer = self.queryOne(Offer, cursor, {"offer_id": offer_id})
xmr_offer = None xmr_offer = None
if offer: if offer:
xmr_offer = firstOrNone( xmr_offer = self.queryOne(XmrOffer, cursor, {"offer_id": offer_id})
self.query(XmrOffer, cursor, {"offer_id": offer_id})
)
return offer, xmr_offer return offer, xmr_offer
def getXmrOffer(self, offer_id: bytes, cursor=None): def getXmrOffer(self, offer_id: bytes, cursor=None):
@ -3142,7 +3132,7 @@ class BasicSwap(BaseApp):
def getBid(self, bid_id: bytes, cursor=None, with_txns=True): def getBid(self, bid_id: bytes, cursor=None, with_txns=True):
try: try:
use_cursor = self.openDB(cursor) use_cursor = self.openDB(cursor)
bid = firstOrNone(self.query(Bid, use_cursor, {"bid_id": bid_id})) bid = self.queryOne(Bid, use_cursor, {"bid_id": bid_id})
if bid and with_txns: if bid and with_txns:
self.loadBidTxns(bid, use_cursor) self.loadBidTxns(bid, use_cursor)
return bid return bid
@ -3153,12 +3143,10 @@ class BasicSwap(BaseApp):
def getBidAndOffer(self, bid_id: bytes, cursor=None, with_txns=True): def getBidAndOffer(self, bid_id: bytes, cursor=None, with_txns=True):
try: try:
use_cursor = self.openDB(cursor) use_cursor = self.openDB(cursor)
bid = firstOrNone(self.query(Bid, use_cursor, {"bid_id": bid_id})) bid = self.queryOne(Bid, use_cursor, {"bid_id": bid_id})
offer = None offer = None
if bid: if bid:
offer = firstOrNone( offer = self.queryOne(Offer, use_cursor, {"offer_id": bid.offer_id})
self.query(Offer, use_cursor, {"offer_id": bid.offer_id})
)
if with_txns: if with_txns:
self.loadBidTxns(bid, use_cursor) self.loadBidTxns(bid, use_cursor)
return bid, offer return bid, offer
@ -3174,17 +3162,13 @@ class BasicSwap(BaseApp):
xmr_offer = None xmr_offer = None
events = [] events = []
bid = firstOrNone(self.query(Bid, cursor, {"bid_id": bid_id})) bid = self.queryOne(Bid, cursor, {"bid_id": bid_id})
if bid: if bid:
offer = firstOrNone( offer = self.queryOne(Offer, cursor, {"offer_id": bid.offer_id})
self.query(Offer, cursor, {"offer_id": bid.offer_id})
)
if offer and offer.swap_type == SwapTypes.XMR_SWAP: if offer and offer.swap_type == SwapTypes.XMR_SWAP:
xmr_swap = firstOrNone( xmr_swap = self.queryOne(XmrSwap, cursor, {"bid_id": bid.bid_id})
self.query(XmrSwap, cursor, {"bid_id": bid.bid_id}) xmr_offer = self.queryOne(
) XmrOffer, cursor, {"offer_id": bid.offer_id}
xmr_offer = firstOrNone(
self.query(XmrOffer, cursor, {"offer_id": bid.offer_id})
) )
self.loadBidTxns(bid, cursor) self.loadBidTxns(bid, cursor)
if list_events: if list_events:
@ -3197,9 +3181,7 @@ class BasicSwap(BaseApp):
def getIdentity(self, address: str): def getIdentity(self, address: str):
try: try:
cursor = self.openDB() cursor = self.openDB()
identity = firstOrNone( identity = self.queryOne(KnownIdentity, cursor, {"address": address})
self.query(KnownIdentity, cursor, {"address": address})
)
return identity return identity
finally: finally:
self.closeDB(cursor, commit=False) self.closeDB(cursor, commit=False)
@ -4998,14 +4980,12 @@ class BasicSwap(BaseApp):
try: try:
cursor = self.openDB() cursor = self.openDB()
xmr_offer = firstOrNone( xmr_offer = self.queryOne(XmrOffer, cursor, {"offer_id": offer.offer_id})
self.query(XmrOffer, cursor, {"offer_id": offer.offer_id})
)
ensure( ensure(
xmr_offer, xmr_offer,
"Adaptor-sig offer not found: {}.".format(offer.offer_id.hex()), "Adaptor-sig offer not found: {}.".format(offer.offer_id.hex()),
) )
xmr_swap = firstOrNone(self.query(XmrSwap, cursor, {"bid_id": bid.bid_id})) xmr_swap = self.queryOne(XmrSwap, cursor, {"bid_id": bid.bid_id})
ensure(xmr_swap, "Adaptor-sig swap not found: {}.".format(bid.bid_id.hex())) ensure(xmr_swap, "Adaptor-sig swap not found: {}.".format(bid.bid_id.hex()))
if TxTypes.XMR_SWAP_A_LOCK_REFUND in bid.txns: if TxTypes.XMR_SWAP_A_LOCK_REFUND in bid.txns:
@ -6842,10 +6822,14 @@ class BasicSwap(BaseApp):
def checkXmrSwaps(self) -> None: def checkXmrSwaps(self) -> None:
now: int = self.getTime() now: int = self.getTime()
ttl_xmr_split_messages = 60 * 60 ttl_xmr_split_messages = 60 * 60
bid_cursor = None
try: try:
cursor = self.openDB() cursor = self.openDB()
q = self.query(Bid, cursor, {"state": int(BidStates.BID_RECEIVING)}) bid_cursor = self.getNewDBCursor()
for bid in q: q_bids = self.query(
Bid, bid_cursor, {"state": int(BidStates.BID_RECEIVING)}
)
for bid in q_bids:
q = cursor.execute( q = cursor.execute(
"SELECT COUNT(*) FROM xmr_split_data WHERE bid_id = :bid_id AND msg_type = :msg_type", "SELECT COUNT(*) FROM xmr_split_data WHERE bid_id = :bid_id AND msg_type = :msg_type",
{"bid_id": bid.bid_id, "msg_type": int(XmrSplitMsgTypes.BID)}, {"bid_id": bid.bid_id, "msg_type": int(XmrSplitMsgTypes.BID)},
@ -6887,8 +6871,10 @@ class BasicSwap(BaseApp):
], ],
) )
q = self.query(Bid, cursor, {"state": int(BidStates.BID_RECEIVING_ACC)}) q_bids = self.query(
for bid in q: Bid, bid_cursor, {"state": int(BidStates.BID_RECEIVING_ACC)}
)
for bid in q_bids:
q = cursor.execute( q = cursor.execute(
"SELECT COUNT(*) FROM xmr_split_data WHERE bid_id = :bid_id AND msg_type = :msg_type", "SELECT COUNT(*) FROM xmr_split_data WHERE bid_id = :bid_id AND msg_type = :msg_type",
{ {
@ -6941,6 +6927,7 @@ class BasicSwap(BaseApp):
{"ttl": ttl_xmr_split_messages, "now": now}, {"ttl": ttl_xmr_split_messages, "now": now},
) )
finally: finally:
self.closeDBCursor(bid_cursor)
self.closeDB(cursor) self.closeDB(cursor)
def processOffer(self, msg) -> None: def processOffer(self, msg) -> None:
@ -7235,8 +7222,7 @@ class BasicSwap(BaseApp):
try: try:
use_cursor = self.openDB(cursor) use_cursor = self.openDB(cursor)
link = firstOrNone( link = self.queryOne(
self.query(
AutomationLink, AutomationLink,
use_cursor, use_cursor,
{ {
@ -7245,17 +7231,14 @@ class BasicSwap(BaseApp):
"linked_id": offer.offer_id, "linked_id": offer.offer_id,
}, },
) )
)
if link is None: if link is None:
return False return False
strategy = firstOrNone( strategy = self.queryOne(
self.query(
AutomationStrategy, AutomationStrategy,
use_cursor, use_cursor,
{"active_ind": 1, "record_id": link.strategy_id}, {"active_ind": 1, "record_id": link.strategy_id},
) )
)
opts = json.loads(strategy.data.decode("utf-8")) opts = json.loads(strategy.data.decode("utf-8"))
bid_amount: int = bid.amount bid_amount: int = bid.amount
@ -7308,8 +7291,8 @@ class BasicSwap(BaseApp):
"Already have {} bids to complete".format(num_not_completed) "Already have {} bids to complete".format(num_not_completed)
) )
identity_stats = firstOrNone( identity_stats = self.queryOne(
self.query(KnownIdentity, use_cursor, {"address": bid.bid_addr}) KnownIdentity, use_cursor, {"address": bid.bid_addr}
) )
self.evaluateKnownIdentityForAutoAccept(strategy, identity_stats) self.evaluateKnownIdentityForAutoAccept(strategy, identity_stats)
@ -7583,7 +7566,7 @@ class BasicSwap(BaseApp):
ensure(offer, "Offer not found: {}.".format(bid.offer_id.hex())) ensure(offer, "Offer not found: {}.".format(bid.offer_id.hex()))
ensure(xmr_offer, "Adaptor-sig offer not found: {}.".format(bid.offer_id.hex())) ensure(xmr_offer, "Adaptor-sig offer not found: {}.".format(bid.offer_id.hex()))
xmr_swap = firstOrNone(self.query(XmrSwap, cursor, {"bid_id": bid.bid_id})) xmr_swap = self.queryOne(XmrSwap, cursor, {"bid_id": bid.bid_id})
ensure(xmr_swap, "Adaptor-sig swap not found: {}.".format(bid.bid_id.hex())) ensure(xmr_swap, "Adaptor-sig swap not found: {}.".format(bid.bid_id.hex()))
reverse_bid: bool = self.is_reverse_ads_bid(offer.coin_from, offer.coin_to) reverse_bid: bool = self.is_reverse_ads_bid(offer.coin_from, offer.coin_to)
@ -7681,7 +7664,7 @@ class BasicSwap(BaseApp):
offer, xmr_offer = self.getXmrOffer(bid.offer_id, cursor=cursor) offer, xmr_offer = self.getXmrOffer(bid.offer_id, cursor=cursor)
ensure(offer, "Offer not found: {}.".format(bid.offer_id.hex())) ensure(offer, "Offer not found: {}.".format(bid.offer_id.hex()))
ensure(xmr_offer, "Adaptor-sig offer not found: {}.".format(bid.offer_id.hex())) ensure(xmr_offer, "Adaptor-sig offer not found: {}.".format(bid.offer_id.hex()))
xmr_swap = firstOrNone(self.query(XmrSwap, cursor, {"bid_id": bid.bid_id})) xmr_swap = self.queryOne(XmrSwap, cursor, {"bid_id": bid.bid_id})
ensure(xmr_swap, "Adaptor-sig swap not found: {}.".format(bid.bid_id.hex())) ensure(xmr_swap, "Adaptor-sig swap not found: {}.".format(bid.bid_id.hex()))
reverse_bid: bool = self.is_reverse_ads_bid(offer.coin_from, offer.coin_to) reverse_bid: bool = self.is_reverse_ads_bid(offer.coin_from, offer.coin_to)
@ -10724,9 +10707,7 @@ class BasicSwap(BaseApp):
def getAutomationStrategy(self, strategy_id: int): def getAutomationStrategy(self, strategy_id: int):
try: try:
cursor = self.openDB() cursor = self.openDB()
return firstOrNone( return self.queryOne(AutomationStrategy, cursor, {"record_id": strategy_id})
self.query(AutomationStrategy, cursor, {"record_id": strategy_id})
)
finally: finally:
self.closeDB(cursor, commit=False) self.closeDB(cursor, commit=False)
@ -10734,8 +10715,8 @@ class BasicSwap(BaseApp):
self.log.debug(f"updateAutomationStrategy {strategy_id}") self.log.debug(f"updateAutomationStrategy {strategy_id}")
try: try:
cursor = self.openDB() cursor = self.openDB()
strategy = firstOrNone( strategy = self.queryOne(
self.query(AutomationStrategy, cursor, {"record_id": strategy_id}) AutomationStrategy, cursor, {"record_id": strategy_id}
) )
if "data" in data: if "data" in data:
strategy.data = json.dumps(data["data"]).encode("utf-8") strategy.data = json.dumps(data["data"]).encode("utf-8")
@ -11062,7 +11043,7 @@ class BasicSwap(BaseApp):
try: try:
rv = [] rv = []
for a in addresses: for a in addresses:
v = firstOrNone(self.query(KnownIdentity, cursor, {"address": a})) v = self.queryOne(KnownIdentity, cursor, {"address": a})
rv.append("" if (not v or not v.label) else v.label) rv.append("" if (not v or not v.label) else v.label)
return rv return rv
finally: finally:

26
basicswap/db.py
View file

@ -749,6 +749,12 @@ class DBMethods:
assert self.mxDB.locked() assert self.mxDB.locked()
self._db_con.rollback() self._db_con.rollback()
def closeDBCursor(self, cursor):
assert self.mxDB.locked()
if cursor:
cursor.close()
def closeDB(self, cursor, commit=True): def closeDB(self, cursor, commit=True):
assert self.mxDB.locked() assert self.mxDB.locked()
@ -955,6 +961,26 @@ class DBMethods:
setattr(obj, colname, value) setattr(obj, colname, value)
yield obj yield obj
def queryOne(
self,
table_class,
cursor,
constraints={},
order_by={},
query_suffix=None,
extra_query_data={},
):
return firstOrNone(
self.query(
table_class,
cursor,
constraints,
order_by,
query_suffix,
extra_query_data,
)
)
def updateDB(self, obj, cursor, constraints=[]): def updateDB(self, obj, cursor, constraints=[]):
if cursor is None: if cursor is None:
raise ValueError("Cursor is null") raise ValueError("Cursor is null")