Version 0.1.9

Author: traderben

assets/images/coverage.svg

@@ -11,11 +11,13 @@
 Tif = Union[Literal["Alo"], Literal["Ioc"], Literal["Gtc"]]
 Tpsl = Union[Literal["tp"], Literal["sl"]]
 LimitOrderType = TypedDict("LimitOrderType", {"tif": Tif})
-TriggerOrderType = TypedDict("TriggerOrderType", {"triggerPx": int, "isMarket": bool, "tpsl": Tpsl})
+TriggerOrderType = TypedDict("TriggerOrderType", {"triggerPx": float, "isMarket": bool, "tpsl": Tpsl})
+TriggerOrderTypeWire = TypedDict("TriggerOrderTypeWire", {"triggerPx": str, "isMarket": bool, "tpsl": Tpsl})
 OrderType = TypedDict("OrderType", {"limit": LimitOrderType, "trigger": TriggerOrderType}, total=False)
+OrderTypeWire = TypedDict("OrderTypeWire", {"limit": LimitOrderType, "trigger": TriggerOrderTypeWire}, total=False)
 
 
-def order_type_to_tuple(order_type: OrderType) -> Tuple[int, int]:
+def order_type_to_tuple(order_type: OrderType) -> Tuple[int, float]:
     if "limit" in order_type:
         tif = order_type["limit"]["tif"]
         if tif == "Gtc":
@@ -69,10 +71,25 @@ def order_spec_preprocessing(order_spec: OrderSpec) -> Any:
 
 
 OrderWire = TypedDict(
-    "OrderWire", {"asset": int, "isBuy": bool, "limitPx": str, "sz": str, "reduceOnly": bool, "orderType": OrderType}
+    "OrderWire",
+    {"asset": int, "isBuy": bool, "limitPx": str, "sz": str, "reduceOnly": bool, "orderType": OrderTypeWire},
 )
 
 
+def order_type_to_wire(order_type: OrderType) -> OrderTypeWire:
+    if "limit" in order_type:
+        return {"limit": order_type["limit"]}
+    elif "trigger" in order_type:
+        return {
+            "trigger": {
+                "triggerPx": float_to_wire(order_type["trigger"]["triggerPx"]),
+                "tpsl": order_type["trigger"]["tpsl"],
+                "isMarket": order_type["trigger"]["isMarket"],
+            }
+        }
+    raise ValueError("Invalid order type", order_type)
+
+
 def order_spec_to_order_wire(order_spec: OrderSpec) -> OrderWire:
     order = order_spec["order"]
     return {
@@ -81,7 +98,7 @@ def order_spec_to_order_wire(order_spec: OrderSpec) -> OrderWire:
         "limitPx": float_to_wire(order["limitPx"]),
         "sz": float_to_wire(order["sz"]),
         "reduceOnly": order["reduceOnly"],
-        "orderType": order_spec["orderType"],
+        "orderType": order_type_to_wire(order_spec["orderType"]),
     }
 
 

hyperliquid/utils/signing.py

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "hyperliquid-python-sdk"
-version = "0.1.8"
+version = "0.1.9"
 description = "SDK for Hyperliquid API trading with Python."
 readme = "README.md"
 authors = ["Hyperliquid <[email protected]>"]

pyproject.toml

@@ -44,6 +44,33 @@ def test_l1_action_signing_matches():
     assert signature["v"] == 27
 
 
+def test_l1_action_signing_order_matches():
+    wallet = eth_account.Account.from_key("0x0123456789012345678901234567890123456789012345678901234567890123")
+    order_spec: OrderSpec = {
+        "order": {
+            "asset": 1,
+            "isBuy": True,
+            "reduceOnly": False,
+            "limitPx": 100,
+            "sz": 100,
+        },
+        "orderType": {"limit": {"tif": "Gtc"}},
+    }
+    timestamp = 0
+    grouping: Literal["na"] = "na"
+
+    signature = sign_l1_action(
+        wallet,
+        ["(uint32,bool,uint64,uint64,bool,uint8,uint64)[]", "uint8"],
+        [[order_spec_preprocessing(order_spec)], order_grouping_to_number(grouping)],
+        ZERO_ADDRESS,
+        timestamp,
+    )
+    assert signature["r"] == "0xc7249fd2e6483b2ab8fb0a80ac5201c4d36c8ed52bea5896012de499cdb78f4f"
+    assert signature["s"] == "0x235a525be1a3b3c5186a241763a47f4e1db463dbba64a3c4abad3696852cd6ff"
+    assert signature["v"] == 27
+
+
 def test_l1_action_signing_matches_with_vault():
     wallet = eth_account.Account.from_key("0x0123456789012345678901234567890123456789012345678901234567890123")
     signature = sign_l1_action(
@@ -54,6 +81,33 @@ def test_l1_action_signing_matches_with_vault():
     assert signature["v"] == 27
 
 
+def test_l1_action_signing_tpsl_order_matches():
+    wallet = eth_account.Account.from_key("0x0123456789012345678901234567890123456789012345678901234567890123")
+    order_spec: OrderSpec = {
+        "order": {
+            "asset": 1,
+            "isBuy": True,
+            "reduceOnly": False,
+            "limitPx": 100,
+            "sz": 100,
+        },
+        "orderType": {"trigger": {"triggerPx": 103, "isMarket": True, "tpsl": "sl"}},
+    }
+    timestamp = 0
+    grouping: Literal["na"] = "na"
+
+    signature = sign_l1_action(
+        wallet,
+        ["(uint32,bool,uint64,uint64,bool,uint8,uint64)[]", "uint8"],
+        [[order_spec_preprocessing(order_spec)], order_grouping_to_number(grouping)],
+        ZERO_ADDRESS,
+        timestamp,
+    )
+    assert signature["r"] == "0xac0669959d0031e822c0aac9569f256ed66adfc409ab0bc3349f3006b794daf"
+    assert signature["s"] == "0x25e31fba6a324b13f1b1960142b9af31bfc4cc73796ac988aef434d693f865ea"
+    assert signature["v"] == 28
+
+
 def test_float_to_int_for_hashing():
     assert float_to_int_for_hashing(123123123123) == 12312312312300000000
     assert float_to_int_for_hashing(0.00001231) == 1231