Merge pull request #306 from tecnovert/sip

UI: Improve swaps in progress.

basicswap/js_server.py

@@ -999,6 +999,16 @@ def js_active(self, url_split, post_string, is_json) -> bytes:
     try:
         for bid_id, (bid, offer) in list(swap_client.swaps_in_progress.items()):
             try:
+                ci_from = swap_client.ci(offer.coin_from)
+                ci_to = swap_client.ci(offer.coin_to)
+                if offer.bid_reversed:
+                    amount_from: int = bid.amount_to
+                    amount_to: int = bid.amount
+                    bid_rate: int = ci_from.make_int(amount_to / amount_from, r=1)
+                else:
+                    amount_from: int = bid.amount
+                    amount_to: int = bid.amount_to
+                    bid_rate: int = bid.rate
                 swap_data = {
                     "bid_id": bid_id.hex(),
                     "offer_id": offer.offer_id.hex(),
@@ -1007,15 +1017,13 @@ def js_active(self, url_split, post_string, is_json) -> bytes:
                     "bid_state": strBidState(bid.state),
                     "tx_state_a": None,
                     "tx_state_b": None,
-                    "coin_from": swap_client.ci(offer.coin_from).coin_name(),
+                    "coin_from": ci_from.coin_name(),
-                    "coin_to": swap_client.ci(offer.coin_to).coin_name(),
+                    "coin_to": ci_to.coin_name(),
-                    "amount_from": swap_client.ci(offer.coin_from).format_amount(
+                    "amount_from": ci_from.format_amount(amount_from),
-                        bid.amount
+                    "amount_to": ci_to.format_amount(amount_to),
-                    ),
+                    "rate": bid_rate,
-                    "amount_to": swap_client.ci(offer.coin_to).format_amount(
-                        bid.amount_to
-                    ),
                     "addr_from": bid.bid_addr if bid.was_received else offer.addr_from,
+                    "was_sent": bid.was_sent,
                 }
 
                 if offer.swap_type == SwapTypes.XMR_SWAP:
@@ -1033,9 +1041,6 @@ def js_active(self, url_split, post_string, is_json) -> bytes:
                     swap_data["tx_state_a"] = bid.getITxState()
                     swap_data["tx_state_b"] = bid.getPTxState()
 
-                if hasattr(bid, "rate"):
-                    swap_data["rate"] = bid.rate
-
                 all_bids.append(swap_data)
 
             except Exception:

basicswap/static/js/swaps_in_progress.js

@@ -298,7 +298,28 @@ const createSwapTableRow = async (swap) => {
     const timeColor = getTimeStrokeColor(swap.expire_at);
     const fromAmount = parseFloat(swap.amount_from) || 0;
     const toAmount = parseFloat(swap.amount_to) || 0;
+    let send_column = "";
+    let recv_column = "";
+    if (swap.was_sent) {
+        send_column = `
+            <div class="text-sm font-semibold">${fromAmount.toFixed(8)}</div>
+            <div class="text-sm text-gray-500 dark:text-gray-400">${fromSymbol}</div>
+        `
+        recv_column = `
+            <div class="text-sm font-semibold">${toAmount.toFixed(8)}</div>
+            <div class="text-sm text-gray-500 dark:text-gray-400">${toSymbol}</div>
+        `
+    } else {
+        send_column = `
+            <div class="text-sm font-semibold">${toAmount.toFixed(8)}</div>
+            <div class="text-sm text-gray-500 dark:text-gray-400">${toSymbol}</div>
+        `
+        recv_column = `
+            <div class="text-sm font-semibold">${fromAmount.toFixed(8)}</div>
+            <div class="text-sm text-gray-500 dark:text-gray-400">${fromSymbol}</div>
 
+        `
+    }
     return `
         <tr class="relative opacity-100 text-gray-500 dark:text-gray-100 hover:bg-coolGray-200 dark:hover:bg-gray-600" data-bid-id="${swap.bid_id}">
             <td class="relative w-0 p-0 m-0">
@@ -356,8 +377,7 @@ const createSwapTableRow = async (swap) => {
                 <div class="py-3 px-4 text-left">
                     <div class="items-center monospace">
                         <div class="pr-2">
-                            <div class="text-sm font-semibold">${fromAmount.toFixed(8)}</div>
+                            ${send_column}
-                            <div class="text-sm text-gray-500 dark:text-gray-400">${fromSymbol}</div>
                         </div>
                     </div>
                 </div>
@@ -390,8 +410,7 @@ const createSwapTableRow = async (swap) => {
             <td class="py-0">
                 <div class="py-3 px-4 text-right">
                     <div class="items-center monospace">
-                        <div class="text-sm font-semibold">${toAmount.toFixed(8)}</div>
+                        ${recv_column}
-                        <div class="text-sm text-gray-500 dark:text-gray-400">${toSymbol}</div>
                     </div>
                 </div>
             </td>

tests/basicswap/selenium/test_swap_direction.py

@@ -7,6 +7,7 @@
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
 import logging
+import sys
 import time
 
 from tests.basicswap.util import (
@@ -16,17 +17,27 @@ from util import get_driver
 from selenium.webdriver.common.by import By
 
 
-def clear_offers(port) -> None:
+logger = logging.getLogger()
-    logging.info(f"clear_offers {port}")
+logger.level = logging.INFO
-    offers = read_json_api(port, "offers")
+if not len(logger.handlers):
+    logger.addHandler(logging.StreamHandler(sys.stdout))
 
+
+def clear_offers(port_list) -> None:
+    logger.info(f"clear_offers {port_list}")
+
+    for port in port_list:
+        offers = read_json_api(port, "offers")
         for offer in offers:
             read_json_api(port, "revokeoffer/{}".format(offer["offer_id"]))
 
-    for i in range(20):
+    for i in range(30):
         time.sleep(1)
+        offers_sum: int = 0
+        for port in port_list:
             offers = read_json_api(port, "offers")
-        if len(offers) == 0:
+            offers_sum += len(offers)
+        if offers_sum == 0:
             return
     raise ValueError("clear_offers failed")
 
@@ -37,8 +48,7 @@ def test_swap_dir(driver):
     node1_url = f"http://localhost:{node_1_port}"
     node2_url = f"http://localhost:{node_2_port}"
 
-    clear_offers(node_1_port)
+    clear_offers((node_1_port, node_2_port))
-    clear_offers(node_2_port)
 
     offer_data = {
         "addr_from": -1,
@@ -47,6 +57,7 @@ def test_swap_dir(driver):
         "amt_from": 1,
         "amt_to": 2,
         "lockhrs": 24,
+        "automation_strat_id": 1,
     }
     rv = read_json_api(node_1_port, "offers/new", offer_data)
     offer_1_id = rv["offer_id"]
@@ -58,31 +69,55 @@ def test_swap_dir(driver):
         "amt_from": 3,
         "amt_to": 4,
         "lockhrs": 24,
+        "automation_strat_id": 1,
     }
     rv = read_json_api(node_1_port, "offers/new", offer_data)
     offer_2_id = rv["offer_id"]
 
-    # Wait for offer to propagate
+    offer_data = {
+        "addr_from": -1,
+        "coin_from": "XMR",
+        "coin_to": "PART",
+        "amt_from": 5,
+        "amt_to": 6,
+        "lockhrs": 24,
+        "automation_strat_id": 1,
+    }
+    rv = read_json_api(node_2_port, "offers/new", offer_data)
+    offer_3_id = rv["offer_id"]
+
+    # Wait for offers to propagate
+    for i in range(1000):
         offers_1 = read_json_api(node_1_port, "offers")
+        if len(offers_1) >= 3:
+            break
+        time.sleep(0.1)
+    assert len(offers_1) >= 3
 
     for offer in offers_1:
         if offer["offer_id"] == offer_1_id:
             assert offer["coin_to"] == "Monero"
         elif offer["offer_id"] == offer_2_id:
             assert offer["coin_to"] == "Bitcoin"
+        elif offer["offer_id"] == offer_3_id:
+            assert offer["coin_to"] == "Particl"
         else:
             raise ValueError("Unknown offer id")
 
+    for i in range(1000):
         offers_2 = read_json_api(node_2_port, "offers")
-    while len(offers_2) < 1:
+        if len(offers_2) >= 3:
-        offers_2 = read_json_api(node_2_port, "offers")
+            break
         time.sleep(0.1)
+    assert len(offers_2) >= 3
 
     for offer in offers_2:
         if offer["offer_id"] == offer_1_id:
             assert offer["coin_to"] == "Monero"
         elif offer["offer_id"] == offer_2_id:
             assert offer["coin_to"] == "Bitcoin"
+        elif offer["offer_id"] == offer_3_id:
+            assert offer["coin_to"] == "Particl"
         else:
             raise ValueError("Unknown offer id")
 
@@ -101,11 +136,12 @@ def test_swap_dir(driver):
                         for td in row.find_elements(By.XPATH, ".//td")
                     ]
                 )
+            if len(found_rows) >= 3:
                 break
         except Exception as e:
             print(e)
 
-    assert len(found_rows) == 2
+    assert len(found_rows) == 3
     for row in found_rows:
         if offer_1_id in row[0]:
             loc_xmr = row[5].find("Monero")
@@ -117,6 +153,11 @@ def test_swap_dir(driver):
             loc_part = row[5].find("Particl")
             assert loc_btc < loc_part
             assert "Edit" in row[9]
+        elif offer_3_id in row[0]:
+            loc_xmr = row[5].find("Monero")
+            loc_part = row[5].find("Particl")
+            assert loc_part < loc_xmr
+            assert "Swap" in row[9]
         else:
             raise ValueError("Unknown offer id")
 
@@ -139,7 +180,7 @@ def test_swap_dir(driver):
         except Exception as e:
             print(e)
 
-    assert len(found_rows) == 2
+    assert len(found_rows) == 3
     for row in found_rows:
         if offer_1_id in row[0]:
             assert ("Monero") in row[5]
@@ -152,9 +193,193 @@ def test_swap_dir(driver):
             loc_part = row[5].find("Particl")
             assert loc_btc < loc_part
             assert "Swap" in row[9]
+        elif offer_3_id in row[0]:
+            loc_xmr = row[5].find("Monero")
+            loc_part = row[5].find("Particl")
+            assert loc_part < loc_xmr
+            assert "Edit" in row[9]
         else:
             raise ValueError("Unknown offer id")
 
+    bid_data = {
+        "offer_id": offer_1_id,
+        "amount_from": 1,
+    }
+    rv = read_json_api(node_2_port, "bids/new", bid_data)
+    bid_1_id = rv["bid_id"]
+    bid_data = {
+        "offer_id": offer_3_id,
+        "amount_from": 5,
+    }
+    rv = read_json_api(node_1_port, "bids/new", bid_data)
+    bid_3_id = rv["bid_id"]
+
+    bid_ids = [bid_1_id, bid_3_id]
+    # Wait for bids to propagate
+    for i in range(1000):
+        num_found: int = 0
+        for bid_id in bid_ids:
+            bid = read_json_api(node_1_port, f"bids/{bid_id}")
+            if "error" not in bid:
+                num_found += 1
+        if num_found >= 2:
+            break
+        time.sleep(0.5)
+    assert num_found >= 2
+
+    for i in range(1000):
+        num_found: int = 0
+        for bid_id in bid_ids:
+            bid = read_json_api(node_2_port, f"bids/{bid_id}")
+            if "error" not in bid:
+                num_found += 1
+        if num_found >= 2:
+            break
+        time.sleep(0.5)
+    assert num_found >= 2
+
+    driver.get(f"{node1_url}/bid/{bid_1_id}")
+    td_sent = driver.find_element(
+        "xpath", "//td[contains(text(), 'Sent')]/following-sibling::td"
+    )
+    assert "False" in td_sent.get_attribute("innerHTML")
+    td_ys = driver.find_element(
+        "xpath", "//td[contains(text(), 'You Send')]/following-sibling::td"
+    )
+    assert "Particl" in td_ys.get_attribute("innerHTML")
+    td_yg = driver.find_element(
+        "xpath", "//td[contains(text(), 'You Get')]/following-sibling::td"
+    )
+    assert "Monero" in td_yg.get_attribute("innerHTML")
+
+    driver.get(f"{node2_url}/bid/{bid_1_id}")
+    td_sent = driver.find_element(
+        "xpath", "//td[contains(text(), 'Sent')]/following-sibling::td"
+    )
+    assert "True" in td_sent.get_attribute("innerHTML")
+    td_ys = driver.find_element(
+        "xpath", "//td[contains(text(), 'You Send')]/following-sibling::td"
+    )
+    assert "Monero" in td_ys.get_attribute("innerHTML")
+    td_yg = driver.find_element(
+        "xpath", "//td[contains(text(), 'You Get')]/following-sibling::td"
+    )
+    assert "Particl" in td_yg.get_attribute("innerHTML")
+
+    driver.get(f"{node1_url}/bid/{bid_3_id}")
+    td_sent = driver.find_element(
+        "xpath", "//td[contains(text(), 'Sent')]/following-sibling::td"
+    )
+    assert "True" in td_sent.get_attribute("innerHTML")
+    td_ys = driver.find_element(
+        "xpath", "//td[contains(text(), 'You Send')]/following-sibling::td"
+    )
+    assert "Particl" in td_ys.get_attribute("innerHTML")
+    td_yg = driver.find_element(
+        "xpath", "//td[contains(text(), 'You Get')]/following-sibling::td"
+    )
+    assert "Monero" in td_yg.get_attribute("innerHTML")
+
+    driver.get(f"{node2_url}/bid/{bid_3_id}")
+    td_sent = driver.find_element(
+        "xpath", "//td[contains(text(), 'Sent')]/following-sibling::td"
+    )
+    assert "False" in td_sent.get_attribute("innerHTML")
+    td_ys = driver.find_element(
+        "xpath", "//td[contains(text(), 'You Send')]/following-sibling::td"
+    )
+    assert "Monero" in td_ys.get_attribute("innerHTML")
+    td_yg = driver.find_element(
+        "xpath", "//td[contains(text(), 'You Get')]/following-sibling::td"
+    )
+    assert "Particl" in td_yg.get_attribute("innerHTML")
+
+    logger.info(f"Waiting for {node1_url}/active")
+    driver.get(f"{node1_url}/active")
+    bid_rows = dict()
+    for i in range(120):
+        try:
+            bid_rows = dict()
+            table = driver.find_element(By.XPATH, "//tbody[@id='active-swaps-body']")
+            for row in table.find_elements(By.XPATH, ".//tr"):
+                tds = row.find_elements(By.XPATH, ".//td")
+                td_details = tds[2]
+                td_send = tds[5]
+                td_recv = tds[3]
+                td_send_amount = td_send.find_element(
+                    By.XPATH, ".//div[contains(@class, 'font-semibold')]"
+                )
+                td_recv_amount = td_recv.find_element(
+                    By.XPATH, ".//div[contains(@class, 'font-semibold')]"
+                )
+                row_data = (
+                    td_send.get_attribute("innerHTML"),
+                    td_send_amount.get_attribute("innerHTML"),
+                    td_recv.get_attribute("innerHTML"),
+                    td_recv_amount.get_attribute("innerHTML"),
+                )
+                if bid_1_id in td_details.get_attribute("innerHTML"):
+                    bid_rows[bid_1_id] = row_data
+                elif bid_3_id in td_details.get_attribute("innerHTML"):
+                    bid_rows[bid_3_id] = row_data
+            if len(bid_rows) >= 2:
+                break
+        except Exception as e:
+            print(e)
+        time.sleep(2)
+    assert "PART" in bid_rows[bid_1_id][0]
+    assert float(bid_rows[bid_1_id][1]) == 1.0
+    assert "XMR" in bid_rows[bid_1_id][2]
+    assert float(bid_rows[bid_1_id][3]) == 2.0
+
+    assert "PART" in bid_rows[bid_3_id][0]
+    assert float(bid_rows[bid_3_id][1]) == 6.0
+    assert "XMR" in bid_rows[bid_3_id][2]
+    assert float(bid_rows[bid_3_id][3]) == 5.0
+
+    logger.info(f"Waiting for {node2_url}/active")
+    driver.get(f"{node2_url}/active")
+    bid_rows = dict()
+    for i in range(120):
+        try:
+            bid_rows = dict()
+            table = driver.find_element(By.XPATH, "//tbody[@id='active-swaps-body']")
+            for row in table.find_elements(By.XPATH, ".//tr"):
+                tds = row.find_elements(By.XPATH, ".//td")
+                td_details = tds[2]
+                td_send = tds[5]
+                td_recv = tds[3]
+                td_send_amount = td_send.find_element(
+                    By.XPATH, ".//div[contains(@class, 'font-semibold')]"
+                )
+                td_recv_amount = td_recv.find_element(
+                    By.XPATH, ".//div[contains(@class, 'font-semibold')]"
+                )
+                row_data = (
+                    td_send.get_attribute("innerHTML"),
+                    td_send_amount.get_attribute("innerHTML"),
+                    td_recv.get_attribute("innerHTML"),
+                    td_recv_amount.get_attribute("innerHTML"),
+                )
+                if bid_1_id in td_details.get_attribute("innerHTML"):
+                    bid_rows[bid_1_id] = row_data
+                elif bid_3_id in td_details.get_attribute("innerHTML"):
+                    bid_rows[bid_3_id] = row_data
+            if len(bid_rows) >= 2:
+                break
+        except Exception as e:
+            print(e)
+        time.sleep(2)
+    assert "XMR" in bid_rows[bid_1_id][0]
+    assert float(bid_rows[bid_1_id][1]) == 2.0
+    assert "PART" in bid_rows[bid_1_id][2]
+    assert float(bid_rows[bid_1_id][3]) == 1.0
+
+    assert "XMR" in bid_rows[bid_3_id][0]
+    assert float(bid_rows[bid_3_id][1]) == 5.0
+    assert "PART" in bid_rows[bid_3_id][2]
+    assert float(bid_rows[bid_3_id][3]) == 6.0
+
     print("Test Passed!")