Add query for registred validator queries (#105)

* Add query for registred validator queries * Fix merge * Fix import * Regenerate schema and compiles
informalsystems · Sep 14, 2024 · 4adb223 · 4adb223
1 parent 31e5996
commit 4adb223
Show file tree

Hide file tree

Showing 7 changed files with 119 additions and 6 deletions.
diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt
@@ -1,2 +1,2 @@
-f3f06c36a664d7e1c6b2992ffc7e1b1175830eef4c29ebc476dc2f320666ca10  hydro.wasm
-3b2eb51bbf8ec9da85d20751341b3c659f050f430f8c08674af0cfd91e870637  tribute.wasm
+5e958ba7eabde84bacbf1f0338594849f29576a476858e5c185216f4990ed8f3  hydro.wasm
+0320254a30298260030dda411339b131f570003f4adf7db566df865d2797f2e2  tribute.wasm
diff --git a/artifacts/hydro.wasm b/artifacts/hydro.wasm
diff --git a/artifacts/tribute.wasm b/artifacts/tribute.wasm
diff --git a/contracts/hydro/schema/hydro_full_schema.json b/contracts/hydro/schema/hydro_full_schema.json
@@ -769,6 +769,46 @@
           }
         },
         "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "registered_validator_queries"
+        ],
+        "properties": {
+          "registered_validator_queries": {
+            "type": "object",
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
+      },
+      {
+        "type": "object",
+        "required": [
+          "validator_power_ratio"
+        ],
+        "properties": {
+          "validator_power_ratio": {
+            "type": "object",
+            "required": [
+              "round_id",
+              "validator"
+            ],
+            "properties": {
+              "round_id": {
+                "type": "integer",
+                "format": "uint64",
+                "minimum": 0.0
+              },
+              "validator": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          }
+        },
+        "additionalProperties": false
       }
     ]
   },

diff --git a/contracts/hydro/schema/query_msg.json b/contracts/hydro/schema/query_msg.json
@@ -356,6 +356,46 @@
         }
       },
       "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "registered_validator_queries"
+      ],
+      "properties": {
+        "registered_validator_queries": {
+          "type": "object",
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    {
+      "type": "object",
+      "required": [
+        "validator_power_ratio"
+      ],
+      "properties": {
+        "validator_power_ratio": {
+          "type": "object",
+          "required": [
+            "round_id",
+            "validator"
+          ],
+          "properties": {
+            "round_id": {
+              "type": "integer",
+              "format": "uint64",
+              "minimum": 0.0
+            },
+            "validator": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
     }
   ]
 }
diff --git a/contracts/hydro/src/contract.rs b/contracts/hydro/src/contract.rs
@@ -20,10 +20,10 @@ use crate::lsm_integration::{
 use crate::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, TrancheInfo};
 use crate::query::{
     AllUserLockupsResponse, ConstantsResponse, CurrentRoundResponse, ExpiredUserLockupsResponse,
-    LockEntryWithPower, ProposalResponse, QueryMsg, RoundEndResponse, RoundProposalsResponse,
-    RoundTotalVotingPowerResponse, TopNProposalsResponse, TotalLockedTokensResponse,
-    TranchesResponse, UserVoteResponse, UserVotingPowerResponse, ValidatorPowerRatioResponse,
-    WhitelistAdminsResponse, WhitelistResponse,
+    LockEntryWithPower, ProposalResponse, QueryMsg, RegisteredValidatorQueriesResponse,
+    RoundEndResponse, RoundProposalsResponse, RoundTotalVotingPowerResponse, TopNProposalsResponse,
+    TotalLockedTokensResponse, TranchesResponse, UserVoteResponse, UserVotingPowerResponse,
+    ValidatorPowerRatioResponse, WhitelistAdminsResponse, WhitelistResponse,
 };
 use crate::score_keeper::{
     add_validator_shares_to_proposal, get_total_power_for_proposal,
@@ -1109,6 +1109,9 @@ pub fn query(deps: Deps<NeutronQuery>, env: Env, msg: QueryMsg) -> StdResult<Bin
         QueryMsg::Whitelist {} => to_json_binary(&query_whitelist(deps)?),
         QueryMsg::WhitelistAdmins {} => to_json_binary(&query_whitelist_admins(deps)?),
         QueryMsg::TotalLockedTokens {} => to_json_binary(&query_total_locked_tokens(deps)?),
+        QueryMsg::RegisteredValidatorQueries {} => {
+            to_json_binary(&query_registered_validator_queries(deps)?)
+        }
         QueryMsg::ValidatorPowerRatio {
             validator,
             round_id,
@@ -1437,6 +1440,26 @@ pub fn query_total_locked_tokens(deps: Deps<NeutronQuery>) -> StdResult<TotalLoc
     })
 }
 
+// Returns all the validator queries that are registered
+// by the contract right now, for each query returning the address of the validator it is
+// associated with, plus its query id.
+pub fn query_registered_validator_queries(
+    deps: Deps<NeutronQuery>,
+) -> StdResult<RegisteredValidatorQueriesResponse> {
+    let query_ids = VALIDATOR_TO_QUERY_ID
+        .range(deps.storage, None, None, Order::Ascending)
+        .filter_map(|l| {
+            if l.is_err() {
+                deps.api
+                    .debug(&format!("Error when querying validator query id: {:?}", l));
+            }
+            l.ok()
+        })
+        .collect();
+
+    Ok(RegisteredValidatorQueriesResponse { query_ids })
+}
+
 pub fn query_validators_info(
     deps: Deps<NeutronQuery>,
     round_id: u64,

diff --git a/contracts/hydro/src/query.rs b/contracts/hydro/src/query.rs
@@ -79,6 +79,9 @@ pub enum QueryMsg {
     #[returns(TotalLockedTokensResponse)]
     TotalLockedTokens {},
 
+    #[returns(RegisteredValidatorQueriesResponse)]
+    RegisteredValidatorQueries {},
+
     #[returns(ValidatorPowerRatioResponse)]
     ValidatorPowerRatio { validator: String, round_id: u64 },
 }
@@ -167,6 +170,13 @@ pub struct RoundProposalsResponse {
     pub proposals: Vec<Proposal>,
 }
 
+// A vector containing tuples, where each tuple contains a validator address
+// and the id of the interchain query associated with that validator.
+#[cw_serde]
+pub struct RegisteredValidatorQueriesResponse {
+    pub query_ids: Vec<(String, u64)>,
+}
+
 #[cw_serde]
 pub struct ValidatorPowerRatioResponse {
     pub ratio: Decimal,