Feat: commit reveal timeouts

.rustfmt.toml

@@ -16,5 +16,5 @@ imports_granularity = "Crate"
 imports_layout = "HorizontalVertical"
 reorder_impl_items = true
 struct_field_align_threshold = 120
-version = "Two"
+style_edition = "2021"
 wrap_comments = true

src/msgs/data_requests/execute/mod.rs

@@ -11,6 +11,7 @@ pub enum ExecuteMsg {
     CommitDataResult(commit_result::Execute),
     PostDataRequest(post_request::Execute),
     RevealDataResult(reveal_result::Execute),
+    SetTimeoutConfig(TimeoutConfig),
 }
 
 impl From<ExecuteMsg> for super::ExecuteMsg {

src/msgs/data_requests/sudo/expire_data_requests.rs

@@ -0,0 +1,10 @@
+#[cfg_attr(feature = "cosmwasm", cosmwasm_schema::cw_serde)]
+#[cfg_attr(not(feature = "cosmwasm"), derive(serde::Serialize, Debug, PartialEq))]
+#[cfg_attr(not(feature = "cosmwasm"), serde(rename_all = "snake_case"))]
+pub struct Sudo {}
+
+impl From<Sudo> for crate::msgs::SudoMsg {
+    fn from(value: Sudo) -> Self {
+        super::SudoMsg::ExpireDataRequests(value).into()
+    }
+}

src/msgs/data_requests/sudo/mod.rs

@@ -1,5 +1,6 @@
 use super::*;
 
+pub mod expire_data_requests;
 pub mod post_results;
 
 #[cfg_attr(feature = "cosmwasm", cw_serde)]
@@ -23,6 +24,7 @@ impl From<PostResult> for crate::msgs::SudoMsg {
 pub enum SudoMsg {
     PostDataResult(PostResult),
     PostDataResults(post_results::Sudo),
+    ExpireDataRequests(expire_data_requests::Sudo),
 }
 
 impl From<SudoMsg> for super::SudoMsg {

src/msgs/data_requests/sudo_tests.rs

@@ -63,3 +63,13 @@ fn json_post_result() {
     #[cfg(feature = "cosmwasm")]
     assert_json_deser(msg, expected_json);
 }
+
+#[test]
+fn json_remove_timed_out_data_requests() {
+    let expected_json = json!({"expire_data_requests": {}});
+    let msg: SudoMsg = expire_data_requests::Sudo {}.into();
+    #[cfg(not(feature = "cosmwasm"))]
+    assert_json_ser(msg, expected_json);
+    #[cfg(feature = "cosmwasm")]
+    assert_json_deser(msg, expected_json);
+}

src/msgs/data_requests/types.rs

@@ -297,3 +297,20 @@ impl TryHashSelf for PostDataRequestArgs {
         Ok(dr_hasher.finalize().into())
     }
 }
+
+/// Governance-controlled timeout configuration parameters
+#[cfg_attr(feature = "cosmwasm", cw_serde)]
+#[cfg_attr(not(feature = "cosmwasm"), derive(Serialize, Deserialize, Debug, PartialEq))]
+#[cfg_attr(not(feature = "cosmwasm"), serde(rename_all = "snake_case"))]
+pub struct TimeoutConfig {
+    /// Number of blocks after which a data request is timed out while waiting for commits.
+    pub commit_timeout_in_blocks: u64,
+    /// Number of blocks after which a data request is timed out while waiting for reveals.
+    pub reveal_timeout_in_blocks: u64,
+}
+
+impl From<TimeoutConfig> for crate::msgs::ExecuteMsg {
+    fn from(config: TimeoutConfig) -> Self {
+        super::execute::ExecuteMsg::SetTimeoutConfig(config).into()
+    }
+}

src/msgs/data_requests/types_tests.rs

@@ -4,7 +4,7 @@ use serde_json::json;
 
 #[cfg(feature = "cosmwasm")]
 use super::Bytes;
-use super::{DataRequest, DataResult, HashSelf, PostDataRequestArgs, RevealBody, U128};
+use super::{DataRequest, DataResult, HashSelf, PostDataRequestArgs, RevealBody, TimeoutConfig, U128};
 use crate::msgs::*;
 
 #[test]
@@ -240,3 +240,21 @@ fn json_post_data_request_args() {
 
     assert_json_ser(msg, expected_json);
 }
+
+#[test]
+fn json_timeout_config() {
+    let expected_json = json!({
+        "commit_timeout_in_blocks": 5,
+        "reveal_timeout_in_blocks": 10,
+    });
+
+    let msg = TimeoutConfig {
+        commit_timeout_in_blocks: 5,
+        reveal_timeout_in_blocks: 10,
+    };
+
+    #[cfg(not(feature = "cosmwasm"))]
+    assert_json_ser(msg, expected_json);
+    #[cfg(feature = "cosmwasm")]
+    assert_json_deser(msg, expected_json);
+}

src/msgs/staking/types.rs

@@ -10,7 +10,7 @@ pub struct Staker {
     pub tokens_pending_withdrawal: U128,
 }
 
-/// Governance-controlled configuration parameters
+/// Governance-controlled staking configuration parameters
 #[cfg_attr(feature = "cosmwasm", cw_serde)]
 #[cfg_attr(not(feature = "cosmwasm"), derive(Serialize, Deserialize, Debug, PartialEq))]
 #[cfg_attr(not(feature = "cosmwasm"), serde(rename_all = "snake_case"))]