nado-protocol 0.1.6__py3-none-any.whl → 0.2.0__py3-none-any.whl

nado_protocol/utils/math.py

@@ -17,6 +17,19 @@ def to_pow_10(x: int, pow: int) -> int:
     return x * 10**pow
 
 
+def to_x6(x: float) -> int:
+    """
+    Converts a float to a fixed point of 1e6.
+
+    Args:
+        x (float): Float value to convert.
+
+    Returns:
+        int: Fixed point value represented as an integer.
+    """
+    return int(Decimal(str(x)) * Decimal(10**6))
+
+
 def to_x18(x: float) -> int:
     """
     Converts a float to a fixed point of 1e18.
@@ -45,6 +58,19 @@ def from_pow_10(x: int, pow: int) -> float:
     return float(x) / 10**pow
 
 
+def from_x6(x: int) -> float:
+    """
+    Reverts integer from power of 10^6 format.
+
+    Args:
+        x (int): Converted value.
+
+    Returns:
+        float: Original value.
+    """
+    return from_pow_10(x, 6)
+
+
 def from_x18(x: int) -> float:
     """
     Reverts integer from power of 10^18 format.

nado_protocol/utils/order.py

@@ -4,13 +4,13 @@ from nado_protocol.utils.expiration import OrderType
 
 
 # Order appendix version
-APPENDIX_VERSION = 0
+APPENDIX_VERSION = 1
 
 
 class AppendixBitFields:
     # | value   | reserved | trigger | reduce only | order type| isolated | version |
-    # | 96 bits | 18 bits  | 2 bits  | 1 bit       | 2 bits    | 1 bit    | 8 bits  |
-    # | 127..32 | 31..14   | 13..12  | 11          | 10..9     | 8        | 7..0    |
+    # | 64 bits | 50 bits  | 2 bits  | 1 bit       | 2 bits    | 1 bit    | 8 bits  |
+    # | 127..64 | 63..14   | 13..12  | 11          | 10..9     | 8        | 7..0    |
 
     # Bit positions (from LSB to MSB)
     VERSION_BITS = 8  # bits 7..0
@@ -18,8 +18,8 @@ class AppendixBitFields:
     ORDER_TYPE_BITS = 2  # bits 10..9
     REDUCE_ONLY_BITS = 1  # bit 11
     TRIGGER_TYPE_BITS = 2  # bits 13..12
-    RESERVED_BITS = 18  # bits 31..14
-    VALUE_BITS = 96  # bits 127..32 (for isolated margin or TWAP data)
+    RESERVED_BITS = 50  # bits 63..14
+    VALUE_BITS = 64  # bits 127..64 (for isolated margin or TWAP data)
 
     # Bit masks
     VERSION_MASK = (1 << VERSION_BITS) - 1
@@ -37,7 +37,7 @@ class AppendixBitFields:
     REDUCE_ONLY_SHIFT = 11
     TRIGGER_TYPE_SHIFT = 12
     RESERVED_SHIFT = 14
-    VALUE_SHIFT = 32
+    VALUE_SHIFT = 64
 
 
 class OrderAppendixTriggerType(IntEnum):
@@ -51,22 +51,19 @@ class OrderAppendixTriggerType(IntEnum):
 
 
 class TWAPBitFields:
-    """Bit field definitions for TWAP value packing within the 96-bit value field."""
+    """Bit field definitions for TWAP value packing within the 64-bit value field."""
 
-    # Bit layout (MSB → LSB): | times (32 bits) | slippage_x6 (32 bits) | reserved (32 bits) |
+    # Bit layout (MSB → LSB): | times (32 bits) | slippage_x6 (32 bits) |
     TIMES_BITS = 32
     SLIPPAGE_BITS = 32
-    RESERVED_BITS = 32
 
     # Bit masks
     TIMES_MASK = (1 << TIMES_BITS) - 1
     SLIPPAGE_MASK = (1 << SLIPPAGE_BITS) - 1
-    RESERVED_MASK = (1 << RESERVED_BITS) - 1
 
-    # Bit shift positions (within the 96-bit value field)
-    RESERVED_SHIFT = 0
-    SLIPPAGE_SHIFT = 32
-    TIMES_SHIFT = 64
+    # Bit shift positions (within the 64-bit value field)
+    SLIPPAGE_SHIFT = 0
+    TIMES_SHIFT = 32
 
     # Slippage scaling factor (6 decimal places)
     SLIPPAGE_SCALE = 1_000_000
@@ -74,30 +71,27 @@ class TWAPBitFields:
 
 def pack_twap_appendix_value(times: int, slippage_frac: float) -> int:
     """
-    Packs TWAP order fields into a 96-bit integer for the appendix.
+    Packs TWAP order fields into a 64-bit integer for the appendix.
 
     Bit layout (MSB → LSB):
-    |   times   | slippage_x6 | reserved |
-    |-----------|-------------|----------|
-    | 95..64    | 63..32      | 31..0    |
-    | 32 bits   | 32 bits     | 32 bits  |
+    |   times   | slippage_x6 |
+    |-----------|-------------|
+    | 63..32    | 31..0       |
+    | 32 bits   | 32 bits     |
     """
     slippage_x6 = int(slippage_frac * TWAPBitFields.SLIPPAGE_SCALE)
-    reserved = 0  # reserved 32-bit field (currently unused)
 
-    return (
-        ((times & TWAPBitFields.TIMES_MASK) << TWAPBitFields.TIMES_SHIFT)
-        | ((slippage_x6 & TWAPBitFields.SLIPPAGE_MASK) << TWAPBitFields.SLIPPAGE_SHIFT)
-        | ((reserved & TWAPBitFields.RESERVED_MASK) << TWAPBitFields.RESERVED_SHIFT)
+    return ((times & TWAPBitFields.TIMES_MASK) << TWAPBitFields.TIMES_SHIFT) | (
+        (slippage_x6 & TWAPBitFields.SLIPPAGE_MASK) << TWAPBitFields.SLIPPAGE_SHIFT
     )
 
 
 def unpack_twap_appendix_value(value: int) -> tuple[int, float]:
     """
-    Unpacks a 96-bit integer into TWAP order fields.
+    Unpacks a 64-bit integer into TWAP order fields.
 
     Args:
-        value (int): The 96-bit value to unpack.
+        value (int): The 64-bit value to unpack.
 
     Returns:
         tuple[int, float]: Number of TWAP executions and slippage fraction.
@@ -185,9 +179,9 @@ def build_appendix(
         trigger_value & AppendixBitFields.TRIGGER_TYPE_MASK
     ) << AppendixBitFields.TRIGGER_TYPE_SHIFT
 
-    # Handle upper bits (127..32) based on order type
+    # Handle upper bits (127..64) based on order type
     if isolated and isolated_margin is not None:
-        # Isolated margin (bits 127..32)
+        # Isolated margin (bits 127..64)
         appendix |= (
             isolated_margin & AppendixBitFields.VALUE_MASK
         ) << AppendixBitFields.VALUE_SHIFT
@@ -195,7 +189,7 @@ def build_appendix(
         OrderAppendixTriggerType.TWAP,
         OrderAppendixTriggerType.TWAP_CUSTOM_AMOUNTS,
     ]:
-        # TWAP value (bits 127..32) - 96 bits
+        # TWAP value (bits 127..64) - 64 bits
         # These are guaranteed to be non-None due to validation above
         assert twap_times is not None
         assert twap_slippage_frac is not None

{nado_protocol-0.1.6.dist-info → nado_protocol-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nado-protocol
-Version: 0.1.6
+Version: 0.2.0
 Summary: Nado Protocol SDK
 Keywords: nado protocol,nado sdk,nado protocol api
 Author: Jeury Mejia

{nado_protocol-0.1.6.dist-info → nado_protocol-0.2.0.dist-info}/RECORD

@@ -47,10 +47,10 @@ nado_protocol/engine_client/types/models.py,sha256=hf9HD8rct2XZIqPznfydBq7jqKiJ3
 nado_protocol/engine_client/types/query.py,sha256=N6kPuWSUowMeZnUKpxF9NnMKZBKKe-0Q_B9ccFZkjQA,12185
 nado_protocol/engine_client/types/stream.py,sha256=F_AKqU4pClzUcM6D9Dc79f6RmraahJzj2-hQSXtQ0vQ,159
 nado_protocol/indexer_client/__init__.py,sha256=ea2exePtguCxJsBlisOQPtnFk8hRmFugeQAuSAaPhoc,922
-nado_protocol/indexer_client/query.py,sha256=onhEAoKtBIB_fPJcNLKJg8PnEiQ5qLtTGDwHRryLXhE,16124
+nado_protocol/indexer_client/query.py,sha256=Tm4IYmU0T_9ayFTce8SMRPi_NN8QgyHDr4rFC3h7hSw,17102
 nado_protocol/indexer_client/types/__init__.py,sha256=r3-jxMjrFNbA1nMRSGZjsE3qypmyWab6k20_gasdwL4,3548
-nado_protocol/indexer_client/types/models.py,sha256=sh65JwaOeV8r2lENaVHopnoyP3-9VeqUa0qF4k84Tes,7527
-nado_protocol/indexer_client/types/query.py,sha256=WX7CzVzh239wbv4tQdPBKVal5wH6JPOEN0Bd_DPvzdI,18939
+nado_protocol/indexer_client/types/models.py,sha256=vD1YHHeK15hcU5_O4al7001Fi-gTl6EARMuR-Y8stOc,7533
+nado_protocol/indexer_client/types/query.py,sha256=JlI2TXjezTSgvaP8zzb3bO9GADzeQkay1CScO954RAw,19857
 nado_protocol/trigger_client/__init__.py,sha256=kD_WJWGOCDwX7GvGF5VGZibWR2uPYRcWpIWht31PYR4,545
 nado_protocol/trigger_client/execute.py,sha256=VkVla3SF6MX-ZJC_wZG72em41MPAKX-jv1_Lh4ydezU,15089
 nado_protocol/trigger_client/query.py,sha256=7M7opYEddNo0Wf9VQ7rha-WaoFQVv5F5OI-YLSRWrpk,2705
@@ -58,22 +58,24 @@ nado_protocol/trigger_client/types/__init__.py,sha256=Rj953ymGSNnVdOpDrwRuXmC_jh
 nado_protocol/trigger_client/types/execute.py,sha256=Ij_gCl3ZzhouWF7JxEY_U6hUbe9teOYp1ZfN0PDcOpM,2896
 nado_protocol/trigger_client/types/models.py,sha256=ZVDF3MFWoR39JBaTmSOTl1WnRnw46hjX-WN_a-g6zKk,1638
 nado_protocol/trigger_client/types/query.py,sha256=O6qhFLL2IREHc_mf-jFMyuVSzH1RuwjM-8noolLmEaQ,5288
-nado_protocol/utils/__init__.py,sha256=_nsvXmdiO3YmjSk7UG7df9qDoC8bd1H8_Au0lF-TwTA,1418
+nado_protocol/utils/__init__.py,sha256=heFEgVHHce8nAqQcmEMR69aZ8aaJAYXukJ2-W_KTFwY,1446
 nado_protocol/utils/backend.py,sha256=UqmHN_jmTAOnRiUQcUTZUyTGeM7FwjauwSH5h8UxiLQ,3781
+nado_protocol/utils/balance.py,sha256=Pf6tdcxZSn2Ou8M3XJnBIhsMB85-E7VkZDUIaMuEIbg,7435
 nado_protocol/utils/bytes32.py,sha256=FHeHs9Sf-S7GdFTF6ikuz_sEkM-fpRW-g3kbZawlMd4,5299
 nado_protocol/utils/enum.py,sha256=_Ij7Ai1H_Bj0OPBjmLhGvQjATXYyqD0DLqpUC-br99s,99
 nado_protocol/utils/exceptions.py,sha256=j5U-7JEQRnMTe_nFOrF2x-9kaYKgTrPBG9XkwXVm0cI,1644
 nado_protocol/utils/execute.py,sha256=zK3j2oTzFQlm-075thB_53iePjXpBnKF02RMEAqzl8I,11794
 nado_protocol/utils/expiration.py,sha256=8g0KI8v-Vnoj8rr-8ik3RxmGp9fXdiVbCVGof_2CDm4,532
 nado_protocol/utils/interest.py,sha256=pl5N2s7sux9Z0orPthdmFkldljIPwFTpLx1XC9k1oQk,2498
-nado_protocol/utils/math.py,sha256=hGbClWHRY5D0fIo5tHyT3_riWvf8WfsXJtqMs8pIQTs,1290
+nado_protocol/utils/margin_manager.py,sha256=9U7gfLzhUUKwsHD3z1BahMAPNpMzYQNKkcQvpZ3IPo0,31767
+nado_protocol/utils/math.py,sha256=TyuMb9ZpwfjLh5fMrNnr_QQWSl3bVZnjODglcxT_XTI,1771
 nado_protocol/utils/model.py,sha256=feU7cp0mSgNp-Z0dmC6VSFA6Mkjv3rNfoXdqsoZ7uGU,2087
 nado_protocol/utils/nonce.py,sha256=DHNn5mzXdJRope8QLcDCMFe7Bk4PXLoR9VaFopfse7I,886
-nado_protocol/utils/order.py,sha256=7Tul8pxg1Soxj9tI3HEgZV4bz-bW_b3CGARJKqu3_NM,11251
+nado_protocol/utils/order.py,sha256=Q9TlcotvnB395dPhaKpn0EeN1WNTkpYBTUovlirr1_Y,10938
 nado_protocol/utils/subaccount.py,sha256=WJ7lgU2RekuzJAZH-hhCTbIBlRsl2oHozBm7OEMRV74,495
 nado_protocol/utils/time.py,sha256=tEwmrkc5VdzKLlgkJIAq2ce-nhrduJZNtVPydrrnTHs,360
 nado_protocol/utils/twap.py,sha256=hfBVK0CBa8m4uBArxTnNRoJr3o1rJucyopR_8_9gkOo,6197
-nado_protocol-0.1.6.dist-info/METADATA,sha256=-6aOZgk4baWDEyXErPbGPBxBareZZ6X571RiZBuA9i0,9558
-nado_protocol-0.1.6.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-nado_protocol-0.1.6.dist-info/entry_points.txt,sha256=7xMbwQYtf2zfvzWdBaw5d5hp5TTv5Xia5WPsqxkvKuU,300
-nado_protocol-0.1.6.dist-info/RECORD,,
+nado_protocol-0.2.0.dist-info/METADATA,sha256=wb87CI4zUkoaBhltwTo3WmXEWvCpPxEp5iRuYFrkKgw,9558
+nado_protocol-0.2.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+nado_protocol-0.2.0.dist-info/entry_points.txt,sha256=Df0O9lFc-m0SyOh6_d9FHeG1OT-esxGm-p_z7rTT9h0,340
+nado_protocol-0.2.0.dist-info/RECORD,,

{nado_protocol-0.1.6.dist-info → nado_protocol-0.2.0.dist-info}/entry_points.txt

@@ -3,6 +3,7 @@ client-sanity=sanity.nado_client:run
 contracts-sanity=sanity.contracts:run
 engine-sanity=sanity.engine_client:run
 indexer-sanity=sanity.indexer_client:run
+margin-sanity=sanity.margin_manager:run
 rewards-sanity=sanity.rewards:run
 signing-sanity=sanity.signing:run
 test=pytest:main