Merge branch 'hotfix/0.11.2'

Author: larrysalibra

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

@@ -6,6 +6,7 @@ import { authorizationHeaderValue, btcToSatoshis, encrypt,
   getBitcoinPrivateKeychain,
   getIdentityOwnerAddressNode,
   getBitcoinAddressNode } from '../../../utils'
+import roundTo from 'round-to'
 import * as types from './types'
 import log4js from 'log4js'
 
@@ -225,6 +226,11 @@ function resetCoreWithdrawal() {
 function withdrawBitcoinFromCoreWallet(coreWalletWithdrawUrl, recipientAddress, amount, coreAPIPassword) {
   return dispatch => {
     dispatch(withdrawingCoreBalance(recipientAddress, amount))
+
+    const satoshisAmount = btcToSatoshis(amount)
+    const roundedSatoshiAmount = roundTo(satoshisAmount, 0)
+    logger.debug(`withdrawBitcoinFromCoreWallet: ${roundedSatoshiAmount} satoshis to ${recipientAddress}`)
+
     const requestHeaders = {
       'Accept': 'application/json',
       'Content-Type': 'application/json',
@@ -234,7 +240,7 @@ function withdrawBitcoinFromCoreWallet(coreWalletWithdrawUrl, recipientAddress,
     const requestBody = JSON.stringify({
       address: recipientAddress,
       min_confs: 0,
-      amount: btcToSatoshis(amount)
+      amount: roundedSatoshiAmount
     })
 
     fetch(coreWalletWithdrawUrl, {

app/js/components/InputGroup.js

@@ -4,6 +4,7 @@ class InputGroup extends Component {
   static propTypes = {
     label: PropTypes.string.isRequired,
     placeholder: PropTypes.string,
+    step: PropTypes.number,
     name: PropTypes.string,
     data: PropTypes.object,
     onChange: PropTypes.func,
@@ -19,10 +20,14 @@ class InputGroup extends Component {
     let value = '',
         type = "text",
         disabled = false,
-        required = false
+        required = false,
+        step = 1
     if (this.props.data && this.props.name) {
       value = this.props.data[this.props.name]
     }
+    if (this.props.step) {
+      step = this.props.step
+    }
     if (this.props.type) {
       type = this.props.type
     }
@@ -62,6 +67,7 @@ class InputGroup extends Component {
               className={inputClass}
               type={type}
               required={required}
+              step={step}
               placeholder={
                 this.props.placeholder ? this.props.placeholder : this.props.label
               }

app/js/wallet/SendPage.js

@@ -6,7 +6,7 @@ import { AccountActions } from '../account/store/account'
 
 import {
   broadcastTransaction, decryptPrivateKeychain, getNetworkFee,
-  getBitcoinPrivateKeychain, getUtxo,
+  getBitcoinPrivateKeychain, getUtxo
 } from '../utils'
 import Alert from '../components/Alert'
 import InputGroup from '../components/InputGroup'
@@ -84,7 +84,7 @@ class SendPage extends Component {
       parseFloat(this.state.amount), this.props.coreAPIPassword)
     return // TODO temporary until we switch back to built in wallet
 
-    const password = this.state.password
+    const password = this.state.password 
 
 
     // FIXME this needs to be written to use our BIP44 compliant wallet structure
@@ -192,7 +192,7 @@ class SendPage extends Component {
             required={true}/>
           <InputGroup data={this.state} onChange={this.onValueChange} name="amount"
             label="Amount" placeholder="0.937" className="wallet-form" type="number"
-            required={true}/>
+            required={true} step={0.000001} />
           <InputGroup data={this.state} onChange={this.onValueChange}
             name="password" label="Password"
             placeholder="Password" type="password" required={true}/>

native/macos/Blockstack/Blockstack/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.1</string>
+	<string>0.11.2</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>48</string>
+	<string>49</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

native/macos/build_blockstack_virtualenv.sh

@@ -34,25 +34,10 @@ pip install cryptography --only-binary cryptography
 echo "Build statically-linked scrypt..."
 PYSCRYPT_NO_LINK_FLAGS="1" LDFLAGS="/usr/local/opt/openssl/lib/libcrypto.a /usr/local/opt/openssl/lib/libssl.a" CFLAGS="-I/usr/local/opt/openssl/include" pip install git+https://github.com/larrysalibra/py-scrypt --no-use-wheel
 
-echo "Installing latest virtualchain..."
 
-pip install --upgrade git+https://github.com/blockstack/virtualchain.git@c2f42e3a03d3d49d6e7d6fc7f5828a319b7a58e4
+echo "Installing blockstack-core..."
 
-echo "Installing lastest jsontokens-py"
-
-pip install --upgrade git+https://github.com/blockstack/jsontokens-py.git@0a6134820ee6929e7f00c62b331f5439d38b6b17
-
-echo "Installing latest blockstack-profiles..."
-
-pip install --upgrade git+https://github.com/blockstack/blockstack-profiles-py.git@103783798df78cf0f007801e79ec6298f00b2817
-
-echo "Installing latest blockstack-zones..."
-
-pip install --upgrade git+https://github.com/blockstack/zone-file-py.git@00d801b8c1d2d5024eec80dd6531ab8441742127
-
-echo "Installing latest blockstack..."
-
-pip install --upgrade git+https://github.com/blockstack/blockstack-core.git@cc16fff34c37dd52c10522668beddc215b6b09e8
+pip install --upgrade git+https://github.com/blockstack/blockstack-core.git@50a64766e6a4212ba25f74a210a35c0bf0b2bf93
 
 echo "Blockstack virtual environment created."
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockstack-portal",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "author": "Blockstack Inc <admin@blockstack.com>",
   "description": "The Blockstack browser portal",
   "license": "MPL-2.0",