Fix SELL and parenthesis

askmike · Mar 19, 2015 · b3614e8 · b3614e8
1 parent 0805eac
commit b3614e8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/core/portfolioManager.js b/core/portfolioManager.js
@@ -135,7 +135,7 @@ Manager.prototype.trade = function(what, callback) {
       if(this.infinityOrderExchange)
         amount = 10000;
       else
-        amount = parseFloat((this.getBalance(this.currency) / (parseFloat(this.ticker.ask) + (parseFloat(this.ticker.ask)*this.fee))).toFixed(4);
+        amount = parseFloat((this.getBalance(this.currency) / (parseFloat(this.ticker.ask) + (parseFloat(this.ticker.ask)*this.fee))).toFixed(4));
 
       // can we just create a MKT order?
       if(this.directExchange)
@@ -156,7 +156,7 @@ Manager.prototype.trade = function(what, callback) {
       if(this.infinityOrderExchange)
         amount = 10000;
       else
-        amount = this.getBalance(this.asset);
+        amount = parseFloat(this.getBalance(this.asset) - this.getBalance(this.asset) * this.fee).toFixed(4);
 
       // can we just create a MKT order?
       if(this.directExchange)

diff --git a/exchanges/bitstamp.js b/exchanges/bitstamp.js
@@ -77,6 +77,8 @@ Trader.prototype.buy = function(amount, price, callback) {
     callback(null, result.id);
   };
 
+  // TODO: fees are hardcoded here?
+  // amount *= 0.995; // remove fees
   // prevent: Ensure that there are no more than 8 digits in total.
   amount *= 100000000;
   amount = Math.floor(amount);
@@ -92,6 +94,11 @@ Trader.prototype.sell = function(amount, price, callback) {
     callback(null, result.id);
   };
 
+
+  amount *= 10000000;
+  amount = Math.floor(amount);
+  amount /= 10000000;
+
   this.bitstamp.sell(amount, price, _.bind(set, this));
 }