Fix login with Ledger on Windows. Upgrade neon-js and fix minor UTXO tracking bugs.

jsolman · jsolman · commit 191adede5957 · 2019-01-23T20:02:38.000-08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aphelion-desktop-wallet",
-  "version": "3.3.7",
+  "version": "3.4.2",
   "author": "Aphelion <info@aphelion.org>",
   "description": "Aphelion Desktop Wallet",
   "license": "LicenseRef-LICENSE",
@@ -59,7 +59,7 @@
     }
   },
   "dependencies": {
-    "@cityofzion/neon-js": "git+https://github.com/cityofzion/neon-js.git#3.8.1",
+    "@cityofzion/neon-js": "^3.11.9",
     "@ionic/app-scripts": "^3.1.8",
     "@ledgerhq/hw-transport-node-hid": "^4.7.6",
     "@xkeshi/vue-qrcode": "^0.3.0",
diff --git a/src/renderer/components/login/Ledger.vue b/src/renderer/components/login/Ledger.vue
@@ -43,32 +43,40 @@ export default {
   data() {
     return {
       connected: null,
+      verifying: null,
     };
   },
 
   methods: {
-    checkLedgerStatus() {
-      if (this.connected === true) {
+    async checkLedgerStatus() {
+      if (this.connected || this.verifying) {
         return;
       }
 
-      this.$store.dispatch('verifyLedgerConnection', {
-        done: () => {
-          this.connected = true;
-          this.login();
-        },
-        failed: () => {
-          this.connected = false;
-        },
-      });
+      try {
+        this.verifying = true;
+        await new Promise(async (resolve, reject) => {
+          this.$store.dispatch('verifyLedgerConnection', {
+            done: async () => {
+              this.connected = true;
+              await this.login();
+              resolve();
+            },
+            failed: () => reject(),
+          });
+        });
+      } catch (e) {
+        this.connected = false;
+      }
+      this.verifying = false;
     },
 
-    login() {
+    async login() {
       if (!this.connected) {
         return;
       }
 
-      this.$store.dispatch('openLedger', {
+      await this.$store.dispatch('openLedger', {
         done: () => {
           this.$router.push('/authenticated/dashboard');
         },
diff --git a/src/renderer/l10n/en.json b/src/renderer/l10n/en.json
@@ -171,7 +171,7 @@
   "nightMode": "Night Mode",
   "noContacts": "No contacts",
   "noDataAvailable": "No Data Available",
-  "noLedgerDeviceFound": "No Ledger device found. Please plugin your Ledger in, unlock it and open the NEO application.",
+  "noLedgerDeviceFound": "No Ledger device found. Please plug your Ledger in, unlock it and open the NEO application.",
   "noOptionSelected": "No Option Selected",
   "notRightNow": "No, Not Now",
   "noSavedWallets": "You do not have any saved wallets. Create one?",
diff --git a/src/renderer/services/dex.js b/src/renderer/services/dex.js
@@ -446,9 +446,11 @@ export default {
           .then((transaction) => {
             // send the signed transactions to the api for relay
             const currentNetwork = network.getSelectedNetwork();
+            const currentWallet = wallets.getCurrentWallet();
             axios.delete(`${currentNetwork.aph}/order/${order.marketName}/${order.offerId}/${tx.serializeTransaction(transaction.tx, true)}`)
               .then((res) => {
                 if (res.data.result) {
+                  neo.applyTxToAddressSystemAssetBalance(currentWallet.address, transaction.tx, false);
                   resolve('Order Cancelled');
                 } else {
                   reject('Cancel failed');
@@ -484,6 +486,7 @@ export default {
         alerts.success('Claim relayed, waiting for confirmation...');
         neo.monitorTransactionConfirmation(res.tx, true)
           .then(async () => {
+            neo.applyTxToAddressSystemAssetBalance(wallets.getCurrentWallet().address, res.tx, true);
             alerts.success(`Claimed ${withdrawAmountAfterClaim.toString()} APH to Wallet Balance.`);
             try {
               await store.dispatch('fetchCommitState');
@@ -519,6 +522,7 @@ export default {
               alerts.success('Commit relayed, waiting for confirmation...');
               neo.monitorTransactionConfirmation(res.tx, true)
                 .then(() => {
+                  neo.applyTxToAddressSystemAssetBalance(wallets.getCurrentWallet().address, res.tx, true);
                   setTimeout(async () => {
                     try {
                       await store.dispatch('fetchCommitState');
@@ -605,6 +609,7 @@ export default {
               alerts.success('Compound relayed, waiting for confirmation...');
               neo.monitorTransactionConfirmation(res.tx, true)
                 .then(() => {
+                  neo.applyTxToAddressSystemAssetBalance(wallets.getCurrentWallet().address, res.tx, true);
                   setTimeout(async () => {
                     try {
                       await store.dispatch('fetchCommitState');
@@ -642,6 +647,7 @@ export default {
         let neoToSend = 0;
         let gasToSend = 0;
         let holding = null;
+        const currentWallet = wallets.getCurrentWallet();
 
         if (assetId === assets.NEO) {
           holding = neo.getHolding(assets.NEO);
@@ -671,6 +677,7 @@ export default {
               assetId, quantity);
             if (DBG_LOG) console.log(`Attempting approval of ${assetId}`);
             await neo.monitorTransactionConfirmation(res.tx, true);
+            neo.applyTxToAddressSystemAssetBalance(currentWallet.address, res.tx, true);
             alerts.info(`Confirmed approval of ${quantity} ${holding.symbol} for deposit.`);
             // TODO: wait a few seconds before issuing deposit for UTXOs to settle.
           }
@@ -687,7 +694,7 @@ export default {
                 alerts.success('Deposit relayed, waiting for confirmation...');
                 neo.monitorTransactionConfirmation(res.tx, true)
                   .then(() => {
-                    neo.applyTxToAddressSystemAssetBalance(wallets.getCurrentWallet().address, res.tx, true);
+                    neo.applyTxToAddressSystemAssetBalance(currentWallet.address, res.tx, true);
                     resolve(res.tx);
                   })
                   .catch((e) => {
@@ -727,6 +734,7 @@ export default {
             return api.sendTx(configResponse);
           })
           .then((configResponse) => {
+            neo.applyTxToAddressSystemAssetBalance(wallets.getCurrentWallet().address, configResponse.tx, false);
             resolve({
               success: configResponse.response.result,
               tx: configResponse.tx,
@@ -1832,6 +1840,7 @@ export default {
         }
 
         Vue.set(order, 'status', 'Submitting');
+        const currentWallet = wallets.getCurrentWallet();
 
         // build all the order transactions
         for (let i = 0; i < order.offersToTake.length; i += 1) {
@@ -1840,6 +1849,8 @@ export default {
           // need to ignore this rule, each of these build operations has to happen in order
           // that way they'll each select the right UTXO inputs
           await this.buildAcceptOffer((order.side === 'Buy' ? 'Sell' : 'Buy'), order.orderType, order.market, offer);
+          // TODO: AcceptOffer has to be applied immediately in order to get different UTXO, in future wait to apply...
+          neo.applyTxToAddressSystemAssetBalance(currentWallet.address, offer.tx, false);
           /* eslint-enable no-await-in-loop */
         }
 
@@ -1876,6 +1887,7 @@ export default {
             } else if (res.data.result.error) {
               reject(`Order failed. Error: ${res.data.result.error}`);
             } else {
+              if (order.makerTx) neo.applyTxToAddressSystemAssetBalance(currentWallet.address, order.makerTx, false);
               const responseQuantityToTake = new BigNumber(res.data.quantityToTake);
               const responseQuantityTaken = new BigNumber(res.data.quantityTaken);
 
@@ -2076,12 +2088,14 @@ export default {
                 return;
               }
               store.commit('setSystemWithdrawMergeState', { step: 2 });
+              const dexAddress = wallet.getAddressFromScriptHash(store.state.currentNetwork.dex_hash);
+              neo.applyTxToAddressSystemAssetBalance(dexAddress, res.tx, false);
 
               alerts.success('Withdraw Mark Step Relayed. Waiting for confirmation.');
               neo.monitorTransactionConfirmation(res.tx, true)
                 .then(() => {
                   store.commit('setSystemWithdrawMergeState', { step: 3 });
-                  const dexAddress = wallet.getAddressFromScriptHash(store.state.currentNetwork.dex_hash);
+
                   // Must allow funds to be sent again by moving tx outputs to unspent.
                   neo.applyTxToAddressSystemAssetBalance(dexAddress, res.tx, true);
 
diff --git a/src/renderer/services/ledger.js b/src/renderer/services/ledger.js
@@ -7,51 +7,32 @@ const VALID_STATUS = 0x9000;
 let currentLedger = null;
 let currentDevice = null;
 export default {
-  open() {
-    return new Promise((resolve, reject) => {
-      try {
-        return LedgerNode.isSupported()
-          .then((supported) => {
-            if (!supported) {
-              return reject('Your computer does not support the ledger!');
-            }
 
-            return LedgerNode.list()
-              .then((paths) => {
-                if (paths.length === 0) {
-                  return reject('No Ledger device found. Please plugin your Ledger in, '
-                    + 'unlock it and open the NEO application.');
-                }
-
-                const path = paths[0];
-                return LedgerNode.open(path)
-                  .then((res) => {
-                    currentDevice = res;
-                    this.getPublicKey()
-                      .then(() => {
-                        currentLedger = this;
-                        resolve(currentDevice);
-                      })
-                      .catch(() => {
-                        return reject('Please plugin your Ledger in, '
-                          + 'unlock it and open the NEO application.');
-                      });
-                  })
-                  .catch(({ message }) => {
-                    return reject(message);
-                  });
-              })
-              .catch(({ message }) => {
-                return reject(message);
-              });
-          })
-          .catch(({ message }) => {
-            return reject(message);
-          });
-      } catch ({ message }) {
-        return reject(message);
+  async open() {
+    try {
+      const supported = await LedgerNode.isSupported();
+      if (!supported) {
+        throw Error('Your computer does not support the ledger!');
       }
-    });
+      const paths = await LedgerNode.list();
+      if (paths.length === 0) {
+        throw Error('No Ledger device found. Please plug your Ledger in, '
+        + 'unlock it and open the NEO application.');
+      }
+
+      const path = paths[0];
+      currentDevice = await LedgerNode.open(path);
+      try {
+        await this.getPublicKey();
+      } catch (e) {
+        throw Error('Please plug your Ledger in, unlock it and open the NEO application.');
+      }
+
+      currentLedger = this;
+      return currentDevice;
+    } catch ({ message }) {
+      throw message;
+    }
   },
 
   close() {
diff --git a/src/renderer/services/neo.js b/src/renderer/services/neo.js
@@ -2,6 +2,7 @@ import {
   wallet,
   api,
   u,
+  tx,
 } from '@cityofzion/neon-js';
 import _ from 'lodash';
 import { BigNumber } from 'bignumber.js';
@@ -18,6 +19,7 @@ import { store } from '../store';
 import { timeouts, intervals } from '../constants';
 import { toBigNumber } from './formatting.js';
 
+const { Transaction } = tx;
 const DBG_LOG = false;
 
 const GAS_ASSET_ID = '602c79718b16e442de58778e148d0b1084e3b2dffd5de6b7b16cee7969282de7';
@@ -844,8 +846,10 @@ export default {
             return this.monitorTransactionConfirmation(res.tx, checkRpcForDetails)
               .then(() => {
                 if (isNep5 === false) {
-                  // Make change immediately available to spend.
-                  this.applyTxToAddressSystemAssetBalance(store.state.currentWallet.address, res.tx, true);
+                  // TODO: verify this only makes the change available to spend and doesn't try to add the other
+                  // TODO: utxo outputs too
+                  // this.applyTxToAddressSystemAssetBalance(store.state.currentWallet.address, res.tx, true);
+                  // Make change immediately available to spend
                 }
                 return resolve(res.tx);
               })
@@ -893,8 +897,11 @@ export default {
           config.signingFunction = ledger.signWithLedger;
         }
 
+        // TODO: this probably should happen as an action to update the balance without chance of race condition
         return api.sendAsset(config)
           .then((res) => {
+            // api.sendAsset already applies the transaction to the balance, but if a block has passed and
+            // fetchSystemAssetBalances() retrieved balance again the cached object changes, so we need to apply again.
             this.applyTxToAddressSystemAssetBalance(currentWallet.address, res.tx);
             return res;
           })
@@ -938,7 +945,12 @@ export default {
       config.address = currentWallet.address;
 
       return api.doInvoke(config)
-        .then(res => res)
+        .then((res) => {
+          // api.doInvoke already applies the transaction to the balance, but if a block has passed and
+          // fetchSystemAssetBalances() retrieved balance again the cached object changes, so we need to apply again.
+          this.applyTxToAddressSystemAssetBalance(currentWallet.address, res.tx, false);
+          return res;
+        })
         .catch((e) => {
           alerts.exception(e);
         });
@@ -948,7 +960,10 @@ export default {
     config.account = account;
 
     return api.doInvoke(config)
-      .then(res => res)
+      .then((res) => {
+        this.applyTxToAddressSystemAssetBalance(currentWallet.address, res.tx, false);
+        return res;
+      })
       .catch((e) => {
         alerts.exception(e);
       });
@@ -986,7 +1001,10 @@ export default {
       config.address = currentWallet.address;
 
       return api.doInvoke(config)
-        .then(res => res)
+        .then((res) => {
+          this.applyTxToAddressSystemAssetBalance(currentWallet.address, res.tx, false);
+          return res;
+        })
         .catch((e) => {
           alerts.exception(e);
         });
@@ -996,7 +1014,10 @@ export default {
     config.account = account;
 
     return api.doInvoke(config)
-      .then(res => res)
+      .then((res) => {
+        this.applyTxToAddressSystemAssetBalance(currentWallet.address, res.tx, false);
+        return res;
+      })
       .catch((e) => {
         alerts.exception(e);
       });
@@ -1259,6 +1280,7 @@ export default {
   },
 
   applyTxToAddressSystemAssetBalance(address, tx, confirmed) {
+    tx = tx instanceof Transaction ? tx : Transaction.deserialize(tx);
     if (_.has(addressBalances, address)) {
       const existingBalance = _.get(addressBalances, address);
       existingBalance.balance.balance.applyTx(tx, confirmed);
@@ -1434,8 +1456,10 @@ export default {
                 return api.sendTx(config);
               })
               .then((config) => {
+                this.applyTxToAddressSystemAssetBalance(currentWallet.address, config.tx, false);
                 this.monitorTransactionConfirmation(config.tx, true)
                   .then(() => {
+                    this.applyTxToAddressSystemAssetBalance(currentWallet.address, config.tx, true);
                     resolve({
                       success: config.response.result,
                       tx: config.tx,
diff --git a/src/renderer/store/actions.js b/src/renderer/store/actions.js
