From 6e405d1fc4073b34d880f6045c5c7ec3f2f7ccf0 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Wed, 21 Sep 2022 17:13:05 +0300
Subject: [PATCH 1/8] fix: output address on confirmation based on selected
 network

---
 lnbits/extensions/watchonly/models.py                       | 1 +
 .../watchonly/static/components/payment/payment.js          | 6 ++++--
 lnbits/extensions/watchonly/templates/watchonly/index.html  | 1 +
 lnbits/extensions/watchonly/views_api.py                    | 4 +++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lnbits/extensions/watchonly/models.py b/lnbits/extensions/watchonly/models.py
index cedaa2101..622f5ec80 100644
--- a/lnbits/extensions/watchonly/models.py
+++ b/lnbits/extensions/watchonly/models.py
@@ -80,6 +80,7 @@ class CreatePsbt(BaseModel):
 class ExtractPsbt(BaseModel):
     psbtBase64 = ""  # // todo snake case
     inputs: List[TransactionInput]
+    network = "Mainnet"
 
 
 class SignedTransaction(BaseModel):
diff --git a/lnbits/extensions/watchonly/static/components/payment/payment.js b/lnbits/extensions/watchonly/static/components/payment/payment.js
index f2cccbbaf..9f38df1d0 100644
--- a/lnbits/extensions/watchonly/static/components/payment/payment.js
+++ b/lnbits/extensions/watchonly/static/components/payment/payment.js
@@ -11,7 +11,8 @@ async function payment(path) {
       'mempool-endpoint',
       'sats-denominated',
       'serial-signer-ref',
-      'adminkey'
+      'adminkey',
+      'network'
     ],
     watch: {
       immediate: true,
@@ -279,7 +280,8 @@ async function payment(path) {
             this.adminkey,
             {
               psbtBase64,
-              inputs: this.tx.inputs
+              inputs: this.tx.inputs,
+              network: this.network
             }
           )
           return data
diff --git a/lnbits/extensions/watchonly/templates/watchonly/index.html b/lnbits/extensions/watchonly/templates/watchonly/index.html
index 263f6d92a..91577cd28 100644
--- a/lnbits/extensions/watchonly/templates/watchonly/index.html
+++ b/lnbits/extensions/watchonly/templates/watchonly/index.html
@@ -136,6 +136,7 @@
         :adminkey="g.user.wallets[0].adminkey"
         :serial-signer-ref="$refs.serialSigner"
         :sats-denominated="config.sats_denominated"
+        :network="config.network"
         @broadcast-done="handleBroadcastSuccess"
       ></payment>
       <!-- todo: no more utxos.data -->
diff --git a/lnbits/extensions/watchonly/views_api.py b/lnbits/extensions/watchonly/views_api.py
index 77d28fee1..750d46c98 100644
--- a/lnbits/extensions/watchonly/views_api.py
+++ b/lnbits/extensions/watchonly/views_api.py
@@ -4,6 +4,7 @@ from http import HTTPStatus
 import httpx
 from embit import finalizer, script
 from embit.ec import PublicKey
+from embit.networks import NETWORKS
 from embit.psbt import PSBT, DerivationPath
 from embit.transaction import Transaction, TransactionInput, TransactionOutput
 from fastapi import Query, Request
@@ -295,6 +296,7 @@ async def api_psbt_create(
 async def api_psbt_extract_tx(
     data: ExtractPsbt, w: WalletTypeInfo = Depends(require_admin_key)
 ):
+    network = NETWORKS["main"] if data.network == "Mainnet" else NETWORKS["test"]
     res = SignedTransaction()
     try:
         psbt = PSBT.from_base64(data.psbtBase64)
@@ -316,7 +318,7 @@ async def api_psbt_extract_tx(
 
         for out in transaction.vout:
             tx["outputs"].append(
-                {"amount": out.value, "address": out.script_pubkey.address()}
+                {"amount": out.value, "address": out.script_pubkey.address(network)}
             )
         res.tx_json = json.dumps(tx)
     except Exception as e:

From 80a62569f9164c8fffe6ec33a04df38234dd44d1 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 22 Sep 2022 10:41:54 +0300
Subject: [PATCH 2/8] fix: wait for connection to init

---
 .../components/serial-signer/serial-signer.js | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
index 33d07d94d..332612806 100644
--- a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
+++ b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
@@ -15,7 +15,7 @@ async function serialSigner(path) {
         receivedData: '',
         config: {},
         decryptionKey: null,
-        sharedSecret: null, // todo: store in secure local storage
+        sharedSecret: null,
 
         hww: {
           password: null,
@@ -57,13 +57,16 @@ async function serialSigner(path) {
 
     computed: {
       pairedDevices: {
+        cache: false,
         get: function () {
+          console.log('### get pairedDevices')
           return (
             JSON.parse(window.localStorage.getItem('lnbits-paired-devices')) ||
             []
           )
         },
         set: function (devices) {
+          console.log('### set pairedDevices', devices)
           window.localStorage.setItem(
             'lnbits-paired-devices',
             JSON.stringify(devices)
@@ -81,6 +84,7 @@ async function serialSigner(path) {
         await this.openSerialPort(this.config)
       },
       openSerialPort: async function (config = {baudRate: 9600}) {
+        console.log('### openSerialPort', config)
         if (!this.checkSerialPortSupported()) return false
         if (this.selectedPort) {
           this.$q.notify({
@@ -109,7 +113,10 @@ async function serialSigner(path) {
 
           // Wait for the serial port to open.
           await this.selectedPort.open(config)
+          // do not await
           this.startSerialPortReading()
+          // wait to init
+          sleep(1000)
 
           const textEncoder = new TextEncoderStream()
           this.writableStreamClosed = textEncoder.readable.pipeTo(
@@ -307,7 +314,11 @@ async function serialSigner(path) {
       },
       hwwPing: async function () {
         try {
+          console.log('### hwwPing 1', window.location.host)
+          // Send an empty ping. The serial port buffer might have some jubk data. Flush it.
+          await this.sendCommandClearText(COMMAND_PING)
           await this.sendCommandClearText(COMMAND_PING, [window.location.host])
+          console.log('### hwwPing 2')
         } catch (error) {
           this.$q.notify({
             type: 'warning',
@@ -582,7 +593,7 @@ async function serialSigner(path) {
       hwwCheckPairing: async function () {
         const iv = window.crypto.getRandomValues(new Uint8Array(16))
         const encrypted = await this.encryptMessage(
-          this.sharedSecret,
+          this.sharedSecret, // todo: revisit
           iv,
           PAIRING_CONTROL_TEXT.length + ' ' + PAIRING_CONTROL_TEXT
         )
@@ -724,6 +735,7 @@ async function serialSigner(path) {
       },
       hwwHelp: async function () {
         try {
+          console.log('### cmd help')
           await this.sendCommandSecure(COMMAND_HELP)
           this.$q.notify({
             type: 'positive',
@@ -746,7 +758,7 @@ async function serialSigner(path) {
         } catch (error) {
           this.$q.notify({
             type: 'warning',
-            message: 'Failed to ask for help!',
+            message: 'Failed to wipe!',
             caption: `${error}`,
             timeout: 10000
           })
@@ -861,7 +873,13 @@ async function serialSigner(path) {
 
       sendCommandSecure: async function (command, attrs = []) {
         const message = [command].concat(attrs).join(' ')
+        console.log('### sendCommandSecure', message)
         const iv = window.crypto.getRandomValues(new Uint8Array(16))
+        if (!this.sharedSecret || !this.sharedSecret.length) {
+          throw new Error(
+            `Secure connection not estabileshed. Tried to run command: ${command}`
+          )
+        }
         const encrypted = await this.encryptMessage(
           this.sharedSecret,
           iv,
@@ -874,6 +892,7 @@ async function serialSigner(path) {
       },
       sendCommandClearText: async function (command, attrs = []) {
         const message = [command].concat(attrs).join(' ')
+        console.log('### sendCommandClearText', message)
         await this.writer.write(message + '\n')
       },
       extractCommand: async function (value) {

From d5f78e83d927c61071a709175a95692e06188c49 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 22 Sep 2022 10:42:27 +0300
Subject: [PATCH 3/8] chore: update `created by`

---
 .../watchonly/templates/watchonly/_api_docs.html   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lnbits/extensions/watchonly/templates/watchonly/_api_docs.html b/lnbits/extensions/watchonly/templates/watchonly/_api_docs.html
index ba52c4fa7..e40ca81fd 100644
--- a/lnbits/extensions/watchonly/templates/watchonly/_api_docs.html
+++ b/lnbits/extensions/watchonly/templates/watchonly/_api_docs.html
@@ -18,9 +18,21 @@
         >directly from browser</a
       >
       <small>
-        <br />Created by,
+        <br />Created by
         <a target="_blank" style="color: unset" href="https://github.com/arcbtc"
           >Ben Arc</a
+        >,
+        <a
+          target="_blank"
+          style="color: unset"
+          href="https://github.com/talvasconcelos"
+          >Tiago Vasconcelos</a
+        >,
+        <a
+          target="_blank"
+          style="color: unset"
+          href="https://github.com/motorina0"
+          >motorina0</a
         >
         (using,
         <a

From 2b56efa2b68ebe53eb05d02a56d950ae793ea2fe Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 22 Sep 2022 10:58:19 +0300
Subject: [PATCH 4/8] fix: paired devices list

---
 .../serial-signer/serial-signer.html          |  2 +-
 .../components/serial-signer/serial-signer.js | 21 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.html b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.html
index 2ed2d49c5..a95a19069 100644
--- a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.html
+++ b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.html
@@ -49,7 +49,7 @@
       <q-item
         v-for="device in pairedDevices"
         :key="device.id"
-        v-if="!selectedPort"
+        v-if="!selectedPort && showPairedDevices"
         clickable
         v-close-popup
       >
diff --git a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
index 332612806..b27f2fa29 100644
--- a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
+++ b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
@@ -51,7 +51,8 @@ async function serialSigner(path) {
         },
         tx: null, // todo: move to hww
 
-        showConsole: false
+        showConsole: false,
+        showPairedDevices: true
       }
     },
 
@@ -59,14 +60,12 @@ async function serialSigner(path) {
       pairedDevices: {
         cache: false,
         get: function () {
-          console.log('### get pairedDevices')
           return (
             JSON.parse(window.localStorage.getItem('lnbits-paired-devices')) ||
             []
           )
         },
         set: function (devices) {
-          console.log('### set pairedDevices', devices)
           window.localStorage.setItem(
             'lnbits-paired-devices',
             JSON.stringify(devices)
@@ -84,7 +83,6 @@ async function serialSigner(path) {
         await this.openSerialPort(this.config)
       },
       openSerialPort: async function (config = {baudRate: 9600}) {
-        console.log('### openSerialPort', config)
         if (!this.checkSerialPortSupported()) return false
         if (this.selectedPort) {
           this.$q.notify({
@@ -314,11 +312,9 @@ async function serialSigner(path) {
       },
       hwwPing: async function () {
         try {
-          console.log('### hwwPing 1', window.location.host)
           // Send an empty ping. The serial port buffer might have some jubk data. Flush it.
           await this.sendCommandClearText(COMMAND_PING)
           await this.sendCommandClearText(COMMAND_PING, [window.location.host])
-          console.log('### hwwPing 2')
         } catch (error) {
           this.$q.notify({
             type: 'warning',
@@ -735,7 +731,6 @@ async function serialSigner(path) {
       },
       hwwHelp: async function () {
         try {
-          console.log('### cmd help')
           await this.sendCommandSecure(COMMAND_HELP)
           this.$q.notify({
             type: 'positive',
@@ -873,7 +868,6 @@ async function serialSigner(path) {
 
       sendCommandSecure: async function (command, attrs = []) {
         const message = [command].concat(attrs).join(' ')
-        console.log('### sendCommandSecure', message)
         const iv = window.crypto.getRandomValues(new Uint8Array(16))
         if (!this.sharedSecret || !this.sharedSecret.length) {
           throw new Error(
@@ -892,7 +886,6 @@ async function serialSigner(path) {
       },
       sendCommandClearText: async function (command, attrs = []) {
         const message = [command].concat(attrs).join(' ')
-        console.log('### sendCommandClearText', message)
         await this.writer.write(message + '\n')
       },
       extractCommand: async function (value) {
@@ -968,6 +961,11 @@ async function serialSigner(path) {
           devices.splice(deviceIndex, 1)
         }
         this.pairedDevices = devices
+        this.showPairedDevices = false
+        setTimeout(() => {
+          // force UI refresh
+          this.showPairedDevices = true
+        })
       },
       addPairedDevice: function (deviceId, sharedSecretHex, config) {
         const devices = this.pairedDevices
@@ -979,6 +977,11 @@ async function serialSigner(path) {
           config
         })
         this.pairedDevices = devices
+        this.showPairedDevices = false
+        setTimeout(() => {
+          // force UI refresh
+          this.showPairedDevices = true
+        })
       },
       updatePairedDeviceConfig(deviceId, config) {
         const device = this.getPairedDevice(deviceId)

From 649c653836502a9cc29ec468874e2f9d3860a305 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Tue, 27 Sep 2022 17:19:32 +0300
Subject: [PATCH 5/8] fix: do not show command data in logs

---
 .../static/components/serial-signer/serial-signer.js   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
index b27f2fa29..67268eebf 100644
--- a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
+++ b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
@@ -230,8 +230,9 @@ async function serialSigner(path) {
             while (true) {
               const {value, done} = await readStringUntil('\n')
               if (value) {
-                this.handleSerialPortResponse(value)
-                this.updateSerialPortConsole(value)
+                const {command, commandData} = await this.extractCommand(value)
+                this.handleSerialPortResponse(command, commandData)
+                this.updateSerialPortConsole(command)
               }
               if (done) return
             }
@@ -245,8 +246,7 @@ async function serialSigner(path) {
           }
         }
       },
-      handleSerialPortResponse: async function (value) {
-        const {command, commandData} = await this.extractCommand(value)
+      handleSerialPortResponse: async function (command, commandData) {
         this.logPublicCommandsResponse(command, commandData)
 
         switch (command) {
@@ -287,7 +287,7 @@ async function serialSigner(path) {
             )
             break
           default:
-            console.log(`   %c${value}`, 'background: #222; color: red')
+            console.log(`   %c${command}`, 'background: #222; color: red')
         }
       },
       logPublicCommandsResponse: function (command, commandData) {

From f1670c3153d990aea8060b5305bc0861d2712573 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Tue, 27 Sep 2022 17:20:33 +0300
Subject: [PATCH 6/8] chore: version bump

---
 lnbits/extensions/watchonly/templates/watchonly/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/extensions/watchonly/templates/watchonly/index.html b/lnbits/extensions/watchonly/templates/watchonly/index.html
index 91577cd28..67f898101 100644
--- a/lnbits/extensions/watchonly/templates/watchonly/index.html
+++ b/lnbits/extensions/watchonly/templates/watchonly/index.html
@@ -150,7 +150,7 @@
       <q-card-section>
         <h6 class="text-subtitle1 q-my-none">
           {{SITE_TITLE}} Onchain Wallet (watch-only) Extension
-          <small>(v0.2)</small>
+          <small>(v0.3)</small>
         </h6>
       </q-card-section>
       <q-card-section class="q-pa-none">

From a8b90bd5952601577f6aa5b4c9ff8e4b499d361c Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Tue, 27 Sep 2022 17:35:27 +0300
Subject: [PATCH 7/8] fix: close serial port when re-pairing fails

---
 .../components/serial-signer/serial-signer.js      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
index 67268eebf..8d3c1fecd 100644
--- a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
+++ b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
@@ -610,10 +610,10 @@ async function serialSigner(path) {
         }
       },
       handleCheckPairingResponse: async function (res = '') {
-        const [statusCode, encryptedMessage] = res.split(' ')
+        const [statusCode, message] = res.split(' ')
         switch (statusCode) {
           case '0':
-            const controlText = await this.decryptData(encryptedMessage)
+            const controlText = await this.decryptData(message)
             if (controlText == PAIRING_CONTROL_TEXT) {
               this.$q.notify({
                 type: 'positive',
@@ -629,6 +629,16 @@ async function serialSigner(path) {
               })
             }
             break
+          case '1':
+            this.closeSerialPort()
+            this.$q.notify({
+              type: 'warning',
+              message:
+                'Re-pairing failed. Remove (forget) device and try again!',
+              caption: `Error: ${message}`,
+              timeout: 10000
+            })
+            break
           default:
             // noting to do here yet
             break

From 463941ec94cee61814a3f0714f2a76247175a6bc Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Wed, 28 Sep 2022 10:33:43 +0300
Subject: [PATCH 8/8] fix: always include change output for fee

---
 .../extensions/watchonly/static/components/payment/payment.html | 2 +-
 .../watchonly/static/components/serial-signer/serial-signer.js  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lnbits/extensions/watchonly/static/components/payment/payment.html b/lnbits/extensions/watchonly/static/components/payment/payment.html
index cde65ca29..6e1d94c7a 100644
--- a/lnbits/extensions/watchonly/static/components/payment/payment.html
+++ b/lnbits/extensions/watchonly/static/components/payment/payment.html
@@ -5,7 +5,7 @@
         <send-to
           :data.sync="sendToList"
           :fee-rate="feeRate"
-          :tx-size="txSizeNoChange"
+          :tx-size="txSize"
           :selected-amount="selectedAmount"
           :sats-denominated="satsDenominated"
           @update:outputs="handleOutputsChange"
diff --git a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
index 8d3c1fecd..2e80b1e02 100644
--- a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
+++ b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
@@ -923,6 +923,7 @@ async function serialSigner(path) {
       },
       decryptData: async function (value) {
         if (!this.sharedSecret) {
+          console.log('/error Secure session not established!')
           return '/error Secure session not established!'
         }
         try {
@@ -943,6 +944,7 @@ async function serialSigner(path) {
             .trim()
           return command
         } catch (error) {
+          console.log('/error Failed to decrypt message from device!')
           return '/error Failed to decrypt message from device!'
         }
       },