nado-protocol 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl

nado_protocol/contracts/types.py

@@ -122,6 +122,7 @@ class NadoExecuteType(StrEnum):
     """
 
     PLACE_ORDER = "place_order"
+    PLACE_ORDERS = "place_orders"
     CANCEL_ORDERS = "cancel_orders"
     CANCEL_PRODUCT_ORDERS = "cancel_product_orders"
     CANCEL_AND_PLACE = "cancel_and_place"

nado_protocol/engine_client/types/execute.py

@@ -1,4 +1,4 @@
-from typing import Optional, Type, Union
+from typing import Optional, Type, Union, Sequence
 from pydantic import validator
 from nado_protocol.contracts.types import NadoExecuteType
 from nado_protocol.engine_client.types.models import ResponseStatus
@@ -44,6 +44,21 @@ class PlaceOrderParams(SignatureParams):
     spot_leverage: Optional[bool]
 
 
+class PlaceOrdersParams(NadoBaseModel):
+    """
+    Class for defining the parameters needed to place multiple orders in a single request.
+
+    Attributes:
+        orders (list[PlaceOrderParams]): Array of orders to place.
+
+        stop_on_failure (Optional[bool]): If true, stops processing remaining orders when the first order fails.
+        Already successfully placed orders are NOT cancelled. Defaults to false.
+    """
+
+    orders: Sequence[PlaceOrderParams]
+    stop_on_failure: Optional[bool]
+
+
 class PlaceMarketOrderParams(SignatureParams):
     """
     Class for defining the parameters needed to place a market order.
@@ -215,6 +230,7 @@ class LinkSignerParams(BaseParamsSigned):
 
 ExecuteParams = Union[
     PlaceOrderParams,
+    PlaceOrdersParams,
     CancelOrdersParams,
     CancelProductOrdersParams,
     WithdrawCollateralParams,
@@ -244,7 +260,7 @@ class PlaceOrderRequest(NadoBaseModel):
         if v.order.nonce is None:
             raise ValueError("Missing order `nonce`")
         if v.signature is None:
-            raise ValueError("Missing `signature")
+            raise ValueError("Missing `signature`")
         if isinstance(v.order.sender, bytes):
             v.order.serialize_dict(["sender"], bytes32_to_hex)
         v.order.serialize_dict(
@@ -253,6 +269,34 @@ class PlaceOrderRequest(NadoBaseModel):
         return v
 
 
+class PlaceOrdersRequest(NadoBaseModel):
+    """
+    Parameters for a request to place multiple orders.
+
+    Attributes:
+        place_orders (PlaceOrdersParams): The parameters for the orders to be placed.
+
+    Methods:
+        serialize: Validates and serializes the order parameters.
+    """
+
+    place_orders: PlaceOrdersParams
+
+    @validator("place_orders")
+    def serialize(cls, v: PlaceOrdersParams) -> PlaceOrdersParams:
+        for order_params in v.orders:
+            if order_params.order.nonce is None:
+                raise ValueError("Missing order `nonce`")
+            if order_params.signature is None:
+                raise ValueError("Missing `signature`")
+            if isinstance(order_params.order.sender, bytes):
+                order_params.order.serialize_dict(["sender"], bytes32_to_hex)
+            order_params.order.serialize_dict(
+                ["nonce", "priceX18", "amount", "expiration", "appendix"], str
+            )
+        return v
+
+
 class TxRequest(NadoBaseModel):
     """
     Parameters for a transaction request.
@@ -511,6 +555,7 @@ class LinkSignerRequest(NadoBaseModel):
 
 ExecuteRequest = Union[
     PlaceOrderRequest,
+    PlaceOrdersRequest,
     CancelOrdersRequest,
     CancelProductOrdersRequest,
     CancelAndPlaceRequest,
@@ -530,6 +575,23 @@ class PlaceOrderResponse(NadoBaseModel):
     digest: str
 
 
+class PlaceOrdersItemResponse(NadoBaseModel):
+    """
+    Data model for a single order in place orders response.
+    """
+
+    digest: Optional[str]
+    error: Optional[str]
+
+
+class PlaceOrdersResponse(NadoBaseModel):
+    """
+    Data model for place orders response.
+    """
+
+    place_orders: list[PlaceOrdersItemResponse]
+
+
 class CancelOrdersResponse(NadoBaseModel):
     """
     Data model for cancelled orders response.
@@ -538,7 +600,9 @@ class CancelOrdersResponse(NadoBaseModel):
     cancelled_orders: list[OrderData]
 
 
-ExecuteResponseData = Union[PlaceOrderResponse, CancelOrdersResponse]
+ExecuteResponseData = Union[
+    PlaceOrderResponse, PlaceOrdersResponse, CancelOrdersResponse
+]
 
 
 class ExecuteResponse(NadoBaseModel):
@@ -585,6 +649,7 @@ def to_execute_request(params: ExecuteParams) -> ExecuteRequest:
     """
     execute_request_mapping = {
         PlaceOrderParams: (PlaceOrderRequest, NadoExecuteType.PLACE_ORDER.value),
+        PlaceOrdersParams: (PlaceOrdersRequest, NadoExecuteType.PLACE_ORDERS.value),
         CancelOrdersParams: (
             CancelOrdersRequest,
             NadoExecuteType.CANCEL_ORDERS.value,

nado_protocol/indexer_client/types/query.py

@@ -54,6 +54,7 @@ class IndexerQueryType(StrEnum):
     TOKEN_MERKLE_PROOFS = "token_merkle_proofs"
     FOUNDATION_REWARDS_MERKLE_PROOFS = "foundation_rewards_merkle_proofs"
     INTEREST_AND_FUNDING = "interest_and_funding"
+    INK_AIRDROP = "ink_airdrop"
 
 
 class IndexerBaseParams(NadoBaseModel):
@@ -71,10 +72,10 @@ class IndexerBaseParams(NadoBaseModel):
 
 class IndexerSubaccountHistoricalOrdersParams(IndexerBaseParams):
     """
-    Parameters for querying historical orders by subaccount.
+    Parameters for querying historical orders by subaccounts.
     """
 
-    subaccount: str
+    subaccounts: Optional[list[str]]
     product_ids: Optional[list[int]]
     trigger_types: Optional[list[str]]
     isolated: Optional[bool]
@@ -93,7 +94,7 @@ class IndexerMatchesParams(IndexerBaseParams):
     Parameters for querying matches.
     """
 
-    subaccount: Optional[str]
+    subaccounts: Optional[list[str]]
     product_ids: Optional[list[int]]
     isolated: Optional[bool]
 
@@ -122,7 +123,7 @@ class IndexerEventsParams(IndexerBaseParams):
     Parameters for querying events.
     """
 
-    subaccount: Optional[str]
+    subaccounts: Optional[list[str]]
     product_ids: Optional[list[int]]
     event_types: Optional[list[IndexerEventType]]
     isolated: Optional[bool]
@@ -304,6 +305,14 @@ class IndexerAccountSnapshotsParams(NadoBaseModel):
     active: Optional[bool] = None
 
 
+class IndexerInkAirdropParams(NadoBaseModel):
+    """
+    Parameters for querying Ink airdrop allocation.
+    """
+
+    address: str
+
+
 IndexerParams = Union[
     IndexerSubaccountHistoricalOrdersParams,
     IndexerHistoricalOrdersByDigestParams,
@@ -327,6 +336,7 @@ IndexerParams = Union[
     IndexerFoundationRewardsMerkleProofsParams,
     IndexerInterestAndFundingParams,
     IndexerAccountSnapshotsParams,
+    IndexerInkAirdropParams,
 ]
 
 
@@ -508,6 +518,14 @@ class IndexerAccountSnapshotsRequest(NadoBaseModel):
     account_snapshots: IndexerAccountSnapshotsParams
 
 
+class IndexerInkAirdropRequest(NadoBaseModel):
+    """
+    Request object for querying Ink airdrop allocation.
+    """
+
+    ink_airdrop: IndexerInkAirdropParams
+
+
 IndexerRequest = Union[
     IndexerHistoricalOrdersRequest,
     IndexerMatchesRequest,
@@ -530,6 +548,7 @@ IndexerRequest = Union[
     IndexerFoundationRewardsMerkleProofsRequest,
     IndexerInterestAndFundingRequest,
     IndexerAccountSnapshotsRequest,
+    IndexerInkAirdropRequest,
 ]
 
 
@@ -711,6 +730,14 @@ class IndexerAccountSnapshotsData(NadoBaseModel):
     snapshots: Dict[str, Dict[str, list[IndexerEvent]]]
 
 
+class IndexerInkAirdropData(NadoBaseModel):
+    """
+    Data object for Ink airdrop allocation.
+    """
+
+    amount: str
+
+
 IndexerResponseData = Union[
     IndexerHistoricalOrdersData,
     IndexerMatchesData,
@@ -733,6 +760,7 @@ IndexerResponseData = Union[
     IndexerLiquidationFeedData,
     IndexerFundingRatesData,
     IndexerAccountSnapshotsData,
+    IndexerInkAirdropData,
 ]
 
 
@@ -844,6 +872,10 @@ def to_indexer_request(params: IndexerParams) -> IndexerRequest:
             IndexerAccountSnapshotsRequest,
             IndexerQueryType.ACCOUNT_SNAPSHOTS.value,
         ),
+        IndexerInkAirdropParams: (
+            IndexerInkAirdropRequest,
+            IndexerQueryType.INK_AIRDROP.value,
+        ),
     }
 
     RequestClass, field_name = indexer_request_mapping[type(params)]

nado_protocol/trigger_client/types/execute.py

@@ -1,10 +1,11 @@
-from typing import Union
+from typing import Union, Sequence
 from pydantic import validator
 from nado_protocol.contracts.types import NadoExecuteType
 from nado_protocol.utils.bytes32 import bytes32_to_hex
 from nado_protocol.utils.model import NadoBaseModel
 from nado_protocol.engine_client.types.execute import (
     PlaceOrderParams,
+    PlaceOrdersParams,
     CancelOrdersParams,
     CancelProductOrdersParams,
     CancelOrdersRequest,
@@ -17,11 +18,28 @@ class PlaceTriggerOrderParams(PlaceOrderParams):
     trigger: TriggerCriteria
 
 
+class PlaceTriggerOrdersParams(PlaceOrdersParams):
+    """
+    Class for defining the parameters needed to place multiple trigger orders in a single request.
+
+    Attributes:
+        orders (list[PlaceTriggerOrderParams]): Array of trigger orders to place.
+
+        stop_on_failure (Optional[bool]): If true, stops processing remaining orders when the first order fails.
+        Already successfully placed orders are NOT cancelled. Defaults to false.
+    """
+
+    orders: Sequence[PlaceTriggerOrderParams]
+
+
 CancelTriggerOrdersParams = CancelOrdersParams
 CancelProductTriggerOrdersParams = CancelProductOrdersParams
 
 TriggerExecuteParams = Union[
-    PlaceTriggerOrderParams, CancelTriggerOrdersParams, CancelProductTriggerOrdersParams
+    PlaceTriggerOrderParams,
+    PlaceTriggerOrdersParams,
+    CancelTriggerOrdersParams,
+    CancelProductTriggerOrdersParams,
 ]
 
 
@@ -43,7 +61,7 @@ class PlaceTriggerOrderRequest(NadoBaseModel):
         if v.order.nonce is None:
             raise ValueError("Missing order `nonce`")
         if v.signature is None:
-            raise ValueError("Missing `signature")
+            raise ValueError("Missing `signature`")
         if isinstance(v.order.sender, bytes):
             v.order.serialize_dict(["sender"], bytes32_to_hex)
         v.order.serialize_dict(
@@ -52,11 +70,40 @@ class PlaceTriggerOrderRequest(NadoBaseModel):
         return v
 
 
+class PlaceTriggerOrdersRequest(NadoBaseModel):
+    """
+    Parameters for a request to place multiple trigger orders.
+
+    Attributes:
+        place_orders (PlaceTriggerOrdersParams): The parameters for the trigger orders to be placed.
+
+    Methods:
+        serialize: Validates and serializes the order parameters.
+    """
+
+    place_orders: PlaceTriggerOrdersParams
+
+    @validator("place_orders")
+    def serialize(cls, v: PlaceTriggerOrdersParams) -> PlaceTriggerOrdersParams:
+        for order_params in v.orders:
+            if order_params.order.nonce is None:
+                raise ValueError("Missing order `nonce`")
+            if order_params.signature is None:
+                raise ValueError("Missing `signature`")
+            if isinstance(order_params.order.sender, bytes):
+                order_params.order.serialize_dict(["sender"], bytes32_to_hex)
+            order_params.order.serialize_dict(
+                ["nonce", "priceX18", "amount", "expiration", "appendix"], str
+            )
+        return v
+
+
 CancelTriggerOrdersRequest = CancelOrdersRequest
 CancelProductTriggerOrdersRequest = CancelProductOrdersRequest
 
 TriggerExecuteRequest = Union[
     PlaceTriggerOrderRequest,
+    PlaceTriggerOrdersRequest,
     CancelTriggerOrdersRequest,
     CancelProductTriggerOrdersRequest,
 ]
@@ -77,6 +124,10 @@ def to_trigger_execute_request(params: TriggerExecuteParams) -> TriggerExecuteRe
             PlaceTriggerOrderRequest,
             NadoExecuteType.PLACE_ORDER.value,
         ),
+        PlaceTriggerOrdersParams: (
+            PlaceTriggerOrdersRequest,
+            NadoExecuteType.PLACE_ORDERS.value,
+        ),
         CancelTriggerOrdersParams: (
             CancelTriggerOrdersRequest,
             NadoExecuteType.CANCEL_ORDERS.value,

{nado_protocol-0.2.3.dist-info → nado_protocol-0.2.4.dist-info}/METADATA

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

{nado_protocol-0.2.3.dist-info → nado_protocol-0.2.4.dist-info}/RECORD

@@ -37,12 +37,12 @@ nado_protocol/contracts/eip712/domain.py,sha256=dZ5aKq2Y45-vzZUMQLuUTbFhH9-R-YEg
 nado_protocol/contracts/eip712/sign.py,sha256=WeipHcWaEP_vnmXpRH7_Ksm9uKDH2E4IkYYRI0_p2cY,2410
 nado_protocol/contracts/eip712/types.py,sha256=uTfYD9hjoTozsUL2WTc_-2OREijbfv9FDBYuD1UjVHo,5117
 nado_protocol/contracts/loader.py,sha256=_0W3ImcARs1bTu1lLMpHMrRNuEVYjrRWctvnEbKWoVg,1500
-nado_protocol/contracts/types.py,sha256=GXzqSfbbTZQPw4jalEZR1oE_klI0zVZKRwXVzuRSq4M,4192
+nado_protocol/contracts/types.py,sha256=909nB0crmWzM6-q0rWLFoxIvRIM2RKTXqaZwVUPp0Hs,4226
 nado_protocol/engine_client/__init__.py,sha256=RE_MxQaQVIp0K5EDhR1_uTjLJgEJBx2fLnhepc3cuAg,1137
 nado_protocol/engine_client/execute.py,sha256=Tmd1yvLTlvFFaSYqwOWTkzSxdE6QllGB8LHgsOim3Tc,15314
 nado_protocol/engine_client/query.py,sha256=zCBLeBOY1wkRM42EMsluBRtVw2TuaqJHp4UuIdHWh4c,16265
 nado_protocol/engine_client/types/__init__.py,sha256=pPjKLDJHclcbqROhU8B8OoxUjZkJI9a2qq5fUCVK7j4,2721
-nado_protocol/engine_client/types/execute.py,sha256=prlArTgTCGmnw1JozRP3Sa50brfXwTkTKt6v_n3bwv8,18731
+nado_protocol/engine_client/types/execute.py,sha256=ANF_QwtJAqb9zvga1fjOIiSDt_wjUo4sbf8rVkc-sQ0,20709
 nado_protocol/engine_client/types/models.py,sha256=hf9HD8rct2XZIqPznfydBq7jqKiJ3vcdrL44GCjtnGQ,3873
 nado_protocol/engine_client/types/query.py,sha256=N6kPuWSUowMeZnUKpxF9NnMKZBKKe-0Q_B9ccFZkjQA,12185
 nado_protocol/engine_client/types/stream.py,sha256=F_AKqU4pClzUcM6D9Dc79f6RmraahJzj2-hQSXtQ0vQ,159
@@ -50,12 +50,12 @@ nado_protocol/indexer_client/__init__.py,sha256=ea2exePtguCxJsBlisOQPtnFk8hRmFug
 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=vD1YHHeK15hcU5_O4al7001Fi-gTl6EARMuR-Y8stOc,7533
-nado_protocol/indexer_client/types/query.py,sha256=JlI2TXjezTSgvaP8zzb3bO9GADzeQkay1CScO954RAw,19857
+nado_protocol/indexer_client/types/query.py,sha256=FCIIUv049AoBtB5VEolwgX51wycCIjyw4Qq__z0TodY,20559
 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
 nado_protocol/trigger_client/types/__init__.py,sha256=Rj953ymGSNnVdOpDrwRuXmC_jhuPZU17BaSgBrc9cbk,183
-nado_protocol/trigger_client/types/execute.py,sha256=Ij_gCl3ZzhouWF7JxEY_U6hUbe9teOYp1ZfN0PDcOpM,2896
+nado_protocol/trigger_client/types/execute.py,sha256=y1rxiFy3I7V3BHLKL8wQFDCwmf78AKuf8wB_1K8HlbU,4671
 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=heFEgVHHce8nAqQcmEMR69aZ8aaJAYXukJ2-W_KTFwY,1446
@@ -75,7 +75,7 @@ nado_protocol/utils/order.py,sha256=Q9TlcotvnB395dPhaKpn0EeN1WNTkpYBTUovlirr1_Y,
 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.2.3.dist-info/METADATA,sha256=TEC9RaYoErFM0JiLMpPxdB5Be5IU1d6NJcQaAyHBwY4,9558
-nado_protocol-0.2.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-nado_protocol-0.2.3.dist-info/entry_points.txt,sha256=Df0O9lFc-m0SyOh6_d9FHeG1OT-esxGm-p_z7rTT9h0,340
-nado_protocol-0.2.3.dist-info/RECORD,,
+nado_protocol-0.2.4.dist-info/METADATA,sha256=O5j6sC9-pHy9D4NmSG2XBAyg68rvgRgq97OE9YKThmA,9558
+nado_protocol-0.2.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+nado_protocol-0.2.4.dist-info/entry_points.txt,sha256=Df0O9lFc-m0SyOh6_d9FHeG1OT-esxGm-p_z7rTT9h0,340
+nado_protocol-0.2.4.dist-info/RECORD,,