feat(controller): ability to update timeout for IBC channels

contracts/controller/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ibc-controller"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Astroport"]
 license = "Apache-2.0"
 description = "IBC controller contract intended to be hosted on the main chain."

contracts/controller/src/contract.rs

@@ -2,17 +2,17 @@ use astroport_ibc::TIMEOUT_LIMITS;
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{
-    to_binary, Binary, CosmosMsg, Deps, DepsMut, Empty, Env, IbcMsg, IbcTimeout, MessageInfo,
-    Response, StdError,
+    to_binary, Binary, CosmosMsg, Deps, DepsMut, Env, IbcMsg, IbcTimeout, MessageInfo, Response,
+    StdError,
 };
 use cw2::{get_contract_version, set_contract_version};
 use ibc_controller_package::astroport_governance::assembly::ProposalStatus;
 
 use ibc_controller_package::astroport_governance::astroport::common::{
     claim_ownership, drop_ownership_proposal, propose_new_owner,
 };
-use ibc_controller_package::QueryMsg;
 use ibc_controller_package::{ExecuteMsg, IbcProposal, InstantiateMsg};
+use ibc_controller_package::{MigrateMsg, QueryMsg};
 
 use crate::error::ContractError;
 use crate::migration::migrate_config;
@@ -82,6 +82,23 @@ pub fn execute(
                 .add_attribute("action", "ibc_execute")
                 .add_attribute("channel", channel_id))
         }
+        ExecuteMsg::UpdateTimeout { new_timeout } => {
+            if config.owner != info.sender {
+                return Err(ContractError::Unauthorized {});
+            }
+            if !TIMEOUT_LIMITS.contains(&new_timeout) {
+                return Err(ContractError::TimeoutLimitsError {});
+            }
+
+            CONFIG.update::<_, StdError>(deps.storage, |mut config| {
+                config.timeout = new_timeout;
+                Ok(config)
+            })?;
+
+            Ok(Response::new()
+                .add_attribute("action", "update_timeout")
+                .add_attribute("timeout", new_timeout.to_string()))
+        }
         ExecuteMsg::ProposeNewOwner { owner, expires_in } => propose_new_owner(
             deps,
             info,
@@ -122,12 +139,26 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<Binary, ContractErr
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]
-pub fn migrate(mut deps: DepsMut, _env: Env, _msg: Empty) -> Result<Response, ContractError> {
+pub fn migrate(mut deps: DepsMut, _env: Env, msg: MigrateMsg) -> Result<Response, ContractError> {
     let contract_version = get_contract_version(deps.storage)?;
 
     match contract_version.contract.as_ref() {
         "ibc-controller" => match contract_version.version.as_ref() {
             "0.1.0" => migrate_config(&mut deps)?,
+            "0.2.0" => {
+                let new_timeout = msg
+                    .new_timeout
+                    .ok_or_else(|| StdError::generic_err("Missing new_timeout field"))?;
+
+                if !TIMEOUT_LIMITS.contains(&new_timeout) {
+                    return Err(ContractError::TimeoutLimitsError {});
+                }
+
+                CONFIG.update::<_, StdError>(deps.storage, |mut config| {
+                    config.timeout = new_timeout;
+                    Ok(config)
+                })?;
+            }
             _ => return Err(ContractError::MigrationError {}),
         },
         _ => return Err(ContractError::MigrationError {}),

contracts/satellite/tests/integration.rs

@@ -7,6 +7,7 @@ use cosmwasm_std::{
     StdResult,
 };
 
+use astroport_ibc::TIMEOUT_LIMITS;
 use cw_multi_test::{App, Contract, ContractWrapper, Executor};
 
 fn mock_app(owner: &Addr, coins: Vec<Coin>) -> App {
@@ -65,7 +66,11 @@ fn test_check_messages() {
         )
         .unwrap_err();
     assert_eq!(
-        "Timeout must be within limits (60 <= timeout <= 600)",
+        format!(
+            "Timeout must be within limits ({} <= timeout <= {})",
+            TIMEOUT_LIMITS.start(),
+            TIMEOUT_LIMITS.end()
+        ),
         err.root_cause().to_string()
     );
 

packages/astroport-ibc/src/lib.rs

@@ -1,3 +1,3 @@
 use std::ops::RangeInclusive;
 
-pub const TIMEOUT_LIMITS: RangeInclusive<u64> = 60..=600;
+pub const TIMEOUT_LIMITS: RangeInclusive<u64> = 60..=43200;

packages/controller/src/lib.rs

@@ -15,11 +15,14 @@ pub struct IbcProposal {
 
 #[cw_serde]
 pub enum ExecuteMsg {
+    /// Executes the IBC proposal that came from Assembly contract
     IbcExecuteProposal {
         channel_id: String,
         proposal_id: u64,
         messages: Vec<CosmosMsg>,
     },
+    /// Updates the timeout for the IBC channel
+    UpdateTimeout { new_timeout: u64 },
     /// Creates a request to change contract ownership
     /// ## Executor
     /// Only the current owner can execute this.
@@ -39,6 +42,11 @@ pub enum ExecuteMsg {
     ClaimOwnership {},
 }
 
+#[cw_serde]
+pub struct MigrateMsg {
+    pub new_timeout: Option<u64>,
+}
+
 #[cw_serde]
 #[derive(QueryResponses)]
 pub enum QueryMsg {