ccxt 4.1.58 → 4.1.60

package/js/src/htx.js

@@ -35,7 +35,8 @@ export default class htx extends Exchange {
                 'future': true,
                 'option': undefined,
                 'addMargin': undefined,
-                'borrowMargin': true,
+                'borrowCrossMargin': true,
+                'borrowIsolatedMargin': true,
                 'cancelAllOrders': true,
                 'cancelOrder': true,
                 'cancelOrders': true,
@@ -115,7 +116,8 @@ export default class htx extends Exchange {
                 'fetchWithdrawals': true,
                 'fetchWithdrawalWhitelist': undefined,
                 'reduceMargin': undefined,
-                'repayMargin': true,
+                'repayCrossMargin': true,
+                'repayIsolatedMargin': true,
                 'setLeverage': true,
                 'setMarginMode': false,
                 'setPositionMode': false,
@@ -1165,10 +1167,6 @@ export default class htx extends Exchange {
                     'deposit-earning': 'deposit-earning',
                     'otc-options': 'otc-options',
                 },
-                'marginAccounts': {
-                    'cross': 'super-margin',
-                    'isolated': 'margin',
-                },
                 'typesByAccount': {
                     'pro': 'spot',
                     'futures': 'future',
@@ -8131,41 +8129,60 @@ export default class htx extends Exchange {
             'info': interest,
         }, market);
     }
-    async borrowMargin(code, amount, symbol = undefined, params = {}) {
+    async borrowIsolatedMargin(symbol, code, amount, params = {}) {
         /**
          * @method
-         * @name huobi#borrowMargin
+         * @name huobi#borrowIsolatedMargin
          * @description create a loan to borrow margin
          * @see https://huobiapi.github.io/docs/spot/v1/en/#request-a-margin-loan-isolated
          * @see https://huobiapi.github.io/docs/spot/v1/en/#request-a-margin-loan-cross
+         * @param {string} symbol unified market symbol, required for isolated margin
          * @param {string} code unified currency code of the currency to borrow
          * @param {float} amount the amount to borrow
-         * @param {string} symbol unified market symbol, required for isolated margin
          * @param {object} [params] extra parameters specific to the huobi api endpoint
          * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
          */
         await this.loadMarkets();
         const currency = this.currency(code);
+        const market = this.market(symbol);
         const request = {
             'currency': currency['id'],
             'amount': this.currencyToPrecision(code, amount),
+            'symbol': market['id'],
         };
-        let marginMode = undefined;
-        [marginMode, params] = this.handleMarginModeAndParams('borrowMargin', params);
-        marginMode = (marginMode === undefined) ? 'cross' : marginMode;
-        let method = undefined;
-        if (marginMode === 'isolated') {
-            if (symbol === undefined) {
-                throw new ArgumentsRequired(this.id + ' borrowMargin() requires a symbol argument');
-            }
-            const market = this.market(symbol);
-            request['symbol'] = market['id'];
-            method = 'privatePostMarginOrders';
-        }
-        else if (marginMode === 'cross') {
-            method = 'privatePostCrossMarginOrders';
-        }
-        const response = await this[method](this.extend(request, params));
+        const response = await this.privatePostMarginOrders(this.extend(request, params));
+        //
+        // Isolated
+        //
+        //     {
+        //         "data": 1000
+        //     }
+        //
+        const transaction = this.parseMarginLoan(response, currency);
+        return this.extend(transaction, {
+            'amount': amount,
+            'symbol': symbol,
+        });
+    }
+    async borrowCrossMargin(code, amount, params = {}) {
+        /**
+         * @method
+         * @name huobi#borrowCrossMargin
+         * @description create a loan to borrow margin
+         * @see https://huobiapi.github.io/docs/spot/v1/en/#request-a-margin-loan-isolated
+         * @see https://huobiapi.github.io/docs/spot/v1/en/#request-a-margin-loan-cross
+         * @param {string} code unified currency code of the currency to borrow
+         * @param {float} amount the amount to borrow
+         * @param {object} [params] extra parameters specific to the huobi api endpoint
+         * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
+         */
+        await this.loadMarkets();
+        const currency = this.currency(code);
+        const request = {
+            'currency': currency['id'],
+            'amount': this.currencyToPrecision(code, amount),
+        };
+        const response = await this.privatePostCrossMarginOrders(this.extend(request, params));
         //
         // Cross
         //
@@ -8174,38 +8191,65 @@ export default class htx extends Exchange {
         //         "data": null
         //     }
         //
-        // Isolated
+        const transaction = this.parseMarginLoan(response, currency);
+        return this.extend(transaction, {
+            'amount': amount,
+        });
+    }
+    async repayIsolatedMargin(symbol, code, amount, params = {}) {
+        /**
+         * @method
+         * @name huobi#repayIsolatedMargin
+         * @description repay borrowed margin and interest
+         * @see https://huobiapi.github.io/docs/spot/v1/en/#repay-margin-loan-cross-isolated
+         * @param {string} code unified currency code of the currency to repay
+         * @param {float} amount the amount to repay
+         * @param {string} symbol unified market symbol
+         * @param {object} [params] extra parameters specific to the huobi api endpoint
+         * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
+         */
+        await this.loadMarkets();
+        const currency = this.currency(code);
+        const accountId = await this.fetchAccountIdByType('spot', 'isolated', symbol, params);
+        const request = {
+            'currency': currency['id'],
+            'amount': this.currencyToPrecision(code, amount),
+            'accountId': accountId,
+        };
+        const response = await this.v2PrivatePostAccountRepayment(this.extend(request, params));
         //
         //     {
-        //         "data": 1000
+        //         "code":200,
+        //         "data": [
+        //             {
+        //                 "repayId":1174424,
+        //                 "repayTime":1600747722018
+        //             }
+        //         ]
         //     }
         //
-        const transaction = this.parseMarginLoan(response, currency);
+        const data = this.safeValue(response, 'Data', []);
+        const loan = this.safeValue(data, 0);
+        const transaction = this.parseMarginLoan(loan, currency);
         return this.extend(transaction, {
             'amount': amount,
             'symbol': symbol,
         });
     }
-    async repayMargin(code, amount, symbol = undefined, params = {}) {
+    async repayCrossMargin(code, amount, params = {}) {
         /**
          * @method
-         * @name huobi#repayMargin
+         * @name huobi#repayCrossMargin
          * @description repay borrowed margin and interest
          * @see https://huobiapi.github.io/docs/spot/v1/en/#repay-margin-loan-cross-isolated
          * @param {string} code unified currency code of the currency to repay
          * @param {float} amount the amount to repay
-         * @param {string} symbol unified market symbol
          * @param {object} [params] extra parameters specific to the huobi api endpoint
          * @returns {object} a [margin loan structure]{@link https://docs.ccxt.com/#/?id=margin-loan-structure}
          */
         await this.loadMarkets();
         const currency = this.currency(code);
-        let marginMode = undefined;
-        [marginMode, params] = this.handleMarginModeAndParams('repayMargin', params);
-        marginMode = (marginMode === undefined) ? 'cross' : marginMode;
-        const marginAccounts = this.safeValue(this.options, 'marginAccounts', {});
-        const accountType = this.getSupportedMapping(marginMode, marginAccounts);
-        const accountId = await this.fetchAccountIdByType(accountType, marginMode, symbol, params);
+        const accountId = await this.fetchAccountIdByType('spot', 'cross', undefined, params);
         const request = {
             'currency': currency['id'],
             'amount': this.currencyToPrecision(code, amount),
@@ -8228,7 +8272,6 @@ export default class htx extends Exchange {
         const transaction = this.parseMarginLoan(loan, currency);
         return this.extend(transaction, {
             'amount': amount,
-            'symbol': symbol,
         });
     }
     parseMarginLoan(info, currency = undefined) {
@@ -8255,7 +8298,7 @@ export default class htx extends Exchange {
         //
         const timestamp = this.safeInteger(info, 'repayTime');
         return {
-            'id': this.safeInteger2(info, 'repayId', 'data'),
+            'id': this.safeString2(info, 'repayId', 'data'),
             'currency': this.safeCurrencyCode(undefined, currency),
             'amount': undefined,
             'symbol': undefined,

package/js/src/kucoin.d.ts

@@ -171,7 +171,7 @@ export default class kucoin extends Exchange {
         datetime: string;
         info: any;
     };
-    borrowMargin(code: string, amount: any, symbol?: Str, params?: {}): Promise<{
+    borrowCrossMargin(code: string, amount: any, params?: {}): Promise<{
         id: string;
         currency: string;
         amount: number;
@@ -180,7 +180,25 @@ export default class kucoin extends Exchange {
         datetime: string;
         info: any;
     }>;
-    repayMargin(code: string, amount: any, symbol?: Str, params?: {}): Promise<{
+    borrowIsolatedMargin(symbol: string, code: string, amount: any, params?: {}): Promise<{
+        id: string;
+        currency: string;
+        amount: number;
+        symbol: any;
+        timestamp: number;
+        datetime: string;
+        info: any;
+    }>;
+    repayCrossMargin(code: string, amount: any, params?: {}): Promise<{
+        id: string;
+        currency: string;
+        amount: number;
+        symbol: any;
+        timestamp: number;
+        datetime: string;
+        info: any;
+    }>;
+    repayIsolatedMargin(symbol: string, code: string, amount: any, params?: {}): Promise<{
         id: string;
         currency: string;
         amount: number;