Ui Feature: Global search

cypress.json

@@ -11,6 +11,7 @@
  "spec_qr_signing.js",
  "spec_balances_amounts.js",
  "spec_wallet_send.js",
+ "spec_global_search.js",
  "spec_wallet_utxo.js",
  "spec_plugins.js",
  "spec_elm_single_segwit_wallet.js",

cypress/integration/spec_global_search.js

@@ -0,0 +1,34 @@
+describe('Do global searches', () => {
+ before(() => {
+ Cypress.config('includeShadowDom', true)
+ })
+
+ // Keeps the session cookie alive, Cypress by default clears all cookies before each test
+ beforeEach(() => {
+ cy.viewport(1200,660)
+ cy.visit('/')
+ Cypress.Cookies.preserveOnce('session')
+ })
+
+ it('Search', () => {
+ cy.addHotDevice("Hot Device 1","bitcoin")
+ cy.addWallet('Test Hot Wallet 1', 'segwit', 'funded', 'btc', 'singlesig', 'Hot Device 1')
+ cy.selectWallet("Test Hot Wallet 1")
+
+ // check the #0 Receive address is found
+ cy.get('#global-search-input').clear()
+ cy.get('#global-search-input').type("bcrt1", {force:true})
+ cy.get('#global-search-dropdown-content', { timeout: 3000 }).should('be.visible')
+ cy.get('#global-search-dropdown-content').contains('Address #0', { matchCase: false })
+
+ // check varias names and alias'
+ var searchTerms = ['Address #0', 'Change #10', 'Test Hot Wallet 1', 'Test_Hot_Wallet_1', "Hot Device 1", "Hot_Device_1"];
+ for (var i in searchTerms){
+ cy.get('#global-search-input').clear()
+ cy.get('#global-search-input').type(searchTerms[i], {force:true})
+ cy.get('#global-search-dropdown-content', { timeout: 3000 }).should('be.visible')
+ cy.get('#global-search-dropdown-content').contains(searchTerms[i], { matchCase: false }) 
+ }
+
+ })
+})

src/cryptoadvance/specter/config.py

@@ -179,6 +179,7 @@ class BaseConfig(object):
  "cryptoadvance.specterext.devhelp.service",
  "cryptoadvance.specterext.exfund.service",
  "cryptoadvance.specterext.faucet.service",
+ "cryptoadvance.specterext.globalsearch.service",
  ]
 
  # This is just a placeholder in order to be aware that you cannot set this

src/cryptoadvance/specter/server_endpoints/wallets.py

@@ -386,9 +386,17 @@ def wallet(wallet_alias):
 @wallets_endpoint.route("/wallet/<wallet_alias>/history/", methods=["GET", "POST"])
 @login_required
 def history(wallet_alias):
+ return history_tx_list_type(wallet_alias, "txlist")
+
+
+@wallets_endpoint.route(
+ "/wallet/<wallet_alias>/history/<tx_list_type>/", methods=["GET", "POST"]
+)
+@login_required
+def history_tx_list_type(wallet_alias, tx_list_type):
  wallet = app.specter.wallet_manager.get_by_alias(wallet_alias)
- tx_list_type = "txlist"
 
+ txid_to_show_on_load = None
  if request.method == "POST":
  action = request.form["action"]
  if action == "freezeutxo":
@@ -400,6 +408,8 @@ def history(wallet_alias):
  wallet.abandontransaction(txid)
  except SpecterError as e:
  flash(str(e), "error")
+ elif action == "show_tx_on_load":
+ txid_to_show_on_load = request.form["txid"]
 
  # update balances in the wallet
  app.specter.check_blockheight()
@@ -411,6 +421,7 @@ def history(wallet_alias):
  wallet_alias=wallet_alias,
  wallet=wallet,
  tx_list_type=tx_list_type,
+ txid_to_show_on_load=txid_to_show_on_load,
  specter=app.specter,
  rand=rand,
  services=app.specter.service_manager.services,
@@ -738,11 +749,25 @@ def import_psbt(wallet_alias):
 @wallets_endpoint.route("/wallet/<wallet_alias>/addresses/", methods=["GET"])
 @login_required
 def addresses(wallet_alias):
+ return addresses_with_type(wallet_alias, "receive")
+
+
+@wallets_endpoint.route(
+ "/wallet/<wallet_alias>/addresses/<address_type>/", methods=["GET", "POST"]
+)
+@login_required
+def addresses_with_type(wallet_alias, address_type):
  """Show informations about cached addresses (wallet._addresses) of the <wallet_alias>.
  It updates balances in the wallet before renderization in order to show updated UTXO and
  balance of each address."""
  wallet = app.specter.wallet_manager.get_by_alias(wallet_alias)
 
+ address_json_to_show_on_load = None
+ if request.method == "POST":
+ action = request.form["action"]
+ if action == "show_address_on_load":
+ address_json_to_show_on_load = request.form["address_dict"]
+
  # update balances in the wallet
  app.specter.check_blockheight()
  wallet.update_balance()
@@ -755,6 +780,8 @@ def addresses(wallet_alias):
  specter=app.specter,
  rand=rand,
  services=app.specter.service_manager.services,
+ address_type=address_type,
+ address_json_to_show_on_load=address_json_to_show_on_load,
  )
 
 

src/cryptoadvance/specter/server_endpoints/wallets_api.py

@@ -27,6 +27,7 @@
 from ..server_endpoints.filters import assetlabel
 from ..specter_error import SpecterError, handle_exception
 from ..util.base43 import b43_decode
+from ..util.common import robust_json_dumps
 from ..util.descriptor import Descriptor
 from ..util.fee_estimation import FeeEstimationResultEncoder, get_fees
 from ..util.mnemonic import generate_mnemonic

src/cryptoadvance/specter/static/helpers.js

@@ -149,10 +149,51 @@ async function send_request(url, method_str, csrf_token, formData) {
  }
 
  const response = await fetch(url, d);
- if(response.status != 200){
+ if(!response.ok){
  showError(await response.text());
  console.log(`Error while calling ${url} with ${method_str} ${formData}`)
  return
  }
  return await response.json();
+}
+
+
+
+/**
+ * Takes a dictionary with string keys and string values, transferrs them into input fields in a form and submits this form
+ * @param {*} url : To which url should this form be submitted
+ * @param {*} csrf_token 
+ * @param {*} formDataDict: Should be a dict with string keys and string values
+ * 
+ * Example arguments:
+ * url = "/wallet/<wallet_alias>/history/<tx_list_type>/"
+ * formDataDict = {
+ "action": "txid_to_show_on_load",
+ "txid": tx_dict["txid"],
+ },
+ */
+async function submitForm(url, csrf_token, formDataDict) {
+ var form = document.createElement("form");
+ form.action = url;
+ form.type = "hidden";
+ form.method = "POST";
+ form.value = formDataDict["action"];
+
+ var input = document.createElement("input");
+ input.name = "csrf_token";
+ input.value = csrf_token;
+ form.appendChild(input);
+
+ // transfer all values from the formDataDict into input fields.
+ for (var key in formDataDict){
+ var input = document.createElement("input");
+ input.type = "hidden";
+ input.name = key;
+ input.value = formDataDict[key];
+ form.appendChild(input);
+ } 
+
+
+ document.body.appendChild(form); 
+ form.submit();
 }

src/cryptoadvance/specter/templates/includes/addresses-table.html

@@ -241,19 +241,11 @@ <h1>{{ _("Export addresses to CSV") }}</h1>
 
  // Setup tabs switching
  this.receiveAddressesViewBtn.onclick = () => {
- if (!this.receiveAddressesViewBtn.classList.contains("checked")) {
- this.changeAddressesViewBtn.classList.remove("checked");
- this.receiveAddressesViewBtn.classList.add("checked");
- this.setAttribute("type", "receive");
- }
+ this.setAttribute("type", "receive");
  }
 
  this.changeAddressesViewBtn.onclick = () => {
- if (!this.changeAddressesViewBtn.classList.contains("checked")) {
- this.receiveAddressesViewBtn.classList.remove("checked");
- this.changeAddressesViewBtn.classList.add("checked");
- this.setAttribute("type", "change");
- }
+ this.setAttribute("type", "change");
  }
 
  // Init call id to avoid fetch returning after another one triggered
@@ -357,6 +349,19 @@ <h1>{{ _("Export addresses to CSV") }}</h1>
  shadow.appendChild(clone);
  }
 
+
+ updateCheckedButton () {
+ if (this.listType == "change") {
+ this.changeAddressesViewBtn.classList.add("checked");
+ this.receiveAddressesViewBtn.classList.remove("checked");
+ } else {
+ this.changeAddressesViewBtn.classList.remove("checked");
+ this.receiveAddressesViewBtn.classList.add("checked");
+ }
+ }
+
+
+
  static get observedAttributes() {
  return ['type', 'wallet', 'btc-unit', 'price', 'symbol', 'hide-sensitive-info'];
  }
@@ -420,6 +425,7 @@ <h1>{{ _("Export addresses to CSV") }}</h1>
  } else {
  this.switchText.innerText = "";
  }
+ this.updateCheckedButton();
 
  // Prepare form data with all relevant parameters
  var formData = new FormData();

src/cryptoadvance/specter/templates/wallet/addresses/wallet_addresses.jinja

@@ -18,8 +18,17 @@
  {% endif %}
  btc-unit="{{ specter.unit }}"
  hide-sensitive-info="{{ specter.hide_sensitive_info | lower }}"
- type="receive"
- wallet="{{ wallet.alias }}"></addresses-table>
+ type="{{ address_type }}"
+ wallet="{{ wallet.alias }}"
+ id="addresses-table-{{ wallet.alias }}"></addresses-table>
  </div>
  <div id="address-popup" class="hidden"></div>
+ <script type="text/javascript">
+ // enable that address details can be shown upon loading
+ if ("{{ address_json_to_show_on_load }}" != "None") {
+ addressTable = document.getElementById("addresses-table-{{ wallet.alias }}"); 
+ var addressData = {{ address_json_to_show_on_load|safe }}; 
+ showAddressData(addressData.amount, "", addressData, addressTable.wallet);
+ }
+ </script>
 {% endblock %}

src/cryptoadvance/specter/templates/wallet/history/wallet_history.jinja

@@ -1,5 +1,6 @@
 {% extends "wallet/components/wallet_tab.jinja" %}
 {% set tab = 'history' %}
+{% set tx_list_type = tx_list_type %}
 {% block content %}
  {% from 'wallet/history/components/total_wallet_balances.jinja' import total_wallet_balances %}
  {{ total_wallet_balances(
@@ -27,9 +28,17 @@
  blockhash="{{ specter.config.validate_merkle_proofs | lower }}"
  type="{{ tx_list_type }}"
  hide-sensitive-info="{{ specter.hide_sensitive_info | lower }}"
- wallet="{{ wallet.alias }}">
+ wallet="{{ wallet.alias }}"
+ id="tx-table-{{ wallet.alias }}">
  </tx-table>
  </div>
+ <script type="text/javascript">
+ // enable that tx details can be shown upon loading
+ if ("{{ txid_to_show_on_load }}" != "None") {
+ txtable = document.getElementById("tx-table-{{ wallet.alias }}");
+ showTxData(txtable.btcUnit, txtable.price, txtable.symbol, '{{ txid_to_show_on_load }}', txtable.wallet)
+ }
+ </script>
 {% endblock %}
 
 

src/cryptoadvance/specter/wallet.py

@@ -175,6 +175,10 @@ def __init__(
  ):
  self.save_to_file()
 
+ @property
+ def transactions(self):
+ return self._transactions
+
  @property
  def recv_descriptor(self):
  return add_checksum(str(self.descriptor.branch(0)))

src/cryptoadvance/specterext/.gitignore

@@ -0,0 +1,10 @@
+__pycache__
+.pytest_cache
+*.pyc
+.env
+*.egg-info
+.DS_Store
+node_modules
+btcd-conn.json
+elmd-conn.json
+prevent_mining

src/cryptoadvance/specterext/globalsearch/__main__.py

@@ -0,0 +1,51 @@
+from cryptoadvance.specter.cli import entry_point
+from cryptoadvance.specter.cli.cli_server import server
+import logging
+import click
+
+logger = logging.getLogger(__name__)
+
+
+@click.group()
+def cli():
+ pass
+
+
+@cli.command()
+@click.pass_context
+@click.option(
+ "--host",
+ default="127.0.0.1",
+ help="if you specify --host 0.0.0.0 then Globalsearch will be available in your local LAN.",
+)
+@click.option(
+ "--ssl/--no-ssl",
+ is_flag=True,
+ default=False,
+ help="By default SSL encryption will not be used. Use -ssl to create a self-signed certificate for SSL encryption.",
+)
+@click.option("--debug/--no-debug", default=None)
+@click.option("--filelog/--no-filelog", default=True)
+@click.option(
+ "--config",
+ default=None,
+ help="A class which sets reasonable default values.",
+)
+def start(ctx, host, ssl, debug, filelog, config):
+ if config == None:
+ config = "cryptoadvance.specterext.globalsearch.config.AppProductionConfig"
+ ctx.invoke(
+ server,
+ host=host,
+ ssl=ssl,
+ debug=debug,
+ filelog=filelog,
+ port=8080,
+ config=config,
+ )
+
+
+entry_point.add_command(start)
+
+if __name__ == "__main__":
+ entry_point()

src/cryptoadvance/specterext/globalsearch/app_config.py

@@ -0,0 +1,17 @@
+"""
+Here you can put the Configuration of your Application
+"""
+
+import os
+from cryptoadvance.specter.config import ProductionConfig as SpecterProductionConfig
+
+
+class AppProductionConfig(SpecterProductionConfig):
+ """The AppProductionConfig class can be used to user this extension as application"""
+
+ # Where should the User endup if he hits the root of that domain?
+ ROOT_URL_REDIRECT = "/spc/ext/globalsearch"
+ # I guess this is the only extension which should be available?
+ EXTENSION_LIST = ["cryptoadvance.specterext.globalsearch.service"]
+ # You might also want a different folder here
+ SPECTER_DATA_FOLDER = os.path.expanduser("~/.globalsearch")

src/cryptoadvance/specterext/globalsearch/config.py

@@ -0,0 +1,15 @@
+"""
+Here Configuration of your Extension takes place
+"""
+
+
+class BaseConfig:
+ """This is a extension-based Config which is used as Base"""
+
+ pass
+
+
+class ProductionConfig(BaseConfig):
+ """This is a extension-based Config for Production"""
+
+ pass