From 5e5bf311564d5b09abb3fbbeeb41c1537ebe2393 Mon Sep 17 00:00:00 2001
From: tecnovert <tecnovert@tecnovert.net>
Date: Wed, 20 Jan 2021 01:28:29 +0200
Subject: [PATCH] Don't describe state for xmr style swaps.

---
 basicswap/templates/offer.html                | 11 +++-
 basicswap/ui.py                               | 57 ++++++++++---------
 .../basicswap/extended/test_xmr_persistent.py | 15 +++--
 3 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/basicswap/templates/offer.html b/basicswap/templates/offer.html
index 9efbe74..cb8a967 100644
--- a/basicswap/templates/offer.html
+++ b/basicswap/templates/offer.html
@@ -37,12 +37,17 @@
 {% endif %}
 </table>
 
-
-
 <form method="post">
 {% if data.show_bid_form %}
 <br/><h4>New Bid</h4>
-<p>You will send {{ data.amt_to }} {{ data.tla_to }} and receive {{ data.amt_from }} {{ data.tla_from }} (excluding {{ data.amt_from_lock_spend_tx_fee }} {{ data.tla_from }} in tx fees). </p>
+<p>You will send {{ data.amt_to }} {{ data.tla_to }} and receive {{ data.amt_from }} {{ data.tla_from }}
+{% if data.xmr_type == true %}
+ (excluding {{ data.amt_from_lock_spend_tx_fee }} {{ data.tla_from }} in tx fees).
+{% else %}
+ (excluding a tx fee).
+{% endif %}
+</p>
+
 <table>
 <tr><td>Send From Address</td><td>
 <select name="addr_from">
diff --git a/basicswap/ui.py b/basicswap/ui.py
index 6151a43..ceca83c 100644
--- a/basicswap/ui.py
+++ b/basicswap/ui.py
@@ -92,33 +92,36 @@ def describeBid(swap_client, bid, xmr_swap, offer, xmr_offer, bid_events, edit_b
     ticker_from = ci_from.ticker()
     ticker_to = ci_to.ticker()
 
-    if bid.state == BidStates.BID_SENT:
-        state_description = 'Waiting for seller to accept.'
-    elif bid.state == BidStates.BID_RECEIVED:
-        state_description = 'Waiting for seller to accept.'
-    elif bid.state == BidStates.BID_ACCEPTED:
-        if not bid.initiate_tx:
-            state_description = 'Waiting for seller to send initiate tx.'
-        else:
-            state_description = 'Waiting for initiate tx to confirm.'
-    elif bid.state == BidStates.SWAP_INITIATED:
-        state_description = 'Waiting for participate txn to be confirmed in {} chain'.format(ticker_to)
-    elif bid.state == BidStates.SWAP_PARTICIPATING:
-        state_description = 'Waiting for initiate txn to be spent in {} chain'.format(ticker_from)
-    elif bid.state == BidStates.SWAP_COMPLETED:
-        state_description = 'Swap completed'
-        if bid.getITxState() == TxStates.TX_REDEEMED and bid.getPTxState() == TxStates.TX_REDEEMED:
-            state_description += ' successfully'
-        else:
-            state_description += ', ITX ' + strTxState(bid.getITxState()) + ', PTX ' + strTxState(bid.getPTxState())
-    elif bid.state == BidStates.SWAP_TIMEDOUT:
-        state_description = 'Timed out waiting for initiate txn'
-    elif bid.state == BidStates.BID_ABANDONED:
-        state_description = 'Bid abandoned'
-    elif bid.state == BidStates.BID_ERROR:
-        state_description = bid.state_note
-    else:
-        state_description = ''
+    state_description = ''
+    if offer.swap_type == SwapTypes.SELLER_FIRST:
+        if bid.state == BidStates.BID_SENT:
+            state_description = 'Waiting for seller to accept.'
+        elif bid.state == BidStates.BID_RECEIVED:
+            state_description = 'Waiting for seller to accept.'
+        elif bid.state == BidStates.BID_ACCEPTED:
+            if not bid.initiate_tx:
+                state_description = 'Waiting for seller to send initiate tx.'
+            else:
+                state_description = 'Waiting for initiate tx to confirm.'
+        elif bid.state == BidStates.SWAP_INITIATED:
+            state_description = 'Waiting for participate txn to be confirmed in {} chain'.format(ticker_to)
+        elif bid.state == BidStates.SWAP_PARTICIPATING:
+            if bid.was_sent:
+                state_description = 'Waiting for participate txn to be spent in {} chain'.format(ticker_to)
+            else:
+                state_description = 'Waiting for initiate txn to be spent in {} chain'.format(ticker_from)
+        elif bid.state == BidStates.SWAP_COMPLETED:
+            state_description = 'Swap completed'
+            if bid.getITxState() == TxStates.TX_REDEEMED and bid.getPTxState() == TxStates.TX_REDEEMED:
+                state_description += ' successfully'
+            else:
+                state_description += ', ITX ' + strTxState(bid.getITxState()) + ', PTX ' + strTxState(bid.getPTxState())
+        elif bid.state == BidStates.SWAP_TIMEDOUT:
+            state_description = 'Timed out waiting for initiate txn'
+        elif bid.state == BidStates.BID_ABANDONED:
+            state_description = 'Bid abandoned'
+        elif bid.state == BidStates.BID_ERROR:
+            state_description = bid.state_note
 
     data = {
         'amt_from': ci_from.format_amount(bid.amount),
diff --git a/tests/basicswap/extended/test_xmr_persistent.py b/tests/basicswap/extended/test_xmr_persistent.py
index 5cddd2d..7af6e65 100644
--- a/tests/basicswap/extended/test_xmr_persistent.py
+++ b/tests/basicswap/extended/test_xmr_persistent.py
@@ -68,6 +68,8 @@ UI_PORT = 12700 + PORT_OFS
 BASE_PART_RPC_PORT = 19792
 BASE_BTC_RPC_PORT = 19796
 
+NUM_NODES = 3
+
 logger = logging.getLogger()
 logger.level = logging.DEBUG
 if not len(logger.handlers):
@@ -109,7 +111,7 @@ class Test(unittest.TestCase):
 
         random.seed(time.time())
 
-        for i in range(3):
+        for i in range(NUM_NODES):
             client_path = os.path.join(test_path, 'client{}'.format(i))
             config_path = os.path.join(client_path, cfg.CONFIG_FILENAME)
             if RESET_TEST:
@@ -152,7 +154,7 @@ class Test(unittest.TestCase):
                     fp.write('minstakeinterval=5\n')
                     salt = generate_salt(16)
                     fp.write('rpcauth={}:{}${}\n'.format('test_part_' + str(i), salt, password_to_hmac(salt, 'test_part_pwd_' + str(i))))
-                    for ip in range(3):
+                    for ip in range(NUM_NODES):
                         if ip != i:
                             fp.write('connect=127.0.0.1:{}\n'.format(PARTICL_PORT_BASE + ip + PORT_OFS))
 
@@ -171,14 +173,14 @@ class Test(unittest.TestCase):
                     fp.write('upnp=0\n')
                     salt = generate_salt(16)
                     fp.write('rpcauth={}:{}${}\n'.format('test_btc_' + str(i), salt, password_to_hmac(salt, 'test_btc_pwd_' + str(i))))
-                    for ip in range(3):
+                    for ip in range(NUM_NODES):
                         if ip != i:
                             fp.write('connect=127.0.0.1:{}\n'.format(BITCOIN_PORT_BASE + ip + PORT_OFS))
 
                 with open(os.path.join(client_path, 'monero', 'monerod.conf'), 'a') as fp:
                     fp.write('p2p-bind-ip=127.0.0.1\n')
                     fp.write('p2p-bind-port={}\n'.format(XMR_BASE_P2P_PORT + i + PORT_OFS))
-                    for ip in range(3):
+                    for ip in range(NUM_NODES):
                         if ip != i:
                             fp.write('add-exclusive-node=127.0.0.1:{}\n'.format(XMR_BASE_P2P_PORT + ip + PORT_OFS))
 
@@ -220,7 +222,7 @@ class Test(unittest.TestCase):
     def start_processes(self):
         self.delay_event.clear()
 
-        for i in range(3):
+        for i in range(NUM_NODES):
             self.processes.append(multiprocessing.Process(target=self.run_thread, args=(i,)))
             self.processes[-1].start()
 
@@ -243,6 +245,9 @@ class Test(unittest.TestCase):
             callbtcrpc(0, 'generatetoaddress', [num_blocks, self.btc_addr])
         logging.info('BTC blocks: %d', callbtcrpc(0, 'getblockchaininfo')['blocks'])
 
+        # Lower output split threshold for more stakeable outputs
+        for i in range(NUM_NODES):
+            callpartrpc(i, 'walletsettings', ['stakingoptions', {'stakecombinethreshold': 100, 'stakesplitthreshold': 200}])
         self.update_thread = threading.Thread(target=updateThread, args=(self,))
         self.update_thread.start()