Merge d0ba332 into e56959e

.github/workflows/main.yml

@@ -119,6 +119,8 @@ jobs:
 
     - name: Build Electron App
       run: |
+        sudo apt-get install libusb-1.0-0-dev
+        sudo apt install libudev-dev
         cd electron
         npm install
         npm run dist

config-overrides.js

@@ -20,6 +20,9 @@ module.exports = {
       path.resolve(paths.appNodeModules, 'lru-cache'),
       path.resolve(paths.appNodeModules, 'yallist'),
       path.resolve(paths.appNodeModules, 'u2f-api'),
+      path.resolve(paths.appNodeModules, 'asn1.js'),
+      path.resolve(paths.appNodeModules, 'bech32'),
+      path.resolve(paths.appNodeModules, '@trezor/utxo-lib'),
       path.resolve(paths.appNodeModules, '@ledgerhq/hw-app-btc'),
       path.resolve(paths.appNodeModules, '@ledgerhq/hw-transport/lib-es'),
       path.resolve(paths.appNodeModules, '@ledgerhq/hw-transport-webusb/lib-es'),

electron/main.js

@@ -1,6 +1,6 @@
 // Modules to control application life and create native browser window
 require('babel-polyfill');
-const TransportNodeHid = require('@ledgerhq/hw-transport-node-hid').default;
+const TransportNodeHid = require('@ledgerhq/hw-transport-node-hid-noevents').default;
 const AppBtc = require('@ledgerhq/hw-app-btc').default;
 
 const {

electron/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "hw-kmd-wallet-electron",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Komodo Hardware Wallet Electron App",
   "main": "main.js",
   "scripts": {
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@ledgerhq/hw-app-btc": "^5.16.0",
-    "@ledgerhq/hw-transport-node-hid": "^4.38.6",
+    "@ledgerhq/hw-transport-node-hid-noevents": "^5.51.1",
     "babel-polyfill": "^6.26.0"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hw-kmd-wallet",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "author": "Luke Childs <[email protected]> (http://lukechilds.co.uk), Komodo Platform (https://komodoplatform.com)",
   "repository": "pbca26/hw-kmd-wallet",
   "homepage": "https://pbca26.github.io/hw-kmd-wallet",
@@ -35,6 +35,7 @@
     "@ledgerhq/hw-transport-webhid": "^5.34.0",
     "@ledgerhq/hw-transport-webusb": "^5.34.1",
     "@ledgerhq/hw-transport-web-ble": "^4.78.0",
+    "@trezor/utxo-lib": "^0.1.2",
     "babel-polyfill": "^6.26.0",
     "bip32-path": "^0.4.2",
     "bitcoinjs-lib": "^4.0.2",

src/lib/account-discovery.js

@@ -5,6 +5,7 @@ import bitcoin from 'bitcoinjs-lib';
 import parseHistory from './history-parser';
 import asyncForEach from './async';
 import {airDropCoins} from './coins';
+import TrezorUtxoLib from '@trezor/utxo-lib';
 
 let pubKeysCache = {};
 let gapLimit = 20;
@@ -93,7 +94,7 @@ const getAddressUtxos = async addresses => {
   return await Promise.all(utxos.map(async utxo => {
     const addressInfo = addresses.find(a => a.address === utxo.address);
 
-    const [
+    let [
       {rawtx},
       {
         locktime,
@@ -108,6 +109,14 @@ const getAddressUtxos = async addresses => {
       blockchain.getTransaction(utxo.txid)
     ]);
 
+    // fix for insight explorer value rounding issue
+    TrezorUtxoLib.Transaction.USE_STRING_VALUES = true;
+    const decodeFromRaw = TrezorUtxoLib.Transaction.fromHex(rawtx, TrezorUtxoLib.networks.komodo);
+
+    for (let i = 0; i < vout.length; i++) {
+      vout[i].satoshis = parseInt(decodeFromRaw.outs[i].value);
+    }
+
     return {
       id: `${utxo.txid}:${utxo.vout}`,
       ...addressInfo,

src/lib/coins.js

@@ -158,6 +158,13 @@ const coins = {
     explorer: 'https://soulja.explorer.dexstats.info/',
     api: ['https://soulja.explorer.dexstats.info/insight-api-komodo/'],
   },
+  GLEEC: {
+    explorer: 'https://gleec.xyz/',
+    api: [
+      'https://gleec.explorer.dexstats.info/insight-api-komodo/',
+      'https://gleec.xyz/insight-api-komodo/',
+    ],
+  },
   // DP: '',
   // SHARK: '',
   // EQL: '',

src/lib/trezor.js

@@ -110,7 +110,7 @@ const createTransaction = async (utxos, outputs, isKMD) => {
         }),
         bin_outputs: refTx.outputs.map((output) => {
           return {
-            amount: Number((Number(output.value).toFixed(8) * 100000000).toFixed(0)),
+            amount: output.hasOwnProperty('satoshis') ? output.satoshis.toString() : output.value.replace('.', ''),
             script_pubkey: output.scriptPubKey.hex,
           };
         }),