Merge branch 'release/v0.35.0'

Author: yknl

README.md

@@ -160,7 +160,7 @@ And a few other smaller modules (these can be found in `package.json`).
 
 ## Maintainer
 
-This repository is maintained by [yukan.id](https://explorer.blockstack.org/name/yukan.id).
+This repository is maintained by [hankstoever.id](https://explorer.blockstack.org/name/hankstoever.id).
 
 ## Testing
 

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/actions.js

@@ -63,7 +63,7 @@ function resetApi(api) {
   }
 }
 
-function connectStorage() {
+function connectStorage(customGaiaUrl) {
   return async (dispatch, getState) => {
     logger.info('connectStorage')
     const state = getState()
@@ -75,9 +75,12 @@ function connectStorage() {
       return Promise.reject()
     }
 
-    return connectToGaiaHub(api.gaiaHubUrl, idKeypairs[0].key).then(gaiaHubConfig => {
+    const gaiaHubUrl = customGaiaUrl || api.gaiaHubUrl
+
+    return connectToGaiaHub(gaiaHubUrl, idKeypairs[0].key).then(gaiaHubConfig => {
       const newApi = Object.assign({}, api, {
         gaiaHubConfig,
+        gaiaHubUrl,
         hostedDataLocation: BLOCKSTACK_INC
       })
       dispatch(updateApi(newApi))

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/auth/index.js

@@ -271,7 +271,8 @@ class AuthPage extends React.Component {
                 profile.apps = apps
                 const signedProfileTokenData = signProfileForUpload(
                   profile,
-                  nextProps.identityKeypairs[identityIndex]
+                  nextProps.identityKeypairs[identityIndex],
+                  this.props.api
                 )
                 logger.debug(
                   'componentWillReceiveProps: uploading updated profile with new apps array'

app/js/components/styled/onboarding/index.js

@@ -433,6 +433,20 @@ const Loading = styled.div`
   }
 `
 
+const RecommendedHubPlaceholder = styled.div`
+  background: #ececec;
+  text-align: center;
+  font-weight: 500;
+  padding: 10px;
+  margin-bottom: 2em;
+`
+
+const Hr = styled.hr`
+  border-top: 1px solid #ececec;
+  width: 100%;
+  margin-bottom: 2em;
+`
+
 const PanelCard = ({ children, ...rest }) => (
   <Card {...rest}>
     <PlaceholderStyles />
@@ -458,5 +472,7 @@ Panel.Card.ErrorMessage.Icon = Icon
 Panel.Progress = Progress
 Panel.Progress.Dot = Dot
 Panel.Loading = Loading
+Panel.RecommendedHubPlaceholder = RecommendedHubPlaceholder
+Panel.Hr = Hr
 
 export default Panel

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/profiles/store/identity/actions.js

@@ -271,7 +271,10 @@ function createNewProfile(
 function refreshIdentities(
   api: {
     bitcoinAddressLookupUrl: string,
-    nameLookupUrl: string
+    nameLookupUrl: string,
+    gaiaHubConfig: {
+      url_prefix: string,
+    },
   },
   ownerAddresses: Array<string>
 ) {
@@ -292,7 +295,7 @@ function refreshIdentities(
               )
               const gaiaBucketAddress = ownerAddresses[0]
               return fetchProfileLocations(
-                'https://gaia.blockstack.org/hub',
+                api.gaiaHubConfig.url_prefix,
                 address,
                 gaiaBucketAddress,
                 index

app/js/profiles/store/registration/actions.js

@@ -147,7 +147,7 @@ function registerName(api, domainName, identity, identityIndex,
   return dispatch => {
     logger.debug(`Signing a new profile for ${domainName}`)
     const profile = identity.profile || DEFAULT_PROFILE
-    const signedProfileTokenData = signProfileForUpload(profile, keypair)
+    const signedProfileTokenData = signProfileForUpload(profile, keypair, api)
 
     dispatch(profileUploading())
     logger.info(`Uploading ${domainName} profile...`)

app/js/sign-in/index.js

@@ -206,6 +206,14 @@ class SignIn extends React.Component {
               this.props.api,
               this.props.identityAddresses
             )
+            const identity = this.props.localIdentities[0]
+            if (identity && identity.profile && identity.profile.api) {
+              const newApi = {
+                ...this.props.api,
+                ...identity.profile.api
+              }
+              this.props.updateApi(newApi)
+            }
             logger.debug('refreshIdentities complete')
             updateEmail(this.state.email)
             logger.debug('updated email')
@@ -427,7 +435,8 @@ SignIn.propTypes = {
   refreshIdentities: PropTypes.func.isRequired,
   localIdentities: PropTypes.array.isRequired,
   encryptedBackupPhrase: PropTypes.string,
-  connectStorage: PropTypes.func.isRequired
+  connectStorage: PropTypes.func.isRequired,
+  updateApi: PropTypes.func.isRequired
 }
 
 export default withRouter(