Fixing import script and adding a catch to the loop

Micah Riggan · Micah Riggan · commit bbfabac11049 · 2019-01-07T16:06:01.000-05:00
diff --git a/packages/bitcore-client/bin/wallet-import b/packages/bitcore-client/bin/wallet-import
@@ -31,7 +31,7 @@ const getFileKeys = file => {
 const parseKeys = keys => {
   let parsed = JSON.parse(keys);
   if (typeof parsed === 'object') {
-    if (!parsed instanceof Array ) {
+    if ((parsed instanceof Array) === false ) {
       return [parsed];
     } else {
       return parsed;
diff --git a/packages/bitcore-node/src/models/walletAddress.ts b/packages/bitcore-node/src/models/walletAddress.ts
@@ -41,15 +41,27 @@ export class WalletAddressModel extends BaseModel<IWalletAddress> {
     const unprocessedAddresses: Array<string> = [];
     return new Promise(async resolve => {
       for (let address of addresses) {
-        const updatedAddress = await this.collection.findOneAndUpdate({ 
-          wallet: wallet._id, address: address, chain, network
-        }, { $setOnInsert: { wallet: wallet._id, address: address, chain, network }}, { returnOriginal: false, upsert: true });
-        if (!updatedAddress.value!.processed) {
-          unprocessedAddresses.push(address); 
-          await CoinStorage.collection.updateMany(
-            { chain, network, address },
-            { $addToSet: { wallets: wallet._id } }
+        try {
+          const updatedAddress = await this.collection.findOneAndUpdate(
+            {
+              wallet: wallet._id,
+              address: address,
+              chain,
+              network
+            },
+            { $setOnInsert: { wallet: wallet._id, address: address, chain, network } },
+            { returnOriginal: false, upsert: true }
           );
+          if (!updatedAddress.value!.processed) {
+            unprocessedAddresses.push(address);
+            await CoinStorage.collection.updateMany(
+              { chain, network, address },
+              { $addToSet: { wallets: wallet._id } }
+            );
+          }
+        } catch (err) {
+          // Perhaps a race condition from multiple calls around the same time
+          console.error('Likely an upsert race condition in walletAddress updates');
         }
       }
 
@@ -60,7 +72,7 @@ export class WalletAddressModel extends BaseModel<IWalletAddress> {
       let txids = {};
       coinStream.on('data', (coin: ICoin) => {
         coinStream.pause();
-        if (!unprocessedAddresses.includes(coin.address)){
+        if (!unprocessedAddresses.includes(coin.address)) {
           return coinStream.resume();
         }
         if (!txids[coin.mintTxid]) {
@@ -80,8 +92,11 @@ export class WalletAddressModel extends BaseModel<IWalletAddress> {
         return coinStream.resume();
       });
       coinStream.on('end', async () => {
-        for (const address of unprocessedAddresses){
-          await this.collection.updateOne({ chain, network, address, wallet: wallet._id }, { $set: {processed: true }});
+        for (const address of unprocessedAddresses) {
+          await this.collection.updateOne(
+            { chain, network, address, wallet: wallet._id },
+            { $set: { processed: true } }
+          );
         }
         resolve();
       });
