strideutils 0.4.2__tar.gz → 0.4.4__tar.gz

{strideutils-0.4.2 → strideutils-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strideutils
-Version: 0.4.2
+Version: 0.4.4
 Summary: 
 Author: Your Name
 Author-email: you@example.com

{strideutils-0.4.2 → strideutils-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "strideutils"
-version = "0.4.2"
+version = "0.4.4"
 description = ""
 authors = ["Your Name <you@example.com>"]
 readme = "README.md"

{strideutils-0.4.2 → strideutils-0.4.4}/strideutils/stride_config.py

@@ -129,6 +129,7 @@ class HostChainsConfig(ConfigObj):
     saga: HostChainConfig = field(default_factory=HostChainConfig)
     celestia: HostChainConfig = field(default_factory=HostChainConfig)
     dymension: HostChainConfig = field(default_factory=HostChainConfig)
+    haqq: HostChainConfig = field(default_factory=HostChainConfig)
 
 
 @dataclass(repr=False)

{strideutils-0.4.2 → strideutils-0.4.4}/strideutils/stride_requests.py

@@ -23,6 +23,7 @@ MODULE_ACCOUNTS_QUERY = "cosmos/auth/v1beta1/module_accounts"
 SUPPLY_QUERY = "cosmos/bank/v1beta1/supply/by_denom"
 VALIDATORS_QUERY = "cosmos/staking/v1beta1/validators"
 VALIDATOR_SLASHES_QUERY = "cosmos/distribution/v1beta1/validators/{validator_address}/slashes"
+DELEGATIONS_QUERY = "cosmos/staking/v1beta1/delegations/{delegator_address}"
 
 CONNECTION_QUERY = "ibc/core/connection/v1/connections/{connection_id}"
 CHANNELS_QUERY = "ibc/core/channel/v1/connections/{connection_id}/channels"
@@ -317,7 +318,6 @@ def get_unbonding_records(
     for epoch_unbonding in epoch_unbondings:
         epoch_number = epoch_unbonding["epoch_number"]
         for host_zone_unbonding in epoch_unbonding["host_zone_unbondings"]:
-
             chain_id_match = host_zone_unbonding["host_zone_id"] == chain_id
             status_match = not status or host_zone_unbonding["status"] == status
 
@@ -588,7 +588,6 @@ def get_callback_data(
 
     filtered_callback_data = []
     for data in callback_data:
-
         chain_id_match = not chain_id or chain_id in data["port_id"]
         channel_id_match = not channel_id or data["channel_id"] == channel_id
         port_id_match = not port_id or data["port_id"] == port_id
@@ -623,7 +622,10 @@ def get_redemption_rate(token: str) -> float:
     """
     Queries the redemption rate for a particular token
     """
-    host_zone = get_host_zone(config.get_chain(ticker=token).id)
+    chain_config_id = config.get_chain(ticker=token).id
+    if token == 'TIA':
+        chain_config_id = config.get_chain(name='celestia').id
+    host_zone = get_host_zone(chain_config_id)
     return float(host_zone["redemption_rate"])
 
 
@@ -984,15 +986,30 @@ def get_unbonding_tokens_on_address(
     return unbonding_amounts
 
 
-def get_host_zone_delegations(host_zone_id: str, ground_truth_included: bool = True) -> pd.DataFrame:
+def get_delegations(delegator_address: str, api_endpoint: str = config.stride.api_endpoint) -> dict[str, int]:
+    """
+    Queries all the delegations for a given delegator
+    Returned as a mapping of validator addresss to delegation amount
+    """
+    url = f"{api_endpoint}/{DELEGATIONS_QUERY.format(delegator_address=delegator_address)}"
+    delegations = query_list_with_pagination(url, rel_key="delegation_responses")
+
+    delegations_by_validator = {}
+    for delegation in delegations:
+        validator_address = delegation["delegation"]["validator_address"]
+        amount = int(delegation["balance"]["amount"])
+        delegations_by_validator[validator_address] = amount
+
+    return delegations_by_validator
+
+
+def get_host_zone_delegations(host_zone_id: str, include_ground_truth: bool = True) -> pd.DataFrame:
     """
     Given a host zone id, returns a Dataframe of validator delegations.
 
-    If `ground_truth_included=True`, then will also return the "true" delegations
+    If `include_ground_truth=True`, then will also return the "true" delegations
     on the host zone delegaiton account.
     """
-    host_zone = get_host_zone(host_zone_id)
-    vdf = pd.DataFrame(host_zone["validators"])
     int_cols = [
         "weight",
         "delegation",
@@ -1000,36 +1017,36 @@ def get_host_zone_delegations(host_zone_id: str, ground_truth_included: bool = T
         "slash_query_checkpoint",
         "shares_to_tokens_rate",
     ]
-    for c in int_cols:
-        vdf[c] = vdf[c].astype(float)
-    vdf = vdf[
-        [
-            "name",
-            "address",
-            "weight",
-            "delegation",
-            "slash_query_in_progress",
-            "slash_query_progress_tracker",
-            "shares_to_tokens_rate",
-        ]
+    output_cols = [
+        "name",
+        "address",
+        "weight",
+        "delegation",
+        "slash_query_in_progress",
+        "slash_query_progress_tracker",
+        "shares_to_tokens_rate",
     ]
-    # get delegation on the host zone, if relevant
-    if ground_truth_included:
-        host_zone_delegation_account = host_zone["delegation_ica_address"]
-        lcd_endpoint = config.get_chain(id=host_zone_id).api_endpoint
-        stake_endpoint = f"{lcd_endpoint}/cosmos/staking/v1beta1/delegations/{host_zone_delegation_account}"
-        host_zone_balance = request(stake_endpoint)["delegation_responses"]
-        stake_amounts = {}
-        for hzb in host_zone_balance:
-            stake_amounts[hzb["delegation"]["validator_address"]] = float(hzb["balance"]["amount"])
-        stake_amounts = pd.Series(stake_amounts)
-        vdf["ground_delegation"] = (vdf["address"].map(stake_amounts)).fillna(0)
-        float_cols = ["weight", "delegation", "ground_delegation"]
-        for c in float_cols:
-            vdf[c] = vdf[c].astype(float)
-        filtered_vdf = vdf[(vdf["ground_delegation"] > 0) | (vdf["delegation"] > 0) | (vdf["weight"] > 0)]
-        vdf = filtered_vdf
-    return vdf
+
+    # Query the validator delegations on the host zone
+    host_zone = get_host_zone(host_zone_id)
+    validator_df = pd.DataFrame(host_zone["validators"])
+    validator_df[int_cols] = validator_df[int_cols].map(lambda i: int(float(i)))  # type: ignore
+    validator_df = validator_df[output_cols]
+
+    # If the ground truth isn't requested, return as is
+    if not include_ground_truth:
+        return validator_df
+
+    # Otherwise, query the ground truth delegations from the actual host chain
+    delegation_ica_account = host_zone["delegation_ica_address"]
+    api_endpoint = config.get_chain(id=host_zone_id).api_endpoint
+    delegations_by_validator = get_delegations(delegation_ica_account, api_endpoint=api_endpoint)
+
+    validator_df["ground_delegation"] = (validator_df["address"].map(delegations_by_validator)).fillna(0)
+    validator_df["ground_delegation"] = validator_df["ground_delegation"].apply(int)
+    validator_df["delegation_difference"] = validator_df["ground_delegation"] - validator_df["delegation"]
+
+    return validator_df
 
 
 def get_epochs() -> List[Dict]: