From d8d4d4d057509097633cf36165330082cc0ed1be Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 18 Aug 2022 16:33:10 +0300
Subject: [PATCH] feat: add buttons config

---
 .../serial-signer/serial-signer.html          | 22 +++++++++++++++++
 .../components/serial-signer/serial-signer.js | 24 ++++++++++++-------
 .../extensions/watchonly/static/js/utils.js   |  2 +-
 3 files changed, 39 insertions(+), 9 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 eed1c560..4c183e15 100644
--- a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.html
+++ b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.html
@@ -124,10 +124,32 @@
       <q-form @submit="hwwConfigAndConnect" class="q-gutter-md">
         <span>Enter Config</span>
 
+        <q-input
+          filled
+          dense
+          v-model.trim="hww.deviceConfig.name"
+          label="Name (optional)"
+        ></q-input>
+        <q-separator></q-separator>
         <serial-port-config
           ref="serialPortConfig"
           :config="hww.config"
         ></serial-port-config>
+        <q-separator></q-separator>
+        <q-input
+          filled
+          dense
+          v-model.trim="hww.deviceConfig.buttonOnePin"
+          type="number"
+          label="Pin Number (Button 1)"
+        ></q-input>
+        <q-input
+          filled
+          dense
+          v-model.trim="hww.deviceConfig.buttonTwoPin"
+          type="number"
+          label="Pin Number (Button 2)"
+        ></q-input>
 
         <div class="row q-mt-lg">
           <q-btn unelevated color="primary" type="submit">Connect</q-btn>
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 58771cc9..83278771 100644
--- a/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
+++ b/lnbits/extensions/watchonly/static/components/serial-signer/serial-signer.js
@@ -36,6 +36,12 @@ async function serialSigner(path) {
           xpubResolve: null,
           seedWordPosition: 1,
           showSeedDialog: false,
+          config: null,
+          deviceConfig: {
+            name: null,
+            buttonOnePin: 0,
+            buttonTwoPin: 35
+          },
           confirm: {
             outputIndex: 0,
             showFee: false
@@ -237,7 +243,7 @@ async function serialSigner(path) {
           case COMMAND_SEED:
             this.handleShowSeedResponse(commandData)
             break
-          case COMMAND_DH_EXCHANGE:
+          case COMMAND_PAIR:
             this.handleDhExchangeResponse(commandData)
             break
           case COMMAND_LOG:
@@ -258,7 +264,7 @@ async function serialSigner(path) {
           case COMMAND_SEND_PSBT:
           case COMMAND_WIPE:
           case COMMAND_XPUB:
-          case COMMAND_DH_EXCHANGE:
+          case COMMAND_PAIR:
             console.log(
               `   %c${command} ${commandData}`,
               'background: #222; color: yellow'
@@ -551,10 +557,12 @@ async function serialSigner(path) {
             this.decryptionKey
           )
           const publicKeyHex = publicKey.toHex().slice(2)
-          // must not be encrypted
-          await this.writer.write(
-            COMMAND_DH_EXCHANGE + ' ' + publicKeyHex + '\n'
-          )
+
+          await this.sendCommandClearText(COMMAND_PAIR, [
+            publicKeyHex,
+            this.hww.deviceConfig.buttonOnePin,
+            this.hww.deviceConfig.buttonTwoPin
+          ])
           this.$q.notify({
             type: 'positive',
             message: 'Starting secure session!',
@@ -580,7 +588,7 @@ async function serialSigner(path) {
             break
           case '1':
             errorMessage =
-              'Secure connection can only be established in the first 60 seconds after start-up!'
+              'Secure connection can only be established in the first 10 seconds after start-up!'
             captionMessage = 'Restart and try again'
             break
 
@@ -776,7 +784,7 @@ async function serialSigner(path) {
         const commandData = value.substring(command.length).trim()
 
         if (
-          command === COMMAND_DH_EXCHANGE ||
+          command === COMMAND_PAIR ||
           command === COMMAND_LOG ||
           command === COMMAND_PASSWORD_CLEAR ||
           command === COMMAND_PING ||
diff --git a/lnbits/extensions/watchonly/static/js/utils.js b/lnbits/extensions/watchonly/static/js/utils.js
index e39ecec3..2fc5eeae 100644
--- a/lnbits/extensions/watchonly/static/js/utils.js
+++ b/lnbits/extensions/watchonly/static/js/utils.js
@@ -12,7 +12,7 @@ const COMMAND_RESTORE = '/restore'
 const COMMAND_CONFIRM_NEXT = '/confirm-next'
 const COMMAND_CANCEL = '/cancel'
 const COMMAND_XPUB = '/xpub'
-const COMMAND_DH_EXCHANGE = '/dh-exchange'
+const COMMAND_PAIR = '/pair'
 const COMMAND_LOG = '/log'
 const COMMAND_CHECK_PAIRING = '/check-pairing'