From 495b51a2f670670fe8ea4cca748622ae86afc036 Mon Sep 17 00:00:00 2001
From: Davide Casale <davi0kprogramsthings@gmail.com>
Date: Mon, 14 Nov 2022 17:41:09 +0100
Subject: [PATCH] Rewrite bfxapi/websocket/typings.py script adding new types
 and fixing some naming bug.

---
 bfxapi/websocket/typings.py | 263 ++++++++++++++++++++----------------
 1 file changed, 143 insertions(+), 120 deletions(-)

diff --git a/bfxapi/websocket/typings.py b/bfxapi/websocket/typings.py
index 8172da8..b215187 100644
--- a/bfxapi/websocket/typings.py
+++ b/bfxapi/websocket/typings.py
@@ -1,125 +1,148 @@
-from typing import Type, List, Dict, TypedDict, Union, Optional, Any
+from typing import Type, List, Dict, TypedDict, Union, Optional
 
-JSON = Union[Dict[str, Any], List[Any], int, str, float, bool, Type[None]]
+JSON = Union[Dict[str, "JSON"], List["JSON"], bool, int, float, str, Type[None]]
 
-BalanceUpdateStream = TypedDict("BalanceUpdateStream", {
+Order = TypedDict("Order", {
+    "ID": int,
+    "GID": int,
+    "CID": int,
+    "SYMBOL": str,
+    "MTS_CREATE": int,
+    "MTS_UPDATE": int,
+    "AMOUNT": float,
+    "AMOUNT_ORIG": float,
+    "ORDER_TYPE": str,
+    "TYPE_PREV": str,
+    "MTS_TIF": int,
+    "FLAGS": int,
+    "ORDER_STATUS": str,
+    "PRICE": float,
+    "PRICE_AVG": float,
+    "PRICE_TRAILING": float,
+    "PRICE_AUX_LIMIT": float,
+    "NOTIFY": int,
+    "HIDDEN": int,
+    "PLACED_ID": int,
+    "ROUTING": str,
+    "META": JSON
+})
+
+Orders = List[Order]
+
+Position = TypedDict("Position", {
+    "SYMBOL": str,
+    "STATUS": str,
+    "AMOUNT": float,
+    "BASE_PRICE": float,
+    "MARGIN_FUNDING": float,
+    "MARGIN_FUNDING_TYPE": int,
+    "PL": float,
+    "PL_PERC": float,
+    "PRICE_LIQ": float,
+    "LEVERAGE": float,
+    "POSITION_ID": int,
+    "MTS_CREATE": int,
+    "MTS_UPDATE": int,
+    "TYPE": int,
+    "COLLATERAL": float,
+    "COLLATERAL_MIN": float,
+    "META": JSON,
+})
+
+Positions = List[Position]
+
+Trade = TypedDict("Trade", {
+    "ID": int,
+    "CID": int,
+    "SYMBOL": str,
+    "MTS_CREATE": int,
+    "ORDER_ID": int,
+    "EXEC_AMOUNT": float,
+    "EXEC_PRICE": float,
+    "ORDER_TYPE": str,
+    "ORDER_PRICE": float,
+    "MAKER": int,
+    "FEE": float,
+    "FEE_CURRENCY": str
+})
+
+FundingOffer = TypedDict("FundingOffer", {
+    "ID": int,
+    "SYMBOL": str,
+    "MTS_CREATED": int,
+    "MTS_UPDATED": int,
+    "AMOUNT": float,
+    "AMOUNT_ORIG": float,
+    "OFFER_TYPE": str,
+    "FLAGS": int,
+    "STATUS": str,
+    "RATE": float,
+    "PERIOD": int,
+    "NOTIFY": int,
+    "HIDDEN": int,
+    "RENEW": int,
+})
+
+FundingOffers = List[FundingOffer]
+
+FundingCredit = TypedDict("FundingCredit", {
+    "ID": int,
+    "SYMBOL": str,
+    "SIDE": int,
+    "MTS_CREATE": int,
+    "MTS_UPDATE": int,
+    "AMOUNT": float,
+    "FLAGS": int,
+    "STATUS": str,
+    "RATE": float,
+    "PERIOD": int,
+    "MTS_OPENING": int,
+    "MTS_LAST_PAYOUT": int,
+    "NOTIFY": int,
+    "HIDDEN": int,
+    "RENEW": int,
+    "RATE_REAL": float,
+    "NO_CLOSE": int,
+    "POSITION_PAIR": str
+})
+
+FundingCredits = List[FundingCredit]
+
+FundingLoan = TypedDict("FundingLoan", {
+    "ID": int,
+    "SYMBOL": str,
+    "SIDE": int,
+    "MTS_CREATE": int,
+    "MTS_UPDATE": int,
+    "AMOUNT": float,
+    "FLAGS": int,
+    "STATUS": str,
+    "RATE": float,
+    "PERIOD": int,
+    "MTS_OPENING": int,
+    "MTS_LAST_PAYOUT": int,
+    "NOTIFY": int,
+    "HIDDEN": int,
+    "RENEW": int,
+    "RATE_REAL": float,
+    "NO_CLOSE": int
+})
+
+FundingLoans = List[FundingLoan]
+
+Wallet = TypedDict("Wallet", {
+    "WALLET_TYPE": str,
+    "CURRENCY": str,
+    "BALANCE": float,
+    "UNSETTLED_INTEREST": float,
+    "BALANCE_AVAILABLE": float,
+    "DESCRIPTION": str,
+    "META": JSON
+})
+
+Wallets = List[Wallet]
+
+BalanceInfo = TypedDict("BalanceInfo", {
     "AUM": float,
     "AUM_NET": float
-})
-
-WalletSnapshotStream = List[TypedDict("WalletSnapshotStream", {
-    "WALLET_TYPE": str,
-    "CURRENCY": str,
-    "BALANCE": float,
-    "UNSETTLED_INTEREST": float,
-    "BALANCE_AVAILABLE": Optional[float],
-    "DESCRIPTION": str,
-    "META": JSON
-})]
-
-WalletUpdateStream = TypedDict("WalletUpdateStream", {
-    "WALLET_TYPE": str,
-    "CURRENCY": str,
-    "BALANCE": float,
-    "UNSETTLED_INTEREST": float,
-    "BALANCE_AVAILABLE": Optional[float],
-    "DESCRIPTION": str,
-    "META": JSON
-})
-
-OrderSnapshotStream = List[TypedDict("OrderSnapshotStream", {
-    "ID": int, 
-    "GID": int, 
-    "CID": int, 
-    "SYMBOL": str, 
-    "MTS_CREATE": int, 
-    "MTS_UPDATE": int, 
-    "AMOUNT": float, 
-    "AMOUNT_ORIG": float, 
-    "ORDER_TYPE": str, 
-    "TYPE_PREV": str, 
-    "MTS_TIF": int, 
-    "FLAGS": int, 
-    "STATUS": str, 
-    "PRICE": float, 
-    "PRICE_AVG": float,
-    "PRICE_TRAILING": float, 
-    "PRICE_AUX_LIMIT": float, 
-    "NOTIFY": int,
-    "HIDDEN": int, 
-    "PLACED_ID": int, 
-    "ROUTING": str, 
-    "META": JSON
-})]
-
-NewOrderStream = TypedDict("NewOrderStream", {
-    "ID": int, 
-    "GID": int, 
-    "CID": int, 
-    "SYMBOL": str, 
-    "MTS_CREATE": int, 
-    "MTS_UPDATE": int, 
-    "AMOUNT": float, 
-    "AMOUNT_ORIG": float, 
-    "ORDER_TYPE": str, 
-    "TYPE_PREV": str, 
-    "MTS_TIF": int, 
-    "FLAGS": int, 
-    "ORDER_STATUS": str, 
-    "PRICE": float, 
-    "PRICE_AVG": float,
-    "PRICE_TRAILING": float, 
-    "PRICE_AUX_LIMIT": float, 
-    "NOTIFY": int,
-    "HIDDEN": int, 
-    "PLACED_ID": int, 
-    "ROUTING": str
-})
-
-OrderUpdateStream = TypedDict("OrderUpdateStream", {
-    "ID": int, 
-    "GID": int, 
-    "CID": int, 
-    "SYMBOL": str, 
-    "MTS_CREATE": int, 
-    "MTS_UPDATE": int, 
-    "AMOUNT": float, 
-    "AMOUNT_ORIG": float, 
-    "ORDER_TYPE": str, 
-    "TYPE_PREV": str, 
-    "MTS_TIF": int, 
-    "FLAGS": int, 
-    "ORDER_STATUS": str, 
-    "PRICE": float, 
-    "PRICE_AVG": float,
-    "PRICE_TRAILING": float, 
-    "PRICE_AUX_LIMIT": float, 
-    "NOTIFY": int,
-    "HIDDEN": int, 
-    "PLACED_ID": int, 
-    "ROUTING": str
-})
-
-OrderCancelStream = TypedDict("OrderCancelStream", {
-    "ID": int, 
-    "GID": int, 
-    "CID": int, 
-    "SYMBOL": str, 
-    "MTS_CREATE": int, 
-    "MTS_UPDATE": int, 
-    "AMOUNT": float, 
-    "AMOUNT_ORIG": float, 
-    "ORDER_TYPE": str, 
-    "TYPE_PREV": str, 
-    "MTS_TIF": int, 
-    "FLAGS": int, 
-    "ORDER_STATUS": str, 
-    "PRICE": float, 
-    "PRICE_AVG": float,
-    "PRICE_TRAILING": float, 
-    "PRICE_AUX_LIMIT": float, 
-    "NOTIFY": int,
-    "HIDDEN": int, 
-    "PLACED_ID": int, 
-    "ROUTING": str
 })
\ No newline at end of file