Skip to content

Commit

Permalink
Merge branch 'zb-update-future' of github.com:carlosmiei/ccxt.pro int…
Browse files Browse the repository at this point in the history
…o zb-update-future
  • Loading branch information
carlosmiei committed Jun 21, 2022
2 parents a779d33 + 18cf21e commit 6a54879
Show file tree
Hide file tree
Showing 122 changed files with 166,971 additions and 79,373 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ script:
- cp package.json README.md LICENSE.txt keys.json python
- npm run force-build
- npm run test-base
- bash -c 'node run-tests --js --python --php --verbose 3' 2>&1
- bash -c 'node run-tests --js --python --php --verbose 5' 2>&1
- if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then env COMMIT_MESSAGE=${NPM_VERSION:1} GITHUB_TOKEN=${GITHUB_TOKEN} ./build/push.sh; fi
after_failure:
- dmesg | grep -i kill
Expand Down
82 changes: 44 additions & 38 deletions README.md

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions build/transpile.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const fs = require ('fs')
, errors = require ('ccxt/js/base/errors.js')
, Transpiler = require ('ccxt/build/transpile.js')
, Exchange = require ('../js/base/Exchange.js')
, tsFilename = './ccxt.pro.d.ts'

// ============================================================================

Expand Down Expand Up @@ -218,9 +219,11 @@ class CCXTProTranspiler extends Transpiler {

// HINT: if we're going to support specific class definitions
// this process won't work anymore as it will override the definitions
this.exportTypeScriptDeclarations ('./ccxt.pro.d.ts', classes)
this.exportTypeScriptDeclarations (tsFilename, classes)

// transpileErrorHierarchy ()
//*/

this.transpileErrorHierarchy ({ tsFilename })

// transpilePrecisionTests ()
// transpileDateTimeTests ()
Expand Down
10 changes: 8 additions & 2 deletions build/vss.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
const fs = require ('fs')
const log = require ('ololog')
const ansi = require ('ansicolor').nice
const { execSync } = require ('child_process')
const { copyFile } = require ('ccxt/build/fs.js')
const { vss } = require ('ccxt/build/vss.js')

// ----------------------------------------------------------------------------
Expand All @@ -29,7 +29,13 @@ function vssEverything () {
vss ('./README.md', "ccxt@{version}")
// vss ('./wiki/Install.md', "ccxt@{version}")

execSync ('cp ./package.json ./LICENSE.txt ./keys.json ./python/')
const pythonFiles = [
'package.json',
'LICENSE.txt',
'keys.json',
]

pythonFiles.forEach ((fileName) => copyFile ('./' + fileName, './python/' + fileName))

log.bright.green ('Version single-sourced successfully.')
}
Expand Down
77 changes: 72 additions & 5 deletions ccxt.pro.d.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,49 @@
declare module 'ccxt.pro' {

export const version: string;
export const exchanges: string[];

// errors.js -----------------------------------------
export class BaseError extends Error {
constructor(message: string);
}

export class ExchangeError extends BaseError {}
export class AuthenticationError extends ExchangeError {}
export class PermissionDenied extends AuthenticationError {}
export class AccountNotEnabled extends PermissionDenied {}
export class AccountSuspended extends AuthenticationError {}
export class ArgumentsRequired extends ExchangeError {}
export class BadRequest extends ExchangeError {}
export class BadSymbol extends BadRequest {}
export class MarginModeAlreadySet extends BadRequest {}
export class BadResponse extends ExchangeError {}
export class NullResponse extends BadResponse {}
export class InsufficientFunds extends ExchangeError {}
export class InvalidAddress extends ExchangeError {}
export class AddressPending extends InvalidAddress {}
export class InvalidOrder extends ExchangeError {}
export class OrderNotFound extends InvalidOrder {}
export class OrderNotCached extends InvalidOrder {}
export class CancelPending extends InvalidOrder {}
export class OrderImmediatelyFillable extends InvalidOrder {}
export class OrderNotFillable extends InvalidOrder {}
export class DuplicateOrderId extends InvalidOrder {}
export class NotSupported extends ExchangeError {}
export class NetworkError extends BaseError {}
export class DDoSProtection extends NetworkError {}
export class RateLimitExceeded extends DDoSProtection {}
export class ExchangeNotAvailable extends NetworkError {}
export class OnMaintenance extends ExchangeNotAvailable {}
export class InvalidNonce extends NetworkError {}
export class RequestTimeout extends NetworkError {}

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

import {
Exchange as BaseExchange,
Balances,
Dictionary,
Exchange as BaseExchange,
OHLCV,
Order,
OrderBook,
Expand All @@ -12,8 +52,26 @@ declare module 'ccxt.pro' {
Trade,
} from 'ccxt'

export const version: string;
export const exchanges: string[];
// default interfaces
export {
Balance,
Balances,
Currency,
DepositAddress,
DepositAddressResponse,
ExchangeId,
Fee,
Market,
OHLCV,
Order,
OrderBook,
PartialBalances,
Ticker,
Tickers,
Trade,
Transaction,
WithdrawalResponse,
} from 'ccxt'

export class Exchange extends BaseExchange {
watchTicker (symbol: string, params?: Params): Promise<Ticker>;
Expand All @@ -35,6 +93,7 @@ declare module 'ccxt.pro' {
/* tslint:disable */

export class aax extends Exchange {}
export class ascendex extends Exchange {}
export class bequant extends hitbtc {}
export class binance extends Exchange {}
export class binancecoinm extends binance {}
Expand All @@ -44,26 +103,34 @@ declare module 'ccxt.pro' {
export class bitfinex extends Exchange {}
export class bitmart extends Exchange {}
export class bitmex extends Exchange {}
export class bitopro extends Exchange {}
export class bitstamp extends Exchange {}
export class bittrex extends Exchange {}
export class bitvavo extends Exchange {}
export class bybit extends Exchange {}
export class cdax extends Exchange {}
export class coinbaseprime extends coinbasepro {}
export class coinbasepro extends Exchange {}
export class coinex extends Exchange {}
export class coinflex extends Exchange {}
export class cryptocom extends Exchange {}
export class currencycom extends Exchange {}
export class ftx extends Exchange {}
export class ftxus extends ftx {}
export class gateio extends Exchange {}
export class gate extends Exchange {}
export class gateio extends gate {}
export class hitbtc extends Exchange {}
export class hollaex extends Exchange {}
export class huobi extends Exchange {}
export class huobijp extends Exchange {}
export class huobipro extends huobi {}
export class idex extends Exchange {}
export class kraken extends Exchange {}
export class kucoin extends Exchange {}
export class mexc extends Exchange {}
export class ndax extends Exchange {}
export class okcoin extends Exchange {}
export class okex extends Exchange {}
export class okex extends okx {}
export class okx extends Exchange {}
export class phemex extends Exchange {}
export class poloniex extends Exchange {}
Expand Down
11 changes: 10 additions & 1 deletion ccxt.pro.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ const ccxt = require ('ccxt')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.0.28'
const version = '1.1.73'

// Exchange.ccxtVersion = version

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

const exchanges = {
'aax': require ('./js/aax.js'),
'ascendex': require ('./js/ascendex.js'),
'bequant': require ('./js/bequant.js'),
'binance': require ('./js/binance.js'),
'binancecoinm': require ('./js/binancecoinm.js'),
Expand All @@ -28,23 +29,31 @@ const exchanges = {
'bitfinex': require ('./js/bitfinex.js'),
'bitmart': require ('./js/bitmart.js'),
'bitmex': require ('./js/bitmex.js'),
'bitopro': require ('./js/bitopro.js'),
'bitstamp': require ('./js/bitstamp.js'),
'bittrex': require ('./js/bittrex.js'),
'bitvavo': require ('./js/bitvavo.js'),
'bybit': require ('./js/bybit.js'),
'cdax': require ('./js/cdax.js'),
'coinbaseprime': require ('./js/coinbaseprime.js'),
'coinbasepro': require ('./js/coinbasepro.js'),
'coinex': require ('./js/coinex.js'),
'coinflex': require ('./js/coinflex.js'),
'cryptocom': require ('./js/cryptocom.js'),
'currencycom': require ('./js/currencycom.js'),
'ftx': require ('./js/ftx.js'),
'ftxus': require ('./js/ftxus.js'),
'gate': require ('./js/gate.js'),
'gateio': require ('./js/gateio.js'),
'hitbtc': require ('./js/hitbtc.js'),
'hollaex': require ('./js/hollaex.js'),
'huobi': require ('./js/huobi.js'),
'huobijp': require ('./js/huobijp.js'),
'huobipro': require ('./js/huobipro.js'),
'idex': require ('./js/idex.js'),
'kraken': require ('./js/kraken.js'),
'kucoin': require ('./js/kucoin.js'),
'mexc': require ('./js/mexc.js'),
'ndax': require ('./js/ndax.js'),
'okcoin': require ('./js/okcoin.js'),
'okex': require ('./js/okex.js'),
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
},
"require": {
"php": ">=7.0",
"ccxt/ccxt": ">=1.75.64",
"react/http": "=1.4.0",
"recoil/react": "1.0.2",
"ratchet/pawl": "^0.4.1",
"ccxt/ccxt": ">=1.88.1",
"react/http": ">=1.6.0",
"recoil/react": ">=1.0.3",
"ratchet/pawl": ">=0.4.1",
"ext-ds": "*",
"ext-json": "*"
},
Expand Down

0 comments on commit 6a54879

Please sign in to comment.