Merge pull request #509 from jplomas/master

Fix for Ledger Set XMSS/OTS index & version display

.electrify/index.js

@@ -64,7 +64,7 @@ app.on('ready', function() {
     if (process.platform === 'darwin') {
       app.setAboutPanelOptions({
         applicationName: "QRL Wallet",
-        applicationVersion: "1.8.0",
+        applicationVersion: "1.8.1",
         version: "Electron 16.0.1",
         copyright: "Die QRL Stiftung, Zug Switzerland",
         credits: "The QRL Developers"

.electrify/package.json

@@ -2,10 +2,10 @@
   "name": "QRLWallet",
   "productName": "QRLWallet",
   "projectName": "qrl-wallet",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "main": "index.js",
   "dependencies": {
-    "@theqrl/electrify-qrl": "^1.0.0",
+    "@theqrl/electrify-qrl": "^1.1.3",
     "grpc": "^1.14.0",
     "grpc-promise": "^1.1.0"
   },

.electrify/rpm.json

@@ -1,7 +1,7 @@
 {
   "icon": "assets/qrl.png",
   "options": {
-    "version": "1.8.0",
+    "version": "1.8.1",
     "icon": "assets/qrl.png",
     "name":  "QRLWallet",
     "productName": "QRLWallet",

.gitignore

@@ -17,3 +17,5 @@ local.json
 .electrify/dist
 .electrify/.dist
 /.yarn
+yarn.lock
+.electrify/yarn.lock

README.md

@@ -30,6 +30,8 @@ We recommend using nvm to manage NodeJS versions and using the version of NodeJS
 
 	npm install -g node-gyp
 
+_node-gyp issues can generally be solved with updating npm (npm i -g npm) and rebuilding modules (npm rebuild)_
+
 Linux only: libudev-dev, libusb-dev and libusb-1.0-0-dev
 
 	sudo apt-get install libudev-dev libusb-dev libusb-1.0-0-dev

imports/startup/both/index.js

@@ -14,7 +14,7 @@ import './nodes.js'
 SHOR_PER_QUANTA = 1000000000
 
 // qrl-wallet Version
-WALLET_VERSION = '1.8.0'
+WALLET_VERSION = '1.8.1'
 
 // qrl.proto sha256 sum for each release of QRL Node
 QRLPROTO_SHA256 = [

imports/ui/pages/open/open.js

@@ -120,7 +120,7 @@ async function getLedgerVersion(callback) {
       console.log('> Got Ledger App Version from USB')
       Session.set(
         'ledgerDetailsAppVersion',
-        data.major + '.' + data.minor + '.' + data.patch
+        data.version
       )
       callback(null, data)
     })

imports/ui/pages/tools/xmssindex/update.js

@@ -35,15 +35,12 @@ const getNodeXMSSIndex = () => {
 
 async function updateLedgerIdx(otsKey, callback) {
   if (isElectrified()) {
-    const retry = Meteor.setInterval(() => {
-      Meteor.call('ledgerSetIdx', otsKey, (err, data) => {
-        if (data.error_message !== 'Timeout') {
-          console.log('> Set Ledger OTS Key via USB')
-          Meteor.clearInterval(retry)
-          callback(null, data)
-        }
-      })
-    }, 2000)
+    Meteor.call('ledgerSetIdx', otsKey, (err, data) => {
+      if (data.error_message !== 'Timeout') {
+        console.log('> Set Ledger OTS Key via USB')
+        callback(null, data)
+      }
+    })
   } else {
     const QrlLedger = await createTransport()
     QrlLedger.setIdx(otsKey).then(idxResponse => {