binance 2.15.14 → 3.0.0-beta.1

package/lib/util/beautifier.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const beautifier_maps_1 = require("./beautifier-maps");
 class Beautifier {
-    constructor() {
+    constructor(config) {
+        this.config = config;
         this.floatKeys = [
             'accumulatedQuantity',
             'accumulatedRealisedPreFee',
@@ -28,8 +29,15 @@ class Beautifier {
             'close',
             'closeQuantity',
             'closeTime',
+            'cmUnrealizedPNL',
+            'cmWalletBalance',
             'commission',
             'commissionAmount',
+            'crossMarginAsset',
+            'crossMarginBorrowed',
+            'crossMarginFree',
+            'crossMarginInterest',
+            'crossMarginLocked',
             'crossWalletBalance',
             'currentClose',
             'cummulativeQuoteAssetTransactedQty',
@@ -73,6 +81,7 @@ class Beautifier {
             'multiplierDown',
             'multiplierUp',
             'multiplierDecimal',
+            'negativeBalance',
             'newTraderRebateCommission',
             'notional',
             'oldTraderRebateCommission',
@@ -113,8 +122,11 @@ class Beautifier {
             'totalTradeVol',
             'totalTradedBaseAssetVolume',
             'totalTradedQuoteAssetVolume',
+            'totalWalletBalance',
             'trailingStopActivationPrice',
             'trailingStopCallbackRate',
+            'umUnrealizedPNL',
+            'umWalletBalance',
             'unrealisedPnl',
             'unRealizedProfit',
             'volume',
@@ -188,13 +200,26 @@ class Beautifier {
         return beautifedArray;
     }
     beautify(data, key) {
+        var _a;
+        // console.log('beautify()', { key });
         if (typeof key !== 'string' && typeof key !== 'number') {
             console.warn(`beautify(object, ${key}) is not valid key - beautification failed `, data, key);
             return data;
         }
         const knownBeautification = this.beautificationMap[key];
         if (!knownBeautification) {
-            // console.log(`beautify unknown key(..., "${key}")`);
+            const valueType = typeof data;
+            const isPrimitive = valueType === 'string' ||
+                valueType === 'number' ||
+                valueType === 'boolean';
+            // Nothing to warn for primitives
+            if (((_a = this.config) === null || _a === void 0 ? void 0 : _a.warnKeyMissingInMap) && !isPrimitive) {
+                console.log(`Beautifier(): event not found in map: key(..., "${key}")`, {
+                    valueType,
+                    data,
+                });
+                process.exit(-1);
+            }
             if (Array.isArray(data)) {
                 return this.beautifyArrayValues(data);
             }
@@ -244,22 +269,26 @@ class Beautifier {
     /**
      * Entry point to beautify WS message. EventType is determined automatically unless this is a combined stream event.
      */
-    beautifyWsMessage(data, eventType, isCombined) {
-        if (Array.isArray(data)) {
-            return data.map((event) => {
+    beautifyWsMessage(event, eventType, isCombined, eventMapSuffix) {
+        const eventMapSuffixResolved = eventMapSuffix || '';
+        if (event.data) {
+            return this.beautifyWsMessage(event.data, eventType, isCombined, eventMapSuffixResolved);
+        }
+        if (Array.isArray(event)) {
+            return event.map((event) => {
                 if (event.e) {
-                    return this.beautify(event, event.e + 'Event');
+                    return this.beautify(event, event.e + eventMapSuffixResolved + 'Event');
                 }
                 return event;
             });
         }
-        else if (data.e) {
-            return this.beautify(data, data.e + 'Event');
+        if (event.e) {
+            return this.beautify(event, event.e + eventMapSuffixResolved + 'Event');
         }
-        else if (isCombined && typeof data === 'object' && data !== null) {
-            return this.beautify(data, eventType);
+        if (isCombined && typeof event === 'object' && event !== null) {
+            return this.beautify(event, eventType + eventMapSuffixResolved);
         }
-        return data;
+        return event;
     }
 }
 exports.default = Beautifier;

package/lib/util/beautifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"beautifier.js","sourceRoot":"","sources":["../../src/util/beautifier.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"beautifier.js","sourceRoot":"","sources":["../../src/util/beautifier.ts"],"names":[],"mappings":"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"}

package/lib/util/browser-support.d.ts

@@ -1 +1,2 @@
-export declare function signMessage(message: string, secret: string): Promise<string>;
+import { SignEncodeMethod, SignAlgorithm } from './webCryptoAPI';
+export declare function signMessage(message: string, secret: string, method: SignEncodeMethod, algorithm: SignAlgorithm, pemEncodeMethod?: SignEncodeMethod): Promise<string>;

package/lib/util/browser-support.js

@@ -9,34 +9,52 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.signMessage = void 0;
-function str2ab(str) {
-    const buf = new ArrayBuffer(str.length);
-    const bufView = new Uint8Array(buf);
-    for (let i = 0, strLen = str.length; i < strLen; i++) {
-        bufView[i] = str.charCodeAt(i);
-    }
-    return buf;
-}
-function signMessage(message, secret) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const encoder = new TextEncoder();
-        if (secret.includes('PRIVATE KEY')) {
-            const pemHeader = '-----BEGIN PRIVATE KEY-----';
-            const pemFooter = '-----END PRIVATE KEY-----';
-            const pemContents = secret.substring(pemHeader.length, secret.length - pemFooter.length);
-            const binaryDerString = globalThis.atob(pemContents);
-            const binaryDer = str2ab(binaryDerString);
-            const key = yield globalThis.crypto.subtle.importKey('pkcs8', binaryDer, { name: 'RSASSA-PKCS1-v1_5', hash: { name: 'SHA-256' } }, false, ['sign']);
-            const signature = yield globalThis.crypto.subtle.sign('RSASSA-PKCS1-v1_5', key, encoder.encode(message));
-            return btoa(String.fromCharCode(...new Uint8Array(signature)));
-        }
-        const key = yield globalThis.crypto.subtle.importKey('raw', encoder.encode(secret), { name: 'HMAC', hash: { name: 'SHA-256' } }, false, ['sign']);
-        const signature = yield globalThis.crypto.subtle.sign('HMAC', key, encoder.encode(message));
-        return Array.prototype.map
-            .call(new Uint8Array(signature), (x) => ('00' + x.toString(16)).slice(-2))
-            .join('');
+exports.signMessage = signMessage;
+const webCryptoAPI_1 = require("./webCryptoAPI");
+function signMessage(message_1, secret_1, method_1, algorithm_1) {
+    return __awaiter(this, arguments, void 0, function* (message, secret, method, algorithm, pemEncodeMethod = method) {
+        return (0, webCryptoAPI_1.signMessage)(message, secret, method, algorithm);
+        // const encoder = new TextEncoder();
+        // if (secret.includes('PRIVATE KEY')) {
+        //   const pemHeader = '-----BEGIN PRIVATE KEY-----';
+        //   const pemFooter = '-----END PRIVATE KEY-----';
+        //   const pemContents = secret.substring(
+        //     pemHeader.length,
+        //     secret.length - pemFooter.length,
+        //   );
+        //   const binaryDerString = globalThis.atob(pemContents);
+        //   const binaryDer = str2ab(binaryDerString);
+        //   const key = await globalThis.crypto.subtle.importKey(
+        //     'pkcs8',
+        //     binaryDer,
+        //     { name: 'RSASSA-PKCS1-v1_5', hash: { name: 'SHA-256' } },
+        //     false,
+        //     ['sign'],
+        //   );
+        //   const signature = await globalThis.crypto.subtle.sign(
+        //     'RSASSA-PKCS1-v1_5',
+        //     key,
+        //     encoder.encode(message),
+        //   );
+        //   return btoa(String.fromCharCode(...new Uint8Array(signature)));
+        // }
+        // const key = await globalThis.crypto.subtle.importKey(
+        //   'raw',
+        //   encoder.encode(secret),
+        //   { name: 'HMAC', hash: { name: 'SHA-256' } },
+        //   false,
+        //   ['sign'],
+        // );
+        // const signature = await globalThis.crypto.subtle.sign(
+        //   'HMAC',
+        //   key,
+        //   encoder.encode(message),
+        // );
+        // return Array.prototype.map
+        //   .call(new Uint8Array(signature), (x: any) =>
+        //     ('00' + x.toString(16)).slice(-2),
+        //   )
+        //   .join('');
     });
 }
-exports.signMessage = signMessage;
 //# sourceMappingURL=browser-support.js.map

package/lib/util/browser-support.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser-support.js","sourceRoot":"","sources":["../../src/util/browser-support.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,SAAS,MAAM,CAAC,GAAG;IACjB,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;QACpD,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;KAChC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAsB,WAAW,CAC/B,OAAe,EACf,MAAc;;QAEd,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAElC,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YAClC,MAAM,SAAS,GAAG,6BAA6B,CAAC;YAChD,MAAM,SAAS,GAAG,2BAA2B,CAAC;YAC9C,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAClC,SAAS,CAAC,MAAM,EAChB,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CACjC,CAAC;YACF,MAAM,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACrD,MAAM,SAAS,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;YAE1C,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAClD,OAAO,EACP,SAAS,EACT,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EACxD,KAAK,EACL,CAAC,MAAM,CAAC,CACT,CAAC;YAEF,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CACnD,mBAAmB,EACnB,GAAG,EACH,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CACxB,CAAC;YAEF,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SAChE;QAED,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAClD,KAAK,EACL,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EACtB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAC3C,KAAK,EACL,CAAC,MAAM,CAAC,CACT,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CACnD,MAAM,EACN,GAAG,EACH,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CACxB,CAAC;QAEF,OAAO,KAAK,CAAC,SAAS,CAAC,GAAG;aACvB,IAAI,CAAC,IAAI,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,CAAM,EAAE,EAAE,CAC1C,CAAC,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAClC;aACA,IAAI,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;CAAA;AApDD,kCAoDC"}
+{"version":3,"file":"browser-support.js","sourceRoot":"","sources":["../../src/util/browser-support.ts"],"names":[],"mappings":";;;;;;;;;;;AAMA,kCAyDC;AA/DD,iDAIwB;AAExB,SAAsB,WAAW;yDAC/B,OAAe,EACf,MAAc,EACd,MAAwB,EACxB,SAAwB,EACxB,kBAAoC,MAAM;QAE1C,OAAO,IAAA,0BAAuB,EAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAEnE,qCAAqC;QAErC,wCAAwC;QACxC,qDAAqD;QACrD,mDAAmD;QACnD,0CAA0C;QAC1C,wBAAwB;QACxB,wCAAwC;QACxC,OAAO;QACP,0DAA0D;QAC1D,+CAA+C;QAE/C,0DAA0D;QAC1D,eAAe;QACf,iBAAiB;QACjB,gEAAgE;QAChE,aAAa;QACb,gBAAgB;QAChB,OAAO;QAEP,2DAA2D;QAC3D,2BAA2B;QAC3B,WAAW;QACX,+BAA+B;QAC/B,OAAO;QAEP,oEAAoE;QACpE,IAAI;QAEJ,wDAAwD;QACxD,WAAW;QACX,4BAA4B;QAC5B,iDAAiD;QACjD,WAAW;QACX,cAAc;QACd,KAAK;QAEL,yDAAyD;QACzD,YAAY;QACZ,SAAS;QACT,6BAA6B;QAC7B,KAAK;QAEL,6BAA6B;QAC7B,iDAAiD;QACjD,yCAAyC;QACzC,MAAM;QACN,eAAe;IACjB,CAAC;CAAA"}

package/lib/util/logger.d.ts

@@ -0,0 +1,8 @@
+export type LogParams = null | any;
+export type DefaultLogger = typeof DefaultLogger;
+export declare const DefaultLogger: {
+    /** Ping/pong events and other raw messages that might be noisy. Enable this while troubleshooting. */
+    trace: (..._params: LogParams) => void;
+    info: (...params: LogParams) => void;
+    error: (...params: LogParams) => void;
+};

package/lib/util/logger.js

@@ -0,0 +1,17 @@
+"use strict";
+/* eslint-disable @typescript-eslint/no-unused-vars */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultLogger = void 0;
+exports.DefaultLogger = {
+    /** Ping/pong events and other raw messages that might be noisy. Enable this while troubleshooting. */
+    trace: (..._params) => {
+        // console.log(_params);
+    },
+    info: (...params) => {
+        console.info(params);
+    },
+    error: (...params) => {
+        console.error(params);
+    },
+};
+//# sourceMappingURL=logger.js.map

package/lib/util/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/util/logger.ts"],"names":[],"mappings":";AAAA,sDAAsD;;;AAMzC,QAAA,aAAa,GAAG;IAC3B,sGAAsG;IACtG,KAAK,EAAE,CAAC,GAAG,OAAkB,EAAQ,EAAE;QACrC,wBAAwB;IAC1B,CAAC;IACD,IAAI,EAAE,CAAC,GAAG,MAAiB,EAAQ,EAAE;QACnC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IACD,KAAK,EAAE,CAAC,GAAG,MAAiB,EAAQ,EAAE;QACpC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;CACF,CAAC"}

package/lib/util/node-support.d.ts

@@ -1 +1,2 @@
-export declare function signMessage(message: string, secret: string): Promise<string>;
+import { SignAlgorithm, SignEncodeMethod } from './webCryptoAPI';
+export declare function signMessage(message: string, secret: string, method: SignEncodeMethod, algorithm: SignAlgorithm, pemEncodeMethod?: SignEncodeMethod): Promise<string>;

package/lib/util/node-support.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -32,19 +42,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.signMessage = void 0;
+exports.signMessage = signMessage;
 const crypto_1 = require("crypto");
-const browserMethods = __importStar(require("./browser-support"));
-function signMessage(message, secret) {
-    return __awaiter(this, void 0, void 0, function* () {
+const browserMethods = __importStar(require("./webCryptoAPI"));
+function signMessage(message_1, secret_1, method_1, algorithm_1) {
+    return __awaiter(this, arguments, void 0, function* (message, secret, method, algorithm, pemEncodeMethod = method) {
         if (secret.includes('PRIVATE KEY') && typeof crypto_1.createSign === 'function') {
-            return (0, crypto_1.createSign)('RSA-SHA256').update(message).sign(secret, 'base64');
+            if (secret.includes('RSA PRIVATE KEY')) {
+                // TODO: test me
+                return (0, crypto_1.createSign)('RSA-SHA256')
+                    .update(message)
+                    .sign(secret, pemEncodeMethod);
+            }
+            // fallback to ed25519, if a private key is provided but missing "RSA"
+            return (0, crypto_1.sign)(null, Buffer.from(message), {
+                key: secret,
+                padding: crypto_1.constants.RSA_PKCS1_PSS_PADDING,
+                saltLength: crypto_1.constants.RSA_PSS_SALTLEN_DIGEST,
+            }).toString(pemEncodeMethod);
         }
         if (typeof crypto_1.createHmac === 'function') {
-            return (0, crypto_1.createHmac)('sha256', secret).update(message).digest('hex');
+            return (0, crypto_1.createHmac)('sha256', secret).update(message).digest(method);
         }
-        return browserMethods.signMessage(message, secret);
+        return browserMethods.signMessage(message, secret, method, algorithm);
     });
 }
-exports.signMessage = signMessage;
 //# sourceMappingURL=node-support.js.map

package/lib/util/node-support.js.map

@@ -1 +1 @@
-{"version":3,"file":"node-support.js","sourceRoot":"","sources":["../../src/util/node-support.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAgD;AAEhD,kEAAoD;AAEpD,SAAsB,WAAW,CAC/B,OAAe,EACf,MAAc;;QAEd,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,OAAO,mBAAU,KAAK,UAAU,EAAE;YACtE,OAAO,IAAA,mBAAU,EAAC,YAAY,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;SACxE;QAED,IAAI,OAAO,mBAAU,KAAK,UAAU,EAAE;YACpC,OAAO,IAAA,mBAAU,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACnE;QAED,OAAO,cAAc,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;CAAA;AAbD,kCAaC"}
+{"version":3,"file":"node-support.js","sourceRoot":"","sources":["../../src/util/node-support.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,kCA4BC;AAjCD,mCAAiE;AAEjE,+DAAiD;AAGjD,SAAsB,WAAW;yDAC/B,OAAe,EACf,MAAc,EACd,MAAwB,EACxB,SAAwB,EACxB,kBAAoC,MAAM;QAE1C,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,OAAO,mBAAU,KAAK,UAAU,EAAE,CAAC;YACvE,IAAI,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBACvC,gBAAgB;gBAChB,OAAO,IAAA,mBAAU,EAAC,YAAY,CAAC;qBAC5B,MAAM,CAAC,OAAO,CAAC;qBACf,IAAI,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;YACnC,CAAC;YAED,sEAAsE;YACtE,OAAO,IAAA,aAAI,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBACtC,GAAG,EAAE,MAAM;gBACX,OAAO,EAAE,kBAAS,CAAC,qBAAqB;gBACxC,UAAU,EAAE,kBAAS,CAAC,sBAAsB;aAC7C,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAC/B,CAAC;QAED,IAAI,OAAO,mBAAU,KAAK,UAAU,EAAE,CAAC;YACrC,OAAO,IAAA,mBAAU,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,cAAc,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACxE,CAAC;CAAA"}

package/lib/util/requestUtils.d.ts

@@ -1,9 +1,8 @@
 import { MainClient } from '../main-client';
-import { NewFuturesOrderParams } from '../types/futures';
-import { BinanceBaseUrlKey, CancelOCOParams, CancelOrderParams, NewOCOParams, OrderIdProperty } from '../types/shared';
-import { WsMarket } from '../types/websockets';
+import { BinanceBaseUrlKey, OrderIdProperty } from '../types/shared';
 import { USDMClient } from '../usdm-client';
-import { WsKey } from '../websocket-client';
+import { WsKey } from './websockets/websocket-util';
+import { WsRequestOperationBinance } from '../types/websockets/ws-api';
 export type RestClient = MainClient | USDMClient;
 export interface RestClientOptions {
     api_key?: string;
@@ -25,6 +24,9 @@ export interface RestClientOptions {
 export type GenericAPIResponse<T = any> = Promise<T>;
 export declare function getOrderIdPrefix(network: BinanceBaseUrlKey): string;
 export declare function generateNewOrderId(network: BinanceBaseUrlKey): string;
+export declare function requiresWSAPINewClientOID(request: WsRequestOperationBinance<string>, wsKey: WsKey): boolean;
+export declare function getBaseURLKeyForWsKey(wsKey: WsKey): BinanceBaseUrlKey;
+export declare function validateWSAPINewClientOID(request: WsRequestOperationBinance<string>, wsKey: WsKey): void;
 export declare function serialiseParams(params?: object, strict_validation?: boolean, encodeValues?: boolean, filterUndefinedParams?: boolean): string;
 export interface SignedRequestState {
     requestBody: any;
@@ -33,24 +35,22 @@ export interface SignedRequestState {
     signature?: string;
     recvWindow?: number;
 }
-export declare function getRequestSignature(data: any, key?: string, secret?: string, recvWindow?: number, timestamp?: number, strictParamValidation?: boolean, filterUndefinedParams?: boolean): Promise<SignedRequestState>;
+export declare function getRequestSignature(data: object & {
+    recvWindow?: number;
+    signature?: string;
+}, key?: string, secret?: string, recvWindow?: number, timestamp?: number, strictParamValidation?: boolean, filterUndefinedParams?: boolean): Promise<SignedRequestState>;
 export declare function getServerTimeEndpoint(urlKey: BinanceBaseUrlKey): string;
 export declare function getRestBaseUrl(clientType: BinanceBaseUrlKey, restClientOptions: RestClientOptions): string;
 export declare function isPublicEndpoint(endpoint: string): boolean;
 export declare function isWsPong(response: any): any;
-export declare function logInvalidOrderId(orderIdProperty: OrderIdProperty, expectedOrderIdPrefix: string, params: NewFuturesOrderParams | CancelOrderParams | NewOCOParams | CancelOCOParams): void;
+export declare function logInvalidOrderId(orderIdProperty: OrderIdProperty, expectedOrderIdPrefix: string, params: object): void;
+/**
+ * For some topics, the received event does not include any information on the topic the event is for (e.g. book tickers).
+ *
+ * This method extracts this using available context, to add an "eventType" property if missing.
+ *
+ * - For the old WebsocketClient, this is extracted using the WsKey.
+ * - For the new multiplex Websocketclient, this is extracted using the "stream" parameter.
+ */
 export declare function appendEventIfMissing(wsMsg: any, wsKey: WsKey): void;
-interface WsContext {
-    symbol: string | undefined;
-    market: WsMarket;
-    isTestnet: boolean | undefined;
-    isUserData: boolean;
-    streamName: string;
-    listenKey: string | undefined;
-    otherParams: undefined | string[];
-}
-export declare function getContextFromWsKey(wsKey: WsKey): WsContext;
-export declare function getWsKeyWithContext(market: WsMarket, streamName: string, symbol?: string | undefined, listenKey?: string | undefined, ...otherParams: (string | boolean)[]): WsKey;
-export declare function appendEventMarket(wsMsg: any, wsKey: WsKey): void;
 export declare function asArray<T>(el: T[] | T): T[];
-export {};