ccxt 4.2.89 → 4.2.90

package/dist/cjs/src/okx.js

@@ -84,6 +84,7 @@ class okx extends okx$1 {
                 'fetchLedgerEntry': undefined,
                 'fetchLeverage': true,
                 'fetchLeverageTiers': false,
+                'fetchMarginAdjustmentHistory': true,
                 'fetchMarketLeverageTiers': true,
                 'fetchMarkets': true,
                 'fetchMarkOHLCV': true,
@@ -6463,9 +6464,9 @@ class okx extends okx$1 {
         //     }
         //
         const data = this.safeList(response, 'data', []);
+        const entry = this.safeDict(data, 0, {});
         const errorCode = this.safeString(response, 'code');
-        const item = this.safeDict(data, 0, {});
-        return this.extend(this.parseMarginModification(item, market), {
+        return this.extend(this.parseMarginModification(entry, market), {
             'status': (errorCode === '0') ? 'ok' : 'failed',
         });
     }
@@ -6480,22 +6481,68 @@ class okx extends okx$1 {
         //        "type": "reduce"
         //    }
         //
-        const amountRaw = this.safeNumber(data, 'amt');
+        // fetchMarginAdjustmentHistory
+        //
+        //    {
+        //        bal: '67621.4325135010619812',
+        //        balChg: '-10.0000000000000000',
+        //        billId: '691293628710342659',
+        //        ccy: 'USDT',
+        //        clOrdId: '',
+        //        execType: '',
+        //        fee: '0',
+        //        fillFwdPx: '',
+        //        fillIdxPx: '',
+        //        fillMarkPx: '',
+        //        fillMarkVol: '',
+        //        fillPxUsd: '',
+        //        fillPxVol: '',
+        //        fillTime: '1711089244850',
+        //        from: '',
+        //        instId: 'XRP-USDT-SWAP',
+        //        instType: 'SWAP',
+        //        interest: '0',
+        //        mgnMode: 'isolated',
+        //        notes: '',
+        //        ordId: '',
+        //        pnl: '0',
+        //        posBal: '73.12',
+        //        posBalChg: '10.00',
+        //        px: '',
+        //        subType: '160',
+        //        sz: '10',
+        //        tag: '',
+        //        to: '',
+        //        tradeId: '0',
+        //        ts: '1711089244699',
+        //        type: '6'
+        //    }
+        //
+        const amountRaw = this.safeString2(data, 'amt', 'posBalChg');
         const typeRaw = this.safeString(data, 'type');
-        const type = (typeRaw === 'reduce') ? 'reduce' : 'add';
+        let type = undefined;
+        if (typeRaw === '6') {
+            type = Precise["default"].stringGt(amountRaw, '0') ? 'add' : 'reduce';
+        }
+        else {
+            type = typeRaw;
+        }
+        const amount = Precise["default"].stringAbs(amountRaw);
         const marketId = this.safeString(data, 'instId');
         const responseMarket = this.safeMarket(marketId, market);
         const code = responseMarket['inverse'] ? responseMarket['base'] : responseMarket['quote'];
+        const timestamp = this.safeInteger(data, 'ts');
         return {
             'info': data,
             'symbol': responseMarket['symbol'],
             'type': type,
-            'amount': amountRaw,
-            'total': undefined,
+            'marginMode': 'isolated',
+            'amount': this.parseNumber(amount),
             'code': code,
+            'total': undefined,
             'status': undefined,
-            'timestamp': undefined,
-            'datetime': undefined,
+            'timestamp': timestamp,
+            'datetime': this.iso8601(timestamp),
         };
     }
     async reduceMargin(symbol, amount, params = {}) {
@@ -7597,6 +7644,108 @@ class okx extends okx$1 {
         }
         return undefined;
     }
+    async fetchMarginAdjustmentHistory(symbol = undefined, type = undefined, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name okx#fetchMarginAdjustmentHistory
+         * @description fetches the history of margin added or reduced from contract isolated positions
+         * @see https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-bills-details-last-7-days
+         * @see https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-bills-details-last-3-months
+         * @param {string} [symbol] not used by okx fetchMarginAdjustmentHistory
+         * @param {string} [type] "add" or "reduce"
+         * @param {object} params extra parameters specific to the exchange api endpoint
+         * @param {boolean} [params.auto] true if fetching auto margin increases
+         * @returns {object[]} a list of [margin structures]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
+         */
+        await this.loadMarkets();
+        const auto = this.safeBool(params, 'auto');
+        if (type === undefined) {
+            throw new errors.ArgumentsRequired(this.id + ' fetchMarginAdjustmentHistory () requires a type argument');
+        }
+        const isAdd = type === 'add';
+        let subType = isAdd ? '160' : '161';
+        if (auto) {
+            if (isAdd) {
+                subType = '162';
+            }
+            else {
+                throw new errors.BadRequest(this.id + ' cannot fetch margin adjustments for type ' + type);
+            }
+        }
+        const request = {
+            'subType': subType,
+            'mgnMode': 'isolated',
+        };
+        const until = this.safeInteger(params, 'until');
+        params = this.omit(params, 'until');
+        if (since !== undefined) {
+            request['startTime'] = since;
+        }
+        if (limit !== undefined) {
+            request['limit'] = limit;
+        }
+        if (until !== undefined) {
+            request['endTime'] = until;
+        }
+        let response = undefined;
+        const now = this.milliseconds();
+        const oneWeekAgo = now - 604800000;
+        const threeMonthsAgo = now - 7776000000;
+        if ((since === undefined) || (since > oneWeekAgo)) {
+            response = await this.privateGetAccountBills(this.extend(request, params));
+        }
+        else if (since > threeMonthsAgo) {
+            response = await this.privateGetAccountBillsArchive(this.extend(request, params));
+        }
+        else {
+            throw new errors.BadRequest(this.id + ' fetchMarginAdjustmentHistory () cannot fetch margin adjustments older than 3 months');
+        }
+        //
+        //    {
+        //        code: '0',
+        //        data: [
+        //            {
+        //                bal: '67621.4325135010619812',
+        //                balChg: '-10.0000000000000000',
+        //                billId: '691293628710342659',
+        //                ccy: 'USDT',
+        //                clOrdId: '',
+        //                execType: '',
+        //                fee: '0',
+        //                fillFwdPx: '',
+        //                fillIdxPx: '',
+        //                fillMarkPx: '',
+        //                fillMarkVol: '',
+        //                fillPxUsd: '',
+        //                fillPxVol: '',
+        //                fillTime: '1711089244850',
+        //                from: '',
+        //                instId: 'XRP-USDT-SWAP',
+        //                instType: 'SWAP',
+        //                interest: '0',
+        //                mgnMode: 'isolated',
+        //                notes: '',
+        //                ordId: '',
+        //                pnl: '0',
+        //                posBal: '73.12',
+        //                posBalChg: '10.00',
+        //                px: '',
+        //                subType: '160',
+        //                sz: '10',
+        //                tag: '',
+        //                to: '',
+        //                tradeId: '0',
+        //                ts: '1711089244699',
+        //                type: '6'
+        //            }
+        //        ],
+        //        msg: ''
+        //    }
+        //
+        const data = this.safeList(response, 'data');
+        const modifications = this.parseMarginModifications(data);
+        return this.filterBySymbolSinceLimit(modifications, symbol, since, limit);
+    }
 }
 
 module.exports = okx;

package/dist/cjs/src/phemex.js

@@ -4062,6 +4062,7 @@ class phemex extends phemex$1 {
             'info': data,
             'symbol': this.safeSymbol(undefined, market),
             'type': 'set',
+            'marginMode': 'isolated',
             'amount': undefined,
             'total': undefined,
             'code': market[codeCurrency],

package/dist/cjs/src/static_dependencies/noble-curves/p256.js

@@ -0,0 +1,48 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _shortw_utils = require('./_shortw_utils.js');
+var sha256 = require('../noble-hashes/sha256.js');
+var modular = require('./abstract/modular.js');
+var weierstrass = require('./abstract/weierstrass.js');
+var hashToCurve = require('./abstract/hash-to-curve.js');
+
+/*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
+// NIST secp256r1 aka P256
+// https://www.secg.org/sec2-v2.pdf, https://neuromancer.sk/std/nist/P-256
+// Field over which we'll do calculations; 2n**224n * (2n**32n-1n) + 2n**192n + 2n**96n-1n
+const Fp = modular.Fp(BigInt('0xffffffff00000001000000000000000000000000ffffffffffffffffffffffff'));
+const CURVE_A = Fp.create(BigInt('-3'));
+const CURVE_B = BigInt('0x5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b');
+const mapSWU = weierstrass.mapToCurveSimpleSWU(Fp, {
+    A: CURVE_A,
+    B: CURVE_B,
+    Z: Fp.create(BigInt('-10')),
+});
+const P256 = _shortw_utils.createCurve({
+    // Params: a, b
+    a: CURVE_A,
+    b: CURVE_B,
+    Fp,
+    // Curve order, total count of valid points in the field
+    n: BigInt('0xffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551'),
+    // Base point (x, y) aka generator point
+    Gx: BigInt('0x6b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296'),
+    Gy: BigInt('0x4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5'),
+    h: BigInt(1),
+    lowS: false,
+}, sha256.sha256);
+const secp256r1 = P256;
+hashToCurve.createHasher(secp256r1.ProjectivePoint, (scalars) => mapSWU(scalars[0]), {
+    DST: 'P256_XMD:SHA-256_SSWU_RO_',
+    encodeDST: 'P256_XMD:SHA-256_SSWU_NU_',
+    p: Fp.ORDER,
+    m: 1,
+    k: 128,
+    expand: 'xmd',
+    hash: sha256.sha256,
+});
+
+exports.P256 = P256;
+exports.secp256r1 = secp256r1;

package/dist/cjs/src/woo.js

@@ -68,6 +68,7 @@ class woo extends woo$1 {
                 'fetchIndexOHLCV': false,
                 'fetchLedger': true,
                 'fetchLeverage': true,
+                'fetchMarginAdjustmentHistory': false,
                 'fetchMarginMode': false,
                 'fetchMarkets': true,
                 'fetchMarkOHLCV': false,

package/js/ccxt.d.ts

@@ -4,7 +4,7 @@ import * as functions from './src/base/functions.js';
 import * as errors from './src/base/errors.js';
 import type { Market, Trade, Fee, Ticker, OrderBook, Order, Transaction, Tickers, Currency, Balance, DepositAddress, WithdrawalResponse, DepositAddressResponse, OHLCV, Balances, PartialBalances, Dictionary, MinMax, Position, FundingRateHistory, Liquidation, FundingHistory, MarginMode, Greeks, Leverage, Leverages, Option, OptionChain } from './src/base/types.js';
 import { BaseError, ExchangeError, AuthenticationError, PermissionDenied, AccountNotEnabled, AccountSuspended, ArgumentsRequired, BadRequest, BadSymbol, OperationRejected, NoChange, MarginModeAlreadySet, BadResponse, NullResponse, InsufficientFunds, InvalidAddress, AddressPending, InvalidOrder, OrderNotFound, OrderNotCached, CancelPending, OrderImmediatelyFillable, OrderNotFillable, DuplicateOrderId, ContractUnavailable, NotSupported, ProxyError, OperationFailed, NetworkError, DDoSProtection, RateLimitExceeded, ExchangeNotAvailable, OnMaintenance, InvalidNonce, RequestTimeout, ExchangeClosedByUser } from './src/base/errors.js';
-declare const version = "4.2.88";
+declare const version = "4.2.89";
 import ace from './src/ace.js';
 import alpaca from './src/alpaca.js';
 import ascendex from './src/ascendex.js';

package/js/ccxt.js

@@ -38,7 +38,7 @@ import * as errors from './src/base/errors.js';
 import { BaseError, ExchangeError, AuthenticationError, PermissionDenied, AccountNotEnabled, AccountSuspended, ArgumentsRequired, BadRequest, BadSymbol, OperationRejected, NoChange, MarginModeAlreadySet, BadResponse, NullResponse, InsufficientFunds, InvalidAddress, AddressPending, InvalidOrder, OrderNotFound, OrderNotCached, CancelPending, OrderImmediatelyFillable, OrderNotFillable, DuplicateOrderId, ContractUnavailable, NotSupported, ProxyError, OperationFailed, NetworkError, DDoSProtection, RateLimitExceeded, ExchangeNotAvailable, OnMaintenance, InvalidNonce, RequestTimeout, ExchangeClosedByUser } from './src/base/errors.js';
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
-const version = '4.2.89';
+const version = '4.2.90';
 Exchange.ccxtVersion = version;
 //-----------------------------------------------------------------------------
 import ace from './src/ace.js';

package/js/src/abstract/bingx.d.ts

@@ -29,6 +29,7 @@ interface Exchange {
     swapV1PrivateGetPositionSideDual(params?: {}): Promise<implicitReturnType>;
     swapV1PrivateGetMarketMarkPriceKlines(params?: {}): Promise<implicitReturnType>;
     swapV1PrivateGetTradeBatchCancelReplace(params?: {}): Promise<implicitReturnType>;
+    swapV1PrivateGetTradeFullOrder(params?: {}): Promise<implicitReturnType>;
     swapV1PrivatePostTradeCancelReplace(params?: {}): Promise<implicitReturnType>;
     swapV1PrivatePostPositionSideDual(params?: {}): Promise<implicitReturnType>;
     swapV1PrivatePostTradeClosePosition(params?: {}): Promise<implicitReturnType>;
@@ -96,6 +97,7 @@ interface Exchange {
     copyTradingV1PrivateGetSwapTraceCurrentTrack(params?: {}): Promise<implicitReturnType>;
     copyTradingV1PrivatePostSwapTraceCloseTrackOrder(params?: {}): Promise<implicitReturnType>;
     copyTradingV1PrivatePostSwapTraceSetTPSL(params?: {}): Promise<implicitReturnType>;
+    copyTradingV1PrivatePostSpotTraderSellOrder(params?: {}): Promise<implicitReturnType>;
     apiV3PrivateGetAssetTransfer(params?: {}): Promise<implicitReturnType>;
     apiV3PrivateGetCapitalDepositHisrec(params?: {}): Promise<implicitReturnType>;
     apiV3PrivateGetCapitalWithdrawHistory(params?: {}): Promise<implicitReturnType>;

package/js/src/abstract/bybit.d.ts

@@ -154,6 +154,7 @@ interface Exchange {
     privateGetV5UserGetMemberType(params?: {}): Promise<implicitReturnType>;
     privateGetV5UserAffCustomerInfo(params?: {}): Promise<implicitReturnType>;
     privateGetV5UserDelSubmember(params?: {}): Promise<implicitReturnType>;
+    privateGetV5UserSubmembers(params?: {}): Promise<implicitReturnType>;
     privateGetV5SpotLeverTokenOrderRecord(params?: {}): Promise<implicitReturnType>;
     privateGetV5SpotMarginTradeState(params?: {}): Promise<implicitReturnType>;
     privateGetV5SpotCrossMarginTradeLoanInfo(params?: {}): Promise<implicitReturnType>;
@@ -290,6 +291,7 @@ interface Exchange {
     privatePostV5LendingRedeemCancel(params?: {}): Promise<implicitReturnType>;
     privatePostV5AccountSetCollateralSwitch(params?: {}): Promise<implicitReturnType>;
     privatePostV5AccountSetCollateralSwitchBatch(params?: {}): Promise<implicitReturnType>;
+    privatePostV5AccountDemoApplyMoney(params?: {}): Promise<implicitReturnType>;
 }
 declare abstract class Exchange extends _Exchange {
 }

package/js/src/ascendex.js

@@ -2891,6 +2891,7 @@ export default class ascendex extends Exchange {
             'info': data,
             'symbol': market['symbol'],
             'type': undefined,
+            'marginMode': 'isolated',
             'amount': undefined,
             'total': undefined,
             'code': market['quote'],

package/js/src/base/Exchange.d.ts

@@ -369,6 +369,7 @@ export default class Exchange {
             fetchIndexOHLCV: any;
             fetchIsolatedBorrowRate: any;
             fetchIsolatedBorrowRates: any;
+            fetchMarginAdjustmentHistory: any;
             fetchIsolatedPositions: any;
             fetchL2OrderBook: boolean;
             fetchL3OrderBook: any;
@@ -625,6 +626,7 @@ export default class Exchange {
     intToBase16(elem: any): string;
     extendExchangeOptions(newOptions: any): void;
     createSafeDictionary(): {};
+    randomBytes(length: any): string;
     safeBoolN(dictionaryOrList: any, keys: IndexType[], defaultValue?: boolean): boolean | undefined;
     safeBool2(dictionary: any, key1: IndexType, key2: IndexType, defaultValue?: boolean): boolean | undefined;
     safeBool(dictionary: any, key: IndexType, defaultValue?: boolean): boolean | undefined;
@@ -700,6 +702,7 @@ export default class Exchange {
     addMargin(symbol: string, amount: number, params?: {}): Promise<MarginModification>;
     reduceMargin(symbol: string, amount: number, params?: {}): Promise<MarginModification>;
     setMargin(symbol: string, amount: number, params?: {}): Promise<{}>;
+    fetchMarginAdjustmentHistory(symbol?: Str, type?: Str, since?: Num, limit?: Num, params?: {}): Promise<MarginModification[]>;
     setMarginMode(marginMode: string, symbol?: Str, params?: {}): Promise<{}>;
     fetchDepositAddressesByNetwork(code: string, params?: {}): Promise<{}>;
     fetchOpenInterestHistory(symbol: string, timeframe?: string, since?: Int, limit?: Int, params?: {}): Promise<OpenInterest[]>;
@@ -1015,5 +1018,7 @@ export default class Exchange {
     convertExpireDate(date: string): string;
     convertExpireDateToMarketIdDate(date: string): string;
     convertMarketIdExpireDate(date: string): string;
+    parseMarginModification(data: any, market?: Market): MarginModification;
+    parseMarginModifications(response: object[], symbols?: string[], symbolKey?: Str, marketType?: MarketType): MarginModification[];
 }
 export { Exchange, };

package/js/src/base/Exchange.js

@@ -23,6 +23,7 @@ import { axolotl } from './functions/crypto.js';
 import totp from './functions/totp.js';
 import ethers from '../static_dependencies/ethers/index.js';
 import { TypedDataEncoder } from '../static_dependencies/ethers/hash/index.js';
+import { SecureRandom } from "../static_dependencies/jsencrypt/lib/jsbn/rng.js";
 // ----------------------------------------------------------------------------
 /**
  * @class Exchange
@@ -426,6 +427,7 @@ export default class Exchange {
                 'fetchIndexOHLCV': undefined,
                 'fetchIsolatedBorrowRate': undefined,
                 'fetchIsolatedBorrowRates': undefined,
+                'fetchMarginAdjustmentHistory': undefined,
                 'fetchIsolatedPositions': undefined,
                 'fetchL2OrderBook': true,
                 'fetchL3OrderBook': undefined,
@@ -1432,6 +1434,13 @@ export default class Exchange {
     createSafeDictionary() {
         return {};
     }
+    randomBytes(length) {
+        const rng = new SecureRandom();
+        const x = [];
+        x.length = length;
+        rng.nextBytes(x);
+        return Buffer.from(x).toString('hex');
+    }
     /* eslint-enable */
     // ------------------------------------------------------------------------
     // ########################################################################
@@ -2038,6 +2047,20 @@ export default class Exchange {
     async setMargin(symbol, amount, params = {}) {
         throw new NotSupported(this.id + ' setMargin() is not supported yet');
     }
+    async fetchMarginAdjustmentHistory(symbol = undefined, type = undefined, since = undefined, limit = undefined, params = {}) {
+        /**
+         * @method
+         * @name exchange#fetchMarginAdjustmentHistory
+         * @description fetches the history of margin added or reduced from contract isolated positions
+         * @param {string} [symbol] unified market symbol
+         * @param {string} [type] "add" or "reduce"
+         * @param {int} [since] timestamp in ms of the earliest change to fetch
+         * @param {int} [limit] the maximum amount of changes to fetch
+         * @param {object} params extra parameters specific to the exchange api endpoint
+         * @returns {object[]} a list of [margin structures]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
+         */
+        throw new NotSupported(this.id + ' fetchMarginAdjustmentHistory() is not supported yet');
+    }
     async setMarginMode(marginMode, symbol = undefined, params = {}) {
         throw new NotSupported(this.id + ' setMarginMode() is not supported yet');
     }
@@ -5801,5 +5824,20 @@ export default class Exchange {
         const reconstructedDate = day + month + year;
         return reconstructedDate;
     }
+    parseMarginModification(data, market = undefined) {
+        throw new NotSupported(this.id + ' parseMarginModification() is not supported yet');
+    }
+    parseMarginModifications(response, symbols = undefined, symbolKey = undefined, marketType = undefined) {
+        const marginModifications = [];
+        for (let i = 0; i < response.length; i++) {
+            const info = response[i];
+            const marketId = this.safeString(info, symbolKey);
+            const market = this.safeMarket(marketId, undefined, undefined, marketType);
+            if ((symbols === undefined) || this.inArray(market['symbol'], symbols)) {
+                marginModifications.push(this.parseMarginModification(info, market));
+            }
+        }
+        return marginModifications;
+    }
 }
 export { Exchange, };

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

@@ -8,12 +8,19 @@
 import { hmac as _hmac } from '../../static_dependencies/noble-hashes/hmac.js';
 import { base16, base64, base58 } from '../../static_dependencies/scure-base/index.js';
 import { Base64 } from '../../static_dependencies/jsencrypt/lib/asn1js/base64.js';
+import { ASN1 } from "../../static_dependencies/jsencrypt/lib/asn1js/asn1.js";
+import { secp256k1 } from '../../static_dependencies/noble-curves/secp256k1.js';
+import { P256 } from '../../static_dependencies/noble-curves/p256.js';
 /*  ------------------------------------------------------------------------ */
 const encoders = {
     binary: x => x,
     hex: base16.encode,
     base64: base64.encode,
 };
+const supportedCurve = {
+    '1.3.132.0.10': secp256k1,
+    '1.2.840.10045.3.1.7': P256,
+};
 /*  .............................................   */
 const hash = (request, hash, digest = 'hex') => {
     const binary = hash(request);
@@ -29,6 +36,36 @@ function ecdsa(request, secret, curve, prehash = null) {
     if (prehash) {
         request = hash(request, prehash, 'hex');
     }
+    if (typeof secret === 'string' && secret.length > 64) {
+        // decode pem key
+        if (secret.startsWith('-----BEGIN EC PRIVATE KEY-----')) {
+            const der = Base64.unarmor(secret);
+            let asn1 = ASN1.decode(der);
+            if (asn1.sub.length === 4) {
+                // ECPrivateKey ::= SEQUENCE {
+                //     version        INTEGER { ecPrivkeyVer1(1) } (ecPrivkeyVer1),
+                //     privateKey     OCTET STRING,
+                //     parameters [0] ECParameters {{ NamedCurve }} OPTIONAL,
+                //     publicKey  [1] BIT STRING OPTIONAL
+                // }
+                if (typeof asn1.sub[2].sub !== null && asn1.sub[2].sub.length > 0) {
+                    const oid = asn1.sub[2].sub[0].content(undefined);
+                    if (supportedCurve[oid] === undefined)
+                        throw new Error('Unsupported curve');
+                    curve = supportedCurve[oid];
+                }
+                secret = asn1.sub[1].getHexStringValue();
+            }
+            else {
+                // maybe return false
+                throw new Error('Unsupported key format');
+            }
+        }
+        else {
+            // maybe return false
+            throw new Error('Unsupported key format');
+        }
+    }
     const signature = curve.sign(request, secret);
     return {
         'r': signature.r.toString(16),

package/js/src/base/functions/rsa.d.ts

@@ -1,4 +1,4 @@
 import { CHash } from '../../static_dependencies/noble-hashes/utils.js';
 declare function rsa(request: string, secret: string, hash: CHash): string | false;
-declare function jwt(request: {}, secret: Uint8Array, hash: CHash, isRSA?: boolean): string;
+declare function jwt(request: {}, secret: Uint8Array, hash: CHash, isRSA?: boolean, opts?: {}): string;
 export { rsa, jwt };

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

@@ -6,8 +6,10 @@
 
 import { JSEncrypt } from "../../static_dependencies/jsencrypt/JSEncrypt.js";
 import { base16, utf8 } from '../../static_dependencies/scure-base/index.js';
-import { urlencodeBase64, stringToBase64 } from './encode.js';
+import { urlencodeBase64, stringToBase64, base16ToBinary, binaryToBase64 } from './encode.js';
 import { hmac } from './crypto.js';
+import { P256 } from '../../static_dependencies/noble-curves/p256.js';
+import { ecdsa } from '../../base/functions/crypto.js';
 function rsa(request, secret, hash) {
     const RSA = new JSEncrypt();
     const digester = (input) => base16.encode(hash(input));
@@ -15,9 +17,17 @@ function rsa(request, secret, hash) {
     const name = (hash.create()).constructor.name.toLowerCase();
     return RSA.sign(request, digester, name);
 }
-function jwt(request, secret, hash, isRSA = false) {
-    const alg = (isRSA ? 'RS' : 'HS') + (hash.outputLen * 8);
-    const encodedHeader = urlencodeBase64(stringToBase64(JSON.stringify({ 'alg': alg, 'typ': 'JWT' })));
+function jwt(request, secret, hash, isRSA = false, opts = {}) {
+    let alg = (isRSA ? 'RS' : 'HS') + (hash.outputLen * 8);
+    if (opts['alg']) {
+        alg = opts['alg'].toUpperCase();
+    }
+    const header = Object.assign({ 'alg': alg, 'typ': 'JWT' }, opts);
+    if (header['iat'] !== undefined) {
+        request['iat'] = header['iat'];
+        delete header['iat'];
+    }
+    const encodedHeader = urlencodeBase64(stringToBase64(JSON.stringify(header)));
     const encodedData = urlencodeBase64(stringToBase64(JSON.stringify(request)));
     const token = [encodedHeader, encodedData].join('.');
     const algoType = alg.slice(0, 2);
@@ -25,9 +35,15 @@ function jwt(request, secret, hash, isRSA = false) {
     if (algoType === 'HS') {
         signature = urlencodeBase64(hmac(token, secret, hash, 'base64'));
     }
-    else if (algoType === 'RS') {
+    else if (isRSA || algoType === 'RS') {
         signature = urlencodeBase64(rsa(token, utf8.encode(secret), hash));
     }
+    else if (algoType === 'ES') {
+        const signedHash = ecdsa(token, utf8.encode(secret), P256, hash);
+        const r = (signedHash.r.length === 64) ? signedHash.r : '0' + signedHash.r;
+        const s = (signedHash.s.length === 64) ? signedHash.s : '0' + signedHash.s;
+        signature = urlencodeBase64(binaryToBase64(base16ToBinary(r + s)));
+    }
     return [token, signature].join('.');
 }
 export { rsa, jwt };

package/js/src/base/types.d.ts

@@ -465,6 +465,7 @@ export interface MarginModification {
     'info': any;
     'symbol': string;
     'type': 'add' | 'reduce' | 'set' | undefined;
+    'marginMode': 'cross' | 'isolated' | undefined;
     'amount': Num;
     'total': Num;
     'code': Str;

package/js/src/binance.d.ts

@@ -438,4 +438,5 @@ export default class binance extends Exchange {
         baseVolume: number;
         quoteVolume: any;
     };
+    fetchMarginAdjustmentHistory(symbol?: Str, type?: Str, since?: Num, limit?: Num, params?: {}): Promise<MarginModification[]>;
 }