Added ClientId and Counterparty to TradeHistory. (Counterparty is perp-only though.)
This commit is contained in:
parent
68a2aabcec
commit
6f04f92120
|
@ -48,7 +48,9 @@ class TradeHistory:
|
||||||
"SequenceNumber",
|
"SequenceNumber",
|
||||||
"FeeTier",
|
"FeeTier",
|
||||||
"MarketType",
|
"MarketType",
|
||||||
|
"Counterparty",
|
||||||
"OrderId",
|
"OrderId",
|
||||||
|
"ClientId",
|
||||||
]
|
]
|
||||||
|
|
||||||
__perp_column_name_mapper = {
|
__perp_column_name_mapper = {
|
||||||
|
@ -67,6 +69,7 @@ class TradeHistory:
|
||||||
"feeCost": "Fee",
|
"feeCost": "Fee",
|
||||||
"feeTier": "FeeTier",
|
"feeTier": "FeeTier",
|
||||||
"orderId": "OrderId",
|
"orderId": "OrderId",
|
||||||
|
"clientOrderId": "ClientId",
|
||||||
}
|
}
|
||||||
|
|
||||||
__decimal_spot_columns = [
|
__decimal_spot_columns = [
|
||||||
|
@ -94,6 +97,8 @@ class TradeHistory:
|
||||||
"takerOrderId",
|
"takerOrderId",
|
||||||
"price",
|
"price",
|
||||||
"quantity",
|
"quantity",
|
||||||
|
"makerClientOrderId",
|
||||||
|
"takerClientOrderId",
|
||||||
]
|
]
|
||||||
|
|
||||||
__column_converters = {
|
__column_converters = {
|
||||||
|
@ -186,7 +191,9 @@ class TradeHistory:
|
||||||
# "taker": <PUBLIC-KEY-STRING>,
|
# "taker": <PUBLIC-KEY-STRING>,
|
||||||
# "takerOrderId": <BIG-INT>,
|
# "takerOrderId": <BIG-INT>,
|
||||||
# "price": "50131.9",
|
# "price": "50131.9",
|
||||||
# "quantity": "0.019"
|
# "quantity": "0.019",
|
||||||
|
# "makerClientOrderId": "1646845270119",
|
||||||
|
# "takerClientOrderId": "1646845251729"
|
||||||
# },
|
# },
|
||||||
def __side_lookup(row: pandas.Series) -> str:
|
def __side_lookup(row: pandas.Series) -> str:
|
||||||
if row["MakerOrTaker"] == "taker":
|
if row["MakerOrTaker"] == "taker":
|
||||||
|
@ -241,6 +248,16 @@ class TradeHistory:
|
||||||
frame["makerOrderId"],
|
frame["makerOrderId"],
|
||||||
frame["takerOrderId"],
|
frame["takerOrderId"],
|
||||||
)
|
)
|
||||||
|
frame["ClientId"] = numpy.where(
|
||||||
|
frame["MakerOrTaker"] == "maker",
|
||||||
|
frame["makerClientOrderId"],
|
||||||
|
frame["takerClientOrderId"],
|
||||||
|
)
|
||||||
|
frame["Counterparty"] = numpy.where(
|
||||||
|
frame["MakerOrTaker"] == "maker",
|
||||||
|
frame["taker"],
|
||||||
|
frame["maker"],
|
||||||
|
)
|
||||||
|
|
||||||
return frame[TradeHistory.COLUMNS]
|
return frame[TradeHistory.COLUMNS]
|
||||||
|
|
||||||
|
@ -340,6 +357,7 @@ class TradeHistory:
|
||||||
+ frame["Fee"]
|
+ frame["Fee"]
|
||||||
)
|
)
|
||||||
frame["MarketType"] = "spot"
|
frame["MarketType"] = "spot"
|
||||||
|
frame["Counterparty"] = None
|
||||||
|
|
||||||
return frame[TradeHistory.COLUMNS]
|
return frame[TradeHistory.COLUMNS]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue