Skip to content

Commit

Permalink
1.10.533
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
Travis CI committed Dec 30, 2017
1 parent db356e8 commit 61bfd41
Show file tree
Hide file tree
Showing 14 changed files with 75 additions and 9 deletions.
21 changes: 19 additions & 2 deletions build/ccxt.browser.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ccxt.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const errors = require ('./js/base/errors')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.10.532'
const version = '1.10.533'

Exchange.ccxtVersion = version

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ccxt",
"version": "1.10.532",
"version": "1.10.533",
"description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 90+ exchanges",
"main": "./ccxt.js",
"unpkg": "build/ccxt.browser.js",
Expand Down
2 changes: 1 addition & 1 deletion php/Exchange.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

namespace ccxt;

$version = '1.10.532';
$version = '1.10.533';

abstract class Exchange {

Expand Down
11 changes: 11 additions & 0 deletions php/hitbtc2.php
Original file line number Diff line number Diff line change
Expand Up @@ -948,6 +948,17 @@ public function fetch_my_trades ($symbol = null, $since = null, $limit = null, $
return $this->parse_trades($response, $market, $since, $limit);
}

public function fetch_order_trades ($id, $symbol = null, $params = array ()) {
// The $id needed here is the exchange's $id, and not the clientOrderID, which is
// the $id that is stored in the unified api order $id. In order the get the exchange's $id,
// you need to grab it from order['info']['id']
$this->load_markets();
$trades = $this->privateGetHistoryOrderIdTrades (array_merge (array (
'id' => $id,
), $params));
return $this->parse_trades($trades);
}

public function create_deposit_address ($currency, $params = array ()) {
$currencyId = $this->currency_id ($currency);
$response = $this->privatePostAccountCryptoAddressCurrency (array (
Expand Down
6 changes: 6 additions & 0 deletions php/okcoinusd.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,12 @@ public function describe () {
'https://www.npmjs.com/package/okcoin.com',
),
),
'fees' => array (
'trading' => array (
'taker' => 0.002,
'maker' => 0.002,
),
),
));
}

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

# ----------------------------------------------------------------------------

__version__ = '1.10.532'
__version__ = '1.10.533'

# ----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.10.532'
__version__ = '1.10.533'

# -----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/base/exchange.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.10.532'
__version__ = '1.10.533'

# -----------------------------------------------------------------------------

Expand Down
10 changes: 10 additions & 0 deletions python/ccxt/async/hitbtc2.py
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,16 @@ async def fetch_my_trades(self, symbol=None, since=None, limit=None, params={}):
response = await self.privateGetHistoryTrades(self.extend(request, params))
return self.parse_trades(response, market, since, limit)

async def fetch_order_trades(self, id, symbol=None, params={}):
# The id needed here is the exchange's id, and not the clientOrderID, which is
# the id that is stored in the unified api order id. In order the get the exchange's id,
# you need to grab it from order['info']['id']
await self.load_markets()
trades = await self.privateGetHistoryOrderIdTrades(self.extend({
'id': id,
}, params))
return self.parse_trades(trades)

async def create_deposit_address(self, currency, params={}):
currencyId = self.currency_id(currency)
response = await self.privatePostAccountCryptoAddressCurrency({
Expand Down
6 changes: 6 additions & 0 deletions python/ccxt/async/okcoinusd.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,12 @@ def describe(self):
'https://www.npmjs.com/package/okcoin.com',
],
},
'fees': {
'trading': {
'taker': 0.002,
'maker': 0.002,
},
},
})

async def fetch_markets(self):
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/base/exchange.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.10.532'
__version__ = '1.10.533'

# -----------------------------------------------------------------------------

Expand Down
10 changes: 10 additions & 0 deletions python/ccxt/hitbtc2.py
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,16 @@ def fetch_my_trades(self, symbol=None, since=None, limit=None, params={}):
response = self.privateGetHistoryTrades(self.extend(request, params))
return self.parse_trades(response, market, since, limit)

def fetch_order_trades(self, id, symbol=None, params={}):
# The id needed here is the exchange's id, and not the clientOrderID, which is
# the id that is stored in the unified api order id. In order the get the exchange's id,
# you need to grab it from order['info']['id']
self.load_markets()
trades = self.privateGetHistoryOrderIdTrades(self.extend({
'id': id,
}, params))
return self.parse_trades(trades)

def create_deposit_address(self, currency, params={}):
currencyId = self.currency_id(currency)
response = self.privatePostAccountCryptoAddressCurrency({
Expand Down
6 changes: 6 additions & 0 deletions python/ccxt/okcoinusd.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,12 @@ def describe(self):
'https://www.npmjs.com/package/okcoin.com',
],
},
'fees': {
'trading': {
'taker': 0.002,
'maker': 0.002,
},
},
})

def fetch_markets(self):
Expand Down

0 comments on commit 61bfd41

Please sign in to comment.