Skip to content

Commit

Permalink
Merge branch 'master' of http://github.com/kroitor/ccxt
Browse files Browse the repository at this point in the history
  • Loading branch information
xpl committed Sep 19, 2017
2 parents 417f527 + 47699bc commit 20f3148
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 12 deletions.
4 changes: 2 additions & 2 deletions build/ccxt.browser.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/ccxt.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class DDoSProtection extends NetworkError {}
class RequestTimeout extends NetworkError {}
class ExchangeNotAvailable extends NetworkError {}

$version = '1.7.78';
$version = '1.7.79';

$curl_errors = array (
0 => 'CURLE_OK',
Expand Down
10 changes: 4 additions & 6 deletions ccxt.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const CryptoJS = require ('crypto-js')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.7.78'
const version = '1.7.79'

//-----------------------------------------------------------------------------
// platform detection
Expand Down Expand Up @@ -448,8 +448,6 @@ const Exchange = function (config) {
// })
// },

const this_ = this; // workaround for a Babel plugin bug (not passing `this` to _recursive() call)

// internal rate-limiting REST poller

let lastRestRequestTimestamp = 0
Expand All @@ -467,14 +465,14 @@ const Exchange = function (config) {

// rate limiter

let elapsed = this_.milliseconds () - lastRestPollTimestamp
let delay = this_.rateLimit - elapsed
let elapsed = this.milliseconds () - lastRestPollTimestamp
let delay = this.rateLimit - elapsed
if (delay > 0) {
await sleep (delay)
}

let { args, resolve, reject } = restRequestQueue.shift ()
lastRestPollTimestamp = this_.milliseconds ()
lastRestPollTimestamp = this.milliseconds ()

this_.executeRestRequest (...args)
.then (resolve)
Expand Down
2 changes: 1 addition & 1 deletion ccxt.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class DDoSProtection extends NetworkError {}
class RequestTimeout extends NetworkError {}
class ExchangeNotAvailable extends NetworkError {}

$version = '1.7.78';
$version = '1.7.79';

$curl_errors = array (
0 => 'CURLE_OK',
Expand Down
2 changes: 1 addition & 1 deletion ccxt/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@

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

__version__ = '1.7.78'
__version__ = '1.7.79'

#==============================================================================
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.7.78",
"version": "1.7.79",
"description": "A library for cryptocurrency trading and e-commerce with support for many bitcoin/ether/altcoin exchange markets and merchant APIs",
"main": "./ccxt.js",
"unpkg": "build/ccxt.browser.js",
Expand Down

0 comments on commit 20f3148

Please sign in to comment.