seasharp/basicswap_miserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add tx in mempool and in chain statuses.

Browse Source
This commit is contained in:
tecnovert 2023-07-29 11:58:19 +02:00
parent c3b33c502e
commit 55ded71686
No known key found for this signature in database
GPG Key ID: 8ED6D8750C4E3F93
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
basicswap/basicswap.py
View File

@ -3409,6 +3409,7 @@ class BasicSwap(BaseApp):
chain_height=found_tx['height'],
)
bid_changed = True
bid.xmr_b_lock_tx.setState(TxStates.TX_IN_CHAIN)
else:
bid.xmr_b_lock_tx.chain_height = found_tx['height']
bid_changed = True
@ -3551,9 +3552,13 @@ class BasicSwap(BaseApp):
if lock_tx_chain_info is None:
return rv
if bid.xmr_a_lock_tx.state == TxStates.TX_NONE and lock_tx_chain_info['height'] == 0:
bid.xmr_a_lock_tx.setState(TxStates.TX_IN_MEMPOOL)
if not bid.xmr_a_lock_tx.chain_height and lock_tx_chain_info['height'] != 0:
self.logBidEvent(bid.bid_id, EventLogTypes.LOCK_TX_A_SEEN, '', session)
self.setTxBlockInfoFromHeight(ci_from, bid.xmr_a_lock_tx, lock_tx_chain_info['height'])
bid.xmr_a_lock_tx.setState(TxStates.TX_IN_CHAIN)
bid_changed = True
if bid.xmr_a_lock_tx.chain_height != lock_tx_chain_info['height'] and lock_tx_chain_info['height'] != 0:
@ -5265,7 +5270,7 @@ class BasicSwap(BaseApp):
txid=b_lock_tx_id,
)
xmr_swap.b_lock_tx_id = b_lock_tx_id
bid.xmr_b_lock_tx.setState(TxStates.TX_NONE)
bid.xmr_b_lock_tx.setState(TxStates.TX_SENT)
self.logBidEvent(bid.bid_id, EventLogTypes.LOCK_TX_B_PUBLISHED, '', session)
self.saveBidInSession(bid_id, bid, session, xmr_swap, save_in_progress=offer)

6
basicswap/basicswap_util.py
View File

@ -111,6 +111,8 @@ class TxStates(IntEnum):
TX_CONFIRMED = auto()
TX_REDEEMED = auto()
TX_REFUNDED = auto()
TX_IN_MEMPOOL = auto()
TX_IN_CHAIN = auto()
class TxTypes(IntEnum):
@ -323,6 +325,10 @@ def strTxState(state):
return 'Redeemed'
if state == TxStates.TX_REFUNDED:
return 'Refunded'
if state == TxStates.TX_IN_MEMPOOL:
return 'In Mempool'
if state == TxStates.TX_IN_CHAIN:
return 'In Chain'
return 'Unknown'