ccxt 4.4.30__py2.py3-none-any.whl → 4.4.32__py2.py3-none-any.whl

ccxt/pro/bitmex.py

@@ -66,7 +66,9 @@ class bitmex(ccxt.async_support.bitmex):
     async def watch_ticker(self, symbol: str, params={}) -> Ticker:
         """
         watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
-        :see: https://www.bitmex.com/app/wsAPI#Subscriptions
+
+        https://www.bitmex.com/app/wsAPI#Subscriptions
+
         :param str symbol: unified symbol of the market to fetch the ticker for
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
@@ -79,7 +81,9 @@ class bitmex(ccxt.async_support.bitmex):
     async def watch_tickers(self, symbols: Strings = None, params={}) -> Tickers:
         """
         watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for all markets of a specific list
-        :see: https://www.bitmex.com/app/wsAPI#Subscriptions
+
+        https://www.bitmex.com/app/wsAPI#Subscriptions
+
         :param str[] symbols: unified symbol of the market to fetch the ticker for
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
@@ -359,7 +363,9 @@ class bitmex(ccxt.async_support.bitmex):
     async def watch_liquidations(self, symbol: str, since: Int = None, limit: Int = None, params={}) -> List[Liquidation]:
         """
         watch the public liquidations of a trading pair
-        :see: https://www.bitmex.com/app/wsAPI#Liquidation
+
+        https://www.bitmex.com/app/wsAPI#Liquidation
+
         :param str symbol: unified CCXT market symbol
         :param int [since]: the earliest time in ms to fetch liquidations for
         :param int [limit]: the maximum number of liquidation structures to retrieve
@@ -371,8 +377,10 @@ class bitmex(ccxt.async_support.bitmex):
     async def watch_liquidations_for_symbols(self, symbols: List[str] = None, since: Int = None, limit: Int = None, params={}) -> List[Liquidation]:
         """
         watch the public liquidations of a trading pair
-        :see: https://www.bitmex.com/app/wsAPI#Liquidation
-        :param str symbol: unified CCXT market symbol
+
+        https://www.bitmex.com/app/wsAPI#Liquidation
+
+        :param str[] symbols:
         :param int [since]: the earliest time in ms to fetch liquidations for
         :param int [limit]: the maximum number of liquidation structures to retrieve
         :param dict [params]: exchange specific parameters for the bitmex api endpoint
@@ -451,7 +459,9 @@ class bitmex(ccxt.async_support.bitmex):
     async def watch_balance(self, params={}) -> Balances:
         """
         watch balance and get the amount of funds available for trading or funds locked in orders
-        :see: https://www.bitmex.com/app/wsAPI#Subscriptions
+
+        https://www.bitmex.com/app/wsAPI#Subscriptions
+
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `balance structure <https://docs.ccxt.com/#/?id=balance-structure>`
         """
@@ -654,7 +664,9 @@ class bitmex(ccxt.async_support.bitmex):
     async def watch_trades(self, symbol: str, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
         get the list of most recent trades for a particular symbol
-        :see: https://www.bitmex.com/app/wsAPI#Subscriptions
+
+        https://www.bitmex.com/app/wsAPI#Subscriptions
+
         :param str symbol: unified symbol of the market to fetch trades for
         :param int [since]: timestamp in ms of the earliest trade to fetch
         :param int [limit]: the maximum amount of trades to fetch
@@ -702,8 +714,12 @@ class bitmex(ccxt.async_support.bitmex):
     async def watch_positions(self, symbols: Strings = None, since: Int = None, limit: Int = None, params={}) -> List[Position]:
         """
         watch all open positions
-        :see: https://www.bitmex.com/app/wsAPI#Subscriptions
+
+        https://www.bitmex.com/app/wsAPI#Subscriptions
+
         :param str[]|None symbols: list of unified market symbols
+        :param int [since]: the earliest time in ms to watch positions for
+        :param int [limit]: the maximum number of positions to retrieve
         :param dict params: extra parameters specific to the exchange API endpoint
         :returns dict[]: a list of `position structure <https://docs.ccxt.com/en/latest/manual.html#position-structure>`
         """
@@ -898,7 +914,9 @@ class bitmex(ccxt.async_support.bitmex):
     async def watch_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
         """
         watches information on multiple orders made by the user
-        :see: https://www.bitmex.com/app/wsAPI#Subscriptions
+
+        https://www.bitmex.com/app/wsAPI#Subscriptions
+
         :param str symbol: unified market symbol of the market orders were made in
         :param int [since]: the earliest time in ms to fetch orders for
         :param int [limit]: the maximum number of order structures to retrieve
@@ -1105,7 +1123,9 @@ class bitmex(ccxt.async_support.bitmex):
     async def watch_my_trades(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
         watches information on multiple trades made by the user
-        :see: https://www.bitmex.com/app/wsAPI#Subscriptions
+
+        https://www.bitmex.com/app/wsAPI#Subscriptions
+
         :param str symbol: unified market symbol of the market trades were made in
         :param int [since]: the earliest time in ms to fetch trades for
         :param int [limit]: the maximum number of trade structures to retrieve
@@ -1215,7 +1235,9 @@ class bitmex(ccxt.async_support.bitmex):
     async def watch_order_book(self, symbol: str, limit: Int = None, params={}) -> OrderBook:
         """
         watches information on open orders with bid(buy) and ask(sell) prices, volumes and other data
-        :see: https://www.bitmex.com/app/wsAPI#OrderBookL2
+
+        https://www.bitmex.com/app/wsAPI#OrderBookL2
+
         :param str symbol: unified symbol of the market to fetch the order book for
         :param int [limit]: the maximum amount of order book entries to return
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -1226,7 +1248,9 @@ class bitmex(ccxt.async_support.bitmex):
     async def watch_order_book_for_symbols(self, symbols: List[str], limit: Int = None, params={}) -> OrderBook:
         """
         watches information on open orders with bid(buy) and ask(sell) prices, volumes and other data
-        :see: https://www.bitmex.com/app/wsAPI#OrderBookL2
+
+        https://www.bitmex.com/app/wsAPI#OrderBookL2
+
         :param str[] symbols: unified array of symbols
         :param int [limit]: the maximum amount of order book entries to return
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -1263,7 +1287,9 @@ class bitmex(ccxt.async_support.bitmex):
     async def watch_trades_for_symbols(self, symbols: List[str], since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
         get the list of most recent trades for a list of symbols
-        :see: https://www.bitmex.com/app/wsAPI#Subscriptions
+
+        https://www.bitmex.com/app/wsAPI#Subscriptions
+
         :param str[] symbols: unified symbol of the market to fetch trades for
         :param int [since]: timestamp in ms of the earliest trade to fetch
         :param int [limit]: the maximum amount of trades to fetch
@@ -1297,7 +1323,9 @@ class bitmex(ccxt.async_support.bitmex):
     async def watch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={}) -> List[list]:
         """
         watches historical candlestick data containing the open, high, low, and close price, and the volume of a market
-        :see: https://www.bitmex.com/app/wsAPI#Subscriptions
+
+        https://www.bitmex.com/app/wsAPI#Subscriptions
+
         :param str symbol: unified symbol of the market to fetch OHLCV data for
         :param str timeframe: the length of time each candle represents
         :param int [since]: timestamp in ms of the earliest candle to fetch

ccxt/pro/bitopro.py

@@ -58,7 +58,9 @@ class bitopro(ccxt.async_support.bitopro):
     async def watch_order_book(self, symbol: str, limit: Int = None, params={}) -> OrderBook:
         """
         watches information on open orders with bid(buy) and ask(sell) prices, volumes and other data
-        :see: https://github.com/bitoex/bitopro-offical-api-docs/blob/master/ws/public/order_book_stream.md
+
+        https://github.com/bitoex/bitopro-offical-api-docs/blob/master/ws/public/order_book_stream.md
+
         :param str symbol: unified symbol of the market to fetch the order book for
         :param int [limit]: the maximum amount of order book entries to return
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -117,7 +119,9 @@ class bitopro(ccxt.async_support.bitopro):
     async def watch_trades(self, symbol: str, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
         get the list of most recent trades for a particular symbol
-        :see: https://github.com/bitoex/bitopro-offical-api-docs/blob/master/ws/public/trade_stream.md
+
+        https://github.com/bitoex/bitopro-offical-api-docs/blob/master/ws/public/trade_stream.md
+
         :param str symbol: unified symbol of the market to fetch trades for
         :param int [since]: timestamp in ms of the earliest trade to fetch
         :param int [limit]: the maximum amount of trades to fetch
@@ -172,7 +176,9 @@ class bitopro(ccxt.async_support.bitopro):
     async def watch_my_trades(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
         watches information on multiple trades made by the user
-        :see: https://github.com/bitoex/bitopro-offical-api-docs/blob/master/ws/private/matches_stream.md
+
+        https://github.com/bitoex/bitopro-offical-api-docs/blob/master/ws/private/matches_stream.md
+
         :param str symbol: unified market symbol of the market trades were made in
         :param int [since]: the earliest time in ms to fetch trades for
         :param int [limit]: the maximum number of trade structures to retrieve
@@ -304,7 +310,9 @@ class bitopro(ccxt.async_support.bitopro):
     async def watch_ticker(self, symbol: str, params={}) -> Ticker:
         """
         watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
-        :see: https://github.com/bitoex/bitopro-offical-api-docs/blob/master/ws/public/ticker_stream.md
+
+        https://github.com/bitoex/bitopro-offical-api-docs/blob/master/ws/public/ticker_stream.md
+
         :param str symbol: unified symbol of the market to fetch the ticker for
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
@@ -382,7 +390,9 @@ class bitopro(ccxt.async_support.bitopro):
     async def watch_balance(self, params={}) -> Balances:
         """
         watch balance and get the amount of funds available for trading or funds locked in orders
-        :see: https://github.com/bitoex/bitopro-offical-api-docs/blob/master/ws/private/user_balance_stream.md
+
+        https://github.com/bitoex/bitopro-offical-api-docs/blob/master/ws/private/user_balance_stream.md
+
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `balance structure <https://docs.ccxt.com/#/?id=balance-structure>`
         """

ccxt/pro/bitrue.py

@@ -60,7 +60,9 @@ class bitrue(ccxt.async_support.bitrue):
     async def watch_balance(self, params={}) -> Balances:
         """
         watch balance and get the amount of funds available for trading or funds locked in orders
-        :see: https://github.com/Bitrue-exchange/Spot-official-api-docs#balance-update
+
+        https://github.com/Bitrue-exchange/Spot-official-api-docs#balance-update
+
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `balance structure <https://docs.ccxt.com/#/?id=balance-structure>`
         """
@@ -166,8 +168,10 @@ class bitrue(ccxt.async_support.bitrue):
     async def watch_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
         """
         watches information on user orders
-        :see: https://github.com/Bitrue-exchange/Spot-official-api-docs#order-update
-        :param str[] symbols: unified symbols of the market to watch the orders for
+
+        https://github.com/Bitrue-exchange/Spot-official-api-docs#order-update
+
+        :param str symbol:
         :param int [since]: timestamp in ms of the earliest order
         :param int [limit]: the maximum amount of orders to return
         :param dict [params]: extra parameters specific to the exchange API endpoint

ccxt/pro/bitvavo.py

@@ -111,7 +111,9 @@ class bitvavo(ccxt.async_support.bitvavo):
     async def watch_ticker(self, symbol: str, params={}) -> Ticker:
         """
         watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
-        :see: https://docs.bitvavo.com/#tag/Market-data-subscription-WebSocket/paths/~1subscribeTicker24h/post
+
+        https://docs.bitvavo.com/#tag/Market-data-subscription-WebSocket/paths/~1subscribeTicker24h/post
+
         :param str symbol: unified symbol of the market to fetch the ticker for
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
@@ -121,7 +123,9 @@ class bitvavo(ccxt.async_support.bitvavo):
     async def watch_tickers(self, symbols: Strings = None, params={}) -> Tickers:
         """
         watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for all markets of a specific list
-        :see: https://docs.bitvavo.com/#tag/Market-data-subscription-WebSocket/paths/~1subscribeTicker24h/post
+
+        https://docs.bitvavo.com/#tag/Market-data-subscription-WebSocket/paths/~1subscribeTicker24h/post
+
         :param str[] [symbols]: unified symbol of the market to fetch the ticker for
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
@@ -173,7 +177,9 @@ class bitvavo(ccxt.async_support.bitvavo):
     async def watch_bids_asks(self, symbols: Strings = None, params={}) -> Tickers:
         """
         watches best bid & ask for symbols
-        :see: https://docs.bitvavo.com/#tag/Market-data-subscription-WebSocket/paths/~1subscribeTicker24h/post
+
+        https://docs.bitvavo.com/#tag/Market-data-subscription-WebSocket/paths/~1subscribeTicker24h/post
+
         :param str[] symbols: unified symbol of the market to fetch the ticker for
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
@@ -300,10 +306,9 @@ class bitvavo(ccxt.async_support.bitvavo):
         #        ]
         #    }
         #
-        action = self.safe_string(message, 'action')
         response = self.safe_value(message, 'response')
         ohlcv = self.parse_ohlcvs(response, None, None, None)
-        messageHash = self.build_message_hash(action)
+        messageHash = self.safe_string(message, 'requestId')
         client.resolve(ohlcv, messageHash)
 
     def handle_ohlcv(self, client: Client, message):
@@ -590,7 +595,9 @@ class bitvavo(ccxt.async_support.bitvavo):
     async def create_order_ws(self, symbol: str, type: OrderType, side: OrderSide, amount: float, price: Num = None, params={}) -> Order:
         """
         create a trade order
-        :see: https://docs.bitvavo.com/#tag/Orders/paths/~1order/post
+
+        https://docs.bitvavo.com/#tag/Orders/paths/~1order/post
+
         :param str symbol: unified symbol of the market to create an order in
         :param str type: 'market' or 'limit'
         :param str side: 'buy' or 'sell'
@@ -618,7 +625,9 @@ class bitvavo(ccxt.async_support.bitvavo):
     async def edit_order_ws(self, id: str, symbol: str, type: OrderType, side: OrderSide, amount: Num = None, price: Num = None, params={}) -> Order:
         """
         edit a trade order
-        :see: https://docs.bitvavo.com/#tag/Orders/paths/~1order/put
+
+        https://docs.bitvavo.com/#tag/Orders/paths/~1order/put
+
         :param str id: cancel order id
         :param str symbol: unified symbol of the market to create an order in
         :param str type: 'market' or 'limit'
@@ -635,7 +644,9 @@ class bitvavo(ccxt.async_support.bitvavo):
 
     async def cancel_order_ws(self, id: str, symbol: Str = None, params={}):
         """
-        :see: https://docs.bitvavo.com/#tag/Orders/paths/~1order/delete
+
+        https://docs.bitvavo.com/#tag/Orders/paths/~1order/delete
+
         cancels an open order
         :param str id: order id
         :param str symbol: unified symbol of the market the order was made in
@@ -649,7 +660,9 @@ class bitvavo(ccxt.async_support.bitvavo):
 
     async def cancel_all_orders_ws(self, symbol: Str = None, params={}):
         """
-        :see: https://docs.bitvavo.com/#tag/Orders/paths/~1orders/delete
+
+        https://docs.bitvavo.com/#tag/Orders/paths/~1orders/delete
+
         cancel all open orders
         :param str symbol: unified market symbol, only orders in the market of self symbol are cancelled when symbol is not None
         :param dict [params]: extra parameters specific to the bitvavo api endpoint
@@ -673,19 +686,22 @@ class bitvavo(ccxt.async_support.bitvavo):
         #        }]
         #    }
         #
-        action = self.safe_string(message, 'action')
-        response = self.safe_value(message, 'response')
-        firstRawOrder = self.safe_value(response, 0, {})
-        marketId = self.safe_string(firstRawOrder, 'market')
+        # action = self.safe_string(message, 'action')
+        response = self.safe_list(message, 'response')
+        # firstRawOrder = self.safe_value(response, 0, {})
+        # marketId = self.safe_string(firstRawOrder, 'market')
         orders = self.parse_orders(response)
-        messageHash = self.build_message_hash(action, {'market': marketId})
-        client.resolve(orders, messageHash)
-        messageHash = self.build_message_hash(action, message)
+        # messageHash = self.build_message_hash(action, {'market': marketId})
+        # client.resolve(orders, messageHash)
+        # messageHash = self.build_message_hash(action, message)
+        messageHash = self.safe_string(message, 'requestId')
         client.resolve(orders, messageHash)
 
     async def fetch_order_ws(self, id: str, symbol: Str = None, params={}) -> Order:
         """
-        :see: https://docs.bitvavo.com/#tag/General/paths/~1assets/get
+
+        https://docs.bitvavo.com/#tag/General/paths/~1assets/get
+
         fetches information on an order made by the user
         :param str id: the order id
         :param str symbol: unified symbol of the market the order was made in
@@ -705,7 +721,9 @@ class bitvavo(ccxt.async_support.bitvavo):
 
     async def fetch_orders_ws(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
         """
-        :see: https://docs.bitvavo.com/#tag/Orders/paths/~1orders/get
+
+        https://docs.bitvavo.com/#tag/Orders/paths/~1orders/get
+
         fetches information on multiple orders made by the user
         :param str symbol: unified market symbol of the market orders were made in
         :param int [since]: the earliest time in ms to fetch orders for
@@ -721,13 +739,19 @@ class bitvavo(ccxt.async_support.bitvavo):
         orders = await self.watch_request('privateGetOrders', request)
         return self.filter_by_symbol_since_limit(orders, symbol, since, limit)
 
+    def request_id(self):
+        ts = str(self.milliseconds())
+        randomNumber = self.rand_number(4)
+        randomPart = str(randomNumber)
+        return int(ts + randomPart)
+
     async def watch_request(self, action, request):
+        messageHash = self.request_id()
+        messageHashStr = str(messageHash)
         request['action'] = action
-        messageHash = self.build_message_hash(action, request)
-        self.check_message_hash_does_not_exist(messageHash)
+        request['requestId'] = messageHash
         url = self.urls['api']['ws']
-        randomSubHash = str(self.rand_number(5)) + ':' + messageHash
-        return await self.watch(url, messageHash, request, randomSubHash)
+        return await self.watch(url, messageHashStr, request, messageHashStr)
 
     async def fetch_open_orders_ws(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
         """
@@ -752,7 +776,9 @@ class bitvavo(ccxt.async_support.bitvavo):
 
     async def fetch_my_trades_ws(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
-        :see: https://docs.bitvavo.com/#tag/Trades
+
+        https://docs.bitvavo.com/#tag/Trades
+
         fetch all trades made by the user
         :param str symbol: unified market symbol
         :param int [since]: the earliest time in ms to fetch trades for
@@ -790,12 +816,12 @@ class bitvavo(ccxt.async_support.bitvavo):
         #    }
         #
         #
-        action = self.safe_string(message, 'action')
-        response = self.safe_value(message, 'response')
-        firstRawTrade = self.safe_value(response, 0, {})
-        marketId = self.safe_string(firstRawTrade, 'market')
+        # action = self.safe_string(message, 'action')
+        response = self.safe_list(message, 'response')
+        # marketId = self.safe_string(firstRawTrade, 'market')
         trades = self.parse_trades(response, None, None, None)
-        messageHash = self.build_message_hash(action, {'market': marketId})
+        # messageHash = self.build_message_hash(action, {'market': marketId})
+        messageHash = self.safe_string(message, 'requestId')
         client.resolve(trades, messageHash)
 
     async def withdraw_ws(self, code: str, amount, address, tag=None, params={}):
@@ -826,15 +852,18 @@ class bitvavo(ccxt.async_support.bitvavo):
         #        }
         #    }
         #
-        action = self.safe_string(message, 'action')
-        messageHash = self.build_message_hash(action, message)
+        # action = self.safe_string(message, 'action')
+        # messageHash = self.build_message_hash(action, message)
+        messageHash = self.safe_string(message, 'requestId')
         response = self.safe_value(message, 'response')
         withdraw = self.parse_transaction(response)
         client.resolve(withdraw, messageHash)
 
     async def fetch_withdrawals_ws(self, code: Str = None, since: Int = None, limit: Int = None, params={}):
         """
-        :see: https://docs.bitvavo.com/#tag/Account/paths/~1withdrawalHistory/get
+
+        https://docs.bitvavo.com/#tag/Account/paths/~1withdrawalHistory/get
+
         fetch all withdrawals made from an account
         :param str code: unified currency code
         :param int [since]: the earliest time in ms to fetch withdrawals for
@@ -864,15 +893,18 @@ class bitvavo(ccxt.async_support.bitvavo):
         #        ]
         #    }
         #
-        action = self.safe_string(message, 'action')
-        messageHash = self.build_message_hash(action, message)
-        response = self.safe_value(message, 'response')
+        # action = self.safe_string(message, 'action')
+        # messageHash = self.build_message_hash(action, message)
+        response = self.safe_list(message, 'response')
+        messageHash = self.safe_string(message, 'requestId')
         withdrawals = self.parse_transactions(response, None, None, None, {'type': 'withdrawal'})
         client.resolve(withdrawals, messageHash)
 
     async def fetch_ohlcv_ws(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={}) -> List[list]:
         """
-        :see: https://docs.bitvavo.com/#tag/Market-Data/paths/~1{market}~1candles/get
+
+        https://docs.bitvavo.com/#tag/Market-Data/paths/~1{market}~1candles/get
+
         fetches historical candlestick data containing the open, high, low, and close price, and the volume of a market
         :param str symbol: unified symbol of the market to fetch OHLCV data for
         :param str timeframe: the length of time each candle represents
@@ -889,7 +921,9 @@ class bitvavo(ccxt.async_support.bitvavo):
 
     async def fetch_deposits_ws(self, code: Str = None, since: Int = None, limit: Int = None, params={}):
         """
-        :see: https://docs.bitvavo.com/#tag/Account/paths/~1depositHistory/get
+
+        https://docs.bitvavo.com/#tag/Account/paths/~1depositHistory/get
+
         fetch all deposits made to an account
         :param str code: unified currency code
         :param int [since]: the earliest time in ms to fetch deposits for
@@ -919,15 +953,16 @@ class bitvavo(ccxt.async_support.bitvavo):
         #        ]
         #    }
         #
-        action = self.safe_string(message, 'action')
-        messageHash = self.build_message_hash(action, message)
         response = self.safe_value(message, 'response')
         deposits = self.parse_transactions(response, None, None, None, {'type': 'deposit'})
+        messageHash = self.safe_string(message, 'requestId')
         client.resolve(deposits, messageHash)
 
     async def fetch_trading_fees_ws(self, params={}) -> TradingFees:
         """
-        :see: https://docs.bitvavo.com/#tag/Account/paths/~1account/get
+
+        https://docs.bitvavo.com/#tag/Account/paths/~1account/get
+
         fetch the trading fees for multiple markets
         :param dict [params]: extra parameters specific to the bitvavo api endpoint
         :returns dict: a dictionary of `fee structures <https://docs.ccxt.com/#/?id=fee-structure>` indexed by market symbols
@@ -938,7 +973,9 @@ class bitvavo(ccxt.async_support.bitvavo):
 
     async def fetch_markets_ws(self, params={}):
         """
-        :see: https://docs.bitvavo.com/#tag/General/paths/~1markets/get
+
+        https://docs.bitvavo.com/#tag/General/paths/~1markets/get
+
         retrieves data on all markets for bitvavo
         :param dict [params]: extra parameters specific to the exchange api endpoint
         :returns dict[]: an array of objects representing market data
@@ -947,7 +984,9 @@ class bitvavo(ccxt.async_support.bitvavo):
 
     async def fetch_currencies_ws(self, params={}):
         """
-        :see: https://docs.bitvavo.com/#tag/General/paths/~1assets/get
+
+        https://docs.bitvavo.com/#tag/General/paths/~1assets/get
+
         fetches all available currencies on an exchange
         :param dict [params]: extra parameters specific to the bitvavo api endpoint
         :returns dict: an associative dictionary of currencies
@@ -976,8 +1015,7 @@ class bitvavo(ccxt.async_support.bitvavo):
         #        ]
         #    }
         #
-        action = self.safe_string(message, 'action')
-        messageHash = self.build_message_hash(action, message)
+        messageHash = self.safe_string(message, 'requestId')
         response = self.safe_value(message, 'response')
         currencies = self.parse_currencies(response)
         client.resolve(currencies, messageHash)
@@ -995,15 +1033,16 @@ class bitvavo(ccxt.async_support.bitvavo):
         #        }
         #    }
         #
-        action = self.safe_string(message, 'action')
-        messageHash = self.build_message_hash(action, message)
+        messageHash = self.safe_string(message, 'requestId')
         response = self.safe_value(message, 'response')
         fees = self.parse_trading_fees(response)
         client.resolve(fees, messageHash)
 
     async def fetch_balance_ws(self, params={}) -> Balances:
         """
-        :see: https://docs.bitvavo.com/#tag/Account/paths/~1balance/get
+
+        https://docs.bitvavo.com/#tag/Account/paths/~1balance/get
+
         query for balance and get the amount of funds available for trading or funds locked in orders
         :param dict [params]: extra parameters specific to the bitvavo api endpoint
         :returns dict: a `balance structure <https://docs.ccxt.com/en/latest/manual.html?#balance-structure>`
@@ -1025,8 +1064,7 @@ class bitvavo(ccxt.async_support.bitvavo):
         #        ]
         #    }
         #
-        action = self.safe_string(message, 'action', 'privateGetBalance')
-        messageHash = self.build_message_hash(action, message)
+        messageHash = self.safe_string(message, 'requestId')
         response = self.safe_value(message, 'response', [])
         balance = self.parse_balance(response)
         client.resolve(balance, messageHash)
@@ -1060,10 +1098,9 @@ class bitvavo(ccxt.async_support.bitvavo):
         #        }
         #    }
         #
-        action = self.safe_string(message, 'action')
         response = self.safe_value(message, 'response', {})
         order = self.parse_order(response)
-        messageHash = self.build_message_hash(action, response)
+        messageHash = self.safe_string(message, 'requestId')
         client.resolve(order, messageHash)
 
     def handle_markets(self, client: Client, message):
@@ -1086,10 +1123,9 @@ class bitvavo(ccxt.async_support.bitvavo):
         #        ]
         #    }
         #
-        action = self.safe_string(message, 'action')
         response = self.safe_value(message, 'response', {})
         markets = self.parse_markets(response)
-        messageHash = self.build_message_hash(action, response)
+        messageHash = self.safe_string(message, 'requestId')
         client.resolve(markets, messageHash)
 
     def build_message_hash(self, action, params={}):
@@ -1106,15 +1142,6 @@ class bitvavo(ccxt.async_support.bitvavo):
             messageHash = method(action, params)
         return messageHash
 
-    def check_message_hash_does_not_exist(self, messageHash):
-        supressMultipleWsRequestsError = self.safe_bool(self.options, 'supressMultipleWsRequestsError', False)
-        if not supressMultipleWsRequestsError:
-            client = self.safe_value(self.clients, self.urls['api']['ws'])
-            if client is not None:
-                future = self.safe_value(client.futures, messageHash)
-                if future is not None:
-                    raise ExchangeError(self.id + ' a similar request with messageHash ' + messageHash + ' is already pending, you must wait for a response, or turn off self error by setting supressMultipleWsRequestsError in the options to True')
-
     def action_and_market_message_hash(self, action, params={}):
         symbol = self.safe_string(params, 'market', '')
         return action + symbol
@@ -1258,11 +1285,19 @@ class bitvavo(ccxt.async_support.bitvavo):
         #        errorCode: 217,
         #        error: 'Minimum order size in quote currency is 5 EUR or 0.001 BTC.'
         #    }
+        #    {
+        #        action: 'privateCreateOrder',
+        #        requestId: '17317539426571916',
+        #        market: 'USDT-EUR',
+        #        errorCode: 216,
+        #        error: 'You do not have sufficient balance to complete self operation.'
+        #    }
         #
         error = self.safe_string(message, 'error')
         code = self.safe_integer(error, 'errorCode')
         action = self.safe_string(message, 'action')
-        messageHash = self.build_message_hash(action, message)
+        buildMessage = self.build_message_hash(action, message)
+        messageHash = self.safe_string(message, 'requestId', buildMessage)
         rejected = False
         try:
             self.handle_errors(code, error, client.url, None, None, error, message, None, None)