Merge remote-tracking branch 'cryptoadvance/master' into upgrade310

docs/release-notes.md

@@ -1,3 +1,24 @@
+# Release Notes
+
+## v1.12.0 August 26, 2022
+- Feature: add faucet and exfund extensions #1820 (Stepan Snigirev)
+- Feature: Dev tools - Adding full python access via javascript for developers #1842 (relativisticelectron)
+- UIUX: Complete overhaul of the tooltips used in Specter Desktop #1813 (Manolis Mandrapilias)
+- UIUX: Easier adding and deleting of recipients #1782 (relativisticelectron)
+- UIUX: Optimize tx-table for mobile screen #1804 (relativisticelectron)
+- Mobile: Some extra height in mobile browsers #1827 (relativisticelectron)
+- Bugfix: Allow mouse selection during address label editing for Firefox #1825 (relativisticelectron)
+- Bugfix: Another broken html part and b tag #1823 (relativisticelectron)
+- Bugfix: Fiat price in address table not visible #1836 (relativisticelectron)
+- Bugfix: remove print statement with buggy expression #1822 (k9ert)
+- Bugfix: fix explorer issue #1838 #1839 (relativisticelectron)
+- Chore: Detecting Liquid chain #1851 (Manolis Mandrapilias)
+- Chore: Fix psbt creator api to work with liquid assets when using json #1831 (Stepan Snigirev)
+- Chore: Upgrade pyinstaller from 4.9 to 5.2 #1807 (k9ert)
+- Docs: Add mobile access question to the FAQ #1829 (Manolis Mandrapilias)
+- Docs: some doc fixes, refactorings and ext clarification #1789 (k9ert)
+- Docs: Supported Python versions #1847 (Willie Wheeler)
+
 ## v1.10.5 Juli 21, 2022
 - Bugfix: startup issues for MacOS App 1815 #1816 (relativisticelectron)
 - Feature: generate app_config.py in extgen #1801 (k9ert)

requirements.in

@@ -29,5 +29,5 @@ gunicorn==20.1.0
 protobuf==3.20.1
 # Extensions
 cryptoadvance-liquidissuer==0.2.4
-specterext-exfund==0.1.6
+specterext-exfund==0.1.7
 specterext-faucet==0.1.2

requirements.txt

@@ -429,8 +429,8 @@ six==1.16.0 \
     #   pgpy
     #   pyopenssl
     #   python-dateutil
-specterext-exfund==0.1.6 \
-    --hash=sha256:8f31a6da089a3c7b4bfac50775bc2481ab88a65fec58300321d7516916c51f61
+specterext-exfund==0.1.7 \
+    --hash=sha256:d686e2d0c35064265f2ecebd71d906825ad1c917046e494526a12e80539de7f3
     # via -r requirements.in
 specterext-faucet==0.1.2 \
     --hash=sha256:86db78a6c41688152cfeec14efafd6d06c97e6edd9735461ee897495f90cb2e8

src/cryptoadvance/specter/managers/config_manager.py

@@ -65,7 +65,7 @@ def __init__(self, data_folder, config={}):
             "fee_estimator": "bitcoin_core",
             "fee_estimator_custom_url": "",
             "hide_sensitive_info": False,
-            "autohide_sensitive_info_timeout_minutes": 20,
+            "autohide_sensitive_info_timeout_minutes": None,
             "autologout_timeout_hours": 4,
             # TODO: remove
             "bitcoind": False,

src/cryptoadvance/specter/server_endpoints/settings.py

@@ -118,7 +118,8 @@ def general():
             app.specter.update_merkleproof_settings(
                 validate_bool=validate_merkleproof_bool
             )
-            app.specter.service_manager.set_active_services(active_services)
+            if current_user.is_admin:
+                app.specter.service_manager.set_active_services(active_services)
             app.specter.update_fee_estimator(
                 fee_estimator=fee_estimator,
                 custom_url=fee_estimator_custom_url,

src/cryptoadvance/specter/specter.py

@@ -642,7 +642,7 @@ def hide_sensitive_info(self):
 
     @property
     def autohide_sensitive_info_timeout(self):
-        return self.user_config.get("autohide_sensitive_info_timeout_minutes", 20)
+        return self.user_config.get("autohide_sensitive_info_timeout_minutes", None)
 
     @property
     def autologout_timeout(self):

src/cryptoadvance/specter/templates/device/device_blinding_key.jinja

@@ -39,15 +39,8 @@
 {% block scripts %}
     <script type="text/javascript">
         document.getElementById('connect-hwi').addEventListener('click', async e => {
-            var devicesRadios = document.getElementsByName('devices');
-            let deviceType;
-            for (var i = 0, length = devicesRadios.length; i < length; i++) {
-                if (devicesRadios[i].checked) {
-                    deviceType = devicesRadios[i].value;
-                    break;
-                }
-            }
             // detect devices
+            let deviceType = `{{ device.device_type }}`;
             let devices = await enumerate(deviceType);
             if(devices == null){
                 return

src/cryptoadvance/specter/templates/device/new_device/new_device_keys.jinja

@@ -91,7 +91,12 @@
                     </span>
                 </div>
                 <div id="hwi-only-instructions" {%if device_class.device_type in ['bitcoincore', 'bitcoincore_watchonly', 'cobo', 'coldcard', 'electrum', 'other', 'specter']%}class="hidden"{% endif %}>
-                    <p>{{ _("Connect your hardware device to the computer via USB.") }}</p>
+                    <p>
+                    {{ _("Connect your hardware device to the computer via USB.") }}
+                    {% if device_class.device_type == 'ledger' %}
+                    <br>{{ _("Open the Bitcoin app on your Ledger.") }}
+                    {% endif %}
+                    </p>
                 </div>
                 <br>
                 <table>
@@ -305,15 +310,8 @@
 
     <script type="text/javascript">
         document.getElementById('connect-hwi').addEventListener('click', async e => {
-            var devicesRadios = document.getElementsByName('devices');
-            let deviceType;
-            for (var i = 0, length = devicesRadios.length; i < length; i++) {
-                if (devicesRadios[i].checked) {
-                    deviceType = devicesRadios[i].value;
-                    break;
-                }
-            }
             // detect devices
+            let deviceType = `{{ device_class.device_type }}`;
             let devices = await enumerate(deviceType);
             if(devices == null){
                 return

src/cryptoadvance/specter/templates/device/new_device_manual.jinja

@@ -204,8 +204,8 @@ m/48h/{{ 0 if specter.info.chain == "main" else 1 }}h/0h/2h</textarea>
 			});
 		}
 	}
+	const deviceType = document.getElementById("device_type");
 	function checkType() {
-		var deviceType = document.getElementById("device_type");
 		if (!deviceType.value) {
 			type_reminder.style.display = 'block';
 		} else {
@@ -240,7 +240,6 @@ m/48h/{{ 0 if specter.info.chain == "main" else 1 }}h/0h/2h</textarea>
             {% endfor %}
 			
 		}
-		var deviceType = document.getElementById("device_type");
 		var typeReminder = document.getElementById("type_reminder");
 
 		if(deviceType!=null){
@@ -272,8 +271,12 @@ m/48h/{{ 0 if specter.info.chain == "main" else 1 }}h/0h/2h</textarea>
 	{% include "device/components/add_keys.js" %}
 
 	document.getElementById('askhwi').addEventListener('click', async e=>{
+		// Ensure that device type was selected
+		if (!checkType()) {
+			return
+		}
 		// detect devices
-		let devices = await enumerate();
+		let devices = await enumerate(deviceType.value);
 		if(devices == null){
 			return
 		}

src/cryptoadvance/specter/templates/includes/hwi/hwi.jinja

@@ -82,7 +82,12 @@
                 }
         // detect device
         if (devicePath == null) {
+            if (deviceTypes == 'ledger') {
+             showHWIProgress(`{{ _("Detecting...") }}`, `{{ _("Plug in your Ledger. Make sure you have opened the Bitcoin app on your Ledger otherwise Specter can't detect the device.") }}`);
+            }
+            else {
             showHWIProgress(`{{ _("Detecting...") }}`, `{{ _("Plug in your device") }}`);
+            }   
         }
         let result = [];
         let retryCounter = 0;

src/cryptoadvance/specter/templates/includes/tx-row.html

@@ -105,7 +105,7 @@
             <span class="amount"></span> 
             <span class="amount-price note hidden">()</span>
         </td>
-        <td id="column-time" class="time"></td>
+        <td id="column-time" class="time optional"></td>
         <td id="column-confirmations">
             <span class="confirmations"></span>
         </td>

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

@@ -200,7 +200,6 @@
             width: 100%;
             margin-bottom: 10px;
             border: 1.5px solid var(--cmap-border);
-            overflow-x: auto;
         }
         .scrollbar {
             overflow-y: auto;
@@ -365,7 +364,7 @@ <h1>{{ _("Export transactions to CSV") }}</h1>
                     <th value="txid"     class="column-txid optional txid-header">TxID<div class="txid-arrow"></div></th>
                     <th value="label"    class="column-label optional label-header">{{ _("Label") }}<div class="label-arrow"></div></th>
                     <th value="amount"   class="column-amount amount-header">{{ _("Amount") }}<div class="amount-arrow"></div></th>
-                    <th value="time"     class="column-time time-header">{{ _("Time") }}<div class="time-arrow up-arrow"></div></th>
+                    <th value="time"     class="column-time time-header optional">{{ _("Time") }}<div class="time-arrow up-arrow"></div></th>
                     <th value="confirmations" class="column-confirmations confirmations-header">{{ _("Confirmations") }}<div class="confirmations-arrow"></div></th>
                     <th value="blockhash" class="column-blockhash optional hidden blockhash-header">
                         <div style="display: flex">

tests/test_managers_config.py

@@ -15,3 +15,6 @@ def test_ConfigManager(empty_data_folder):
     user_mock = Mock()
     cm.update_explorer("CUSTOM", {"url": "meh"}, user_mock, "regtest")
     cm.update_fee_estimator("bitcoin_core", "blub", user_mock)
+    # Check defaults for hiding sensitive info
+    assert cm.data["hide_sensitive_info"] == False
+    assert cm.data["autohide_sensitive_info_timeout_minutes"] == None