mirror of
https://github.com/basicswap/basicswap.git
synced 2025-02-26 13:00:35 +00:00
Add tx in mempool and in chain statuses.
This commit is contained in:
parent
c3b33c502e
commit
55ded71686
2 changed files with 12 additions and 1 deletions
basicswap
|
@ -3409,6 +3409,7 @@ class BasicSwap(BaseApp):
|
||||||
chain_height=found_tx['height'],
|
chain_height=found_tx['height'],
|
||||||
)
|
)
|
||||||
bid_changed = True
|
bid_changed = True
|
||||||
|
bid.xmr_b_lock_tx.setState(TxStates.TX_IN_CHAIN)
|
||||||
else:
|
else:
|
||||||
bid.xmr_b_lock_tx.chain_height = found_tx['height']
|
bid.xmr_b_lock_tx.chain_height = found_tx['height']
|
||||||
bid_changed = True
|
bid_changed = True
|
||||||
|
@ -3551,9 +3552,13 @@ class BasicSwap(BaseApp):
|
||||||
if lock_tx_chain_info is None:
|
if lock_tx_chain_info is None:
|
||||||
return rv
|
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:
|
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.logBidEvent(bid.bid_id, EventLogTypes.LOCK_TX_A_SEEN, '', session)
|
||||||
self.setTxBlockInfoFromHeight(ci_from, bid.xmr_a_lock_tx, lock_tx_chain_info['height'])
|
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
|
bid_changed = True
|
||||||
if bid.xmr_a_lock_tx.chain_height != lock_tx_chain_info['height'] and lock_tx_chain_info['height'] != 0:
|
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,
|
txid=b_lock_tx_id,
|
||||||
)
|
)
|
||||||
xmr_swap.b_lock_tx_id = 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.logBidEvent(bid.bid_id, EventLogTypes.LOCK_TX_B_PUBLISHED, '', session)
|
||||||
|
|
||||||
self.saveBidInSession(bid_id, bid, session, xmr_swap, save_in_progress=offer)
|
self.saveBidInSession(bid_id, bid, session, xmr_swap, save_in_progress=offer)
|
||||||
|
|
|
@ -111,6 +111,8 @@ class TxStates(IntEnum):
|
||||||
TX_CONFIRMED = auto()
|
TX_CONFIRMED = auto()
|
||||||
TX_REDEEMED = auto()
|
TX_REDEEMED = auto()
|
||||||
TX_REFUNDED = auto()
|
TX_REFUNDED = auto()
|
||||||
|
TX_IN_MEMPOOL = auto()
|
||||||
|
TX_IN_CHAIN = auto()
|
||||||
|
|
||||||
|
|
||||||
class TxTypes(IntEnum):
|
class TxTypes(IntEnum):
|
||||||
|
@ -323,6 +325,10 @@ def strTxState(state):
|
||||||
return 'Redeemed'
|
return 'Redeemed'
|
||||||
if state == TxStates.TX_REFUNDED:
|
if state == TxStates.TX_REFUNDED:
|
||||||
return 'Refunded'
|
return 'Refunded'
|
||||||
|
if state == TxStates.TX_IN_MEMPOOL:
|
||||||
|
return 'In Mempool'
|
||||||
|
if state == TxStates.TX_IN_CHAIN:
|
||||||
|
return 'In Chain'
|
||||||
return 'Unknown'
|
return 'Unknown'
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue