mirror of
https://github.com/basicswap/basicswap.git
synced 2024-12-22 19:49:20 +00:00
Show depth spendable when lock tx B confirming.
This commit is contained in:
parent
037851a002
commit
4942f23de6
3 changed files with 14 additions and 8 deletions
|
@ -8770,7 +8770,7 @@ class BasicSwap(BaseApp):
|
|||
lock_tx_depth = (chain_height - bid.xmr_b_lock_tx.chain_height) + 1
|
||||
if lock_tx_depth < ci_to.depth_spendable():
|
||||
raise TemporaryError(
|
||||
f"Chain B lock tx depth {lock_tx_depth} < required for spending."
|
||||
f"Chain B lock tx still confirming {lock_tx_depth} / {ci_to.depth_spendable()}."
|
||||
)
|
||||
|
||||
if TxTypes.BCH_MERCY in bid.txns:
|
||||
|
@ -8857,9 +8857,7 @@ class BasicSwap(BaseApp):
|
|||
):
|
||||
delay = self.get_delay_retry_seconds()
|
||||
self.log.info(
|
||||
"Retrying sending adaptor-sig swap chain B spend tx for bid %s in %d seconds",
|
||||
bid_id.hex(),
|
||||
delay,
|
||||
f"Retrying sending adaptor-sig swap chain B spend tx for bid {bid_id.hex()} in {delay} seconds"
|
||||
)
|
||||
self.createActionInSession(
|
||||
delay, ActionTypes.REDEEM_XMR_SWAP_LOCK_TX_B, bid_id, cursor
|
||||
|
|
|
@ -1520,7 +1520,9 @@ def printVersion(with_coins):
|
|||
if len(with_coins) < 1:
|
||||
return
|
||||
print("Core versions:")
|
||||
with_coins_changed: bool = False if len(with_coins) == 1 and "particl" in with_coins else True
|
||||
with_coins_changed: bool = (
|
||||
False if len(with_coins) == 1 and "particl" in with_coins else True
|
||||
)
|
||||
for coin, version in known_coins.items():
|
||||
if with_coins_changed and coin not in with_coins:
|
||||
continue
|
||||
|
|
|
@ -163,7 +163,9 @@ def parseOfferFormData(swap_client, form_data, page_data, options={}):
|
|||
if swap_client.debug:
|
||||
page_data["amt_var"] = True if have_data_entry(form_data, "amt_var") else False
|
||||
parsed_data["amt_var"] = page_data["amt_var"]
|
||||
page_data["rate_var"] = True if have_data_entry(form_data, "rate_var") else False
|
||||
page_data["rate_var"] = (
|
||||
True if have_data_entry(form_data, "rate_var") else False
|
||||
)
|
||||
parsed_data["rate_var"] = page_data["rate_var"]
|
||||
else:
|
||||
page_data["amt_var"] = True
|
||||
|
@ -634,7 +636,11 @@ def page_offer(self, url_split, post_string):
|
|||
swap_client.editOffer(offer_id, change_data)
|
||||
elif b"newbid" in form_data:
|
||||
show_bid_form = True
|
||||
elif b"sendbid" in form_data and b"confirm" in form_data and b"formid" in form_data:
|
||||
elif (
|
||||
b"sendbid" in form_data
|
||||
and b"confirm" in form_data
|
||||
and b"formid" in form_data
|
||||
):
|
||||
try:
|
||||
addr_from = form_data[b"addr_from"][0].decode("utf-8")
|
||||
extend_data["nb_addr_from"] = addr_from
|
||||
|
@ -719,7 +725,7 @@ def page_offer(self, url_split, post_string):
|
|||
"active_ind": offer.active_ind,
|
||||
"swap_type": strSwapDesc(offer.swap_type),
|
||||
"reverse": reverse_bid,
|
||||
"form_id": get_data_entry_or(form_data, "formid", "") if form_data else ""
|
||||
"form_id": get_data_entry_or(form_data, "formid", "") if form_data else "",
|
||||
}
|
||||
data.update(extend_data)
|
||||
|
||||
|
|
Loading…
Reference in a new issue