Merge pull request #390 from EYBlockchain/daveroga/balance-error-tran…

…sfer daveroga/blockProposedEventHandler not updating transfer commitment
EYBlockchain · Jan 14, 2022 · 64432c1 · 64432c1
2 parents 7443c05 + 4bfebbc
commit 64432c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/nightfall-client/src/event-handlers/block-proposed.mjs b/nightfall-client/src/event-handlers/block-proposed.mjs
@@ -62,7 +62,9 @@ async function blockProposedEventHandler(data) {
         }
       });
     }
-    await Promise.all(storeCommitments);
+    await Promise.all(storeCommitments).catch(function (err) {
+      logger.info(err);
+    }); // control errors when storing commitments in order to ensure next Promise being executed
     return Promise.all([
       markOnChain(nonZeroCommitments, block.blockNumberL2, data.blockNumber, data.transactionHash),
       markNullifiedOnChain(

diff --git a/nightfall-client/src/services/keys.mjs b/nightfall-client/src/services/keys.mjs
@@ -83,7 +83,10 @@ export async function generateKeys(mnemonic, path) {
 }
 
 export function storeMemoryKeysForDecryption(ivk, nsk) {
-  return Promise.all([ivks.push(...ivk), nsks.push(...nsk)]);
+  return Promise.all([
+    ivks.includes(ivk[0]) ? ivks : ivks.push(...ivk),
+    nsks.includes(nsk[0]) ? nsk : nsks.push(...nsk),
+  ]);
 }
 
 export function calculateIvkPkdfromAskNsk(ask, nsk) {