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

Merge pull request #412 from tecnovert/logging

Browse Source 
fix duplicate bid id in coin b lock tx submit msg, use logIDT consistently
This commit is contained in:
tecnovert
2026-01-02 17:40:07 +00:00
committed by GitHub
parent 9d716d25cb d1d20e855b
commit 339d52f114
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
basicswap/basicswap.py
View File

@@ -3848,7 +3848,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
txid = ci_from.publishTx(bytes.fromhex(txn)) txid = ci_from.publishTx(bytes.fromhex(txn))
self.log.debug( self.log.debug(
f"Submitted initiate txn {txid} to {ci_from.coin_name()} chain for bid {self.log.id(bid_id)}", f"Submitted initiate txn {self.logIDT(txid)} to {ci_from.coin_name()} chain for bid {self.log.id(bid_id)}",
) )
bid.initiate_tx = SwapTx( bid.initiate_tx = SwapTx(
bid_id=bid_id, bid_id=bid_id,
@@ -5514,7 +5514,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
txn = self.createParticipateTxn(bid_id, bid, offer, participate_script) txn = self.createParticipateTxn(bid_id, bid, offer, participate_script)
txid = ci_to.publishTx(bytes.fromhex(txn)) txid = ci_to.publishTx(bytes.fromhex(txn))
self.log.debug( self.log.debug(
f"Submitted participate tx {self.log.id(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}" f"Submitted participate tx {self.logIDT(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}"
) )
bid.setPTxState(TxStates.TX_SENT) bid.setPTxState(TxStates.TX_SENT)
self.logEvent( self.logEvent(
@@ -5622,7 +5622,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
txn = self.createRedeemTxn(ci_to.coin_type(), bid) txn = self.createRedeemTxn(ci_to.coin_type(), bid)
txid = ci_to.publishTx(bytes.fromhex(txn)) txid = ci_to.publishTx(bytes.fromhex(txn))
self.log.debug( self.log.debug(
f"Submitted participate redeem tx {self.log.id(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}." f"Submitted participate redeem tx {self.logIDT(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
) )
self.logEvent( self.logEvent(
Concepts.BID, bid.bid_id, EventLogTypes.PTX_REDEEM_PUBLISHED, "", None Concepts.BID, bid.bid_id, EventLogTypes.PTX_REDEEM_PUBLISHED, "", None
@@ -5908,7 +5908,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
) )
self.log.info( self.log.info(
f"Submitted coin a lock refund spend tx for bid {self.log.id(bid_id)}, txid {self.log.id(txid_str)}" f"Submitted coin a lock refund spend tx for bid {self.log.id(bid_id)}, txid {self.logIDT(txid_str)}"
) )
bid.txns[TxTypes.XMR_SWAP_A_LOCK_REFUND_SPEND] = SwapTx( bid.txns[TxTypes.XMR_SWAP_A_LOCK_REFUND_SPEND] = SwapTx(
bid_id=bid_id, bid_id=bid_id,
@@ -5983,7 +5983,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
txid=bytes.fromhex(txid_hex), txid=bytes.fromhex(txid_hex),
) )
self.log.info( self.log.info(
f"Submitted mercy tx for bid {self.log.id(bid_id)}, txid {self.log.id(txid_hex)}" f"Submitted mercy tx for bid {self.log.id(bid_id)}, txid {self.logIDT(txid_hex)}"
) )
self.logBidEvent( self.logBidEvent(
bid_id, bid_id,
@@ -6670,7 +6670,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
try: try:
txid = ci_to.publishTx(bid.participate_txn_refund) txid = ci_to.publishTx(bid.participate_txn_refund)
self.log.debug( self.log.debug(
f"Submitted participate refund txn {self.log.id(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}." f"Submitted participate refund txn {self.logIDT(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
) )
self.logEvent( self.logEvent(
Concepts.BID, Concepts.BID,
@@ -6726,7 +6726,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
def removeWatchedTransaction(self, coin_type, bid_id: bytes, txid_hex: str) -> None: def removeWatchedTransaction(self, coin_type, bid_id: bytes, txid_hex: str) -> None:
# Remove all for bid if txid is None # Remove all for bid if txid is None
self.log.debug( self.log.debug(
f"Removing watched transaction {Coins(coin_type).name} {self.log.id(bid_id)} {self.log.id(txid_hex)}" f"Removing watched transaction {Coins(coin_type).name} {self.log.id(bid_id)} {self.logIDT(txid_hex)}"
) )
watched = self.coin_clients[coin_type]["watched_transactions"] watched = self.coin_clients[coin_type]["watched_transactions"]
old_len = len(watched) old_len = len(watched)
@@ -6735,7 +6735,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
if wo.bid_id == bid_id and (txid_hex is None or wo.txid_hex == txid_hex): if wo.bid_id == bid_id and (txid_hex is None or wo.txid_hex == txid_hex):
del watched[i] del watched[i]
self.log.debug( self.log.debug(
f"Removed watched transaction {Coins(coin_type).name} {self.log.id(bid_id)} {self.log.id(wo.txid_hex)}" f"Removed watched transaction {Coins(coin_type).name} {self.log.id(bid_id)} {self.logIDT(wo.txid_hex)}"
) )
def addWatchedOutput( def addWatchedOutput(
@@ -6756,7 +6756,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
def removeWatchedOutput(self, coin_type, bid_id: bytes, txid_hex: str) -> None: def removeWatchedOutput(self, coin_type, bid_id: bytes, txid_hex: str) -> None:
# Remove all for bid if txid is None # Remove all for bid if txid is None
self.log.debug( self.log.debug(
f"Removing watched output {Coins(coin_type).name} {self.log.id(bid_id)} {self.log.id(txid_hex)}" f"Removing watched output {Coins(coin_type).name} {self.log.id(bid_id)} {self.logIDT(txid_hex)}"
) )
watched = self.coin_clients[coin_type]["watched_outputs"] watched = self.coin_clients[coin_type]["watched_outputs"]
old_len = len(watched) old_len = len(watched)
@@ -6765,7 +6765,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
if wo.bid_id == bid_id and (txid_hex is None or wo.txid_hex == txid_hex): if wo.bid_id == bid_id and (txid_hex is None or wo.txid_hex == txid_hex):
del watched[i] del watched[i]
self.log.debug( self.log.debug(
f"Removed watched output {Coins(coin_type).name} {self.log.id(bid_id)} {self.log.id(wo.txid_hex)}" f"Removed watched output {Coins(coin_type).name} {self.log.id(bid_id)} {self.logIDT(wo.txid_hex)}"
) )
def addWatchedScript( def addWatchedScript(
@@ -9408,7 +9408,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
xmr_swap.a_lock_tx, xmr_swap.a_lock_tx_script xmr_swap.a_lock_tx, xmr_swap.a_lock_tx_script
) )
self.log.debug( self.log.debug(
f"Submitted lock tx {self.log.id(txid_hex)} to {ci_from.coin_name()} chain for bid {self.log.id(bid_id)}.", f"Submitted lock tx {self.logIDT(txid_hex)} to {ci_from.coin_name()} chain for bid {self.log.id(bid_id)}.",
) )
if bid.xmr_a_lock_tx is None: if bid.xmr_a_lock_tx is None:
@@ -9560,7 +9560,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
return return
self.log.debug( self.log.debug(
f"Submitted lock txn {self.log.id(bid_id)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}." f"Submitted lock txn {self.logIDT(b_lock_tx_id)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
) )
bid.xmr_b_lock_tx = SwapTx( bid.xmr_b_lock_tx = SwapTx(
bid_id=bid_id, bid_id=bid_id,
@@ -9733,7 +9733,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
txid = bytes.fromhex(ci_from.publishTx(xmr_swap.a_lock_spend_tx)) txid = bytes.fromhex(ci_from.publishTx(xmr_swap.a_lock_spend_tx))
self.log.debug( self.log.debug(
f"Submitted lock spend txn {self.log.id(txid)} to {ci_from.coin_name()} chain for bid {self.log.id(bid_id)}." f"Submitted lock spend txn {self.logIDT(txid)} to {ci_from.coin_name()} chain for bid {self.log.id(bid_id)}."
) )
self.logBidEvent( self.logBidEvent(
bid.bid_id, EventLogTypes.LOCK_TX_A_SPEND_TX_PUBLISHED, "", cursor bid.bid_id, EventLogTypes.LOCK_TX_A_SPEND_TX_PUBLISHED, "", cursor
@@ -9843,7 +9843,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
lock_tx_vout=lock_tx_vout, lock_tx_vout=lock_tx_vout,
) )
self.log.debug( self.log.debug(
f"Submitted lock B spend txn {self.log.id(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}." f"Submitted lock B spend txn {self.logIDT(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
) )
self.logBidEvent( self.logBidEvent(
bid.bid_id, EventLogTypes.LOCK_TX_B_SPEND_TX_PUBLISHED, "", cursor bid.bid_id, EventLogTypes.LOCK_TX_B_SPEND_TX_PUBLISHED, "", cursor
@@ -9958,7 +9958,7 @@ class BasicSwap(BaseApp, BSXNetwork, UIApp):
), ),
) )
self.log.debug( self.log.debug(
f"Submitted lock B refund txn {self.log.id(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}." f"Submitted lock B refund txn {self.logIDT(txid)} to {ci_to.coin_name()} chain for bid {self.log.id(bid_id)}."
) )
self.logBidEvent( self.logBidEvent(
bid.bid_id, EventLogTypes.LOCK_TX_B_REFUND_TX_PUBLISHED, "", cursor bid.bid_id, EventLogTypes.LOCK_TX_B_REFUND_TX_PUBLISHED, "", cursor

5
basicswap/protocols/atomic_swap_1.py
View File

@@ -130,10 +130,7 @@ def redeemITx(self, bid_id: bytes, cursor):
bid.initiate_tx.spend_txid = bytes.fromhex(txid) bid.initiate_tx.spend_txid = bytes.fromhex(txid)
self.log.debug( self.log.debug(
"Submitted initiate redeem txn %s to %s chain for bid %s", f"Submitted initiate redeem txn {self.logIDT(txid)} to {ci_from.coin_name()} chain for bid {self.logIDB(bid_id)}"
txid,
ci_from.coin_name(),
bid_id.hex(),
) )
self.logEvent(Concepts.BID, bid_id, EventLogTypes.ITX_REDEEM_PUBLISHED, "", cursor) self.logEvent(Concepts.BID, bid_id, EventLogTypes.ITX_REDEEM_PUBLISHED, "", cursor)

2
basicswap/protocols/xmr_swap_1.py
View File

@@ -119,7 +119,7 @@ def recoverNoScriptTxnWithKey(self, bid_id: bytes, encoded_key, cursor=None):
lock_tx_vout=lock_tx_vout, lock_tx_vout=lock_tx_vout,
) )
self.log.debug( self.log.debug(
f"Submitted lock B spend txn {self.log.id(txid)} to {ci_follower.coin_name()} chain for bid {self.log.id(bid_id)}." f"Submitted lock B spend txn {self.logIDT(txid)} to {ci_follower.coin_name()} chain for bid {self.log.id(bid_id)}."
) )
self.logBidEvent( self.logBidEvent(
bid.bid_id, bid.bid_id,