ccxt 4.4.38__py2.py3-none-any.whl → 4.4.39__py2.py3-none-any.whl

ccxt/__init__.py

@@ -22,7 +22,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '4.4.38'
+__version__ = '4.4.39'
 
 # ----------------------------------------------------------------------------
 

ccxt/abstract/digifinex.py

@@ -71,6 +71,7 @@ class ImplicitAPI:
     private_swap_get_trade_history_trades = privateSwapGetTradeHistoryTrades = Entry('trade/history_trades', ['private', 'swap'], 'GET', {})
     private_swap_get_trade_open_orders = privateSwapGetTradeOpenOrders = Entry('trade/open_orders', ['private', 'swap'], 'GET', {})
     private_swap_get_trade_order_info = privateSwapGetTradeOrderInfo = Entry('trade/order_info', ['private', 'swap'], 'GET', {})
+    private_swap_post_account_transfer = privateSwapPostAccountTransfer = Entry('account/transfer', ['private', 'swap'], 'POST', {})
     private_swap_post_account_leverage = privateSwapPostAccountLeverage = Entry('account/leverage', ['private', 'swap'], 'POST', {})
     private_swap_post_account_position_mode = privateSwapPostAccountPositionMode = Entry('account/position_mode', ['private', 'swap'], 'POST', {})
     private_swap_post_account_position_margin = privateSwapPostAccountPositionMargin = Entry('account/position_margin', ['private', 'swap'], 'POST', {})

ccxt/abstract/mexc.py

@@ -20,6 +20,7 @@ class ImplicitAPI:
     spot_private_get_allorders = spotPrivateGetAllOrders = Entry('allOrders', ['spot', 'private'], 'GET', {'cost': 10})
     spot_private_get_account = spotPrivateGetAccount = Entry('account', ['spot', 'private'], 'GET', {'cost': 10})
     spot_private_get_mytrades = spotPrivateGetMyTrades = Entry('myTrades', ['spot', 'private'], 'GET', {'cost': 10})
+    spot_private_get_tradefee = spotPrivateGetTradeFee = Entry('tradeFee', ['spot', 'private'], 'GET', {'cost': 10})
     spot_private_get_sub_account_list = spotPrivateGetSubAccountList = Entry('sub-account/list', ['spot', 'private'], 'GET', {'cost': 1})
     spot_private_get_sub_account_apikey = spotPrivateGetSubAccountApiKey = Entry('sub-account/apiKey', ['spot', 'private'], 'GET', {'cost': 1})
     spot_private_get_capital_config_getall = spotPrivateGetCapitalConfigGetall = Entry('capital/config/getall', ['spot', 'private'], 'GET', {'cost': 10})

ccxt/abstract/woo.py

@@ -3,7 +3,7 @@ from ccxt.base.types import Entry
 
 class ImplicitAPI:
     v1_pub_get_hist_kline = v1PubGetHistKline = Entry('hist/kline', ['v1', 'pub'], 'GET', {'cost': 10})
-    v1_pub_get_hist_trades = v1PubGetHistTrades = Entry('hist/trades', ['v1', 'pub'], 'GET', {'cost': 1})
+    v1_pub_get_hist_trades = v1PubGetHistTrades = Entry('hist/trades', ['v1', 'pub'], 'GET', {'cost': 10})
     v1_public_get_info = v1PublicGetInfo = Entry('info', ['v1', 'public'], 'GET', {'cost': 1})
     v1_public_get_info_symbol = v1PublicGetInfoSymbol = Entry('info/{symbol}', ['v1', 'public'], 'GET', {'cost': 1})
     v1_public_get_system_info = v1PublicGetSystemInfo = Entry('system_info', ['v1', 'public'], 'GET', {'cost': 1})
@@ -43,7 +43,7 @@ class ImplicitAPI:
     v1_private_get_position_symbol = v1PrivateGetPositionSymbol = Entry('position/{symbol}', ['v1', 'private'], 'GET', {'cost': 3.33})
     v1_private_get_client_transaction_history = v1PrivateGetClientTransactionHistory = Entry('client/transaction_history', ['v1', 'private'], 'GET', {'cost': 60})
     v1_private_get_client_futures_leverage = v1PrivateGetClientFuturesLeverage = Entry('client/futures_leverage', ['v1', 'private'], 'GET', {'cost': 60})
-    v1_private_post_order = v1PrivatePostOrder = Entry('order', ['v1', 'private'], 'POST', {'cost': 5})
+    v1_private_post_order = v1PrivatePostOrder = Entry('order', ['v1', 'private'], 'POST', {'cost': 1})
     v1_private_post_order_cancel_all_after = v1PrivatePostOrderCancelAllAfter = Entry('order/cancel_all_after', ['v1', 'private'], 'POST', {'cost': 1})
     v1_private_post_asset_main_sub_transfer = v1PrivatePostAssetMainSubTransfer = Entry('asset/main_sub_transfer', ['v1', 'private'], 'POST', {'cost': 30})
     v1_private_post_asset_ltv = v1PrivatePostAssetLtv = Entry('asset/ltv', ['v1', 'private'], 'POST', {'cost': 30})

ccxt/alpaca.py

@@ -5,7 +5,7 @@
 
 from ccxt.base.exchange import Exchange
 from ccxt.abstract.alpaca import ImplicitAPI
-from ccxt.base.types import Currency, DepositAddress, Int, Market, Num, Order, OrderBook, OrderSide, OrderType, Str, Strings, Ticker, Tickers, Trade, Transaction
+from ccxt.base.types import Balances, Currency, DepositAddress, Int, Market, Num, Order, OrderBook, OrderSide, OrderType, Str, Strings, Ticker, Tickers, Trade, Transaction
 from typing import List
 from ccxt.base.errors import ExchangeError
 from ccxt.base.errors import PermissionDenied
@@ -44,7 +44,7 @@ class alpaca(Exchange, ImplicitAPI):
                 'test': {
                     'broker': 'https://broker-api.sandbox.{hostname}',
                     'trader': 'https://paper-api.{hostname}',
-                    'market': 'https://data.sandbox.{hostname}',
+                    'market': 'https://data.{hostname}',
                 },
                 'doc': 'https://alpaca.markets/docs/',
                 'fees': 'https://docs.alpaca.markets/docs/crypto-fees',
@@ -64,7 +64,7 @@ class alpaca(Exchange, ImplicitAPI):
                 'createStopOrder': True,
                 'createTriggerOrder': True,
                 'editOrder': True,
-                'fetchBalance': False,
+                'fetchBalance': True,
                 'fetchBidsAsks': False,
                 'fetchClosedOrders': True,
                 'fetchCurrencies': False,
@@ -1553,6 +1553,77 @@ class alpaca(Exchange, ImplicitAPI):
         }
         return self.safe_string(types, type, type)
 
+    def fetch_balance(self, params={}) -> Balances:
+        """
+        query for balance and get the amount of funds available for trading or funds locked in orders
+
+        https://docs.alpaca.markets/reference/getaccount-1
+
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict: a `balance structure <https://docs.ccxt.com/#/?id=balance-structure>`
+        """
+        self.load_markets()
+        response = self.traderPrivateGetV2Account(params)
+        #
+        #     {
+        #         "id": "43a01bde-4eb1-64fssc26adb5",
+        #         "admin_configurations": {
+        #             "allow_instant_ach": True,
+        #             "max_margin_multiplier": "4"
+        #         },
+        #         "user_configurations": {
+        #             "fractional_trading": True,
+        #             "max_margin_multiplier": "4"
+        #         },
+        #         "account_number": "744873727",
+        #         "status": "ACTIVE",
+        #         "crypto_status": "ACTIVE",
+        #         "currency": "USD",
+        #         "buying_power": "5.92",
+        #         "regt_buying_power": "5.92",
+        #         "daytrading_buying_power": "0",
+        #         "effective_buying_power": "5.92",
+        #         "non_marginable_buying_power": "5.92",
+        #         "bod_dtbp": "0",
+        #         "cash": "5.92",
+        #         "accrued_fees": "0",
+        #         "portfolio_value": "48.6",
+        #         "pattern_day_trader": False,
+        #         "trading_blocked": False,
+        #         "transfers_blocked": False,
+        #         "account_blocked": False,
+        #         "created_at": "2022-06-13T14:59:18.318096Z",
+        #         "trade_suspended_by_user": False,
+        #         "multiplier": "1",
+        #         "shorting_enabled": False,
+        #         "equity": "48.6",
+        #         "last_equity": "48.8014266",
+        #         "long_market_value": "42.68",
+        #         "short_market_value": "0",
+        #         "position_market_value": "42.68",
+        #         "initial_margin": "0",
+        #         "maintenance_margin": "0",
+        #         "last_maintenance_margin": "0",
+        #         "sma": "5.92",
+        #         "daytrade_count": 0,
+        #         "balance_asof": "2024-12-10",
+        #         "crypto_tier": 1,
+        #         "intraday_adjustments": "0",
+        #         "pending_reg_taf_fees": "0"
+        #     }
+        #
+        return self.parse_balance(response)
+
+    def parse_balance(self, response) -> Balances:
+        result: dict = {'info': response}
+        account = self.account()
+        currencyId = self.safe_string(response, 'currency')
+        code = self.safe_currency_code(currencyId)
+        account['free'] = self.safe_string(response, 'cash')
+        account['total'] = self.safe_string(response, 'equity')
+        result[code] = account
+        return self.safe_balance(result)
+
     def sign(self, path, api='public', method='GET', params={}, headers=None, body=None):
         endpoint = '/' + self.implode_params(path, params)
         url = self.implode_hostname(self.urls['api'][api[0]])

ccxt/async_support/__init__.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.4.38'
+__version__ = '4.4.39'
 
 # -----------------------------------------------------------------------------
 

ccxt/async_support/alpaca.py

@@ -5,7 +5,7 @@
 
 from ccxt.async_support.base.exchange import Exchange
 from ccxt.abstract.alpaca import ImplicitAPI
-from ccxt.base.types import Currency, DepositAddress, Int, Market, Num, Order, OrderBook, OrderSide, OrderType, Str, Strings, Ticker, Tickers, Trade, Transaction
+from ccxt.base.types import Balances, Currency, DepositAddress, Int, Market, Num, Order, OrderBook, OrderSide, OrderType, Str, Strings, Ticker, Tickers, Trade, Transaction
 from typing import List
 from ccxt.base.errors import ExchangeError
 from ccxt.base.errors import PermissionDenied
@@ -44,7 +44,7 @@ class alpaca(Exchange, ImplicitAPI):
                 'test': {
                     'broker': 'https://broker-api.sandbox.{hostname}',
                     'trader': 'https://paper-api.{hostname}',
-                    'market': 'https://data.sandbox.{hostname}',
+                    'market': 'https://data.{hostname}',
                 },
                 'doc': 'https://alpaca.markets/docs/',
                 'fees': 'https://docs.alpaca.markets/docs/crypto-fees',
@@ -64,7 +64,7 @@ class alpaca(Exchange, ImplicitAPI):
                 'createStopOrder': True,
                 'createTriggerOrder': True,
                 'editOrder': True,
-                'fetchBalance': False,
+                'fetchBalance': True,
                 'fetchBidsAsks': False,
                 'fetchClosedOrders': True,
                 'fetchCurrencies': False,
@@ -1553,6 +1553,77 @@ class alpaca(Exchange, ImplicitAPI):
         }
         return self.safe_string(types, type, type)
 
+    async def fetch_balance(self, params={}) -> Balances:
+        """
+        query for balance and get the amount of funds available for trading or funds locked in orders
+
+        https://docs.alpaca.markets/reference/getaccount-1
+
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict: a `balance structure <https://docs.ccxt.com/#/?id=balance-structure>`
+        """
+        await self.load_markets()
+        response = await self.traderPrivateGetV2Account(params)
+        #
+        #     {
+        #         "id": "43a01bde-4eb1-64fssc26adb5",
+        #         "admin_configurations": {
+        #             "allow_instant_ach": True,
+        #             "max_margin_multiplier": "4"
+        #         },
+        #         "user_configurations": {
+        #             "fractional_trading": True,
+        #             "max_margin_multiplier": "4"
+        #         },
+        #         "account_number": "744873727",
+        #         "status": "ACTIVE",
+        #         "crypto_status": "ACTIVE",
+        #         "currency": "USD",
+        #         "buying_power": "5.92",
+        #         "regt_buying_power": "5.92",
+        #         "daytrading_buying_power": "0",
+        #         "effective_buying_power": "5.92",
+        #         "non_marginable_buying_power": "5.92",
+        #         "bod_dtbp": "0",
+        #         "cash": "5.92",
+        #         "accrued_fees": "0",
+        #         "portfolio_value": "48.6",
+        #         "pattern_day_trader": False,
+        #         "trading_blocked": False,
+        #         "transfers_blocked": False,
+        #         "account_blocked": False,
+        #         "created_at": "2022-06-13T14:59:18.318096Z",
+        #         "trade_suspended_by_user": False,
+        #         "multiplier": "1",
+        #         "shorting_enabled": False,
+        #         "equity": "48.6",
+        #         "last_equity": "48.8014266",
+        #         "long_market_value": "42.68",
+        #         "short_market_value": "0",
+        #         "position_market_value": "42.68",
+        #         "initial_margin": "0",
+        #         "maintenance_margin": "0",
+        #         "last_maintenance_margin": "0",
+        #         "sma": "5.92",
+        #         "daytrade_count": 0,
+        #         "balance_asof": "2024-12-10",
+        #         "crypto_tier": 1,
+        #         "intraday_adjustments": "0",
+        #         "pending_reg_taf_fees": "0"
+        #     }
+        #
+        return self.parse_balance(response)
+
+    def parse_balance(self, response) -> Balances:
+        result: dict = {'info': response}
+        account = self.account()
+        currencyId = self.safe_string(response, 'currency')
+        code = self.safe_currency_code(currencyId)
+        account['free'] = self.safe_string(response, 'cash')
+        account['total'] = self.safe_string(response, 'equity')
+        result[code] = account
+        return self.safe_balance(result)
+
     def sign(self, path, api='public', method='GET', params={}, headers=None, body=None):
         endpoint = '/' + self.implode_params(path, params)
         url = self.implode_hostname(self.urls['api'][api[0]])

ccxt/async_support/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.4.38'
+__version__ = '4.4.39'
 
 # -----------------------------------------------------------------------------
 

ccxt/async_support/digifinex.py

@@ -231,6 +231,7 @@ class digifinex(Exchange, ImplicitAPI):
                             'trade/order_info',
                         ],
                         'post': [
+                            'account/transfer',
                             'account/leverage',
                             'account/position_mode',
                             'account/position_margin',
@@ -2749,12 +2750,23 @@ class digifinex(Exchange, ImplicitAPI):
 
     def parse_transfer(self, transfer: dict, currency: Currency = None) -> TransferEntry:
         #
-        # transfer
+        # transfer between spot, margin and OTC
         #
         #     {
         #         "code": 0
         #     }
         #
+        # transfer between spot and swap
+        #
+        #     {
+        #         "code": 0,
+        #         "data": {
+        #             "type": 2,
+        #             "currency": "USDT",
+        #             "transfer_amount": "5"
+        #         }
+        #     }
+        #
         # fetchTransfers
         #
         #     {
@@ -2767,7 +2779,8 @@ class digifinex(Exchange, ImplicitAPI):
         #
         fromAccount = None
         toAccount = None
-        type = self.safe_integer(transfer, 'type')
+        data = self.safe_dict(transfer, 'data', transfer)
+        type = self.safe_integer(data, 'type')
         if type == 1:
             fromAccount = 'spot'
             toAccount = 'swap'
@@ -2780,8 +2793,8 @@ class digifinex(Exchange, ImplicitAPI):
             'id': self.safe_string(transfer, 'transfer_id'),
             'timestamp': timestamp,
             'datetime': self.iso8601(timestamp),
-            'currency': self.safe_currency_code(self.safe_string(transfer, 'currency'), currency),
-            'amount': self.safe_number(transfer, 'amount'),
+            'currency': self.safe_currency_code(self.safe_string(data, 'currency'), currency),
+            'amount': self.safe_number_2(data, 'amount', 'transfer_amount'),
             'fromAccount': fromAccount,
             'toAccount': toAccount,
             'status': self.parse_transfer_status(self.safe_string(transfer, 'code')),
@@ -2790,30 +2803,56 @@ class digifinex(Exchange, ImplicitAPI):
     async def transfer(self, code: str, amount: float, fromAccount: str, toAccount: str, params={}) -> TransferEntry:
         """
         transfer currency internally between wallets on the same account
+
+        https://docs.digifinex.com/en-ww/spot/v3/rest.html#transfer-assets-among-accounts
+        https://docs.digifinex.com/en-ww/swap/v2/rest.html#accounttransfer
+
         :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: 'spot', 'swap', 'margin', 'OTC' - account to transfer from
+        :param str toAccount: 'spot', 'swap', 'margin', 'OTC' - account to transfer to
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `transfer structure <https://docs.ccxt.com/#/?id=transfer-structure>`
         """
         await self.load_markets()
         currency = self.currency(code)
+        currencyId = currency['id']
         accountsByType = self.safe_value(self.options, 'accountsByType', {})
         fromId = self.safe_string(accountsByType, fromAccount, fromAccount)
         toId = self.safe_string(accountsByType, toAccount, toAccount)
-        request: dict = {
-            'currency_mark': currency['id'],
-            'num': self.currency_to_precision(code, amount),
-            'from': fromId,  # 1 = SPOT, 2 = MARGIN, 3 = OTC
-            'to': toId,  # 1 = SPOT, 2 = MARGIN, 3 = OTC
-        }
-        response = await self.privateSpotPostTransfer(self.extend(request, params))
-        #
-        #     {
-        #         "code": 0
-        #     }
-        #
+        request = {}
+        fromSwap = (fromAccount == 'swap')
+        toSwap = (toAccount == 'swap')
+        response = None
+        amountString = self.currency_to_precision(code, amount)
+        if fromSwap or toSwap:
+            if (fromId != '1') and (toId != '1'):
+                raise ExchangeError(self.id + ' transfer() supports transferring between spot and swap, spot and margin, spot and OTC only')
+            request['type'] = 1 if toSwap else 2  # 1 = spot to swap, 2 = swap to spot
+            request['currency'] = currencyId
+            request['transfer_amount'] = amountString
+            #
+            #     {
+            #         "code": 0,
+            #         "data": {
+            #             "type": 2,
+            #             "currency": "USDT",
+            #             "transfer_amount": "5"
+            #         }
+            #     }
+            #
+            response = await self.privateSwapPostAccountTransfer(self.extend(request, params))
+        else:
+            request['currency_mark'] = currencyId
+            request['num'] = amountString
+            request['from'] = fromId  # 1 = SPOT, 2 = MARGIN, 3 = OTC
+            request['to'] = toId  # 1 = SPOT, 2 = MARGIN, 3 = OTC
+            #
+            #     {
+            #         "code": 0
+            #     }
+            #
+            response = await self.privateSpotPostTransfer(self.extend(request, params))
         return self.parse_transfer(response, currency)
 
     async def withdraw(self, code: str, amount: float, address: str, tag=None, params={}) -> Transaction: