1.33.95

[ci skip]
errord · Sep 3, 2020 · 40d30a0 · 40d30a0
1 parent c1e2514
commit 40d30a0
Show file tree

Hide file tree

Showing 13 changed files with 119 additions and 121 deletions.
diff --git a/README.md b/README.md
@@ -226,13 +226,13 @@ console.log (ccxt.exchanges) // print all available exchanges
 
 All-in-one browser bundle (dependencies included), served from a CDN of your choice:
 
-* jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].94/dist/ccxt.browser.js
-* unpkg: https://unpkg.com/[email protected].94/dist/ccxt.browser.js
+* jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].95/dist/ccxt.browser.js
+* unpkg: https://unpkg.com/[email protected].95/dist/ccxt.browser.js
 
 CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers.
 
 ```HTML
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].94/dist/ccxt.browser.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].95/dist/ccxt.browser.js"></script>
 ```
 
 Creates a global `ccxt` object:

diff --git a/ccxt.js b/ccxt.js
@@ -35,7 +35,7 @@ const Exchange  = require ('./js/base/Exchange')
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
 
-const version = '1.33.94'
+const version = '1.33.95'
 
 Exchange.ccxtVersion = version
 

diff --git a/dist/ccxt.browser.js b/dist/ccxt.browser.js
@@ -43,7 +43,7 @@ const Exchange  = require ('./js/base/Exchange')
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
 
-const version = '1.33.94'
+const version = '1.33.95'
 
 Exchange.ccxtVersion = version
 
@@ -3710,40 +3710,31 @@ module.exports['byteArrayToWordArray'] = byteArrayToWordArray
 },{"../../static_dependencies/BN/bn":122,"../../static_dependencies/crypto-js/crypto-js":123,"../../static_dependencies/qs/index":158}],11:[function(require,module,exports){
 "use strict";
 
-/*  ------------------------------------------------------------------------ */
+// ----------------------------------------------------------------------------
 
 const { isObject, isNumber, isDictionary, isArray } = require ('./type')
 
-/*  ------------------------------------------------------------------------ */
+// ----------------------------------------------------------------------------
 
 const keys = Object.keys
-
-    , values = x => !isArray (x)  // don't copy arrays if they're already arrays!
-                        ? Object.values (x)
-                        : x
-
-    , index = x => new Set (values (x))
-
+    , values = (x) => ((!isArray (x)) ? Object.values (x) : x) // don't copy arrays if they're already arrays
+    , index = (x) => new Set (values (x))
     , extend = (...args) => Object.assign ({}, ...args) // NB: side-effect free
+    , clone = (x) => (isArray (x) ? Array.from (x) : extend (x)) // clone arrays or objects
 
-    , clone = x => isArray (x)
-                        ? Array.from (x) // clones arrays
-                        : extend (x)     // clones objects
-
-/*  ------------------------------------------------------------------------ */
-
-module.exports =
+// ----------------------------------------------------------------------------
 
-    { keys
+module.exports = {
+    keys
     , values
     , extend
     , clone
     , index
-    , ordered: x => x // a stub to keep assoc keys in order (in JS it does nothing, it's mostly for Python)
-    , unique:  x => Array.from (index (x))
+    , ordered: (x) => x // a stub to keep assoc keys in order (in JS it does nothing, it's mostly for Python)
+    , unique: (x) => Array.from (index (x))
     , arrayConcat: (a, b) => a.concat (b)
 
-    /*  .............................................   */
+    // ------------------------------------------------------------------------
 
     , inArray (needle, haystack) {
 
@@ -3756,12 +3747,13 @@ module.exports =
     }
 
     , isEmpty (object) {
-        if (!object)
-            return true;
+        if (!object) {
+            return true
+        }
         return (Array.isArray (object) ? object : Object.keys (object)).length < 1;
     }
 
-/*  .............................................   */
+    // ------------------------------------------------------------------------
 
     , keysort (x, out = {}) {
 
@@ -3771,55 +3763,57 @@ module.exports =
         return out
     }
 
-/*  .............................................   */
+    // ------------------------------------------------------------------------
 
     /*
-       Accepts a map/array of objects and a key name to be used as an index:
-       array = [
-          { someKey: 'value1', anotherKey: 'anotherValue1' },
-          { someKey: 'value2', anotherKey: 'anotherValue2' },
-          { someKey: 'value3', anotherKey: 'anotherValue3' },
-       ]
-       key = 'someKey'
-
-       Returns a map:
-      {
-          value1: { someKey: 'value1', anotherKey: 'anotherValue1' },
-          value2: { someKey: 'value2', anotherKey: 'anotherValue2' },
-          value3: { someKey: 'value3', anotherKey: 'anotherValue3' },
-      }
+        Accepts a map/array of objects and a key name to be used as an index:
+        array = [
+            { someKey: 'value1', anotherKey: 'anotherValue1' },
+            { someKey: 'value2', anotherKey: 'anotherValue2' },
+            { someKey: 'value3', anotherKey: 'anotherValue3' },
+        ]
+        key = 'someKey'
+
+        Returns a map:
+        {
+            value1: { someKey: 'value1', anotherKey: 'anotherValue1' },
+            value2: { someKey: 'value2', anotherKey: 'anotherValue2' },
+            value3: { someKey: 'value3', anotherKey: 'anotherValue3' },
+        }
     */
 
     , indexBy (x, k, out = {}) {
 
-        for (const v of values (x))
-            if (k in v)
+        for (const v of values (x)) {
+            if (k in v) {
                 out[v[k]] = v
+            }
+        }
 
         return out
     }
 
-/*  .............................................   */
+    // ------------------------------------------------------------------------
 
     /*
-       Accepts a map/array of objects and a key name to be used as a grouping parameter:
-       array = [
-          { someKey: 'value1', anotherKey: 'anotherValue1' },
-          { someKey: 'value1', anotherKey: 'anotherValue2' },
-          { someKey: 'value3', anotherKey: 'anotherValue3' },
-       ]
-       key = 'someKey'
-
-       Returns a map:
-      {
-          value1: [
+        Accepts a map/array of objects and a key name to be used as a grouping parameter:
+        array = [
             { someKey: 'value1', anotherKey: 'anotherValue1' },
             { someKey: 'value1', anotherKey: 'anotherValue2' },
-          ]
-          value3: [
-            { someKey: 'value3', anotherKey: 'anotherValue3' }
-          ],
-      }
+            { someKey: 'value3', anotherKey: 'anotherValue3' },
+        ]
+        key = 'someKey'
+
+        Returns a map:
+        {
+            value1: [
+                { someKey: 'value1', anotherKey: 'anotherValue1' },
+                { someKey: 'value1', anotherKey: 'anotherValue2' },
+            ]
+            value3: [
+                { someKey: 'value3', anotherKey: 'anotherValue3' }
+            ],
+        }
     */
 
     , groupBy (x, k, out = {}) {
@@ -3834,61 +3828,68 @@ module.exports =
         return out
     }
 
-/*  .............................................   */
+    // ------------------------------------------------------------------------
 
     /*
-       Accepts a map/array of objects, a key name and a key value to be used as a filter:
-       array = [
-          { someKey: 'value1', anotherKey: 'anotherValue1' },
-          { someKey: 'value2', anotherKey: 'anotherValue2' },
-          { someKey: 'value3', anotherKey: 'anotherValue3' },
-       ]
-       key = 'someKey'
-       value = 'value1'
-
-       Returns an array:
-      [
-          value1: { someKey: 'value1', anotherKey: 'anotherValue1' },
-      ]
+        Accepts a map/array of objects, a key name and a key value to be used as a filter:
+        array = [
+            { someKey: 'value1', anotherKey: 'anotherValue1' },
+            { someKey: 'value2', anotherKey: 'anotherValue2' },
+            { someKey: 'value3', anotherKey: 'anotherValue3' },
+        ]
+        key = 'someKey'
+        value = 'value1'
+
+        Returns an array:
+        [
+            value1: { someKey: 'value1', anotherKey: 'anotherValue1' },
+        ]
     */
 
     , filterBy (x, k, value = undefined, out = []) {
 
-        for (const v of values (x))
-            if (v[k] === value)
+        for (const v of values (x)) {
+            if (v[k] === value) {
                 out.push (v)
+            }
+        }
 
         return out
     }
 
-/*  .............................................   */
+    // ------------------------------------------------------------------------
+    // NB: MUTATES ARRAY!
 
-    , sortBy: (array, // NB: MUTATES ARRAY!
-               key,
-               descending = false,
-               direction  = descending ? -1 : 1) => array.sort ((a, b) =>
-                                                                ((a[key] < b[key]) ? -direction :
-                                                                ((a[key] > b[key]) ?  direction : 0)))
+    , sortBy: (array, key, descending = false, direction  = descending ? -1 : 1) => array.sort ((a, b) => {
+        if (a[key] < b[key]) {
+            return -direction
+        } else if (a[key] > b[key]) {
+            return direction
+        } else {
+            return 0
+        }
+    })
 
-/*  .............................................   */
+    // ------------------------------------------------------------------------
 
     , flatten: function flatten (x, out = []) {
 
         for (const v of x) {
-            if (isArray (v)) flatten (v, out)
-            else out.push (v)
+            if (isArray (v)) {
+                flatten (v, out)
+            } else {
+                out.push (v)
+            }
         }
 
         return out
     }
 
-/*  .............................................   */
+    // ------------------------------------------------------------------------
 
-    , pluck: (x, k) => values (x)
-                        .filter (v => k in v)
-                        .map (v => v[k])
+    , pluck: (x, k) => values (x).filter ((v) => k in v).map ((v) => v[k])
 
-/*  .............................................   */
+    // ------------------------------------------------------------------------
 
     , omit (x, ...args) {
 
@@ -3897,15 +3898,13 @@ module.exports =
             const out = clone (x)
 
             for (const k of args) {
-
                 if (isArray (k)) { // omit (x, ['a', 'b'])
-
                     for (const kk of k) {
                         delete out[kk]
                     }
+                } else {
+                    delete out[k] // omit (x, 'a', 'b')
                 }
-
-                else delete out[k] // omit (x, 'a', 'b')
             }
 
             return out
@@ -3914,24 +3913,22 @@ module.exports =
         return x
     }
 
-/*  .............................................   */
+    // ------------------------------------------------------------------------
 
     , sum (...xs) {
 
         const ns = xs.filter (isNumber) // leave only numbers
 
-        return (ns.length > 0)
-                    ? ns.reduce ((a, b) => a + b, 0)
-                    : undefined
+        return (ns.length > 0) ? ns.reduce ((a, b) => a + b, 0) : undefined
     }
 
-/*  .............................................   */
+    // ------------------------------------------------------------------------
 
     , deepExtend: function deepExtend (...xs) {
         let out = undefined
         for (const x of xs) {
             if (isDictionary (x)) {
-                if (!isObject (out)) {
+                if (!isDictionary (out)) {
                     out = {}
                 }
                 for (const k in x) {
@@ -3944,7 +3941,7 @@ module.exports =
         return out
     }
 
-/*  ------------------------------------------------------------------------ */
+// ----------------------------------------------------------------------------
 
 }
 
@@ -4760,9 +4757,10 @@ const isNumber          = Number.isFinite
     , isInteger         = Number.isInteger
     , isArray           = Array.isArray
     , hasProps          = o => ((o !== undefined) && (o !== null))
-    , isString          = s =>                 (typeof s === 'string')
+    , isString          = s =>                  (typeof s === 'string')
     , isObject          = o => ((o !== null) && (typeof o === 'object'))
-    , isDictionary      = o => (isObject (o) && !isArray (o))
+    , isRegExp          = o => (o instanceof RegExp)
+    , isDictionary      = o => (isObject (o) && !isArray (o) && !isRegExp (o))
     , isStringCoercible = x => ((hasProps (x) && x.toString) || isNumber (x))
 
 /*  .............................................   */

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.33.94",
+  "version": "1.33.95",
   "description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 130+ exchanges",
   "main": "./ccxt.js",
   "unpkg": "dist/ccxt.browser.js",

diff --git a/php/base/Exchange.php b/php/base/Exchange.php
@@ -36,7 +36,7 @@
 use Elliptic\EdDSA;
 use BN\BN;
 
-$version = '1.33.94';
+$version = '1.33.95';
 
 // rounding mode
 const TRUNCATE = 0;
@@ -55,7 +55,7 @@
 
 class Exchange {
 
-    const VERSION = '1.33.94';
+    const VERSION = '1.33.95';
 
     private static $base58_alphabet = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
     private static $base58_encoder = null;