Skip to content

Commit

Permalink
Merge branch 'master' into feature/coinfloor-balances
Browse files Browse the repository at this point in the history
  • Loading branch information
kroitor committed Jun 1, 2018
2 parents 4c42d4b + 91da21f commit 95ef849
Show file tree
Hide file tree
Showing 534 changed files with 58,294 additions and 18,859 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,6 +2,7 @@
# You shouldn't edit these files, as they're generated automatically from ccxt.js by build scripts.
# Please read https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#multilanguage-support for details.
#
.vscode
build/*
node_modules/
npm-debug.log
Expand Down
6 changes: 4 additions & 2 deletions CONTRIBUTING.md
Expand Up @@ -19,10 +19,12 @@ If you want to submit an issue and you want your issue to be resolved quickly, h
- Search for similar issues first to avoid duplicates.
- If your issue is unique, along with a basic description of the failure, the following **IS REQUIRED**:
- **set `exchange.verbose = true` property on the exchange instance before calling its functions or methods**
- **surround code and output with triple backticks: ```YOUR\_CODE```**
- **surround code and output with triple backticks: ```GOOD```**
- don't confuse the backtick symbol (`) with the quote symbol (\'): '''BAD'''
- don't confuse a single backtick with triple backticks: `BAD`
- paste a complete code snippet you're having difficulties with, avoid one-liners
- paste the **full verbose output** of the failing method without your keys
- don't confuse the backtick symbol (`) with the quote symbol (\'), ```GOOD```, '''BAD'''
- the verbose output should include the request and response from the exchange (not just an error callstack)
- write your language **and version**
- write ccxt library version
- which exchange it is
Expand Down
250 changes: 133 additions & 117 deletions README.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions appveyor.yml
Expand Up @@ -8,6 +8,7 @@ install:
- set PATH=%APPDATA%\npm;%PATH%
- npm install
- pip install tox
- pip install requests
- cinst -y curl
- SET PATH=C:\Program Files\curl;%PATH%
- ps: Set-Service wuauserv -StartupType Manual
Expand Down
24,079 changes: 15,782 additions & 8,297 deletions build/ccxt.browser.js

Large diffs are not rendered by default.

18 changes: 16 additions & 2 deletions ccxt.d.ts
Expand Up @@ -102,6 +102,7 @@ declare module 'ccxt' {
bids: [number, number][];
datetime: string;
timestamp: number;
nonce: number;
}

export interface Trade {
Expand Down Expand Up @@ -264,7 +265,7 @@ declare module 'ccxt' {
marketIds (symbols: string[]): string[];
symbol (symbol: string): string;
extractParams (str: string): string[];
createOrder (market: string, type: string, side: string, amount: string, price?: string, params?: string): Promise<any>;
createOrder (symbol: string, type: string, side: string, amount: string, price?: string, params?: string): Promise<any>;
fetchBalance (params?: any): Promise<Balances>;
fetchTotalBalance (params?: any): Promise<PartialBalances>;
fetchUsedBalance (params?: any): Promise<PartialBalances>;
Expand Down Expand Up @@ -298,12 +299,13 @@ declare module 'ccxt' {
export class bibox extends Exchange {}
export class binance extends Exchange {}
export class bit2c extends Exchange {}
export class bitbank extends Exchange {}
export class bitbay extends Exchange {}
export class bitcoincoid extends Exchange {}
export class bitfinex extends Exchange {}
export class bitfinex2 extends bitfinex {}
export class bitflyer extends Exchange {}
export class bithumb extends Exchange {}
export class bitkk extends zb {}
export class bitlish extends Exchange {}
export class bitmarket extends Exchange {}
export class bitmex extends Exchange {}
Expand All @@ -329,20 +331,26 @@ declare module 'ccxt' {
export class chbtc extends zb {}
export class chilebit extends foxbit {}
export class cobinhood extends Exchange {}
export class coinbase extends Exchange {}
export class coincheck extends Exchange {}
export class coinegg extends Exchange {}
export class coinex extends Exchange {}
export class coinexchange extends Exchange {}
export class coinfloor extends Exchange {}
export class coingi extends Exchange {}
export class coinmarketcap extends Exchange {}
export class coinmate extends Exchange {}
export class coinnest extends Exchange {}
export class coinone extends Exchange {}
export class coinsecure extends Exchange {}
export class coinspot extends Exchange {}
export class cointiger extends huobipro {}
export class coolcoin extends coinegg {}
export class cryptopia extends Exchange {}
export class dsx extends liqui {}
export class ethfinex extends bitfinex {}
export class exmo extends Exchange {}
export class exx extends Exchange {}
export class flowbtc extends Exchange {}
export class foxbit extends Exchange {}
export class fybse extends Exchange {}
Expand All @@ -352,24 +360,29 @@ declare module 'ccxt' {
export class gdax extends Exchange {}
export class gemini extends Exchange {}
export class getbtc extends _1btcxe {}
export class hadax extends huobipro {}
export class hitbtc extends Exchange {}
export class hitbtc2 extends hitbtc {}
export class huobi extends Exchange {}
export class huobicny extends huobipro {}
export class huobipro extends Exchange {}
export class ice3x extends Exchange {}
export class independentreserve extends Exchange {}
export class indodax extends Exchange {}
export class itbit extends Exchange {}
export class jubi extends btcbox {}
export class kraken extends Exchange {}
export class kucoin extends Exchange {}
export class kuna extends acx {}
export class lakebtc extends Exchange {}
export class lbank extends Exchange {}
export class liqui extends Exchange {}
export class livecoin extends Exchange {}
export class luno extends Exchange {}
export class lykke extends Exchange {}
export class mercado extends Exchange {}
export class mixcoins extends Exchange {}
export class negociecoins extends Exchange {}
export class nova extends Exchange {}
export class okcoincny extends okcoinusd {}
export class okcoinusd extends Exchange {}
Expand All @@ -382,6 +395,7 @@ declare module 'ccxt' {
export class southxchange extends Exchange {}
export class surbitcoin extends foxbit {}
export class therock extends Exchange {}
export class tidebit extends Exchange {}
export class tidex extends liqui {}
export class urdubit extends foxbit {}
export class vaultoro extends Exchange {}
Expand Down
17 changes: 15 additions & 2 deletions ccxt.js
Expand Up @@ -37,7 +37,7 @@ const Exchange = require ('./js/base/Exchange')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.11.117'
const version = '1.14.116'

Exchange.ccxtVersion = version

Expand All @@ -52,12 +52,13 @@ const exchanges = {
'bibox': require ('./js/bibox.js'),
'binance': require ('./js/binance.js'),
'bit2c': require ('./js/bit2c.js'),
'bitbank': require ('./js/bitbank.js'),
'bitbay': require ('./js/bitbay.js'),
'bitcoincoid': require ('./js/bitcoincoid.js'),
'bitfinex': require ('./js/bitfinex.js'),
'bitfinex2': require ('./js/bitfinex2.js'),
'bitflyer': require ('./js/bitflyer.js'),
'bithumb': require ('./js/bithumb.js'),
'bitkk': require ('./js/bitkk.js'),
'bitlish': require ('./js/bitlish.js'),
'bitmarket': require ('./js/bitmarket.js'),
'bitmex': require ('./js/bitmex.js'),
Expand All @@ -83,20 +84,26 @@ const exchanges = {
'chbtc': require ('./js/chbtc.js'),
'chilebit': require ('./js/chilebit.js'),
'cobinhood': require ('./js/cobinhood.js'),
'coinbase': require ('./js/coinbase.js'),
'coincheck': require ('./js/coincheck.js'),
'coinegg': require ('./js/coinegg.js'),
'coinex': require ('./js/coinex.js'),
'coinexchange': require ('./js/coinexchange.js'),
'coinfloor': require ('./js/coinfloor.js'),
'coingi': require ('./js/coingi.js'),
'coinmarketcap': require ('./js/coinmarketcap.js'),
'coinmate': require ('./js/coinmate.js'),
'coinnest': require ('./js/coinnest.js'),
'coinone': require ('./js/coinone.js'),
'coinsecure': require ('./js/coinsecure.js'),
'coinspot': require ('./js/coinspot.js'),
'cointiger': require ('./js/cointiger.js'),
'coolcoin': require ('./js/coolcoin.js'),
'cryptopia': require ('./js/cryptopia.js'),
'dsx': require ('./js/dsx.js'),
'ethfinex': require ('./js/ethfinex.js'),
'exmo': require ('./js/exmo.js'),
'exx': require ('./js/exx.js'),
'flowbtc': require ('./js/flowbtc.js'),
'foxbit': require ('./js/foxbit.js'),
'fybse': require ('./js/fybse.js'),
Expand All @@ -106,24 +113,29 @@ const exchanges = {
'gdax': require ('./js/gdax.js'),
'gemini': require ('./js/gemini.js'),
'getbtc': require ('./js/getbtc.js'),
'hadax': require ('./js/hadax.js'),
'hitbtc': require ('./js/hitbtc.js'),
'hitbtc2': require ('./js/hitbtc2.js'),
'huobi': require ('./js/huobi.js'),
'huobicny': require ('./js/huobicny.js'),
'huobipro': require ('./js/huobipro.js'),
'ice3x': require ('./js/ice3x.js'),
'independentreserve': require ('./js/independentreserve.js'),
'indodax': require ('./js/indodax.js'),
'itbit': require ('./js/itbit.js'),
'jubi': require ('./js/jubi.js'),
'kraken': require ('./js/kraken.js'),
'kucoin': require ('./js/kucoin.js'),
'kuna': require ('./js/kuna.js'),
'lakebtc': require ('./js/lakebtc.js'),
'lbank': require ('./js/lbank.js'),
'liqui': require ('./js/liqui.js'),
'livecoin': require ('./js/livecoin.js'),
'luno': require ('./js/luno.js'),
'lykke': require ('./js/lykke.js'),
'mercado': require ('./js/mercado.js'),
'mixcoins': require ('./js/mixcoins.js'),
'negociecoins': require ('./js/negociecoins.js'),
'nova': require ('./js/nova.js'),
'okcoincny': require ('./js/okcoincny.js'),
'okcoinusd': require ('./js/okcoinusd.js'),
Expand All @@ -136,6 +148,7 @@ const exchanges = {
'southxchange': require ('./js/southxchange.js'),
'surbitcoin': require ('./js/surbitcoin.js'),
'therock': require ('./js/therock.js'),
'tidebit': require ('./js/tidebit.js'),
'tidex': require ('./js/tidex.js'),
'urdubit': require ('./js/urdubit.js'),
'vaultoro': require ('./js/vaultoro.js'),
Expand Down
2 changes: 1 addition & 1 deletion ccxt.php
Expand Up @@ -37,4 +37,4 @@
$file = PATH_TO_CCXT . $class_name . '.php';
if (file_exists ($file))
require_once ($file);
} );
});
9 changes: 5 additions & 4 deletions convert-md-2-rst
Expand Up @@ -2,8 +2,9 @@
echo "Converting .md → .rst..."
pandoc --wrap=preserve --columns=10000 --from=markdown --to=rst --output=python/README.rst README.md
pandoc --wrap=preserve --columns=10000 --from=markdown --to=rst --output=doc/README.rst README.md
pandoc --wrap=preserve --columns=10000 --from=markdown --to=rst --output=doc/manual.rst ccxt.wiki/Manual.md
pandoc --wrap=preserve --columns=10000 --from=markdown --to=rst --output=doc/install.rst ccxt.wiki/Install.md
pandoc --wrap=preserve --columns=10000 --from=markdown --to=rst --output=doc/exchanges.rst ccxt.wiki/Exchange-Markets.md
pandoc --wrap=preserve --columns=10000 --from=markdown --to=rst --output=doc/exchanges-by-country.rst ccxt.wiki/Exchange-Markets-By-Country.md
pandoc --wrap=preserve --columns=10000 --from=markdown --to=rst --output=doc/FAQ.rst wiki/FAQ.md
pandoc --wrap=preserve --columns=10000 --from=markdown --to=rst --output=doc/manual.rst wiki/Manual.md
pandoc --wrap=preserve --columns=10000 --from=markdown --to=rst --output=doc/install.rst wiki/Install.md
pandoc --wrap=preserve --columns=10000 --from=markdown --to=rst --output=doc/exchanges.rst wiki/Exchange-Markets.md
pandoc --wrap=preserve --columns=10000 --from=markdown --to=rst --output=doc/exchanges-by-country.rst wiki/Exchange-Markets-By-Country.md
echo "Successfully converted .md → .rst"
32 changes: 32 additions & 0 deletions doc/FAQ.rst
@@ -0,0 +1,32 @@
Frequently Asked Questions
==========================

I'm trying to run the code, but it's not working, how do I fix it?
------------------------------------------------------------------

If your question is formulated in a short manner like the above, we won't help. We don't teach programming. If you're unable to read and understand the `Manual <https://github.com/ccxt/ccxt/wiki>`__ or you can't follow the guides from the `CONTRIBUTING <https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md>`__ doc on how to report an issue, we won't help either. Read the Manual. You should not risk money and time without reading the entire Manual very carefully. Namely, when asking a question:
- Use the search button for duplicates first!
- **Post your request and response in ``verbose`` mode!** It's written and mentioned everywhere, in the `Troubleshooting <https://github.com/ccxt/ccxt/wiki/Manual#troubleshooting>`__ section, in the `README <https://github.com/ccxt/ccxt/blob/master/README.md>`__ and in many answers to similar questions among `previous issues <https://github.com/ccxt/ccxt/issues>`__ and `pull requests <https://github.com/ccxt/ccxt/pulls>`__.
- Post your code to reproduce the problem. Make it a complete short runnable program, don't swallow the lines and make it as compact as you can (5-10 lines of code), including the instantation code.
- Post your version number of ccxt
- Post your language version number, how do you think we can guess it otherwise?

I am calling a method and I get an error, what am I doing wrong?
----------------------------------------------------------------

You're not reporting the issue properly ) Please, help the community to help you ) Read this and follow the steps: https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-submit-an-issue. Once again, your code to reproduce the issue and your verbose request and response **ARE REQUIRED**. *The error traceback is not enough.*

Can you implement feature ``foo`` in exchange ``bar``?
------------------------------------------------------

Yes, we can. And we will, if nobody else does that before us. There's very little point in asking this type of questions, because the answer is always positive. When someone asks if we can do this or that, the question is not about our abilities, it all boils down to time and management needed for implementing all accumulated feature requests. Moreover, this is an open-source library which is a work in progress. This means, that this project is intended to be developed by the community of users, who are using it. All contributions are welcome! What you're asking is not whether we can or cannot implement it, in fact you're actually telling us to go do that particular task and this is not how we see a voluntary collaboration.

When will you add feature ``foo`` for exchange ``bar`` ? What's the estimated time? When should we expect this?
---------------------------------------------------------------------------------------------------------------

We don't give promises or estimates on the open-source work. The reasoning behind this is explained in the previous paragraph.

What's your progress on adding the feature ``foo`` that was requested earlier? How do you do implementing exchange ``bar``?
---------------------------------------------------------------------------------------------------------------------------

This type of questions is usually a waste of time, because answering it usually requires too much time for context-switching, and it often takes more time to answer this question, than to actually satisfy the request with code for a new feature or a new exchange. The progress of this open-source project is also open, so, whenever you're wondering how it is doing, take a look into commit history.

0 comments on commit 95ef849

Please sign in to comment.