From 4ce8c588724c4870cf2ab257dd24e0d7641731a6 Mon Sep 17 00:00:00 2001
From: tecnovert <tecnovert@tecnovert.net>
Date: Mon, 18 Oct 2021 22:28:42 +0200
Subject: [PATCH] ui: Reseed wallet must trigger update

---
 basicswap/basicswap.py      |  8 ++++----
 basicswap/basicswap_util.py | 16 ++++++++++++++++
 basicswap/http_server.py    |  1 +
 basicswap/ui.py             |  6 ++++--
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/basicswap/basicswap.py b/basicswap/basicswap.py
index ed7b1ed..a9334fc 100644
--- a/basicswap/basicswap.py
+++ b/basicswap/basicswap.py
@@ -115,7 +115,8 @@ from .basicswap_util import (
     getVoutByP2WSH,
     replaceAddrPrefix,
     getOfferProofOfFundsHash,
-    getLastBidState)
+    getLastBidState,
+    isActiveBidState)
 
 
 def threadPollChainState(swap_client, coin_type):
@@ -4244,9 +4245,8 @@ class BasicSwap(BaseApp):
         kbsl = self.getPathKey(coin_from, coin_to, bid.created_at, xmr_swap.contract_count, 2, for_ed25519)
         vkbs = ci_to.sumKeys(kbsl, kbsf)
 
-        address_to = ci_to.getMainWalletAddress()
-
         try:
+            address_to = ci_to.getMainWalletAddress()  # TODO: cache main wallet address to reduce network traffic
             txid = ci_to.spendBLockTx(address_to, xmr_swap.vkbv, vkbs, bid.amount_to, xmr_offer.b_fee_rate, xmr_swap.b_restore_height)
             self.log.debug('Submitted lock B spend txn %s to %s chain for bid %s', txid.hex(), ci_to.coin_name(), bid_id.hex())
             self.logBidEvent(bid.bid_id, EventLogTypes.LOCK_TX_B_SPEND_TX_PUBLISHED, '', session)
@@ -4653,7 +4653,7 @@ class BasicSwap(BaseApp):
                     else:
                         self.log.debug('TODO - determine in-progress for manualBidUpdate')
                         if offer.swap_type == SwapTypes.XMR_SWAP:
-                            if bid.state and bid.state in (BidStates.XMR_SWAP_HAVE_SCRIPT_COIN_SPEND_TX, BidStates.XMR_SWAP_SCRIPT_COIN_LOCKED, BidStates.XMR_SWAP_NOSCRIPT_COIN_LOCKED, BidStates.XMR_SWAP_LOCK_RELEASED, BidStates.XMR_SWAP_NOSCRIPT_TX_REDEEMED):
+                            if bid.state and isActiveBidState(bid.state):
                                 activate_bid = True
 
                     if activate_bid:
diff --git a/basicswap/basicswap_util.py b/basicswap/basicswap_util.py
index 8952856..bb82fa8 100644
--- a/basicswap/basicswap_util.py
+++ b/basicswap/basicswap_util.py
@@ -336,3 +336,19 @@ def getLastBidState(packed_states):
         return struct.unpack_from('<i', packed_states[(num_states - 2) * 12:])[0]
     except Exception:
         return BidStates.BID_STATE_UNKNOWN
+
+
+def isActiveBidState(state):
+    if state == BidStates.XMR_SWAP_HAVE_SCRIPT_COIN_SPEND_TX:
+        return True
+    if state == BidStates.XMR_SWAP_SCRIPT_COIN_LOCKED:
+        return True
+    if state == BidStates.XMR_SWAP_NOSCRIPT_COIN_LOCKED:
+        return True
+    if state == BidStates.XMR_SWAP_LOCK_RELEASED:
+        return True
+    if state == BidStates.XMR_SWAP_NOSCRIPT_TX_REDEEMED:
+        return True
+    if state == BidStates.XMR_SWAP_SCRIPT_TX_REDEEMED:
+        return True
+    return False
diff --git a/basicswap/http_server.py b/basicswap/http_server.py
index 3123fdd..cd37f9b 100644
--- a/basicswap/http_server.py
+++ b/basicswap/http_server.py
@@ -240,6 +240,7 @@ class HttpHandler(BaseHTTPRequestHandler):
                         messages.append('Reseed complete ' + str(c))
                     except Exception as ex:
                         messages.append('Reseed failed ' + str(ex))
+                    swap_client.updateWalletsInfo(True, c)
                 elif bytes('withdraw_' + cid, 'utf-8') in form_data:
                     try:
                         value = form_data[bytes('amt_' + cid, 'utf-8')][0].decode('utf-8')
diff --git a/basicswap/ui.py b/basicswap/ui.py
index 45c7ae5..d2c5219 100644
--- a/basicswap/ui.py
+++ b/basicswap/ui.py
@@ -164,6 +164,8 @@ def describeBid(swap_client, bid, xmr_swap, offer, xmr_offer, bid_events, edit_b
         elif bid.state == BidStates.BID_ERROR:
             state_description = bid.state_note
     elif offer.swap_type == SwapTypes.XMR_SWAP:
+        if bid.state == BidStates.BID_SENT:
+            tate_description = 'Waiting for offerer to accept'
         if bid.state == BidStates.BID_RECEIVING:
             # Offerer receiving bid from bidder
             state_description = 'Waiting for bid to be fully received'
@@ -188,9 +190,9 @@ def describeBid(swap_client, bid, xmr_swap, offer, xmr_offer, bid_events, edit_b
             else:
                 state_description = 'Delaying before automated action'
         elif bid.state == BidStates.XMR_SWAP_HAVE_SCRIPT_COIN_SPEND_TX:
-            state_description = f'Waiting for {ticker_from} lock tx to confirm in chain'
+            state_description = f'Waiting for {ticker_from} lock tx to confirm in chain ({ci_from.blocks_confirmed} blocks)'
         elif bid.state == BidStates.XMR_SWAP_SCRIPT_COIN_LOCKED:
-            state_description = f'Waiting for {ticker_to} lock tx to confirm in chain'
+            state_description = f'Waiting for {ticker_to} lock tx to confirm in chain ({ci_to.blocks_confirmed} blocks)'
         elif bid.state == BidStates.XMR_SWAP_NOSCRIPT_COIN_LOCKED:
             state_description = f'Waiting for offerer to unlock {ticker_from} lock tx'
         elif bid.state == BidStates.XMR_SWAP_LOCK_RELEASED: