1.10.1257

[ci skip]

ccxt.js

@@ -37,7 +37,7 @@ const Exchange  = require ('./js/base/Exchange')
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
 
-const version = '1.10.1256'
+const version = '1.10.1257'
 
 Exchange.ccxtVersion = version
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.10.1256",
+  "version": "1.10.1257",
   "description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 90+ exchanges",
   "main": "./ccxt.js",
   "unpkg": "build/ccxt.browser.js",

php/Exchange.php

@@ -30,7 +30,7 @@
 
 namespace ccxt;
 
-$version = '1.10.1256';
+$version = '1.10.1257';
 
 abstract class Exchange {
 

php/bitstamp.php

@@ -276,6 +276,14 @@ public function parse_trade ($trade, $market = null) {
         // only if overrided externally
         $side = $this->safe_string($trade, 'side');
         $orderId = $this->safe_string($trade, 'order_id');
+        if ($orderId === null)
+            if ($side === null) {
+                $side = $this->safe_integer($trade, 'type');
+                if ($side === 0)
+                    $side = 'buy';
+                else
+                    $side = 'sell';
+            }
         $price = $this->safe_float($trade, 'price');
         $amount = $this->safe_float($trade, 'amount');
         $id = $this->safe_string($trade, 'tid');
@@ -423,6 +431,9 @@ public function parse_order ($order, $market = null) {
         $id = $this->safe_string($order, 'id');
         $timestamp = null;
         $iso8601 = null;
+        $side = $this->safe_string($order, 'type');
+        if ($side !== null)
+            $side = ($side === '1') ? 'sell' : 'buy';
         $datetimeString = $this->safe_string($order, 'datetime');
         if ($datetimeString !== null) {
             $timestamp = $this->parse8601 ($datetimeString);
@@ -445,7 +456,10 @@ public function parse_order ($order, $market = null) {
         if ($transactions !== null) {
             if (gettype ($transactions) === 'array' && count (array_filter (array_keys ($transactions), 'is_string')) == 0) {
                 for ($i = 0; $i < count ($transactions); $i++) {
-                    $trade = $this->parse_trade(array_merge (array ( 'order_id' => $id ), $transactions[$i]), $market);
+                    $trade = $this->parse_trade(array_merge (array (
+                        'order_id' => $id,
+                        'side' => $side,
+                    ), $transactions[$i]), $market);
                     $filled .= $trade['amount'];
                     if ($feeCost === null)
                         $feeCost = 0.0;
@@ -469,9 +483,6 @@ public function parse_order ($order, $market = null) {
         if ($amount !== null)
             $remaining = $amount - $filled;
         $price = $this->safe_float($order, 'price');
-        $side = $this->safe_string($order, 'type');
-        if ($side !== null)
-            $side = ($side === '1') ? 'sell' : 'buy';
         if ($market === null)
             $market = $this->get_market_from_trades ($trades);
         $feeCurrency = null;

python/ccxt/__init__.py

@@ -28,7 +28,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '1.10.1256'
+__version__ = '1.10.1257'
 
 # ----------------------------------------------------------------------------
 

python/ccxt/async/__init__.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.10.1256'
+__version__ = '1.10.1257'
 
 # -----------------------------------------------------------------------------
 

python/ccxt/async/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.10.1256'
+__version__ = '1.10.1257'
 
 # -----------------------------------------------------------------------------
 

python/ccxt/async/bitstamp.py

@@ -280,6 +280,13 @@ def parse_trade(self, trade, market=None):
         # only if overrided externally
         side = self.safe_string(trade, 'side')
         orderId = self.safe_string(trade, 'order_id')
+        if orderId is None:
+            if side is None:
+                side = self.safe_integer(trade, 'type')
+                if side == 0:
+                    side = 'buy'
+                else:
+                    side = 'sell'
         price = self.safe_float(trade, 'price')
         amount = self.safe_float(trade, 'amount')
         id = self.safe_string(trade, 'tid')
@@ -412,6 +419,9 @@ def parse_order(self, order, market=None):
         id = self.safe_string(order, 'id')
         timestamp = None
         iso8601 = None
+        side = self.safe_string(order, 'type')
+        if side is not None:
+            side = 'sell' if (side == '1') else 'buy'
         datetimeString = self.safe_string(order, 'datetime')
         if datetimeString is not None:
             timestamp = self.parse8601(datetimeString)
@@ -431,7 +441,10 @@ def parse_order(self, order, market=None):
         if transactions is not None:
             if isinstance(transactions, list):
                 for i in range(0, len(transactions)):
-                    trade = self.parse_trade(self.extend({'order_id': id}, transactions[i]), market)
+                    trade = self.parse_trade(self.extend({
+                        'order_id': id,
+                        'side': side,
+                    }, transactions[i]), market)
                     filled += trade['amount']
                     if feeCost is None:
                         feeCost = 0.0
@@ -451,9 +464,6 @@ def parse_order(self, order, market=None):
         if amount is not None:
             remaining = amount - filled
         price = self.safe_float(order, 'price')
-        side = self.safe_string(order, 'type')
-        if side is not None:
-            side = 'sell' if (side == '1') else 'buy'
         if market is None:
             market = self.get_market_from_trades(trades)
         feeCurrency = None

python/ccxt/base/exchange.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.10.1256'
+__version__ = '1.10.1257'
 
 # -----------------------------------------------------------------------------
 

python/ccxt/bitstamp.py

@@ -280,6 +280,13 @@ def parse_trade(self, trade, market=None):
         # only if overrided externally
         side = self.safe_string(trade, 'side')
         orderId = self.safe_string(trade, 'order_id')
+        if orderId is None:
+            if side is None:
+                side = self.safe_integer(trade, 'type')
+                if side == 0:
+                    side = 'buy'
+                else:
+                    side = 'sell'
         price = self.safe_float(trade, 'price')
         amount = self.safe_float(trade, 'amount')
         id = self.safe_string(trade, 'tid')
@@ -412,6 +419,9 @@ def parse_order(self, order, market=None):
         id = self.safe_string(order, 'id')
         timestamp = None
         iso8601 = None
+        side = self.safe_string(order, 'type')
+        if side is not None:
+            side = 'sell' if (side == '1') else 'buy'
         datetimeString = self.safe_string(order, 'datetime')
         if datetimeString is not None:
             timestamp = self.parse8601(datetimeString)
@@ -431,7 +441,10 @@ def parse_order(self, order, market=None):
         if transactions is not None:
             if isinstance(transactions, list):
                 for i in range(0, len(transactions)):
-                    trade = self.parse_trade(self.extend({'order_id': id}, transactions[i]), market)
+                    trade = self.parse_trade(self.extend({
+                        'order_id': id,
+                        'side': side,
+                    }, transactions[i]), market)
                     filled += trade['amount']
                     if feeCost is None:
                         feeCost = 0.0
@@ -451,9 +464,6 @@ def parse_order(self, order, market=None):
         if amount is not None:
             remaining = amount - filled
         price = self.safe_float(order, 'price')
-        side = self.safe_string(order, 'type')
-        if side is not None:
-            side = 'sell' if (side == '1') else 'buy'
         if market is None:
             market = self.get_market_from_trades(trades)
         feeCurrency = None