ccxt 4.2.95 → 4.2.97

package/dist/cjs/ccxt.js

@@ -182,7 +182,7 @@ var woo$1 = require('./src/pro/woo.js');
 
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.2.95';
+const version = '4.2.97';
 Exchange["default"].ccxtVersion = version;
 const exchanges = {
     'ace': ace,

package/dist/cjs/src/base/Exchange.js

@@ -4062,11 +4062,26 @@ class Exchange {
         const [result, empty] = this.handleOptionAndParams({}, methodName, optionName, defaultValue);
         return result;
     }
-    handleMarketTypeAndParams(methodName, market = undefined, params = {}) {
+    handleMarketTypeAndParams(methodName, market = undefined, params = {}, defaultValue = undefined) {
+        /**
+         * @ignore
+         * @method
+         * @name exchange#handleMarketTypeAndParams
+         * @param methodName the method calling handleMarketTypeAndParams
+         * @param {Market} market
+         * @param {object} params
+         * @param {string} [params.type] type assigned by user
+         * @param {string} [params.defaultType] same as params.type
+         * @param {string} [defaultValue] assigned programatically in the method calling handleMarketTypeAndParams
+         * @returns {[string, object]} the market type and params with type and defaultType omitted
+         */
         const defaultType = this.safeString2(this.options, 'defaultType', 'type', 'spot');
+        if (defaultValue === undefined) { // defaultValue takes precendence over exchange wide defaultType
+            defaultValue = defaultType;
+        }
         const methodOptions = this.safeDict(this.options, methodName);
-        let methodType = defaultType;
-        if (methodOptions !== undefined) {
+        let methodType = defaultValue;
+        if (methodOptions !== undefined) { // user defined methodType takes precedence over defaultValue
             if (typeof methodOptions === 'string') {
                 methodType = methodOptions;
             }

package/dist/cjs/src/base/functions/crypto.js

@@ -8,6 +8,7 @@ var base64 = require('../../static_dependencies/jsencrypt/lib/asn1js/base64.js')
 var asn1 = require('../../static_dependencies/jsencrypt/lib/asn1js/asn1.js');
 var secp256k1 = require('../../static_dependencies/noble-curves/secp256k1.js');
 var p256 = require('../../static_dependencies/noble-curves/p256.js');
+var utils = require('../../static_dependencies/noble-curves/abstract/utils.js');
 
 /*  ------------------------------------------------------------------------ */
 /*  ------------------------------------------------------------------------ */
@@ -31,7 +32,7 @@ const hmac = (request, secret, hash, digest = 'hex') => {
     return encoders[digest](binary);
 };
 /*  .............................................   */
-function ecdsa(request, secret, curve, prehash = null) {
+function ecdsa(request, secret, curve, prehash = null, fixedLength = false) {
     if (prehash) {
         request = hash(request, prehash, 'hex');
     }
@@ -65,7 +66,19 @@ function ecdsa(request, secret, curve, prehash = null) {
             throw new Error('Unsupported key format');
         }
     }
-    const signature = curve.sign(request, secret);
+    let signature = curve.sign(request, secret, {
+        lowS: true,
+    });
+    const minimumSize = (BigInt(1) << (BigInt(8) * BigInt(31))) - BigInt(1);
+    const halfOrder = curve.CURVE.n / BigInt(2);
+    let counter = 0;
+    while (fixedLength && (signature.r > halfOrder || signature.r <= minimumSize || signature.s <= minimumSize)) {
+        signature = curve.sign(request, secret, {
+            lowS: true,
+            extraEntropy: utils.numberToBytesLE(BigInt(counter), 32)
+        });
+        counter += 1;
+    }
     return {
         'r': signature.r.toString(16),
         's': signature.s.toString(16),

package/dist/cjs/src/base/functions/rsa.js

@@ -38,8 +38,8 @@ function jwt(request, secret, hash, isRSA = false, opts = {}) {
     }
     else if (algoType === 'ES') {
         const signedHash = crypto.ecdsa(token, index.utf8.encode(secret), p256.P256, hash);
-        const r = (signedHash.r.length === 64) ? signedHash.r : '0' + signedHash.r;
-        const s = (signedHash.s.length === 64) ? signedHash.s : '0' + signedHash.s;
+        const r = signedHash.r.padStart(64, '0');
+        const s = signedHash.s.padStart(64, '0');
         signature = encode.urlencodeBase64(encode.binaryToBase64(encode.base16ToBinary(r + s)));
     }
     return [token, signature].join('.');

package/dist/cjs/src/binance.js

@@ -5796,7 +5796,7 @@ class binance extends binance$1 {
                 response = await this.dapiPrivatePostOrder(request);
             }
         }
-        else if (marketType === 'margin' || marginMode !== undefined) {
+        else if (marketType === 'margin' || marginMode !== undefined || isPortfolioMargin) {
             if (isPortfolioMargin) {
                 response = await this.papiPostMarginOrder(request);
             }
@@ -5898,15 +5898,6 @@ class binance extends binance$1 {
                 uppercaseType = market['contract'] ? 'TAKE_PROFIT' : 'TAKE_PROFIT_LIMIT';
             }
         }
-        if ((marketType === 'spot') || (marketType === 'margin')) {
-            request['newOrderRespType'] = this.safeString(this.options['newOrderRespType'], type, 'RESULT'); // 'ACK' for order id, 'RESULT' for full order or 'FULL' for order with fills
-        }
-        else {
-            // swap, futures and options
-            if (!isPortfolioMargin) {
-                request['newOrderRespType'] = 'RESULT'; // "ACK", "RESULT", default "ACK"
-            }
-        }
         if (market['option']) {
             if (type === 'market') {
                 throw new errors.InvalidOrder(this.id + ' ' + type + ' is not a valid order type for the ' + symbol + ' market');
@@ -5946,6 +5937,14 @@ class binance extends binance$1 {
                 }
             }
         }
+        // handle newOrderRespType response type
+        if (((marketType === 'spot') || (marketType === 'margin')) && !isPortfolioMargin) {
+            request['newOrderRespType'] = this.safeString(this.options['newOrderRespType'], type, 'FULL'); // 'ACK' for order id, 'RESULT' for full order or 'FULL' for order with fills
+        }
+        else {
+            // swap, futures and options
+            request['newOrderRespType'] = 'RESULT'; // "ACK", "RESULT", default "ACK"
+        }
         const typeRequest = isPortfolioMarginConditional ? 'strategyType' : 'type';
         request[typeRequest] = uppercaseType;
         // additional required fields depending on the order type
@@ -6599,7 +6598,7 @@ class binance extends binance$1 {
                 response = await this.dapiPrivateGetOpenOrders(this.extend(request, params));
             }
         }
-        else if (type === 'margin' || marginMode !== undefined) {
+        else if (type === 'margin' || marginMode !== undefined || isPortfolioMargin) {
             if (isPortfolioMargin) {
                 response = await this.papiGetMarginOpenOrders(this.extend(request, params));
             }
@@ -7100,7 +7099,7 @@ class binance extends binance$1 {
                 response = await this.dapiPrivateDeleteAllOpenOrders(this.extend(request, params));
             }
         }
-        else if ((type === 'margin') || (marginMode !== undefined)) {
+        else if ((type === 'margin') || (marginMode !== undefined) || isPortfolioMargin) {
             if (isPortfolioMargin) {
                 response = await this.papiDeleteMarginAllOpenOrders(this.extend(request, params));
             }