Skip to content

Commit

Permalink
Merge branch 'materemias-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@kroitor
kroitor committed Aug 23, 2017
2 parents b4ada1e + 70f0cc9 commit 4aab4f6
Show file tree
Hide file tree
Showing 10 changed files with 151 additions and 6 deletions.
5 changes: 3 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CCXT – CryptoCurrency eXchange Trading Library

[![Build Status](https://travis-ci.org/kroitor/ccxt.svg?branch=master)](https://travis-ci.org/kroitor/ccxt) [![npm](https://img.shields.io/npm/v/ccxt.svg)](https://npmjs.com/package/ccxt) [![PyPI](https://img.shields.io/pypi/v/ccxt.svg)](https://pypi.python.org/pypi/ccxt) [![NPM Downloads](https://img.shields.io/npm/dm/ccxt.svg)](https://www.npmjs.com/package/ccxt) [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/kroitor/ccxt.svg)](https://scrutinizer-ci.com/g/kroitor/ccxt/?branch=master) [![Try ccxt on RunKit](https://badge.runkitcdn.com/ccxt.svg)](https://npm.runkit.com/ccxt) [![Supported Exchanges](https://img.shields.io/badge/exchanges-74-blue.svg)](https://github.com/kroitor/ccxt/wiki/Exchange-Markets)
[![Build Status](https://travis-ci.org/kroitor/ccxt.svg?branch=master)](https://travis-ci.org/kroitor/ccxt) [![npm](https://img.shields.io/npm/v/ccxt.svg)](https://npmjs.com/package/ccxt) [![PyPI](https://img.shields.io/pypi/v/ccxt.svg)](https://pypi.python.org/pypi/ccxt) [![NPM Downloads](https://img.shields.io/npm/dm/ccxt.svg)](https://www.npmjs.com/package/ccxt) [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/kroitor/ccxt.svg)](https://scrutinizer-ci.com/g/kroitor/ccxt/?branch=master) [![Try ccxt on RunKit](https://badge.runkitcdn.com/ccxt.svg)](https://npm.runkit.com/ccxt) [![Supported Exchanges](https://img.shields.io/badge/exchanges-75-blue.svg)](https://github.com/kroitor/ccxt/wiki/Exchange-Markets)

A JavaScript / Python / PHP library for cryptocurrency trading and e-commerce with support for many bitcoin/ether/altcoin exchange markets and merchant APIs.

Expand All @@ -19,7 +19,7 @@ Current featurelist:

## Supported Cryptocurrency Exchange Markets

The ccxt library currently supports the following 74 cryptocurrency exchange markets and trading APIs:
The ccxt library currently supports the following 75 cryptocurrency exchange markets and trading APIs:

| | id | name | ver | doc | countries |
|----------------------------------------------------------------------------------------------------------------------|---------------|------------------------------------------------------|:---:|:-------------------------------------------------------------------------------------------:|-----------------------------------------|
Expand Down Expand Up @@ -82,6 +82,7 @@ The ccxt library currently supports the following 74 cryptocurrency exchange mar
|![mercado](https://user-images.githubusercontent.com/1294454/27837060-e7c58714-60ea-11e7-9192-f05e86adb83f.jpg) | mercado | [Mercado Bitcoin](https://www.mercadobitcoin.com.br) | 3 | [API](https://www.mercadobitcoin.com.br/api-doc) | Brazil |
|![okcoincny](https://user-images.githubusercontent.com/1294454/27766792-8be9157a-5ee5-11e7-926c-6d69b8d3378d.jpg) | okcoincny | [OKCoin CNY](https://www.okcoin.cn) | 1 | [API](https://www.okcoin.cn/rest_getStarted.html) | China |
|![okcoinusd](https://user-images.githubusercontent.com/1294454/27766791-89ffb502-5ee5-11e7-8a5b-c5950b68ac65.jpg) | okcoinusd | [OKCoin USD](https://www.okcoin.com) | 1 | [API](https://www.okcoin.com/rest_getStarted.html) | China, US |
|![okex](https://user-images.githubusercontent.com/1294454/29562593-9038a9bc-8742-11e7-91cc-8201f845bfc1.jpg) | okex | [OKEX](https://www.okex.com) | 1 | [API](https://www.okex.com/rest_getStarted.html) | China, US |
|![paymium](https://user-images.githubusercontent.com/1294454/27790564-a945a9d4-5ff9-11e7-9d2d-b635763f2f24.jpg) | paymium | [Paymium](https://www.paymium.com) | 1 | [API](https://github.com/Paymium/api-documentation) | France, EU |
|![poloniex](https://user-images.githubusercontent.com/1294454/27766817-e9456312-5ee6-11e7-9b3c-b628ca5626a5.jpg) | poloniex | [Poloniex](https://poloniex.com) | * | [API](https://poloniex.com/support/api/) | US |
|![quadrigacx](https://user-images.githubusercontent.com/1294454/27766825-98a6d0de-5ee7-11e7-9fa4-38e11a2c6f52.jpg) | quadrigacx | [QuadrigaCX](https://www.quadrigacx.com) | 2 | [API](https://www.quadrigacx.com/api_info) | Canada |
Expand Down
6 changes: 4 additions & 2 deletions README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CCXT – CryptoCurrency eXchange Trading Library
:target: https://scrutinizer-ci.com/g/kroitor/ccxt/?branch=master
.. image:: https://badge.runkitcdn.com/ccxt.svg
:target: https://npm.runkit.com/ccxt
.. image:: https://img.shields.io/badge/exchanges-74-blue.svg
.. image:: https://img.shields.io/badge/exchanges-75-blue.svg
:target: https://github.com/kroitor/ccxt/wiki/Exchange-Markets

A JavaScript / Python / PHP library for cryptocurrency trading and e-commerce with support for many bitcoin/ether/altcoin exchange markets and merchant APIs.
Expand All @@ -34,7 +34,7 @@ Current featurelist:
Supported Cryptocurrency Exchange Markets
-----------------------------------------

The ccxt library currently supports the following 74 cryptocurrency exchange markets and trading APIs:
The ccxt library currently supports the following 75 cryptocurrency exchange markets and trading APIs:

+-----------------+-----------------------------------------------------------+-------+--------------------------------------------------------------------------------------------------+--------------------------------------------+
| id | name | ver | doc | countries |
Expand Down Expand Up @@ -157,6 +157,8 @@ The ccxt library currently supports the following 74 cryptocurrency exchange mar
+-----------------+-----------------------------------------------------------+-------+--------------------------------------------------------------------------------------------------+--------------------------------------------+
| okcoinusd | `OKCoin USD <https://www.okcoin.com>`__ | 1 | `API <https://www.okcoin.com/rest_getStarted.html>`__ | China, US |
+-----------------+-----------------------------------------------------------+-------+--------------------------------------------------------------------------------------------------+--------------------------------------------+
| okex | `OKEX <https://www.okex.com>`__ | 1 | `API <https://www.okex.com/rest_getStarted.html>`__ | China, US |
+-----------------+-----------------------------------------------------------+-------+--------------------------------------------------------------------------------------------------+--------------------------------------------+
| paymium | `Paymium <https://www.paymium.com>`__ | 1 | `API <https://github.com/Paymium/api-documentation>`__ | France, EU |
+-----------------+-----------------------------------------------------------+-------+--------------------------------------------------------------------------------------------------+--------------------------------------------+
| poloniex | `Poloniex <https://poloniex.com>`__ | \* | `API <https://poloniex.com/support/api/>`__ | US |
Expand Down
23 changes: 22 additions & 1 deletion build/ccxt.browser.js
View file

Large diffs are not rendered by default.

23 changes: 22 additions & 1 deletion build/ccxt.es5.js
View file

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions build/ccxt.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ class Exchange {
'mercado',
'okcoincny',
'okcoinusd',
'okex',
'paymium',
'poloniex',
'quadrigacx',
Expand Down Expand Up @@ -13025,6 +13026,31 @@ public function __construct ($options = array ()) {

//------------------------------------------------------------------------------

class okex extends okcoin {

public function __construct ($options = array ()) {
parent::__construct (array_merge(array (
'id' => 'okex',
'name' => 'OKEX',
'countries' => array ( 'CN', 'US' ),
'urls' => array (
'logo' => 'https://user-images.githubusercontent.com/1294454/29562593-9038a9bc-8742-11e7-91cc-8201f845bfc1.jpg',
'api' => 'https://www.okex.com',
'www' => 'https://www.okex.com',
'doc' => 'https://www.okex.com/rest_getStarted.html',
),
'markets' => array (
'LTC/BTC' => array ( 'id' => 'ltc_btc', 'symbol' => 'LTC/BTC', 'base' => 'LTC', 'quote' => 'BTC' ),
'ETH/BTC' => array ( 'id' => 'eth_btc', 'symbol' => 'ETH/BTC', 'base' => 'ETH', 'quote' => 'BTC' ),
'ETC/BTC' => array ( 'id' => 'etc_btc', 'symbol' => 'ETC/BTC', 'base' => 'ETC', 'quote' => 'BTC' ),
'BCH/BTC' => array ( 'id' => 'bcc_btc', 'symbol' => 'BCH/BTC', 'base' => 'BCH', 'quote' => 'BTC' ),
),
), $options));
}
}

//------------------------------------------------------------------------------

class paymium extends Exchange {

public function __construct ($options = array ()) {
Expand Down
21 changes: 21 additions & 0 deletions ccxt.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12611,6 +12611,26 @@ var okcoinusd = extend (okcoin, {

//-----------------------------------------------------------------------------

var okex = extend (okcoin, {
'id': 'okex',
'name': 'OKEX',
'countries': [ 'CN', 'US' ],
'urls': {
'logo': 'https://user-images.githubusercontent.com/1294454/29562593-9038a9bc-8742-11e7-91cc-8201f845bfc1.jpg',
'api': 'https://www.okex.com',
'www': 'https://www.okex.com',
'doc': 'https://www.okex.com/rest_getStarted.html',
},
'markets': {
'LTC/BTC': { 'id': 'ltc_btc', 'symbol': 'LTC/BTC', 'base': 'LTC', 'quote': 'BTC' },
'ETH/BTC': { 'id': 'eth_btc', 'symbol': 'ETH/BTC', 'base': 'ETH', 'quote': 'BTC' },
'ETC/BTC': { 'id': 'etc_btc', 'symbol': 'ETC/BTC', 'base': 'ETC', 'quote': 'BTC' },
'BCH/BTC': { 'id': 'bcc_btc', 'symbol': 'BCH/BTC', 'base': 'BCH', 'quote': 'BTC' },
},
})

//-----------------------------------------------------------------------------

var paymium = {

'id': 'paymium',
Expand Down Expand Up @@ -15511,6 +15531,7 @@ var exchanges = {
'mercado': mercado,
'okcoincny': okcoincny,
'okcoinusd': okcoinusd,
'okex': okex,
'paymium': paymium,
'poloniex': poloniex,
'quadrigacx': quadrigacx,
Expand Down
1 change: 1 addition & 0 deletions ccxt.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ class Exchange {
'mercado',
'okcoincny',
'okcoinusd',
'okex',
'paymium',
'poloniex',
'quadrigacx',
Expand Down
25 changes: 25 additions & 0 deletions ccxt/async/exchanges.py
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions ccxt/exchanges.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
'mercado',
'okcoincny',
'okcoinusd',
'okex',
'paymium',
'poloniex',
'quadrigacx',
Expand Down Expand Up @@ -11508,6 +11509,31 @@ def __init__(self, config={}):

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

class okex (okcoin):

def __init__(self, config={}):
params = {
'id': 'okex',
'name': 'OKEX',
'countries': ['CN', 'US'],
'urls': {
'logo': 'https://user-images.githubusercontent.com/1294454/29562593-9038a9bc-8742-11e7-91cc-8201f845bfc1.jpg',
'api': 'https://www.okex.com',
'www': 'https://www.okex.com',
'doc': 'https://www.okex.com/rest_getStarted.html',
},
'markets': {
'LTC/BTC': {'id': 'ltc_btc', 'symbol': 'LTC/BTC', 'base': 'LTC', 'quote': 'BTC'},
'ETH/BTC': {'id': 'eth_btc', 'symbol': 'ETH/BTC', 'base': 'ETH', 'quote': 'BTC'},
'ETC/BTC': {'id': 'etc_btc', 'symbol': 'ETC/BTC', 'base': 'ETC', 'quote': 'BTC'},
'BCH/BTC': {'id': 'bcc_btc', 'symbol': 'BCH/BTC', 'base': 'BCH', 'quote': 'BTC'},
},
}
params.update(config)
super(okex, self).__init__(params)

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

class paymium (Exchange):

def __init__(self, config={}):
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@
"OKCoin",
"OKCoin.com",
"OKCoin.cn",
"OKex.com",
"Paymium",
"Poloniex",
"QuadrigaCX",
Expand Down

0 comments on commit 4aab4f6

Please sign in to comment.