Merge pull request #2983 from BlueWallet/add-easier-hw-pairing

Add easier hw pairing
BlueWallet · Apr 19, 2021 · 9b2fe7d · 9b2fe7d
2 parents de8fd08 + b556996
commit 9b2fe7d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/class/wallets/abstract-wallet.js b/class/wallets/abstract-wallet.js
@@ -194,13 +194,16 @@ export class AbstractWallet {
         }
         this.secret = parsedSecret.keystore.xpub;
         this.masterFingerprint = masterFingerprint;
+
+        if (parsedSecret.keystore.type === 'hardware') this.use_with_hardware_wallet = true;
       }
       // It is a Cobo Vault Hardware Wallet
       if (parsedSecret && parsedSecret.ExtPubKey && parsedSecret.MasterFingerprint) {
         this.secret = parsedSecret.ExtPubKey;
         const mfp = Buffer.from(parsedSecret.MasterFingerprint, 'hex').reverse().toString('hex');
         this.masterFingerprint = parseInt(mfp, 16);
         this.setLabel('Cobo Vault ' + parsedSecret.MasterFingerprint);
+        if (parsedSecret.CoboVaultFirmwareVersion) this.use_with_hardware_wallet = true;
       }
     } catch (_) {}
     return this;

diff --git a/tests/integration/lightning-custodian-wallet.test.js b/tests/integration/lightning-custodian-wallet.test.js
@@ -167,7 +167,7 @@ describe('LightningCustodianWallet', () => {
       },
       body: '{"amount": "0.01", "currency": "USD"}',
     });
-    if (!res.body.data || !res.body.data.lightning_invoice || !res.body.data.lightning_invoice.payreq) {
+    if (!res.body || !res.body.data || !res.body.data.lightning_invoice || !res.body.data.lightning_invoice.payreq) {
       throw new Error('Opennode problem');
     }
 

diff --git a/tests/unit/watch-only-wallet.test.js b/tests/unit/watch-only-wallet.test.js
@@ -19,6 +19,7 @@ describe('Watch only wallet', () => {
         [secret.toUpperCase()],
       );
       assert.strictEqual(w.isHd(), false);
+      assert.ok(!w.useWithHardwareWalletEnabled());
     }
 
     w.setSecret('not valid');
@@ -35,6 +36,7 @@ describe('Watch only wallet', () => {
       assert.strictEqual(w.getMasterFingerprint(), false);
       assert.strictEqual(w.getMasterFingerprintHex(), '00000000');
       assert.ok(w.isXpubValid(), w.secret);
+      assert.ok(!w.useWithHardwareWalletEnabled());
     }
   });
 
@@ -102,6 +104,7 @@ describe('Watch only wallet', () => {
     );
     assert.strictEqual(w.getMasterFingerprint(), 64392470);
     assert.strictEqual(w.getMasterFingerprintHex(), '168dd603');
+    assert.ok(w.useWithHardwareWalletEnabled());
 
     const utxos = [
       {
@@ -140,6 +143,7 @@ describe('Watch only wallet', () => {
     );
     assert.strictEqual(w.getMasterFingerprint(), 64392470);
     assert.strictEqual(w.getMasterFingerprintHex(), '168dd603');
+    assert.ok(w.useWithHardwareWalletEnabled());
 
     const utxos = [
       {
@@ -179,6 +183,7 @@ describe('Watch only wallet', () => {
     assert.strictEqual(w.getMasterFingerprint(), 1908437330);
     assert.strictEqual(w.getMasterFingerprintHex(), '5271c071');
     assert.strictEqual(w.getLabel(), 'Cobo Vault 5271c071');
+    assert.ok(w.useWithHardwareWalletEnabled());
   });
 
   it('can import zpub with master fingerprint', async () => {
@@ -192,6 +197,7 @@ describe('Watch only wallet', () => {
     );
     assert.strictEqual(w.getMasterFingerprint(), 4167290508);
     assert.strictEqual(w.getMasterFingerprintHex(), '8cce63f8');
+    assert.ok(!w.useWithHardwareWalletEnabled());
   });
 
   it('can combine signed PSBT and prepare it for broadcast', async () => {