UI: Improve Adding/deleting recipients in Send , and move the recipient to a webcomponent

.cirrus.yml

@@ -70,7 +70,7 @@ test_task:
 
 cypress_test_task:
   container:
-    image: registry.gitlab.com/cryptoadvance/specter-desktop/cypress-python:v9.5.4
+    image: registry.gitlab.com/cryptoadvance/specter-desktop/cypress-python:v9.7.0
     cpu: 6
     memory: 6G
   pre_prep_script: 

.gitignore

@@ -39,3 +39,4 @@ tests/elements
 signing_dir
 site
 docs/README.md
+cypresstest-output.xml

cypress.json

@@ -25,5 +25,4 @@
       "mochaFile": "cypresstest-output.xml",
       "toConsole": true
     }
-
 }

cypress/integration/spec_elm_single_segwit_wallet.js

@@ -37,11 +37,6 @@ describe('Operating with an elements singlesig wallet', () => {
                 expect(newBalance).to.be.lte(oldBalance - 1.5)
             })
         })
-
-        // Workaround: Transaction does not disappear
-        cy.get('#btn_send').click()
-        // The "delete" button in the first psbt
-        cy.get('.row > :nth-child(2) > .btn').click()
     })
 
     it('send unconfidential transaction from segwit', () => {
@@ -83,11 +78,6 @@ describe('Operating with an elements singlesig wallet', () => {
                 expect(newBalance).to.be.lte(oldBalance - 1.5)
             })
         })
-
-        // Workaround: Transaction does not disappear
-        cy.get('#btn_send').click()
-        // The "delete" button in the first psbt
-        cy.get('.row > :nth-child(2) > .btn').click()
     })
 
     it('send unconfidential transaction from nested segwit', () => {

cypress/integration/spec_ghost_machine.js

@@ -3,6 +3,6 @@ describe('Ghost machine', () => {
         cy.viewport(1200,660)
         cy.visit('/')
         cy.addDevice('DIY ghost', 'Specter-DIY', 'ghost_machine')
-        cy.addWallet('Ghost wallet', null, 'segwit', 'funded', 'btc')
+        cy.addWallet('Ghost wallet', 'segwit', 'funded', 'btc', 'singlesig', 'DIY ghost')
     })
 })

cypress/integration/spec_rescan.js

@@ -13,7 +13,7 @@ describe('Test the UI related to a blockchain rescan', () => {
     it('Go to the rescan section from a fresh wallet', () => {
         // Create a completely fresh wallet which is not receiving funds from the continous mining
         cy.addDevice('Trezor hold', 'Trezor', 'hold_accident')
-        cy.addWallet('Fresh wallet', 'Trezor hold', 'segwit', false)
+        cy.addWallet('Fresh wallet', 'segwit', false, 'btc', 'singlesig', 'Trezor hold')
         cy.get('#btn_transactions').click()
         cy.get('#go-to-rescan-btn').click()
         cy.get('#blockchain-rescan').should('be.visible')

cypress/integration/spec_wallet_utxo.js

@@ -98,8 +98,8 @@ describe('Test the actions in UTXO list', () => {
 
     it('Managing unsigned transactions', () => {
         // Make an unsigned tx
-        cy.get('#address_0').type("bcrt1qvtdx75y4554ngrq6aff3xdqnvjhmct5wck95qs") // address from "Ghost wallet"
-        cy.get('#send_max_0').click()
+        cy.get('#recipient_0').find('#address').type("bcrt1qvtdx75y4554ngrq6aff3xdqnvjhmct5wck95qs") // address from "Ghost wallet"
+        cy.get('#recipient_0').get('#send_max').click()
         cy.get('#create_psbt_btn').click()
         // Check the labeling of the unsigned UTXO
         cy.log("Check the labeling of the unsigned UTXO")

cypress/support/commands.js

@@ -61,12 +61,8 @@ Cypress.Commands.add("addDevice", (name, device_type, mnemonic) => {
 Cypress.Commands.add("addHotDevice", (name, node_type) => { 
   // node_type is either elements or bitcoin
   cy.get('body').then(($body) => {
-      cy.task("delete:elements-hotwallet")
       if ($body.text().includes(name)) {
-        cy.get('#toggle_devices_list').click()
-        var refName = "#device_list_item_"+name.toLowerCase().replace(/ /g,"_")
-        cy.get(refName).click( {force: true} )
-        cy.get('#forget_device').click()
+        cy.deleteDevice(name)
         // We might get an error here, if the device is used in a wallet
         // We assume therefore that this is ok (see below)
       } 
@@ -149,40 +145,60 @@ Cypress.Commands.add("addHotWallet", (wallet_name, device_name, node_type, walle
     })
 })
 
-Cypress.Commands.add("addWallet", (wallet_name, device_name, wallet_type, funded, node_type) => { 
-  if (wallet_type == null) {
-    wallet_type = "segwit"
+Cypress.Commands.add("addWallet", (walletName, walletType, funded, nodeType, keyType, deviceNameOne, deviceNameTwo, deviceNameThree) => { 
+  if (walletType == null) {
+    walletType = "segwit"
   }
-  if (device_name == null) {
-    device_name = "DIY ghost"
+  if (deviceNameOne == null) {
+    deviceNameOne = "DIY ghost"
   }
   cy.get('body').then(($body) => {
-      if ($body.text().includes(wallet_name)) {
-        cy.contains(wallet_name).click()
+      if ($body.text().includes(walletName)) {
+        cy.contains(walletName).click()
         cy.get('#btn_settings' ).click( {force: true})
         cy.get('#advanced_settings_tab_btn').click()
         cy.get('#delete_wallet').click()
       }
       cy.get('#side-content').click()
       cy.get('#btn_new_wallet').click()
-      cy.get('[href="./simple/"]').click()
-      var device_button = "#"+device_name.toLowerCase().replace(/ /g,"_")
-      cy.get(device_button).click()
-      cy.get('#wallet_name').type(wallet_name)
-      if (wallet_type == "nested_segwit") {
-        cy.get('#type_nested_segwit_btn').click()
+      if (keyType == 'singlesig') {
+        cy.get('[href="./simple/"]').click()
+        var device_button = "#"+deviceNameOne.toLowerCase().replace(/ /g,"_")
+        cy.get(device_button).click()
+        cy.get('#wallet_name').type(walletName)
+        if (walletType == "nested_segwit") {
+          cy.get('#type_nested_segwit_btn').click()
+        }
+        if (walletType == "taproot") {
+          cy.get('#type_taproot_btn').click()
+        }
       }
-      if (wallet_type == "taproot") {
-        cy.get('#type_taproot_btn').click()
+      // Makes a 2 out 3 multisig
+      else if (keyType == "multisig") {
+        cy.get('[href="./multisig/"]').click()
+        var deviceButtonOne = "#"+deviceNameOne.toLowerCase().replace(/ /g,"_")
+        cy.get(deviceButtonOne).click()
+        var deviceButtonTwo = "#"+deviceNameTwo.toLowerCase().replace(/ /g,"_")
+        cy.get(deviceButtonTwo).click()
+        var deviceButtonThree = "#"+deviceNameThree.toLowerCase().replace(/ /g,"_")
+        cy.get(deviceButtonThree).click()
+        cy.get('#submit-device').click()
+        cy.get('#wallet_name').type(walletName)
+        if (walletType == "nested_segwit") {
+          cy.get('#type_nested_segwit_btn').click()
+        }
+        cy.get(':nth-child(9) > .inline').clear()
+        cy.get(':nth-child(9) > .inline').type(2)
       }
       cy.get('#keysform > .centered').click()
       cy.get('body').contains("New wallet was created successfully!")
-      cy.get('#btn_continue').click()
+      cy.get('#page_overlay_popup_cancel_button').click()
       if (funded) {
-        cy.mine2wallet(node_type)
+        cy.mine2wallet(nodeType)
       }  
     })
 })
+
 Cypress.Commands.add("deleteWallet", (name) => { 
   cy.get('body').then(($body) => {
     if ($body.text().includes(name)) {
@@ -234,9 +250,10 @@ Cypress.Commands.add("mine2wallet", (chain) => {
 // Quick and easy way to fill out the send form and create a psbt
 Cypress.Commands.add("createPsbt", (address, label="a_label", amount=0.01) => { 
   cy.get('#btn_send').click()
-  cy.get('#address_0').type(address)
-  cy.get('#label_0').type(label)
+  // it is not clear why .shadow(), or { includeShadowDom: true } is needed here to find the elements in the ShadowDOM, but not in the other cypresss tests 
+  cy.get('#recipient_0').find('#address', { includeShadowDom: true }).type(address)   
+  cy.get('#recipient_0').find('#label', { includeShadowDom: true }).type(label)
   //cy.get('#send_max_0').click()
-  cy.get('#amount_0').type(amount)
+  cy.get('#recipient_0').find('#amount', { includeShadowDom: true }).type(amount)
   cy.get('#create_psbt_btn').click()
 })

docker/cypress-python/Dockerfile

@@ -10,5 +10,5 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get install  --no-install-recommends -y
 
 WORKDIR /test
 RUN rm -rf node_modules package-lock.json ~/.cache/Cypress
-RUN npm install --save-dev cypress@9.5.4
+RUN npm install --save-dev cypress@9.7.0
 RUN $(npm bin)/cypress verify

docker/cypress-python/Readme.md

@@ -1,7 +1,10 @@
 
 An image, ready to be used with cypress but also provides all the dependencies we need for testing specter-desktop.
+Use versions of cypress as the version part of the tag. So e.g.:
 
 ```
-docker build . -t registry.gitlab.com/cryptoadvance/specter-desktop/cypress-python
-docker push registry.gitlab.com/cryptoadvance/specter-desktop/cypress-python
-```
+docker build . -t registry.gitlab.com/cryptoadvance/specter-desktop/cypress-python:v9.7.0
+docker push registry.gitlab.com/cryptoadvance/specter-desktop/cypress-python:v9.7.0
+```
+
+Search for `cypress-python` on where this is used in the project.

package.json

@@ -12,7 +12,7 @@
     "wait-on": "^5.3.0"
   },
   "devDependencies": {
-    "cypress": "^9.5.4",
+    "cypress": "^9.7.0",
     "cypress-wait-until": "^1.7.1"
   },
   "scripts": {

src/cryptoadvance/specter/commands/psbt_creator.py

@@ -28,8 +28,7 @@ def __init__(
     ):
         """
         * depending of ui_option = (ui|text) Fill the payment-details in either of these:
-          * request_form: expects the payment-details in a dict request_form:
-             { "address_1":"bc1...","btc_amount_1":"0.2", "amount_unit_1":"btc", "label_1":"someLabel","address_2": ...}
+          * request_form: For details on the structure of the data for each recipient (amounts, addresses, etc.) see below at paymentinfo_from_ui
           * recipients_txt: expects the payment-details in textblock "recipients" and recipients_amount_unit for all
             amounts in recipients_txt either "sats" or "btc"
         * in both cases, the request_form also contains:
@@ -135,32 +134,39 @@ def create_psbt(self, wallet):
 
     @classmethod
     def paymentinfo_from_ui(cls, specter, wallet, request_form):
-        """calculates the correct format needed by wallet.createpsbt() out of a request-form
-        returns something like  (addresses, labels, amounts, amount_units) (all arrays)
+        """Calculates the correct format needed by wallet.createpsbt() out of a request form.
+        The recipient_dicts part in the form is a list of dicts and looks like this:
+        [{'unit': 'btc', 'amount': 1, 'btc_amount': 1, 'recipient_id': 0, 'label': '', 'address': 'bcrt1q ... 58qwn'},
+        {'unit': 'btc', 'amount': 2, 'btc_amount': 2, 'recipient_id': 1, 'label': '', 'address': 'bcrt1q ... vaa3p'},
+        {'unit': 'btc', 'amount': 3, 'btc_amount': 3, 'recipient_id': 2, 'label': '', 'address': 'bcrt1q ... n0a85'}]
+
+        Returns (addresses, labels, amounts, amount_units) (all arrays)
         """
-        i = 0
         addresses = []
         labels = []
         amounts = []
         amount_units = []
-        while "address_{}".format(i) in request_form:
-            addresses.append(request_form["address_{}".format(i)])
+
+        recipient_dicts = json.loads(request_form["recipient_dicts"])
+        print(recipient_dicts)
+        for recipient_dict in recipient_dicts:
+            addresses.append(recipient_dict["address"])
             amount = 0.0
             try:
-                amount = float(request_form["btc_amount_{}".format(i)])
+                amount = float(recipient_dict["btc_amount"])
             except ValueError:
                 pass
             if isnan(amount):
                 amount = 0.0
             amounts.append(amount)
-            unit = request_form["amount_unit_{}".format(i)]
+            unit = recipient_dict["unit"]
             if specter.is_liquid and unit in ["sat", "btc"]:
                 unit = specter.default_asset
             amount_units.append(unit)
-            labels.append(request_form["label_{}".format(i)])
-            if request_form["label_{}".format(i)] != "":
-                wallet.setlabel(addresses[i], labels[i])
-            i += 1
+            labels.append(recipient_dict["label"])
+            if recipient_dict["label"] != "":
+                wallet.setlabel(addresses[-1], labels[-1])
+
         return addresses, labels, amounts, amount_units
 
     @classmethod
@@ -170,7 +176,6 @@ def paymentinfo_from_text(
         """calculates the correct format needed by wallet.createpsbt() out of a request-form
         out of a textbox holding addresses and amounts.
         """
-        i = 0
         addresses = []
         labels = []
         amounts = []
@@ -264,7 +269,7 @@ def kwargs_from_request_form(request_form):
         """calculates the needed kwargs fow wallet.createpsbt() out of a request_form"""
         # Who pays the fees?
         subtract = str2bool(request_form.get("subtract", False))
-        subtract_from = int(request_form.get("subtract_from", 1))
+        subtract_from = int(request_form.get("subtract_from", 0))
         fee_option = request_form.get("fee_option")
         fee_rate = None
         if fee_option:
@@ -296,7 +301,7 @@ def kwargs_from_request_form(request_form):
         rbf_tx_id = request_form.get("rbf_tx_id", "")
         kwargs = {
             "subtract": subtract,
-            "subtract_from": subtract_from - 1,
+            "subtract_from": subtract_from,
             "fee_rate": fee_rate,
             "rbf": rbf,
             "selected_coins": selected_coins,
@@ -319,14 +324,14 @@ def kwargs_from_request_json(cls, request_json):
         except JSONDecodeError as e:
             raise SpecterError(f"Error parsing json: {e}")
         subtract = bool(json_data.get("subtract", False))
-        subtract_from = int(json_data.get("subtract_from", 1))
+        subtract_from = int(json_data.get("subtract_from", 0))
 
         fee_rate = float(json_data.get("fee_rate", None))
         rbf = bool(json_data.get("rbf", False))
         rbf_tx_id = json_data.get("rbf_tx_id", "")
         kwargs = {
             "subtract": subtract,
-            "subtract_from": subtract_from - 1,
+            "subtract_from": subtract_from,
             "fee_rate": fee_rate,
             "rbf": rbf,
             "selected_coins": [],

src/cryptoadvance/specter/liquid/addresslist.py

@@ -59,3 +59,6 @@ def get(self, addr, default=None):
             return self[addr]
         except KeyError:
             return default
+        except TypeError:
+            logger.warning(f"{addr} seems to be invalid")
+            return default

src/cryptoadvance/specter/server_endpoints/wallets.py

@@ -462,7 +462,7 @@ def send_new(wallet_alias):
     recipients_txt = ""
     fillform = False
     subtract = False
-    subtract_from = 1
+    subtract_from = 0
     fee_options = "dynamic"
     rbf = not app.specter.is_liquid
     rbf_utxo = []

src/cryptoadvance/specter/server_endpoints/wallets_api.py

@@ -669,6 +669,24 @@ def utxo_csv(wallet_alias):
         return _("Failed to export wallet utxo. Error: {}").format(e), 500
 
 
+@wallets_endpoint_api.route(
+    "/wallet/<wallet_alias>/is_address_mine/<address>", methods=["GET"]
+)
+@login_required
+def is_address_mine(wallet_alias, address):
+    wallet = app.specter.wallet_manager.get_by_alias(wallet_alias)
+
+    # filter out invalid input
+    if (not address) or not isinstance(address, str):
+        return jsonify(False)
+
+    # Segwit addresses are always between 14 and 74 characters long.
+    if len(address) < 14:
+        return jsonify(False)
+
+    return jsonify(wallet.is_address_mine(address))
+
+
 @wallets_endpoint_api.route("/wallet/<wallet_alias>/send/estimatefee", methods=["POST"])
 @login_required
 def estimate_fee(wallet_alias):