From 15bb3c50cfd3f37353e9fe80efd6f94c2896bc24 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Mon, 8 Nov 2021 07:10:39 -0800
Subject: [PATCH] Retrying wallet init if it fails

---
 .../admin-lte/configure/ipfs-tab/index.js     | 79 +++++++++++++++----
 .../admin-lte/configure/lib/wallet-service.js |  2 +-
 2 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/src/components/admin-lte/configure/ipfs-tab/index.js b/src/components/admin-lte/configure/ipfs-tab/index.js
index 4d3f8f7..c73fcc8 100644
--- a/src/components/admin-lte/configure/ipfs-tab/index.js
+++ b/src/components/admin-lte/configure/ipfs-tab/index.js
@@ -44,15 +44,15 @@ class IPFS extends React.Component {
       <Content>
         <Row>
           <Col sm={12}>
-            <Box className='text-center ipfs-checkbox-container'>
+            <Box className="text-center ipfs-checkbox-container">
               <Checkbox
-                id='ipfs-checkbox'
-                className='ipfs-checkbox'
+                id="ipfs-checkbox"
+                className="ipfs-checkbox"
                 value={ipfsConnection} // mark as checked
-                text='Connect to wallet services over IPFS'
-                labelPosition='none'
+                text="Connect to wallet services over IPFS"
+                labelPosition="none"
                 labelXs={0}
-                name='ipfsConnection'
+                name="ipfsConnection"
                 onChange={this.handleIpfs}
               />
             </Box>
@@ -338,17 +338,68 @@ class IPFS extends React.Component {
 
       _this.bchWalletLib = new _this.BchWallet(mnemonic, advancedConfig)
 
-      await _this.bchWalletLib.walletInfoPromise // Wait for wallet to be created.
+      let utxosInitialized = false
+      let cnt = 0
+      do {
+        cnt++
 
-      // If UTXOs fail to update, try one more time.
-      if (!_this.bchWalletLib.utxos.utxoStore) {
-        await _this.bchWalletLib.getUtxos()
+        try {
+          // Wait for wallet to be created.
+          await _this.bchWalletLib.walletInfoPromise
 
-        // Throw an error if UTXOs are still not updated.
-        if (!_this.bchWalletLib.utxos.utxoStore) {
-          throw new Error('UTXOs failed to update. Try again.')
+          // await _this.bchWalletLib.bchjs.Util.sleep(5000)
+          await _this.sleep(5000)
+
+          const utxos = await _this.bchWalletLib.getUtxos()
+          if (_this.bchWalletLib.utxos.utxoStore) {
+            _this.onStatusLog(
+              `utxo initialization succeeded: ${JSON.stringify(utxos, null, 2)}`
+            )
+            utxosInitialized = true
+          } else {
+            _this.onStatusLog(
+              `Attempt ${cnt} to re-initialize timed out. Will try again.`
+            )
+          }
+        } catch (err) {
+          _this.onStatusLog(
+            `Attempt ${cnt} to re-initialize wallet failed. Will try again.`
+          )
+          console.log(err)
         }
-      }
+        // } while (!utxosInitialized)
+      } while (!utxosInitialized && cnt < 10)
+
+      // console.log('_this.bchWalletLib: ', _this.bchWalletLib)
+      //
+      // setInterval(async function () {
+      //   const now = new Date()
+      //   console.log(`Getting UTXOs at ${now.toLocaleString()}`)
+      //   await _this.bchWalletLib.getUtxos()
+      //   console.log(
+      //     `_this.bchWalletLib.utxos.utxoStore: ${JSON.stringify(
+      //       _this.bchWalletLib.utxos.utxoStore,
+      //       null,
+      //       2
+      //     )}`
+      //   )
+      // }, 20000)
+
+      // let now = new Date()
+      // console.log(`Starting at ${now.toLocaleString()}`)
+      // await _this.bchWalletLib.bchjs.Util.sleep(5000)
+      // now = new Date()
+      // console.log(`Finished at ${now.toLocaleString()}`)
+
+      // // If UTXOs fail to update, try one more time.
+      // if (!_this.bchWalletLib.utxos.utxoStore) {
+      //   await _this.bchWalletLib.getUtxos()
+      //
+      //   // Throw an error if UTXOs are still not updated.
+      //   if (!_this.bchWalletLib.utxos.utxoStore) {
+      //     throw new Error('UTXOs failed to update. Try again.')
+      //   }
+      // }
 
       // Update redux state
       _this.props.setBchWallet(_this.bchWalletLib)
diff --git a/src/components/admin-lte/configure/lib/wallet-service.js b/src/components/admin-lte/configure/lib/wallet-service.js
index a36602e..3a01188 100644
--- a/src/components/admin-lte/configure/lib/wallet-service.js
+++ b/src/components/admin-lte/configure/lib/wallet-service.js
@@ -206,7 +206,7 @@ class WalletService {
 
         // Wait between loops.
         // await this.sleep(1000)
-        await this.ipfsControl.wallet.bchjs.Util.sleep(5000)
+        await this.ipfsControl.wallet.bchjs.Util.sleep(4500)
 
         cnt++