ccxt 4.4.87__py2.py3-none-any.whl → 4.4.90__py2.py3-none-any.whl

ccxt/bingx.py

@@ -513,6 +513,8 @@ class bingx(Exchange, ImplicitAPI):
                     '100437': BadRequest,  # {"code":100437,"msg":"The withdrawal amount is lower than the minimum limit, please re-enter.","timestamp":1689258588845}
                     '101204': InsufficientFunds,  # {"code":101204,"msg":"","data":{}}
                     '110425': InvalidOrder,  # {"code":110425,"msg":"Please ensure that the minimum nominal value of the order placed must be greater than 2u","data":{}}
+                    'Insufficient assets': InsufficientFunds,  # {"transferErrorMsg":"Insufficient assets"}
+                    'illegal transferType': BadRequest,  # {"transferErrorMsg":"illegal transferType"}
                 },
                 'broad': {},
             },
@@ -526,12 +528,14 @@ class bingx(Exchange, ImplicitAPI):
             'options': {
                 'defaultType': 'spot',
                 'accountsByType': {
-                    'spot': 'FUND',
+                    'funding': 'FUND',
+                    'spot': 'SPOT',
                     'swap': 'PFUTURES',
                     'future': 'SFUTURES',
                 },
                 'accountsById': {
-                    'FUND': 'spot',
+                    'FUND': 'funding',
+                    'SPOT': 'spot',
                     'PFUTURES': 'swap',
                     'SFUTURES': 'future',
                 },
@@ -1529,7 +1533,7 @@ class bingx(Exchange, ImplicitAPI):
         #        ]
         #    }
         #
-        data = self.safe_list(response, 'data', [])
+        data = self.safe_dict(response, 'data')
         return self.parse_funding_rate(data, market)
 
     def fetch_funding_rates(self, symbols: Strings = None, params={}) -> FundingRates:
@@ -4637,12 +4641,12 @@ class bingx(Exchange, ImplicitAPI):
         """
         transfer currency internally between wallets on the same account
 
-        https://bingx-api.github.io/docs/#/spot/account-api.html#User%20Universal%20Transfer
+        https://bingx-api.github.io/docs/#/en-us/common/account-api.html#Asset%20Transfer
 
         :param str code: unified currency code
         :param float amount: amount to transfer
-        :param str fromAccount: account to transfer from
-        :param str toAccount: account to transfer to
+        :param str fromAccount: account to transfer from(spot, swap, futures, or funding)
+        :param str toAccount: account to transfer to(spot, swap, futures, or funding)
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `transfer structure <https://docs.ccxt.com/#/?id=transfer-structure>`
         """
@@ -4658,9 +4662,10 @@ class bingx(Exchange, ImplicitAPI):
         }
         response = self.spotV3PrivateGetGetAssetTransfer(self.extend(request, params))
         #
-        #    {
-        #        "tranId":13526853623
-        #    }
+        #     {
+        #         "tranId": 1933130865269936128,
+        #         "transferId": "1051450703949464903736"
+        #     }
         #
         return {
             'info': response,
@@ -4682,8 +4687,11 @@ class bingx(Exchange, ImplicitAPI):
 
         :param str [code]: unified currency code of the currency transferred
         :param int [since]: the earliest time in ms to fetch transfers for
-        :param int [limit]: the maximum number of transfers structures to retrieve
+        :param int [limit]: the maximum number of transfers structures to retrieve(default 10, max 100)
         :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param str params.fromAccount:(mandatory) transfer from(spot, swap, futures, or funding)
+        :param str params.toAccount:(mandatory) transfer to(spot, swap, futures, or funding)
+        :param boolean [params.paginate]: whether to paginate the results(default False)
         :returns dict[]: a list of `transfer structures <https://docs.ccxt.com/#/?id=transfer-structure>`
         """
         self.load_markets()
@@ -4697,6 +4705,12 @@ class bingx(Exchange, ImplicitAPI):
         toId = self.safe_string(accountsByType, toAccount, toAccount)
         if fromId is None or toId is None:
             raise ExchangeError(self.id + ' fromAccount & toAccount parameter are required')
+        params = self.omit(params, ['fromAccount', 'toAccount'])
+        maxLimit = 100
+        paginate = False
+        paginate, params = self.handle_option_and_params(params, 'fetchTransfers', 'paginate', False)
+        if paginate:
+            return self.fetch_paginated_call_dynamic('fetchTransfers', None, since, limit, params, maxLimit)
         request: dict = {
             'type': fromId + '_' + toId,
         }
@@ -4704,18 +4718,19 @@ class bingx(Exchange, ImplicitAPI):
             request['startTime'] = since
         if limit is not None:
             request['size'] = limit
+        request, params = self.handle_until_option('endTime', request, params)
         response = self.spotV3PrivateGetAssetTransfer(self.extend(request, params))
         #
         #     {
         #         "total": 3,
         #         "rows": [
         #             {
-        #                 "asset":"USDT",
-        #                 "amount":"-100.00000000000000000000",
-        #                 "type":"FUND_SFUTURES",
-        #                 "status":"CONFIRMED",
-        #                 "tranId":1067594500957016069,
-        #                 "timestamp":1658388859000
+        #                 "asset": "USDT",
+        #                 "amount": "100.00000000000000000000",
+        #                 "type": "FUND_SFUTURES",
+        #                 "status": "CONFIRMED",
+        #                 "tranId": 1067594500957016069,
+        #                 "timestamp": 1658388859000
         #             },
         #         ]
         #     }
@@ -4732,7 +4747,7 @@ class bingx(Exchange, ImplicitAPI):
         typeId = self.safe_string(transfer, 'type')
         typeIdSplit = typeId.split('_')
         fromId = self.safe_string(typeIdSplit, 0)
-        toId = self.safe_string(typeId, 1)
+        toId = self.safe_string(typeIdSplit, 1)
         fromAccount = self.safe_string(accountsById, fromId, fromId)
         toAccount = self.safe_string(accountsById, toId, toId)
         return {
@@ -4744,9 +4759,15 @@ class bingx(Exchange, ImplicitAPI):
             'amount': self.safe_number(transfer, 'amount'),
             'fromAccount': fromAccount,
             'toAccount': toAccount,
-            'status': status,
+            'status': self.parse_transfer_status(status),
         }
 
+    def parse_transfer_status(self, status: Str) -> str:
+        statuses: dict = {
+            'CONFIRMED': 'ok',
+        }
+        return self.safe_string(statuses, status, status)
+
     def fetch_deposit_addresses_by_network(self, code: str, params={}) -> List[DepositAddress]:
         """
         fetch the deposit addresses for a currency associated with self account
@@ -5552,11 +5573,12 @@ class bingx(Exchange, ImplicitAPI):
         return self.parse_transaction(data)
 
     def parse_params(self, params):
-        sortedParams = self.keysort(params)
-        keys = list(sortedParams.keys())
+        # sortedParams = self.keysort(params)
+        rawKeys = list(params.keys())
+        keys = self.sort(rawKeys)
         for i in range(0, len(keys)):
             key = keys[i]
-            value = sortedParams[key]
+            value = params[key]
             if isinstance(value, list):
                 arrStr = '['
                 for j in range(0, len(value)):
@@ -5565,8 +5587,8 @@ class bingx(Exchange, ImplicitAPI):
                         arrStr += ','
                     arrStr += str(arrayElement)
                 arrStr += ']'
-                sortedParams[key] = arrStr
-        return sortedParams
+                params[key] = arrStr
+        return params
 
     def fetch_my_liquidations(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}):
         """
@@ -6166,13 +6188,14 @@ class bingx(Exchange, ImplicitAPI):
         }
 
     def custom_encode(self, params):
-        sortedParams = self.keysort(params)
-        keys = list(sortedParams.keys())
+        # sortedParams = self.keysort(params)
+        rawKeys = list(params.keys())
+        keys = self.sort(rawKeys)
         adjustedValue = None
         result = None
         for i in range(0, len(keys)):
             key = keys[i]
-            value = sortedParams[key]
+            value = params[key]
             if isinstance(value, list):
                 arrStr = None
                 for j in range(0, len(value)):
@@ -6230,7 +6253,7 @@ class bingx(Exchange, ImplicitAPI):
                 encodeRequest = self.custom_encode(params)
             else:
                 parsedParams = self.parse_params(params)
-                encodeRequest = self.rawencode(parsedParams)
+                encodeRequest = self.rawencode(parsedParams, True)
             signature = self.hmac(self.encode(encodeRequest), self.encode(self.secret), hashlib.sha256)
             headers = {
                 'X-BX-APIKEY': self.apiKey,
@@ -6241,7 +6264,7 @@ class bingx(Exchange, ImplicitAPI):
                 params['signature'] = signature
                 body = self.json(params)
             else:
-                query = self.urlencode(parsedParams)
+                query = self.urlencode(parsedParams, True)
                 url += '?' + query + '&' + 'signature=' + signature
         return {'url': url, 'method': method, 'body': body, 'headers': headers}
 
@@ -6265,7 +6288,10 @@ class bingx(Exchange, ImplicitAPI):
         #
         code = self.safe_string(response, 'code')
         message = self.safe_string(response, 'msg')
-        if code is not None and code != '0':
+        transferErrorMsg = self.safe_string(response, 'transferErrorMsg')  # handling with errors from transfer endpoint
+        if (transferErrorMsg is not None) or (code is not None and code != '0'):
+            if transferErrorMsg is not None:
+                message = transferErrorMsg
             feedback = self.id + ' ' + body
             self.throw_exactly_matched_exception(self.exceptions['exact'], message, feedback)
             self.throw_exactly_matched_exception(self.exceptions['exact'], code, feedback)