Merge pull request #1750 from blockstack/feature/wallet-balance-update-fix

Wallet balance update fix

Author: yknl

app/js/account/store/account/actions.js

@@ -433,62 +433,46 @@ function withdrawBitcoinFromCoreWallet(
   }
 }
 
-function refreshBalances(insightUrl, addresses, coreAPIPassword) {
+function refreshBalances(balanceURL, addresses) {
   return dispatch => {
     const results = []
     return Promise.all(
       addresses.map(address => {
-        logger.debug(
+        logger.debug( 
           `refreshBalances: refreshing balances for address ${address}`
         )
-        const insightUrls = getInsightUrls(insightUrl, address, coreAPIPassword)
-        const confirmedBalanceUrl = insightUrls.confirmedBalanceUrl
-        const unconfirmedBalanceUrl = insightUrls.unconfirmedBalanceUrl
-        return fetch(confirmedBalanceUrl)
+
+        return fetch(`${balanceURL}${address}`)
           .then(response => response.text())
-          .then(responseText => {
-            const confirmedBalance = parseInt(responseText, 10)
-            fetch(unconfirmedBalanceUrl)
-              .then(response => response.text())
-              .then(balanceResponseText => {
-                const unconfirmedBalance = parseInt(balanceResponseText, 10)
-                results.push({
-                  address,
-                  balance: satoshisToBtc(unconfirmedBalance + confirmedBalance)
-                })
-
-                if (results.length >= addresses.length) {
-                  let balances = {}
-                  let total = 0.0
-
-                  for (let i = 0; i < results.length; i++) {
-                    const thisAddress = results[i].address
-                    if (!balances.hasOwnProperty(thisAddress)) {
-                      const balance = results[i].balance
-                      total = total + balance
-                      balances[thisAddress] = balance
-                    } else {
-                      logger.error(
-                        `refreshBalances: Duplicate address ${thisAddress} in addresses array`
-                      )
-                    }
-                  }
-
-                  balances.total = total
-
-                  dispatch(updateBalances(balances))
+          .then(response => {
+            results.push({
+              address,
+              balance: satoshisToBtc(parseInt(response))
+            })
+
+            if (results.length >= addresses.length) {
+              let balances = {}
+              let total = 0.0
+
+              for (let i = 0; i < results.length; i++) {
+                const thisAddress = results[i].address
+                if (!balances.hasOwnProperty(thisAddress)) {
+                  const balance = results[i].balance
+                  total = total + balance
+                  balances[thisAddress] = balance
+                } else {
+                  logger.error(
+                    `refreshBalances: Duplicate address ${thisAddress} in addresses array`
+                  )
                 }
-              })
-              .catch(error => {
-                logger.error(
-                  `refreshBalances: error fetching ${address} unconfirmed balance`,
-                  error
-                )
-              })
+              }
+              balances.total = total
+              dispatch(updateBalances(balances))
+            }
           })
           .catch(error => {
             logger.error(
-              `refreshBalances: error fetching ${address} confirmed balance`,
+              `refreshBalances: error fetching ${address} balance`,
               error
             )
           })

app/js/account/store/settings/default.js

@@ -21,6 +21,7 @@ const DEFAULT_API = {
   bitcoinAddressLookupUrl: `${DEFAULT_CORE_API_ENDPOINT}/v1/addresses/bitcoin/{address}`,
   zeroConfBalanceUrl: `${DEFAULT_CORE_API_ENDPOINT}/v1/wallet/balance/0`,
   insightUrl: 'https://utxo.blockstack.org/insight-api/addr/{address}',
+  btcBalanceUrl: 'https://blockchain.info/q/addressbalance/',
   broadcastUrl: 'https://utxo.blockstack.org/insight-api/tx/send',
   priceUrl: `${DEFAULT_CORE_API_ENDPOINT}/v1/prices/names/{name}`,
   networkFeeUrl: 'https://bitcoinfees.21.co/api/v1/fees/recommended',

app/js/profiles/components/registration/RegistrationSelectView.js

@@ -30,7 +30,7 @@ function mapStateToProps(state) {
     balanceUrl: state.settings.api.zeroConfBalanceUrl,
     encryptedBackupPhrase: state.account.encryptedBackupPhrase,
     balances: state.account.bitcoinAccount.balances,
-    insightUrl: state.settings.api.insightUrl
+    btcBalanceUrl: state.settings.api.btcBalanceUrl
   }
 }
 
@@ -54,7 +54,7 @@ class AddUsernameSelectPage extends Component {
     encryptedBackupPhrase: PropTypes.string.isRequired,
     addresses: PropTypes.array.isRequired,
     balances: PropTypes.object.isRequired,
-    insightUrl: PropTypes.string.isRequired,
+    btcBalanceUrl: PropTypes.string.isRequired,
     refreshBalances: PropTypes.func.isRequired
   }
 
@@ -93,8 +93,7 @@ class AddUsernameSelectPage extends Component {
     if (!enoughMoney) {
       this.paymentTimer = setInterval(() => {
         logger.debug('paymentTimer: calling refreshBalances...')
-        that.props.refreshBalances(that.props.insightUrl, that.props.addresses,
-              that.props.api.coreAPIPassword)
+        that.props.refreshBalances(that.props.btcBalanceUrl, that.props.addresses)
       }, CHECK_FOR_PAYMENT_INTERVAL)
     }
     this.state = {
@@ -114,8 +113,7 @@ class AddUsernameSelectPage extends Component {
 
   componentDidMount() {
     logger.info('componentDidMount')
-    this.props.refreshBalances(this.props.insightUrl, this.props.addresses,
-          this.props.api.coreAPIPassword)
+    this.props.refreshBalances(this.props.btcBalanceUrl, this.props.addresses)
 
     // Only consider top level domains for showing the alert
     if (!isSubdomain(this.props.routeParams.name)) {

app/js/wallet/components/Balance.js

@@ -12,13 +12,13 @@ import log4js from 'log4js'
 
 const logger = log4js.getLogger(__filename)
 
-const UPDATE_BALANCE_INTERVAL = 10000
+const UPDATE_BALANCE_INTERVAL = 30000
 
 function mapStateToProps(state) {
   return {
     addresses: state.account.bitcoinAccount.addresses,
     balances: state.account.bitcoinAccount.balances,
-    insightUrl: state.settings.api.insightUrl,
+    btcBalanceUrl: state.settings.api.btcBalanceUrl,
     btcPriceUrl: state.settings.api.btcPriceUrl,
     btcPrice: state.settings.api.btcPrice,
     coreAPIPassword: state.settings.api.coreAPIPassword
@@ -34,7 +34,7 @@ class Balance extends Component {
     addresses: PropTypes.array.isRequired,
     balances: PropTypes.object.isRequired,
     refreshBalances: PropTypes.func.isRequired,
-    insightUrl: PropTypes.string.isRequired,
+    btcBalanceUrl: PropTypes.string.isRequired,
     btcPriceUrl: PropTypes.string.isRequired,
     btcPrice: PropTypes.string.isRequired,
     refreshBtcPrice: PropTypes.func.isRequired,
@@ -49,13 +49,11 @@ class Balance extends Component {
   }
 
   componentDidMount() {
-    this.props.refreshBalances(this.props.insightUrl, this.props.addresses,
-          this.props.coreAPIPassword)
+    this.props.refreshBalances(this.props.btcBalanceUrl, this.props.addresses)
     this.props.refreshBtcPrice(this.props.btcPriceUrl)
     this.balanceTimer = setInterval(() => {
       logger.debug('balanceTimer: calling refreshBalances...')
-      this.props.refreshBalances(this.props.insightUrl, this.props.addresses,
-            this.props.coreAPIPassword)
+      this.props.refreshBalances(this.props.btcBalanceUrl, this.props.addresses)
       this.props.refreshBtcPrice(this.props.btcPriceUrl)
     }, UPDATE_BALANCE_INTERVAL)
   }