Merge pull request #582 from keerifox/handle-frontier-errors

Fix 20 unused accounts being added on wallet import, and malformed lightweight proof of work requests for unused accounts
Nault · Jun 1, 2023 · a04d7b5 · a04d7b5
2 parents cd6d388 + 6bed180
commit a04d7b5
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/app/services/wallet.service.ts b/src/app/services/wallet.service.ts
@@ -512,8 +512,12 @@ export class WalletService {
         for (const accountID in batchResponse.frontiers) {
           if (batchResponse.frontiers.hasOwnProperty(accountID)) {
             const frontier = batchResponse.frontiers[accountID];
-            if (frontier !== batchAccounts[accountID].publicKey) {
-              usedIndices.push(batchAccounts[accountID].index);
+            const frontierIsValidHash = this.util.nano.isValidHash(frontier);
+
+            if (frontierIsValidHash === true) {
+              if (frontier !== batchAccounts[accountID].publicKey) {
+                usedIndices.push(batchAccounts[accountID].index);
+              }
             }
           }
         }
@@ -754,7 +758,14 @@ export class WalletService {
 
       walletAccount.balanceFiat = this.util.nano.rawToMnano(walletAccount.balance).times(fiatPrice).toNumber();
 
-      walletAccount.frontier = frontiers.frontiers[accountID] || null;
+      const walletAccountFrontier = frontiers.frontiers[accountID];
+      const walletAccountFrontierIsValidHash = this.util.nano.isValidHash(walletAccountFrontier);
+
+      walletAccount.frontier = (
+          (walletAccountFrontierIsValidHash === true)
+        ? walletAccountFrontier
+        : null
+      );
 
       walletBalance = walletBalance.plus(walletAccount.balance);
       walletPendingInclUnconfirmed = walletPendingInclUnconfirmed.plus(accountBalancePendingInclUnconfirmed);