ccxt 4.2.93 → 4.2.95

package/dist/cjs/src/okx.js

@@ -60,6 +60,8 @@ class okx extends okx$1 {
                 'fetchCanceledOrders': true,
                 'fetchClosedOrder': undefined,
                 'fetchClosedOrders': true,
+                'fetchConvertCurrencies': true,
+                'fetchConvertQuote': true,
                 'fetchCrossBorrowRate': true,
                 'fetchCrossBorrowRates': true,
                 'fetchCurrencies': true,
@@ -1115,7 +1117,7 @@ class okx extends okx$1 {
         return super.handleMarketTypeAndParams(methodName, market, params);
     }
     convertToInstrumentType(type) {
-        const exchangeTypes = this.safeValue(this.options, 'exchangeType', {});
+        const exchangeTypes = this.safeDict(this.options, 'exchangeType', {});
         return this.safeString(exchangeTypes, type, type);
     }
     createExpiredOptionMarket(symbol) {
@@ -2919,7 +2921,7 @@ class okx extends okx$1 {
             const side = this.safeString(rawOrder, 'side');
             const amount = this.safeValue(rawOrder, 'amount');
             const price = this.safeValue(rawOrder, 'price');
-            const orderParams = this.safeValue(rawOrder, 'params', {});
+            const orderParams = this.safeDict(rawOrder, 'params', {});
             const extendedParams = this.extend(orderParams, params); // the request does not accept extra params since it's a list, so we're extending each order with the common params
             const orderRequest = this.createOrderRequest(marketId, type, side, amount, price, extendedParams);
             ordersRequests.push(orderRequest);
@@ -3108,8 +3110,8 @@ class okx extends okx$1 {
         //        "msg": ""
         //     }
         //
-        const data = this.safeValue(response, 'data', []);
-        const first = this.safeValue(data, 0);
+        const data = this.safeList(response, 'data', []);
+        const first = this.safeDict(data, 0, {});
         const order = this.parseOrder(first, market);
         order['type'] = type;
         order['side'] = side;
@@ -4308,7 +4310,7 @@ class okx extends okx$1 {
         if (paginate) {
             return await this.fetchPaginatedCallDynamic('fetchLedger', code, since, limit, params);
         }
-        const options = this.safeValue(this.options, 'fetchLedger', {});
+        const options = this.safeDict(this.options, 'fetchLedger', {});
         let method = this.safeString(options, 'method');
         method = this.safeString(params, 'method', method);
         params = this.omit(params, 'method');
@@ -4637,7 +4639,7 @@ class okx extends okx$1 {
         //         ]
         //     }
         //
-        const data = this.safeValue(response, 'data', []);
+        const data = this.safeList(response, 'data', []);
         const filtered = this.filterBy(data, 'selected', true);
         const parsed = this.parseDepositAddresses(filtered, [currency['code']], false);
         return this.indexBy(parsed, 'network');
@@ -4711,7 +4713,7 @@ class okx extends okx$1 {
         };
         let network = this.safeString(params, 'network'); // this line allows the user to specify either ERC20 or ETH
         if (network !== undefined) {
-            const networks = this.safeValue(this.options, 'networks', {});
+            const networks = this.safeDict(this.options, 'networks', {});
             network = this.safeString(networks, network.toUpperCase(), network); // handle ETH>ERC20 alias
             request['chain'] = currency['id'] + '-' + network;
             params = this.omit(params, 'network');
@@ -4720,7 +4722,7 @@ class okx extends okx$1 {
         if (fee === undefined) {
             const currencies = await this.fetchCurrencies();
             this.currencies = this.deepExtend(this.currencies, currencies);
-            const targetNetwork = this.safeValue(currency['networks'], this.networkIdToCode(network), {});
+            const targetNetwork = this.safeDict(currency['networks'], this.networkIdToCode(network), {});
             fee = this.safeString(targetNetwork, 'fee');
             if (fee === undefined) {
                 throw new errors.ArgumentsRequired(this.id + ' withdraw() requires a "fee" string parameter, network transaction fee must be ≥ 0. Withdrawals to OKCoin or OKX are fee-free, please set "0". Withdrawing to external digital asset address requires network transaction fee.');
@@ -4742,7 +4744,7 @@ class okx extends okx$1 {
         //         ]
         //     }
         //
-        const data = this.safeValue(response, 'data', []);
+        const data = this.safeList(response, 'data', []);
         const transaction = this.safeDict(data, 0);
         return this.parseTransaction(transaction, currency);
     }
@@ -4967,7 +4969,7 @@ class okx extends okx$1 {
         //        "msg": ''
         //    }
         //
-        const data = this.safeValue(response, 'data');
+        const data = this.safeList(response, 'data', []);
         const withdrawal = this.safeDict(data, 0, {});
         return this.parseTransaction(withdrawal);
     }
@@ -5254,8 +5256,8 @@ class okx extends okx$1 {
         //         ]
         //     }
         //
-        const data = this.safeValue(response, 'data', []);
-        const position = this.safeValue(data, 0);
+        const data = this.safeList(response, 'data', []);
+        const position = this.safeDict(data, 0);
         if (position === undefined) {
             return undefined;
         }
@@ -5291,7 +5293,7 @@ class okx extends okx$1 {
                 request['instId'] = marketIds.join(',');
             }
         }
-        const fetchPositionsOptions = this.safeValue(this.options, 'fetchPositions', {});
+        const fetchPositionsOptions = this.safeDict(this.options, 'fetchPositions', {});
         const method = this.safeString(fetchPositionsOptions, 'method', 'privateGetAccountPositions');
         let response = undefined;
         if (method === 'privateGetAccountPositionsHistory') {
@@ -5346,7 +5348,7 @@ class okx extends okx$1 {
         //         ]
         //     }
         //
-        const positions = this.safeValue(response, 'data', []);
+        const positions = this.safeList(response, 'data', []);
         const result = [];
         for (let i = 0; i < positions.length; i++) {
             result.push(this.parsePosition(positions[i]));
@@ -5554,7 +5556,7 @@ class okx extends okx$1 {
          */
         await this.loadMarkets();
         const currency = this.currency(code);
-        const accountsByType = this.safeValue(this.options, 'accountsByType', {});
+        const accountsByType = this.safeDict(this.options, 'accountsByType', {});
         const fromId = this.safeString(accountsByType, fromAccount, fromAccount);
         const toId = this.safeString(accountsByType, toAccount, toAccount);
         const request = {
@@ -5596,7 +5598,7 @@ class okx extends okx$1 {
         //         ]
         //     }
         //
-        const data = this.safeValue(response, 'data', []);
+        const data = this.safeList(response, 'data', []);
         const rawTransfer = this.safeDict(data, 0, {});
         return this.parseTransfer(rawTransfer, currency);
     }
@@ -5659,7 +5661,7 @@ class okx extends okx$1 {
         let amount = this.safeNumber(transfer, 'amt');
         const fromAccountId = this.safeString(transfer, 'from');
         const toAccountId = this.safeString(transfer, 'to');
-        const accountsById = this.safeValue(this.options, 'accountsById', {});
+        const accountsById = this.safeDict(this.options, 'accountsById', {});
         const timestamp = this.safeInteger(transfer, 'ts');
         const balanceChange = this.safeString(transfer, 'sz');
         if (balanceChange !== undefined) {
@@ -5710,7 +5712,7 @@ class okx extends okx$1 {
         //         "msg": ""
         //     }
         //
-        const data = this.safeValue(response, 'data', []);
+        const data = this.safeList(response, 'data', []);
         const transfer = this.safeDict(data, 0);
         return this.parseTransfer(transfer);
     }
@@ -5916,8 +5918,8 @@ class okx extends okx$1 {
         //        "msg": ""
         //    }
         //
-        const data = this.safeValue(response, 'data', []);
-        const entry = this.safeValue(data, 0, {});
+        const data = this.safeList(response, 'data', []);
+        const entry = this.safeDict(data, 0, {});
         return this.parseFundingRate(entry, market);
     }
     async fetchFundingHistory(symbol = undefined, since = undefined, limit = undefined, params = {}) {
@@ -6057,7 +6059,7 @@ class okx extends okx$1 {
         //        "type": "8"
         //    }
         //
-        const data = this.safeValue(response, 'data', []);
+        const data = this.safeList(response, 'data', []);
         const result = [];
         for (let i = 0; i < data.length; i++) {
             const entry = data[i];
@@ -6249,7 +6251,7 @@ class okx extends okx$1 {
         //        ],
         //    }
         //
-        const data = this.safeValue(response, 'data', []);
+        const data = this.safeList(response, 'data', []);
         const rates = [];
         for (let i = 0; i < data.length; i++) {
             rates.push(this.parseBorrowRate(data[i]));
@@ -6285,8 +6287,8 @@ class okx extends okx$1 {
         //        "msg": ""
         //    }
         //
-        const data = this.safeValue(response, 'data');
-        const rate = this.safeValue(data, 0);
+        const data = this.safeList(response, 'data', []);
+        const rate = this.safeDict(data, 0, {});
         return this.parseBorrowRate(rate);
     }
     parseBorrowRate(info, currency = undefined) {
@@ -6390,7 +6392,7 @@ class okx extends okx$1 {
         //         "msg": ""
         //     }
         //
-        const data = this.safeValue(response, 'data');
+        const data = this.safeList(response, 'data', []);
         return this.parseBorrowRateHistories(data, codes, since, limit);
     }
     async fetchBorrowRateHistory(code, since = undefined, limit = undefined, params = {}) {
@@ -6434,7 +6436,7 @@ class okx extends okx$1 {
         //         "msg": ""
         //     }
         //
-        const data = this.safeValue(response, 'data');
+        const data = this.safeList(response, 'data', []);
         return this.parseBorrowRateHistory(data, code, since, limit);
     }
     async modifyMarginHelper(symbol, amount, type, params = {}) {
@@ -6626,7 +6628,7 @@ class okx extends okx$1 {
         //        ]
         //    }
         //
-        const data = this.safeValue(response, 'data');
+        const data = this.safeList(response, 'data', []);
         return this.parseMarketLeverageTiers(data, market);
     }
     parseMarketLeverageTiers(info, market = undefined) {
@@ -6728,7 +6730,7 @@ class okx extends okx$1 {
         //        "msg": ""
         //    }
         //
-        const data = this.safeValue(response, 'data');
+        const data = this.safeList(response, 'data', []);
         const interest = this.parseBorrowInterests(data);
         return this.filterByCurrencySinceLimit(interest, code, since, limit);
     }
@@ -6784,8 +6786,8 @@ class okx extends okx$1 {
         //         "msg": ""
         //     }
         //
-        const data = this.safeValue(response, 'data', []);
-        const loan = this.safeValue(data, 0);
+        const data = this.safeList(response, 'data', []);
+        const loan = this.safeDict(data, 0, {});
         return this.parseMarginLoan(loan, currency);
     }
     async repayCrossMargin(code, amount, params = {}) {
@@ -6829,8 +6831,8 @@ class okx extends okx$1 {
         //         "msg": ""
         //     }
         //
-        const data = this.safeValue(response, 'data', []);
-        const loan = this.safeValue(data, 0);
+        const data = this.safeList(response, 'data', []);
+        const loan = this.safeDict(data, 0, {});
         return this.parseMarginLoan(loan, currency);
     }
     parseMarginLoan(info, currency = undefined) {
@@ -6912,8 +6914,8 @@ class okx extends okx$1 {
          * @param {int} [params.until] The time in ms of the latest record to retrieve as a unix timestamp
          * @returns An array of [open interest structures]{@link https://docs.ccxt.com/#/?id=open-interest-structure}
          */
-        const options = this.safeValue(this.options, 'fetchOpenInterestHistory', {});
-        const timeframes = this.safeValue(options, 'timeframes', {});
+        const options = this.safeDict(this.options, 'fetchOpenInterestHistory', {});
+        const timeframes = this.safeDict(options, 'timeframes', {});
         timeframe = this.safeString(timeframes, timeframe, timeframe);
         if (timeframe !== '5m' && timeframe !== '1H' && timeframe !== '1D') {
             throw new errors.BadRequest(this.id + ' fetchOpenInterestHistory cannot only use the 5m, 1h, and 1d timeframe');
@@ -7203,7 +7205,7 @@ class okx extends okx$1 {
         //         "msg": ""
         //     }
         //
-        const data = this.safeValue(response, 'data', []);
+        const data = this.safeList(response, 'data', []);
         const settlements = this.parseSettlements(data, market);
         const sorted = this.sortBy(settlements, 'timestamp');
         return this.filterBySymbolSinceLimit(sorted, market['symbol'], since, limit);
@@ -7242,7 +7244,7 @@ class okx extends okx$1 {
         for (let i = 0; i < settlements.length; i++) {
             const entry = settlements[i];
             const timestamp = this.safeInteger(entry, 'ts');
-            const details = this.safeValue(entry, 'details', []);
+            const details = this.safeList(entry, 'details', []);
             for (let j = 0; j < details.length; j++) {
                 const settlement = this.parseSettlement(details[j], market);
                 result.push(this.extend(settlement, {
@@ -7288,7 +7290,7 @@ class okx extends okx$1 {
         //         "msg": ""
         //     }
         //
-        const underlyings = this.safeValue(response, 'data', []);
+        const underlyings = this.safeList(response, 'data', []);
         return underlyings[0];
     }
     async fetchGreeks(symbol, params = {}) {
@@ -7340,7 +7342,7 @@ class okx extends okx$1 {
         //         "msg": ""
         //     }
         //
-        const data = this.safeValue(response, 'data', []);
+        const data = this.safeList(response, 'data', []);
         for (let i = 0; i < data.length; i++) {
             const entry = data[i];
             const entryMarketId = this.safeString(entry, 'instId');
@@ -7463,7 +7465,7 @@ class okx extends okx$1 {
         //        "outTime": "1701877077102579"
         //    }
         //
-        const data = this.safeValue(response, 'data');
+        const data = this.safeList(response, 'data', []);
         const order = this.safeDict(data, 0);
         return this.parseOrder(order, market);
     }
@@ -7604,6 +7606,157 @@ class okx extends okx$1 {
             'quoteVolume': undefined,
         };
     }
+    async fetchConvertQuote(fromCode, toCode, amount = undefined, params = {}) {
+        /**
+         * @method
+         * @name okx#fetchConvertQuote
+         * @description fetch a quote for converting from one currency to another
+         * @see https://www.okx.com/docs-v5/en/#funding-account-rest-api-estimate-quote
+         * @param {string} fromCode the currency that you want to sell and convert from
+         * @param {string} toCode the currency that you want to buy and convert into
+         * @param {float} [amount] how much you want to trade in units of the from currency
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} a [conversion structure]{@link https://docs.ccxt.com/#/?id=conversion-structure}
+         */
+        await this.loadMarkets();
+        const request = {
+            'baseCcy': fromCode.toUpperCase(),
+            'quoteCcy': toCode.toUpperCase(),
+            'rfqSzCcy': fromCode.toUpperCase(),
+            'rfqSz': this.numberToString(amount),
+            'side': 'sell',
+        };
+        const response = await this.privatePostAssetConvertEstimateQuote(this.extend(request, params));
+        //
+        //     {
+        //         "code": "0",
+        //         "data": [
+        //             {
+        //                 "baseCcy": "ETH",
+        //                 "baseSz": "0.01023052",
+        //                 "clQReqId": "",
+        //                 "cnvtPx": "2932.40104429",
+        //                 "origRfqSz": "30",
+        //                 "quoteCcy": "USDT",
+        //                 "quoteId": "quoterETH-USDT16461885104612381",
+        //                 "quoteSz": "30",
+        //                 "quoteTime": "1646188510461",
+        //                 "rfqSz": "30",
+        //                 "rfqSzCcy": "USDT",
+        //                 "side": "buy",
+        //                 "ttlMs": "10000"
+        //             }
+        //         ],
+        //         "msg": ""
+        //     }
+        //
+        const data = this.safeList(response, 'data', []);
+        const result = this.safeDict(data, 0, {});
+        const fromCurrencyId = this.safeString(result, 'baseCcy', fromCode);
+        const fromCurrency = this.currency(fromCurrencyId);
+        const toCurrencyId = this.safeString(result, 'quoteCcy', toCode);
+        const toCurrency = this.currency(toCurrencyId);
+        return this.parseConversion(result, fromCurrency, toCurrency);
+    }
+    parseConversion(conversion, fromCurrency = undefined, toCurrency = undefined) {
+        //
+        // fetchConvertQuote
+        //
+        //     {
+        //         "baseCcy": "ETH",
+        //         "baseSz": "0.01023052",
+        //         "clQReqId": "",
+        //         "cnvtPx": "2932.40104429",
+        //         "origRfqSz": "30",
+        //         "quoteCcy": "USDT",
+        //         "quoteId": "quoterETH-USDT16461885104612381",
+        //         "quoteSz": "30",
+        //         "quoteTime": "1646188510461",
+        //         "rfqSz": "30",
+        //         "rfqSzCcy": "USDT",
+        //         "side": "buy",
+        //         "ttlMs": "10000"
+        //     }
+        //
+        const timestamp = this.safeInteger(conversion, 'quoteTime');
+        const fromCoin = this.safeString(conversion, 'baseCcy');
+        const fromCode = this.safeCurrencyCode(fromCoin, fromCurrency);
+        const to = this.safeString(conversion, 'quoteCcy');
+        const toCode = this.safeCurrencyCode(to, toCurrency);
+        return {
+            'info': conversion,
+            'timestamp': timestamp,
+            'datetime': this.iso8601(timestamp),
+            'id': this.safeString(conversion, 'clQReqId'),
+            'fromCurrency': fromCode,
+            'fromAmount': this.safeNumber(conversion, 'baseSz'),
+            'toCurrency': toCode,
+            'toAmount': this.safeNumber(conversion, 'quoteSz'),
+            'price': this.safeNumber(conversion, 'cnvtPx'),
+            'fee': undefined,
+        };
+    }
+    async fetchConvertCurrencies(params = {}) {
+        /**
+         * @method
+         * @name okx#fetchConvertCurrencies
+         * @description fetches all available currencies that can be converted
+         * @see https://www.okx.com/docs-v5/en/#funding-account-rest-api-get-convert-currencies
+         * @param {object} [params] extra parameters specific to the exchange API endpoint
+         * @returns {object} an associative dictionary of currencies
+         */
+        await this.loadMarkets();
+        const response = await this.privateGetAssetConvertCurrencies(params);
+        //
+        //     {
+        //         "code": "0",
+        //         "data": [
+        //             {
+        //                 "ccy": "BTC",
+        //                 "max": "",
+        //                 "min": ""
+        //             },
+        //         ],
+        //         "msg": ""
+        //     }
+        //
+        const result = {};
+        const data = this.safeList(response, 'data', []);
+        for (let i = 0; i < data.length; i++) {
+            const entry = data[i];
+            const id = this.safeString(entry, 'ccy');
+            const code = this.safeCurrencyCode(id);
+            result[code] = {
+                'info': entry,
+                'id': id,
+                'code': code,
+                'networks': undefined,
+                'type': undefined,
+                'name': undefined,
+                'active': undefined,
+                'deposit': undefined,
+                'withdraw': undefined,
+                'fee': undefined,
+                'precision': undefined,
+                'limits': {
+                    'amount': {
+                        'min': this.safeNumber(entry, 'min'),
+                        'max': this.safeNumber(entry, 'max'),
+                    },
+                    'withdraw': {
+                        'min': undefined,
+                        'max': undefined,
+                    },
+                    'deposit': {
+                        'min': undefined,
+                        'max': undefined,
+                    },
+                },
+                'created': undefined,
+            };
+        }
+        return result;
+    }
     handleErrors(httpCode, reason, url, method, headers, body, response, requestHeaders, requestBody) {
         if (!response) {
             return undefined; // fallback to default error handler
@@ -7631,7 +7784,7 @@ class okx extends okx$1 {
         const code = this.safeString(response, 'code');
         if ((code !== '0') && (code !== '2')) { // 2 means that bulk operation partially succeeded
             const feedback = this.id + ' ' + body;
-            const data = this.safeValue(response, 'data', []);
+            const data = this.safeList(response, 'data', []);
             for (let i = 0; i < data.length; i++) {
                 const error = data[i];
                 const errorCode = this.safeString(error, 'sCode');

package/dist/cjs/src/pro/coinbase.js

@@ -186,6 +186,9 @@ class coinbase extends coinbase$1 {
                 const messageHash = channel + '::' + wsMarketId;
                 newTickers.push(result);
                 client.resolve(result, messageHash);
+                if (messageHash.endsWith('USD')) {
+                    client.resolve(result, messageHash + 'C'); // sometimes we subscribe to BTC/USDC and coinbase returns BTC/USD
+                }
             }
         }
         const messageHashes = this.findMessageHashes(client, 'ticker_batch::');
@@ -197,6 +200,9 @@ class coinbase extends coinbase$1 {
             const tickers = this.filterByArray(newTickers, 'symbol', symbols);
             if (!this.isEmpty(tickers)) {
                 client.resolve(tickers, messageHash);
+                if (messageHash.endsWith('USD')) {
+                    client.resolve(tickers, messageHash + 'C'); // sometimes we subscribe to BTC/USDC and coinbase returns BTC/USD
+                }
             }
         }
         return message;
@@ -346,6 +352,9 @@ class coinbase extends coinbase$1 {
             }
         }
         client.resolve(tradesArray, messageHash);
+        if (marketId.endsWith('USD')) {
+            client.resolve(tradesArray, messageHash + 'C'); // sometimes we subscribe to BTC/USDC and coinbase returns BTC/USD
+        }
         return message;
     }
     handleOrder(client, message) {
@@ -401,6 +410,9 @@ class coinbase extends coinbase$1 {
             const marketId = marketIds[i];
             const messageHash = 'user::' + marketId;
             client.resolve(this.orders, messageHash);
+            if (messageHash.endsWith('USD')) {
+                client.resolve(this.orders, messageHash + 'C'); // sometimes we subscribe to BTC/USDC and coinbase returns BTC/USD
+            }
         }
         client.resolve(this.orders, 'user');
         return message;
@@ -513,6 +525,9 @@ class coinbase extends coinbase$1 {
                 orderbook['datetime'] = undefined;
                 orderbook['symbol'] = symbol;
                 client.resolve(orderbook, messageHash);
+                if (messageHash.endsWith('USD')) {
+                    client.resolve(orderbook, messageHash + 'C'); // sometimes we subscribe to BTC/USDC and coinbase returns BTC/USD
+                }
             }
             else if (type === 'update') {
                 const orderbook = this.orderbooks[symbol];
@@ -521,6 +536,9 @@ class coinbase extends coinbase$1 {
                 orderbook['timestamp'] = this.parse8601(datetime);
                 orderbook['symbol'] = symbol;
                 client.resolve(orderbook, messageHash);
+                if (messageHash.endsWith('USD')) {
+                    client.resolve(orderbook, messageHash + 'C'); // sometimes we subscribe to BTC/USDC and coinbase returns BTC/USD
+                }
             }
         }
         return message;