nado-protocol 0.2.6__py3-none-any.whl → 0.2.8__py3-none-any.whl

nado_protocol/client/apis/rewards/execute.py

@@ -78,54 +78,15 @@ class RewardsExecuteAPI(NadoBaseAPI):
     def _get_claim_tokens_contract_params(
         self, params: ClaimTokensParams, signer: LocalAccount
     ) -> ClaimTokensContractParams:
-        epoch_merkle_proofs = self.context.indexer_client.get_token_merkle_proofs(
-            signer.address
-        ).merkle_proofs[params.epoch]
-        total_claimable_amount = int(epoch_merkle_proofs.total_amount)
-        if params.amount is not None:
-            amount_to_claim = params.amount
-        else:
-            assert self.context.contracts.airdrop is not None
-            amount_claimed = self.context.contracts.airdrop.functions.getClaimed(
-                signer.address
-            ).call()
-            amount_to_claim = total_claimable_amount - amount_claimed[params.epoch]
-        return ClaimTokensContractParams(
-            epoch=params.epoch,
-            amount_to_claim=amount_to_claim,
-            total_claimable_amount=total_claimable_amount,
-            merkle_proof=epoch_merkle_proofs.proof,
+        raise NotImplementedError(
+            "Token merkle proofs endpoint has been removed from the indexer. "
+            "This functionality is no longer available."
         )
 
     def _get_claim_foundation_rewards_contract_params(
         self, signer: LocalAccount
     ) -> ClaimFoundationRewardsContractParams:
-        assert self.context.contracts.foundation_rewards_airdrop is not None
-        claimed = (
-            self.context.contracts.foundation_rewards_airdrop.functions.getClaimed(
-                signer.address
-            ).call()
+        raise NotImplementedError(
+            "Foundation rewards merkle proofs endpoint has been removed from the indexer. "
+            "This functionality is no longer available."
         )
-        merkle_proofs = (
-            self.context.indexer_client.get_foundation_rewards_merkle_proofs(
-                signer.address
-            )
-        )
-        claim_proofs = []
-
-        for idx, proof in enumerate(merkle_proofs.merkle_proofs):
-            if idx == 0:
-                # week 0 is invalid
-                continue
-
-            total_amount = int(proof.total_amount)
-
-            # There's no partial claim, so find weeks where there's a claimable amount and amt claimed is zero
-            if total_amount > 0 and int(claimed[idx]) == 0:
-                claim_proofs.append(
-                    ClaimFoundationRewardsProofStruct(
-                        totalAmount=total_amount, week=idx, proof=proof.proof
-                    )
-                )
-
-        return ClaimFoundationRewardsContractParams(claim_proofs=claim_proofs)

nado_protocol/client/apis/subaccount/query.py

@@ -7,10 +7,8 @@ from nado_protocol.engine_client.types.query import (
 )
 from nado_protocol.indexer_client.types.query import (
     IndexerLinkedSignerRateLimitData,
-    IndexerReferralCodeData,
     IndexerSubaccountsData,
     IndexerSubaccountsParams,
-    IndexerTokenRewardsData,
     IndexerInterestAndFundingParams,
     IndexerInterestAndFundingData,
 )
@@ -57,18 +55,6 @@ class SubaccountQueryAPI(NadoBaseAPI):
         """
         return self.context.engine_client.get_fee_rates(subaccount)
 
-    def get_subaccount_token_rewards(self, address: str) -> IndexerTokenRewardsData:
-        """
-        Query the token rewards accumulated per epoch for a specified wallet from the indexer.
-
-        Args:
-            address (str): Wallet address to be queried.
-
-        Returns:
-            IndexerTokenRewardsData: A data class object containing detailed information about the accrued token rewards.
-        """
-        return self.context.indexer_client.get_token_rewards(address)
-
     def get_subaccount_linked_signer_rate_limits(
         self, subaccount: str
     ) -> IndexerLinkedSignerRateLimitData:
@@ -83,18 +69,6 @@ class SubaccountQueryAPI(NadoBaseAPI):
         """
         return self.context.indexer_client.get_linked_signer_rate_limits(subaccount)
 
-    def get_referral_code(self, subaccount: str) -> IndexerReferralCodeData:
-        """
-        Query the referral code for the specified wallet from the indexer.
-
-        Args:
-            subaccount (str): Unique identifier for the subaccount.
-
-        Returns:
-            IndexerReferralCodeData: A data class object containing the wallet's referral code.
-        """
-        return self.context.indexer_client.get_referral_code(subaccount)
-
     def get_subaccounts(
         self,
         address: Optional[str] = None,

nado_protocol/engine_client/query.py

@@ -1,3 +1,4 @@
+import json
 from typing import Optional
 import requests
 
@@ -182,7 +183,10 @@ class EngineQueryClient:
         )
 
     def get_subaccount_info(
-        self, subaccount: str, txs: Optional[list[QuerySubaccountInfoTx]] = None
+        self,
+        subaccount: str,
+        txs: Optional[list[QuerySubaccountInfoTx]] = None,
+        pre_state: Optional[bool] = None,
     ) -> SubaccountInfoData:
         """
         Query the engine for the state of a subaccount, including balances.
@@ -193,11 +197,26 @@ class EngineQueryClient:
             txs (list[QuerySubaccountInfoTx], optional): You can optionally provide a list of txs, to get an estimated view
             of what the subaccount state would look like if the transactions were applied.
 
+            pre_state (bool, optional): When True and txs are provided, returns the subaccount state before the
+            transactions were applied in the pre_state field. Defaults to False.
+
         Returns:
             SubaccountInfoData: Information about the specified subaccount.
         """
+        txns_str = None
+        if txs is not None:
+            txns_str = json.dumps([tx.dict() for tx in txs])
+
+        pre_state_str = None
+        if pre_state is not None:
+            pre_state_str = str(pre_state).lower()
+
         return ensure_data_type(
-            self.query(QuerySubaccountInfoParams(subaccount=subaccount, txs=txs)).data,
+            self.query(
+                QuerySubaccountInfoParams(
+                    subaccount=subaccount, txns=txns_str, pre_state=pre_state_str
+                )
+            ).data,
             SubaccountInfoData,
         )
 

nado_protocol/engine_client/types/__init__.py

@@ -60,6 +60,7 @@ __all__ = [
     "ContractsData",
     "NoncesData",
     "OrderData",
+    "PreState",
     "SubaccountInfoData",
     "SubaccountOpenOrdersData",
     "MarketLiquidityData",

nado_protocol/engine_client/types/query.py

@@ -101,7 +101,8 @@ class QuerySubaccountInfoParams(NadoBaseModel):
 
     type = EngineQueryType.SUBACCOUNT_INFO.value
     subaccount: str
-    txs: Optional[list[QuerySubaccountInfoTx]]
+    txns: Optional[str]
+    pre_state: Optional[str]
 
 
 class QuerySubaccountOpenOrdersParams(NadoBaseModel):
@@ -299,6 +300,17 @@ class OrderData(NadoBaseModel):
     placed_at: str
 
 
+class PreState(NadoBaseModel):
+    """
+    Model for subaccount state before simulated transactions were applied.
+    """
+
+    healths: list[SubaccountHealth]
+    health_contributions: list[list[str]]
+    spot_balances: list[SpotProductBalance]
+    perp_balances: list[PerpProductBalance]
+
+
 class SubaccountInfoData(NadoBaseModel):
     """
     Model for detailed info about a subaccount, including balances.
@@ -314,6 +326,7 @@ class SubaccountInfoData(NadoBaseModel):
     perp_balances: list[PerpProductBalance]
     spot_products: list[SpotProduct]
     perp_products: list[PerpProduct]
+    pre_state: Optional[PreState]
 
     def parse_subaccount_balance(
         self, product_id: int

nado_protocol/indexer_client/query.py

@@ -14,8 +14,6 @@ from nado_protocol.indexer_client.types.query import (
     IndexerFundingRatesData,
     IndexerHistoricalOrdersByDigestParams,
     IndexerHistoricalOrdersData,
-    IndexerReferralCodeData,
-    IndexerReferralCodeParams,
     IndexerSubaccountHistoricalOrdersParams,
     IndexerLinkedSignerRateLimitData,
     IndexerLinkedSignerRateLimitParams,
@@ -23,8 +21,6 @@ from nado_protocol.indexer_client.types.query import (
     IndexerLiquidationFeedParams,
     IndexerMarketSnapshotsData,
     IndexerMarketSnapshotsParams,
-    IndexerMakerStatisticsData,
-    IndexerMakerStatisticsParams,
     IndexerMatchesParams,
     IndexerMatchesData,
     IndexerOraclePricesData,
@@ -36,17 +32,10 @@ from nado_protocol.indexer_client.types.query import (
     IndexerProductSnapshotsParams,
     IndexerRequest,
     IndexerResponse,
-    IndexerSubaccountSummaryParams,
-    IndexerSubaccountSummaryData,
     IndexerSubaccountsData,
     IndexerSubaccountsParams,
-    IndexerTokenRewardsData,
-    IndexerTokenRewardsParams,
-    IndexerUsdcPriceParams,
-    IndexerUsdcPriceData,
-    IndexerTokenMerkleProofsParams,
-    IndexerFoundationRewardsMerkleProofsParams,
-    IndexerMerkleProofsData,
+    IndexerQuotePriceParams,
+    IndexerQuotePriceData,
     IndexerInterestAndFundingParams,
     IndexerInterestAndFundingData,
     IndexerAccountSnapshotsParams,
@@ -186,29 +175,6 @@ class IndexerQueryClient:
             self.query(IndexerEventsParams.parse_obj(params)).data, IndexerEventsData
         )
 
-    def get_subaccount_summary(
-        self, subaccount: str, timestamp: Optional[int] = None
-    ) -> IndexerSubaccountSummaryData:
-        """
-        Retrieves a summary of a specified subaccount at a certain timestamp.
-
-        Args:
-            subaccount (str): The identifier for the subaccount.
-
-            timestamp (int | None, optional): The timestamp for which to retrieve the subaccount summary. If not provided, the most recent summary is retrieved.
-
-        Returns:
-            IndexerSubaccountSummaryData: The summary of the specified subaccount at the provided timestamp.
-        """
-        return ensure_data_type(
-            self.query(
-                IndexerSubaccountSummaryParams(
-                    subaccount=subaccount, timestamp=timestamp
-                )
-            ).data,
-            IndexerSubaccountSummaryData,
-        )
-
     def get_product_snapshots(
         self, params: IndexerProductSnapshotsParams
     ) -> IndexerProductSnapshotsData:
@@ -319,38 +285,6 @@ class IndexerQueryClient:
             IndexerOraclePricesData,
         )
 
-    def get_token_rewards(self, address: str) -> IndexerTokenRewardsData:
-        """
-        Retrieves the token reward data for a specific address.
-
-        Args:
-            address (str): The address for which to retrieve token reward data.
-
-        Returns:
-            IndexerTokenRewardsData: The token reward data for the specified address.
-        """
-        return ensure_data_type(
-            self.query(IndexerTokenRewardsParams(address=address)).data,
-            IndexerTokenRewardsData,
-        )
-
-    def get_maker_statistics(
-        self, params: IndexerMakerStatisticsParams
-    ) -> IndexerMakerStatisticsData:
-        """
-        Retrieves maker statistics based on provided parameters.
-
-        Args:
-            params (IndexerMakerStatisticsParams): The parameters for retrieving maker statistics.
-
-        Returns:
-            IndexerMakerStatisticsData: The maker statistics corresponding to the provided parameters.
-        """
-        return ensure_data_type(
-            self.query(IndexerMakerStatisticsParams.parse_obj(params)).data,
-            IndexerMakerStatisticsData,
-        )
-
     def get_liquidation_feed(self) -> IndexerLiquidationFeedData:
         """
         Retrieves the liquidation feed data.
@@ -377,21 +311,6 @@ class IndexerQueryClient:
             IndexerLinkedSignerRateLimitData,
         )
 
-    def get_referral_code(self, subaccount: str) -> IndexerReferralCodeData:
-        """
-        Retrieves the referral code for a given address.
-
-        Args:
-            subaccount (str): Unique identifier for the subaccount.
-
-        Returns:
-            IndexerReferralCodeData: The referral code for the specific address.
-        """
-        return ensure_data_type(
-            self.query(IndexerReferralCodeParams(subaccount=subaccount)).data,
-            IndexerReferralCodeData,
-        )
-
     def get_subaccounts(
         self, params: IndexerSubaccountsParams
     ) -> IndexerSubaccountsData:
@@ -409,26 +328,10 @@ class IndexerQueryClient:
             IndexerSubaccountsData,
         )
 
-    def get_usdc_price(self) -> IndexerUsdcPriceData:
-        return ensure_data_type(
-            self.query(IndexerUsdcPriceParams()).data,
-            IndexerUsdcPriceData,
-        )
-
-    def get_token_merkle_proofs(self, address: str) -> IndexerMerkleProofsData:
+    def get_quote_price(self) -> IndexerQuotePriceData:
         return ensure_data_type(
-            self.query(IndexerTokenMerkleProofsParams(address=address)).data,
-            IndexerMerkleProofsData,
-        )
-
-    def get_foundation_rewards_merkle_proofs(
-        self, address: str
-    ) -> IndexerMerkleProofsData:
-        return ensure_data_type(
-            self.query(
-                IndexerFoundationRewardsMerkleProofsParams(address=address)
-            ).data,
-            IndexerMerkleProofsData,
+            self.query(IndexerQuotePriceParams()).data,
+            IndexerQuotePriceData,
         )
 
     def get_interest_and_funding_payments(

nado_protocol/indexer_client/types/__init__.py

@@ -25,50 +25,39 @@ __all__ = [
     "IndexerEventsTxsLimit",
     "IndexerEventsLimit",
     "IndexerEventsParams",
-    "IndexerSubaccountSummaryParams",
     "IndexerProductSnapshotsParams",
     "IndexerCandlesticksParams",
     "IndexerFundingRateParams",
     "IndexerPerpPricesParams",
     "IndexerOraclePricesParams",
-    "IndexerTokenRewardsParams",
-    "IndexerMakerStatisticsParams",
     "IndexerLiquidationFeedParams",
     "IndexerLinkedSignerRateLimitParams",
-    "IndexerReferralCodeParams",
     "IndexerSubaccountsParams",
     "IndexerParams",
     "IndexerHistoricalOrdersRequest",
     "IndexerMatchesRequest",
     "IndexerEventsRequest",
-    "IndexerSubaccountSummaryRequest",
     "IndexerProductSnapshotsRequest",
     "IndexerCandlesticksRequest",
     "IndexerFundingRateRequest",
     "IndexerFundingRatesRequest",
     "IndexerPerpPricesRequest",
     "IndexerOraclePricesRequest",
-    "IndexerTokenRewardsRequest",
-    "IndexerMakerStatisticsRequest",
     "IndexerLiquidationFeedRequest",
     "IndexerLinkedSignerRateLimitRequest",
-    "IndexerReferralCodeRequest",
     "IndexerSubaccountsRequest",
     "IndexerRequest",
     "IndexerHistoricalOrdersData",
     "IndexerMatchesData",
     "IndexerEventsData",
-    "IndexerSubaccountSummaryData",
     "IndexerProductSnapshotsData",
     "IndexerCandlesticksData",
     "IndexerFundingRateData",
     "IndexerPerpPricesData",
     "IndexerOraclePricesData",
-    "IndexerTokenRewardsData",
-    "IndexerMakerStatisticsData",
     "IndexerLinkedSignerRateLimitData",
-    "IndexerReferralCodeData",
     "IndexerSubaccountsData",
+    "IndexerQuotePriceData",
     "IndexerLiquidationFeedData",
     "IndexerResponseData",
     "IndexerResponse",

nado_protocol/indexer_client/types/query.py

@@ -1,5 +1,5 @@
 from nado_protocol.utils.enum import StrEnum
-from typing import Dict, Optional, Union
+from typing import Dict, List, Optional, Tuple, Type, Union
 
 from pydantic import Field, validator
 from nado_protocol.indexer_client.types.models import (
@@ -48,11 +48,8 @@ class IndexerQueryType(StrEnum):
     LINKED_SIGNER_RATE_LIMIT = "linked_signer_rate_limit"
     REFERRAL_CODE = "referral_code"
     SUBACCOUNTS = "subaccounts"
-    USDC_PRICE = "usdc_price"
+    QUOTE_PRICE = "quote_price"
     ACCOUNT_SNAPSHOTS = "account_snapshots"
-    # TODO: revise once this endpoint is live
-    TOKEN_MERKLE_PROOFS = "token_merkle_proofs"
-    FOUNDATION_REWARDS_MERKLE_PROOFS = "foundation_rewards_merkle_proofs"
     INTEREST_AND_FUNDING = "interest_and_funding"
     INK_AIRDROP = "ink_airdrop"
 
@@ -80,6 +77,10 @@ class IndexerSubaccountHistoricalOrdersParams(IndexerBaseParams):
     trigger_types: Optional[list[str]]
     isolated: Optional[bool]
 
+    class Config:
+        # Ensure this doesn't get confused with digest params
+        extra = "forbid"
+
 
 class IndexerHistoricalOrdersByDigestParams(NadoBaseModel):
     """
@@ -88,6 +89,10 @@ class IndexerHistoricalOrdersByDigestParams(NadoBaseModel):
 
     digests: list[str]
 
+    class Config:
+        # Ensure this doesn't get confused with subaccount params
+        extra = "forbid"
+
 
 class IndexerMatchesParams(IndexerBaseParams):
     """
@@ -130,16 +135,6 @@ class IndexerEventsParams(IndexerBaseParams):
     limit: Optional[IndexerEventsLimit]  # type: ignore
 
 
-class IndexerSubaccountSummaryParams(NadoBaseModel):
-    """
-    Parameters for querying subaccount summary.
-    """
-
-    subaccount: str
-    timestamp: Optional[int] = None
-    active: Optional[bool] = None
-
-
 class IndexerProductSnapshotsParams(IndexerBaseParams):
     """
     Parameters for querying product snapshots.
@@ -207,24 +202,6 @@ class IndexerOraclePricesParams(NadoBaseModel):
     product_ids: list[int]
 
 
-class IndexerTokenRewardsParams(NadoBaseModel):
-    """
-    Parameters for querying token rewards.
-    """
-
-    address: str
-
-
-class IndexerMakerStatisticsParams(NadoBaseModel):
-    """
-    Parameters for querying maker statistics.
-    """
-
-    product_id: int
-    epoch: int
-    interval: int
-
-
 class IndexerLiquidationFeedParams(NadoBaseModel):
     """
     Parameters for querying liquidation feed.
@@ -241,14 +218,6 @@ class IndexerLinkedSignerRateLimitParams(NadoBaseModel):
     subaccount: str
 
 
-class IndexerReferralCodeParams(NadoBaseModel):
-    """
-    Parameters for querying a referral code.
-    """
-
-    subaccount: str
-
-
 class IndexerSubaccountsParams(NadoBaseModel):
     """
     Parameters for querying subaccounts.
@@ -259,30 +228,14 @@ class IndexerSubaccountsParams(NadoBaseModel):
     start: Optional[int]
 
 
-class IndexerUsdcPriceParams(NadoBaseModel):
+class IndexerQuotePriceParams(NadoBaseModel):
     """
-    Parameters for querying usdc price.
+    Parameters for querying quote price.
     """
 
     pass
 
 
-class IndexerTokenMerkleProofsParams(NadoBaseModel):
-    """
-    Parameters for querying token merkle proofs.
-    """
-
-    address: str
-
-
-class IndexerFoundationRewardsMerkleProofsParams(NadoBaseModel):
-    """
-    Parameters for querying Foundation Rewards merkle proofs.
-    """
-
-    address: str
-
-
 class IndexerInterestAndFundingParams(NadoBaseModel):
     """
     Parameters for querying interest and funding payments.
@@ -318,22 +271,16 @@ IndexerParams = Union[
     IndexerHistoricalOrdersByDigestParams,
     IndexerMatchesParams,
     IndexerEventsParams,
-    IndexerSubaccountSummaryParams,
     IndexerProductSnapshotsParams,
     IndexerCandlesticksParams,
     IndexerFundingRateParams,
     IndexerPerpPricesParams,
     IndexerOraclePricesParams,
-    IndexerTokenRewardsParams,
-    IndexerMakerStatisticsParams,
     IndexerLiquidationFeedParams,
     IndexerLinkedSignerRateLimitParams,
-    IndexerReferralCodeParams,
     IndexerSubaccountsParams,
-    IndexerUsdcPriceParams,
+    IndexerQuotePriceParams,
     IndexerMarketSnapshotsParams,
-    IndexerTokenMerkleProofsParams,
-    IndexerFoundationRewardsMerkleProofsParams,
     IndexerInterestAndFundingParams,
     IndexerAccountSnapshotsParams,
     IndexerInkAirdropParams,
@@ -349,6 +296,9 @@ class IndexerHistoricalOrdersRequest(NadoBaseModel):
         IndexerSubaccountHistoricalOrdersParams, IndexerHistoricalOrdersByDigestParams
     ]
 
+    class Config:
+        smart_union = True
+
 
 class IndexerMatchesRequest(NadoBaseModel):
     """
@@ -366,14 +316,6 @@ class IndexerEventsRequest(NadoBaseModel):
     events: IndexerEventsParams
 
 
-class IndexerSubaccountSummaryRequest(NadoBaseModel):
-    """
-    Request object for querying subaccount summary.
-    """
-
-    summary: IndexerSubaccountSummaryParams
-
-
 class IndexerProductSnapshotsRequest(NadoBaseModel):
     """
     Request object for querying product snapshots.
@@ -430,22 +372,6 @@ class IndexerOraclePricesRequest(NadoBaseModel):
     oracle_price: IndexerOraclePricesParams
 
 
-class IndexerTokenRewardsRequest(NadoBaseModel):
-    """
-    Request object for querying token rewards.
-    """
-
-    rewards: IndexerTokenRewardsParams
-
-
-class IndexerMakerStatisticsRequest(NadoBaseModel):
-    """
-    Request object for querying maker statistics.
-    """
-
-    maker_statistics: IndexerMakerStatisticsParams
-
-
 class IndexerLiquidationFeedRequest(NadoBaseModel):
     """
     Request object for querying liquidation feed.
@@ -462,14 +388,6 @@ class IndexerLinkedSignerRateLimitRequest(NadoBaseModel):
     linked_signer_rate_limit: IndexerLinkedSignerRateLimitParams
 
 
-class IndexerReferralCodeRequest(NadoBaseModel):
-    """
-    Request object for querying a referral code.
-    """
-
-    referral_code: IndexerReferralCodeParams
-
-
 class IndexerSubaccountsRequest(NadoBaseModel):
     """
     Request object for querying subaccounts.
@@ -478,28 +396,12 @@ class IndexerSubaccountsRequest(NadoBaseModel):
     subaccounts: IndexerSubaccountsParams
 
 
-class IndexerUsdcPriceRequest(NadoBaseModel):
-    """
-    Request object for querying usdc price.
-    """
-
-    usdc_price: IndexerUsdcPriceParams
-
-
-class IndexerTokenMerkleProofsRequest(NadoBaseModel):
+class IndexerQuotePriceRequest(NadoBaseModel):
     """
-    Request object for querying token merkle proofs.
+    Request object for querying quote price.
     """
 
-    token_merkle_proofs: IndexerTokenMerkleProofsParams
-
-
-class IndexerFoundationRewardsMerkleProofsRequest(NadoBaseModel):
-    """
-    Request object for querying Foundation Rewards merkle proofs.
-    """
-
-    foundation_rewards_merkle_proofs: IndexerFoundationRewardsMerkleProofsParams
+    quote_price: IndexerQuotePriceParams
 
 
 class IndexerInterestAndFundingRequest(NadoBaseModel):
@@ -530,22 +432,16 @@ IndexerRequest = Union[
     IndexerHistoricalOrdersRequest,
     IndexerMatchesRequest,
     IndexerEventsRequest,
-    IndexerSubaccountSummaryRequest,
     IndexerProductSnapshotsRequest,
     IndexerCandlesticksRequest,
     IndexerFundingRateRequest,
     IndexerPerpPricesRequest,
     IndexerOraclePricesRequest,
-    IndexerTokenRewardsRequest,
-    IndexerMakerStatisticsRequest,
     IndexerLiquidationFeedRequest,
     IndexerLinkedSignerRateLimitRequest,
-    IndexerReferralCodeRequest,
     IndexerSubaccountsRequest,
-    IndexerUsdcPriceRequest,
+    IndexerQuotePriceRequest,
     IndexerMarketSnapshotsRequest,
-    IndexerTokenMerkleProofsRequest,
-    IndexerFoundationRewardsMerkleProofsRequest,
     IndexerInterestAndFundingRequest,
     IndexerAccountSnapshotsRequest,
     IndexerInkAirdropRequest,
@@ -578,14 +474,6 @@ class IndexerEventsData(NadoBaseModel):
     txs: list[IndexerTx]
 
 
-class IndexerSubaccountSummaryData(NadoBaseModel):
-    """
-    Data object for subaccount summary.
-    """
-
-    events: list[IndexerEvent]
-
-
 class IndexerProductSnapshotsData(NadoBaseModel):
     """
     Data object for product snapshots.
@@ -643,25 +531,6 @@ class IndexerOraclePricesData(NadoBaseModel):
     prices: list[IndexerOraclePrice]
 
 
-class IndexerTokenRewardsData(NadoBaseModel):
-    """
-    Data object for token rewards.
-    """
-
-    rewards: list[IndexerTokenReward]
-    update_time: str
-    total_referrals: str
-
-
-class IndexerMakerStatisticsData(NadoBaseModel):
-    """
-    Data object for maker statistics.
-    """
-
-    reward_coefficient: float
-    makers: list[IndexerMarketMaker]
-
-
 class IndexerLinkedSignerRateLimitData(NadoBaseModel):
     """
     Data object for linked signer rate limits.
@@ -673,18 +542,6 @@ class IndexerLinkedSignerRateLimitData(NadoBaseModel):
     signer: str
 
 
-class IndexerReferralCodeData(NadoBaseModel):
-    """
-    Data object for referral codes.
-    """
-
-    referral_code: str
-
-    @validator("referral_code", pre=True, always=True)
-    def set_default_referral_code(cls, v):
-        return v or ""
-
-
 class IndexerSubaccountsData(NadoBaseModel):
     """
     Data object for subaccounts response from the indexer.
@@ -693,22 +550,14 @@ class IndexerSubaccountsData(NadoBaseModel):
     subaccounts: list[IndexerSubaccount]
 
 
-class IndexerUsdcPriceData(NadoBaseModel):
+class IndexerQuotePriceData(NadoBaseModel):
     """
-    Data object for the usdc price response from the indexer.
+    Data object for the quote price response from the indexer.
     """
 
     price_x18: str
 
 
-class IndexerMerkleProofsData(NadoBaseModel):
-    """
-    Data object for the merkle proofs response from the indexer.
-    """
-
-    merkle_proofs: list[IndexerMerkleProof]
-
-
 class IndexerInterestAndFundingData(NadoBaseModel):
     """
     Data object for the interest and funding payments response from the indexer.
@@ -742,20 +591,15 @@ IndexerResponseData = Union[
     IndexerHistoricalOrdersData,
     IndexerMatchesData,
     IndexerEventsData,
-    IndexerSubaccountSummaryData,
     IndexerProductSnapshotsData,
     IndexerCandlesticksData,
     IndexerFundingRateData,
     IndexerPerpPricesData,
     IndexerOraclePricesData,
-    IndexerTokenRewardsData,
-    IndexerMakerStatisticsData,
     IndexerLinkedSignerRateLimitData,
-    IndexerReferralCodeData,
     IndexerSubaccountsData,
-    IndexerUsdcPriceData,
+    IndexerQuotePriceData,
     IndexerMarketSnapshotsData,
-    IndexerMerkleProofsData,
     IndexerInterestAndFundingData,
     IndexerLiquidationFeedData,
     IndexerFundingRatesData,
@@ -796,10 +640,6 @@ def to_indexer_request(params: IndexerParams) -> IndexerRequest:
         ),
         IndexerMatchesParams: (IndexerMatchesRequest, IndexerQueryType.MATCHES.value),
         IndexerEventsParams: (IndexerEventsRequest, IndexerQueryType.EVENTS.value),
-        IndexerSubaccountSummaryParams: (
-            IndexerSubaccountSummaryRequest,
-            IndexerQueryType.SUMMARY.value,
-        ),
         IndexerProductSnapshotsParams: (
             IndexerProductSnapshotsRequest,
             IndexerQueryType.PRODUCTS.value,
@@ -828,14 +668,6 @@ def to_indexer_request(params: IndexerParams) -> IndexerRequest:
             IndexerOraclePricesRequest,
             IndexerQueryType.ORACLE_PRICES.value,
         ),
-        IndexerTokenRewardsParams: (
-            IndexerTokenRewardsRequest,
-            IndexerQueryType.REWARDS.value,
-        ),
-        IndexerMakerStatisticsParams: (
-            IndexerMakerStatisticsRequest,
-            IndexerQueryType.MAKER_STATISTICS.value,
-        ),
         IndexerLiquidationFeedParams: (
             IndexerLiquidationFeedRequest,
             IndexerQueryType.LIQUIDATION_FEED.value,
@@ -844,25 +676,13 @@ def to_indexer_request(params: IndexerParams) -> IndexerRequest:
             IndexerLinkedSignerRateLimitRequest,
             IndexerQueryType.LINKED_SIGNER_RATE_LIMIT.value,
         ),
-        IndexerReferralCodeParams: (
-            IndexerReferralCodeRequest,
-            IndexerQueryType.REFERRAL_CODE.value,
-        ),
         IndexerSubaccountsParams: (
             IndexerSubaccountsRequest,
             IndexerQueryType.SUBACCOUNTS.value,
         ),
-        IndexerUsdcPriceParams: (
-            IndexerUsdcPriceRequest,
-            IndexerQueryType.USDC_PRICE.value,
-        ),
-        IndexerTokenMerkleProofsParams: (
-            IndexerTokenMerkleProofsRequest,
-            IndexerQueryType.TOKEN_MERKLE_PROOFS.value,
-        ),
-        IndexerFoundationRewardsMerkleProofsParams: (
-            IndexerFoundationRewardsMerkleProofsRequest,
-            IndexerQueryType.FOUNDATION_REWARDS_MERKLE_PROOFS.value,
+        IndexerQuotePriceParams: (
+            IndexerQuotePriceRequest,
+            IndexerQueryType.QUOTE_PRICE.value,
         ),
         IndexerInterestAndFundingParams: (
             IndexerInterestAndFundingRequest,
@@ -879,11 +699,11 @@ def to_indexer_request(params: IndexerParams) -> IndexerRequest:
     }
 
     RequestClass, field_name = indexer_request_mapping[type(params)]
-    return RequestClass(**{field_name: params})
+    return RequestClass.parse_obj({field_name: params.dict(exclude_none=False)})  # type: ignore[attr-defined]
 
 
 IndexerTickersData = Dict[str, IndexerTickerInfo]
 
 IndexerPerpContractsData = Dict[str, IndexerPerpContractInfo]
 
-IndexerHistoricalTradesData = list[IndexerTradeInfo]
+IndexerHistoricalTradesData = List[IndexerTradeInfo]

{nado_protocol-0.2.6.dist-info → nado_protocol-0.2.8.dist-info}/METADATA

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

{nado_protocol-0.2.6.dist-info → nado_protocol-0.2.8.dist-info}/RECORD

@@ -8,7 +8,7 @@ nado_protocol/client/apis/market/query.py,sha256=CmL_btMtqp0iJFqUt_gszkhe-i4LlcN
 nado_protocol/client/apis/perp/__init__.py,sha256=KUGZ86Xo-NB-9uhqEyXkrqoGDhWeex0-AQwCfWfvpsg,742
 nado_protocol/client/apis/perp/query.py,sha256=r4E0tJo7-z9J3HOMufo6BZ9yTYtpCb-ANZeM05lf7rU,1420
 nado_protocol/client/apis/rewards/__init__.py,sha256=F7fTCEdGR2J2fMd5AhC1JruJSMKUZcoOvYotdSYWU7M,205
-nado_protocol/client/apis/rewards/execute.py,sha256=WHWpWB5523WQzXiEV-xD3xVDtSdrvIfQ0IiSN-0ItoA,5298
+nado_protocol/client/apis/rewards/execute.py,sha256=U8U1YOFoVwATXQZP5RlIsMowyy9Q0TomEkAnJcbpiTA,3743
 nado_protocol/client/apis/rewards/query.py,sha256=DT1evscywPyXTEvNA5FC-L1JuLqf9YRl7pcj_Ad9JxI,507
 nado_protocol/client/apis/spot/__init__.py,sha256=QdoWAVrvfNAP-YDwM5Z-4N1lS6dgNzNgNqUp78IHMqU,1021
 nado_protocol/client/apis/spot/base.py,sha256=SagkZZ9Ehi7pSxM5lD-glOMEQj9aT3PGGW4UtGnVpuw,1177
@@ -16,7 +16,7 @@ nado_protocol/client/apis/spot/execute.py,sha256=u_O9vjoshv8Zfg8nIsnd8_X7PUO5CSh
 nado_protocol/client/apis/spot/query.py,sha256=6YcnfTlVnEHpUkB3eM8zvbYGBxSAw2Xy4yezMDTsZ9U,2954
 nado_protocol/client/apis/subaccount/__init__.py,sha256=vT857P7_DkIWvV0D5izFg52i-qp800-hlwLzSpIk4Cc,1301
 nado_protocol/client/apis/subaccount/execute.py,sha256=sbiR9VhRl713Cfus_fAzXQiYR6VZWzPROaTowQDGaA4,2005
-nado_protocol/client/apis/subaccount/query.py,sha256=_GhPUacgVdZvb1dy0_0UIT6pJlqaZSGET33ryN-a88s,5800
+nado_protocol/client/apis/subaccount/query.py,sha256=468nG9sNq2Kw8nE4iH5Y6R5yuPienyNHs_PPOlmHTVo,4808
 nado_protocol/client/context.py,sha256=-H4FSuV-CG7nAConYq4RYjzH9baGU57DQVGDOyfV2X4,3448
 nado_protocol/contracts/__init__.py,sha256=XJhf8OmABtSwTvgEeA0ZTMLakvwsqkItMY-MOyfDqV4,13503
 nado_protocol/contracts/abis/Endpoint.json,sha256=8bhbVCW8twMCeqNYXTOREBTBGHEl9fKCenJAEXYiOAY,10931
@@ -41,17 +41,17 @@ nado_protocol/contracts/loader.py,sha256=_0W3ImcARs1bTu1lLMpHMrRNuEVYjrRWctvnEbK
 nado_protocol/contracts/types.py,sha256=km29Md8hCE8yivGdgbgMuQoO7GyE0yOVt9BaJatvjFY,4280
 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/query.py,sha256=v7PqRsnX5jZskNnBpv38HB7BQ7mi8RBhUgczf5msEIc,16858
+nado_protocol/engine_client/types/__init__.py,sha256=aCw_aNxCRy5PhrYpvUHuB7gQPcxHld9iMV5eTFWdEfw,2737
 nado_protocol/engine_client/types/execute.py,sha256=ANF_QwtJAqb9zvga1fjOIiSDt_wjUo4sbf8rVkc-sQ0,20709
 nado_protocol/engine_client/types/models.py,sha256=JIDyOLUBprGcMKHxW2M53_nCc7hoerglnFvfn7wgdXo,3862
-nado_protocol/engine_client/types/query.py,sha256=N6kPuWSUowMeZnUKpxF9NnMKZBKKe-0Q_B9ccFZkjQA,12185
+nado_protocol/engine_client/types/query.py,sha256=5j4KcYUwGAoJFF0m2bmrqYXbU4iJ5IyzUTiEIzn6rh0,12516
 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=Tm4IYmU0T_9ayFTce8SMRPi_NN8QgyHDr4rFC3h7hSw,17102
-nado_protocol/indexer_client/types/__init__.py,sha256=r3-jxMjrFNbA1nMRSGZjsE3qypmyWab6k20_gasdwL4,3548
+nado_protocol/indexer_client/query.py,sha256=aMJoJfKXd9eE4j5me5FPOtsrHY8b5nXCpCV_NCZzh2E,13710
+nado_protocol/indexer_client/types/__init__.py,sha256=p1Q0JVhx273MuH6Q2baOfVknnLkmuL8kH4TlHDSYVTc,3161
 nado_protocol/indexer_client/types/models.py,sha256=vD1YHHeK15hcU5_O4al7001Fi-gTl6EARMuR-Y8stOc,7533
-nado_protocol/indexer_client/types/query.py,sha256=FCIIUv049AoBtB5VEolwgX51wycCIjyw4Qq__z0TodY,20559
+nado_protocol/indexer_client/types/query.py,sha256=g3bymk_Xpl3vK_z51178qEiDUsGAa5Oqe6jmSNhiMOc,16328
 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
@@ -76,7 +76,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.6.dist-info/METADATA,sha256=HDjIgzF093U8m5ZGWGyaBS12PHeONrQ0gnNZrP3ZUb4,9558
-nado_protocol-0.2.6.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-nado_protocol-0.2.6.dist-info/entry_points.txt,sha256=Df0O9lFc-m0SyOh6_d9FHeG1OT-esxGm-p_z7rTT9h0,340
-nado_protocol-0.2.6.dist-info/RECORD,,
+nado_protocol-0.2.8.dist-info/METADATA,sha256=W26ydlZNiR7NihwnL_gzayKfPKqSWetgcxusYz3ioic,9558
+nado_protocol-0.2.8.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+nado_protocol-0.2.8.dist-info/entry_points.txt,sha256=Df0O9lFc-m0SyOh6_d9FHeG1OT-esxGm-p_z7rTT9h0,340
+nado_protocol-0.2.8.dist-info/RECORD,,