Merge branch 'release/1.8.1'

benmarten · Jan 27, 2018 · 9af0d00 · 9af0d00
2 parents 98af08b + ee2aa59
commit 9af0d00
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="1.8.1"></a>
+## [1.8.1](https://github.com/benmarten/CryptoETF/compare/1.8.0...1.8.1) (2018-01-27)
+
+
+### Bug Fixes
+
+* **integrations/bitgrail:** fix bitgrail api url ([2d59631](https://github.com/benmarten/CryptoETF/commit/2d59631))
+
+
+
 <a name="1.8.0"></a>
 # [1.8.0](https://github.com/benmarten/CryptoETF/compare/1.7.0...1.8.0) (2018-01-22)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "babel-preset-es2015": "^6.24.1",
     "binance": "^1.1.0",
     "bitfinex": "^1.0.3",
     "coinbase": "^2.0.6",
@@ -32,5 +31,5 @@
     "testLocal": "./node_modules/.bin/nyc mocha --require babel-core/register test/**/*.js test/**/**/*.js",
     "test": "NODE_ENV=test npm run testLocal"
   },
-  "version": "1.8.0"
+  "version": "1.8.1"
 }
diff --git a/src/model/integrations/BinanceWallet.js b/src/model/integrations/BinanceWallet.js
@@ -22,7 +22,7 @@ export default class BinanceWallet extends AbstractWallet {
             for (let index in balances) {
               let data = balances[index]
               let symbol = data.asset
-              let amount = data.free
+              let amount = Number(data.free) + Number(data.locked)
 
               result.push(new Coin(symbol, amount, 'Binance'))
             }

diff --git a/src/model/integrations/BitgrailWallet.js b/src/model/integrations/BitgrailWallet.js
@@ -17,7 +17,7 @@ export default class BitgrailWallet extends AbstractWallet {
           }
           let options = {
             method: 'POST',
-            uri: 'https://bitgrail.com/api/v1/balances',
+            uri: 'https://api.bitgrail.com/v1/balances',
             form: params,
             json: true,
             headers: {