IBC implementation review

Cargo.toml

@@ -34,15 +34,16 @@ cosmwasm-schema = "2.2.2"
 cosmwasm-std = "2.2.2"
 cw-storage-plus = "2.0.0"
 cw-utils = "2.0.0"
+cw20-ics20 = "2.0.0"
 itertools = "0.14.0"
 prost = "0.13.5"
 schemars = "0.8.22"
 serde = "1.0.219"
+serde_json = "1.0.140"
 sha2 = "0.10.8"
 thiserror = "2.0.12"
 
 [dev-dependencies]
 base64 = "0.22.1"
 hex = "0.4.3"
 hex-literal = "0.4.1"
-serde_json = "1.0.140"

src/app.rs

@@ -6,14 +6,17 @@
     Distribution, DistributionKeeper, StakeKeeper, Staking, StakingSudo,
 };
 use crate::gov::Gov;
-use crate::ibc::Ibc;
+use crate::ibc::{
+    types::IbcResponse, types::MockIbcQuery, IbcModuleMsg, IbcPacketRelayingMsg as IbcSudo,
+};
+use crate::ibc::{Ibc, IbcSimpleModule};
 use crate::module::{FailingModule, Module};
 use crate::prefixed_storage::{
     prefixed, prefixed_multilevel, prefixed_multilevel_read, prefixed_read,
 };
 use crate::transactions::transactional;
 use crate::wasm::{ContractData, Wasm, WasmKeeper, WasmSudo};
-use crate::{AppBuilder, GovFailingModule, IbcFailingModule, Stargate, StargateFailing};
+use crate::{AppBuilder, GovFailingModule, Stargate, StargateFailing};
 use cosmwasm_std::testing::{MockApi, MockStorage};
 use cosmwasm_std::{
     from_json, to_json_binary, Addr, Api, Binary, BlockInfo, ContractResult, CosmosMsg, CustomMsg,
@@ -41,7 +44,7 @@
     WasmKeeper<ExecC, QueryC>,
     StakeKeeper,
     DistributionKeeper,
-    IbcFailingModule,
+    IbcSimpleModule,
     GovFailingModule,
     StargateFailing,
 >;
@@ -58,7 +61,7 @@
     Wasm = WasmKeeper<Empty, Empty>,
     Staking = StakeKeeper,
     Distr = DistributionKeeper,
-    Ibc = IbcFailingModule,
+    Ibc = IbcSimpleModule,
     Gov = GovFailingModule,
     Stargate = StargateFailing,
 > {
@@ -94,7 +97,7 @@
                 WasmKeeper<Empty, Empty>,
                 StakeKeeper,
                 DistributionKeeper,
-                IbcFailingModule,
+                IbcSimpleModule,
                 GovFailingModule,
                 StargateFailing,
             >,
@@ -119,7 +122,7 @@
             WasmKeeper<ExecC, QueryC>,
             StakeKeeper,
             DistributionKeeper,
-            IbcFailingModule,
+            IbcSimpleModule,
             GovFailingModule,
             StargateFailing,
         >,
@@ -484,6 +487,20 @@
         })
     }
 
+    /// Queries the IBC module
+    pub fn ibc_query(&self, query: MockIbcQuery) -> AnyResult<Binary> {
+        let Self {
+            block,
+            router,
+            api,
+            storage,
+        } = self;
+
+        let querier = router.querier(api, storage, block);
+
+        router.ibc.query(api, storage, &querier, block, query)
+    }
+
     /// Runs arbitrary SudoMsg.
     /// This will create a cache before the execution, so no state changes are persisted if this
     /// returns an error, but all are persisted on success.
@@ -566,6 +583,8 @@
     Staking(StakingSudo),
     /// Wasm privileged actions.
     Wasm(WasmSudo),
+    /// Ibc actions, used namely to create channels and relay packets
+    Ibc(IbcSudo),
 }
 
 impl From<WasmSudo> for SudoMsg {
@@ -585,6 +604,20 @@
         SudoMsg::Staking(staking)
     }
 }
+
+/// We use it to allow calling into modules from the ibc module. This is used for receiving packets
+pub struct IbcRouterMsg {
+    pub module: IbcModule,
+    pub msg: IbcModuleMsg,
+}
+
+#[cosmwasm_schema::cw_serde]
+pub enum IbcModule {
+    Wasm(Addr), // The wasm module needs to contain the wasm contract address (usually decoded from the port)
+    Bank,
+    Staking,
+}
+
 /// A trait representing the Cosmos based chain's router.
 ///
 /// This trait is designed for routing messages within the Cosmos ecosystem.
@@ -623,6 +656,15 @@
         block: &BlockInfo,
         msg: SudoMsg,
     ) -> AnyResult<AppResponse>;
+
+    /// Evaluates all ibc related actions
+    fn ibc(
+        &self,
+        api: &dyn Api,
+        storage: &mut dyn Storage,
+        block: &BlockInfo,
+        msg: IbcRouterMsg,
+    ) -> AnyResult<IbcResponse>;
 }
 
 impl<BankT, CustomT, WasmT, StakingT, DistrT, IbcT, GovT, StargateT> CosmosRouter
@@ -699,7 +741,7 @@
                 self.distribution.query(api, storage, &querier, block, req)
             }
             #[cfg(feature = "stargate")]
-            QueryRequest::Ibc(req) => self.ibc.query(api, storage, &querier, block, req),
+            QueryRequest::Ibc(req) => self.ibc.query(api, storage, &querier, block, req.into()),
             #[allow(deprecated)]
             #[cfg(feature = "stargate")]
             QueryRequest::Stargate { path, data } => self
@@ -723,9 +765,99 @@
             SudoMsg::Bank(msg) => self.bank.sudo(api, storage, self, block, msg),
             #[cfg(feature = "staking")]
             SudoMsg::Staking(msg) => self.staking.sudo(api, storage, self, block, msg),
+            SudoMsg::Ibc(msg) => self.ibc.sudo(api, storage, self, block, msg),
             _ => unimplemented!(),
         }
     }
+
+    fn ibc(
+        &self,
+        api: &dyn Api,
+        storage: &mut dyn Storage,
+        block: &BlockInfo,
+        msg: IbcRouterMsg,
+    ) -> AnyResult<IbcResponse> {
+        match msg.module {
+            IbcModule::Bank => match msg.msg {
+                IbcModuleMsg::ChannelOpen(m) => self
+                    .bank
+                    .ibc_channel_open(api, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::ChannelConnect(m) => self
+                    .bank
+                    .ibc_channel_connect(api, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::ChannelClose(m) => self
+                    .bank
+                    .ibc_channel_close(api, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::PacketReceive(m) => self
+                    .bank
+                    .ibc_packet_receive(api, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::PacketAcknowledgement(m) => self
+                    .bank
+                    .ibc_packet_acknowledge(api, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::PacketTimeout(m) => self
+                    .bank
+                    .ibc_packet_timeout(api, storage, self, block, m)
+                    .map(Into::into),
+            },
+            IbcModule::Staking => match msg.msg {
+                IbcModuleMsg::ChannelOpen(m) => self
+                    .staking
+                    .ibc_channel_open(api, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::ChannelConnect(m) => self
+                    .staking
+                    .ibc_channel_connect(api, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::ChannelClose(m) => self
+                    .staking
+                    .ibc_channel_close(api, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::PacketReceive(m) => self
+                    .staking
+                    .ibc_packet_receive(api, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::PacketAcknowledgement(m) => self
+                    .staking
+                    .ibc_packet_acknowledge(api, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::PacketTimeout(m) => self
+                    .staking
+                    .ibc_packet_timeout(api, storage, self, block, m)
+                    .map(Into::into),
+            },
+            IbcModule::Wasm(contract_addr) => match msg.msg {
+                IbcModuleMsg::ChannelOpen(m) => self
+                    .wasm
+                    .ibc_channel_open(api, contract_addr, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::ChannelConnect(m) => self
+                    .wasm
+                    .ibc_channel_connect(api, contract_addr, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::ChannelClose(m) => self
+                    .wasm
+                    .ibc_channel_close(api, contract_addr, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::PacketReceive(m) => self
+                    .wasm
+                    .ibc_packet_receive(api, contract_addr, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::PacketAcknowledgement(m) => self
+                    .wasm
+                    .ibc_packet_acknowledge(api, contract_addr, storage, self, block, m)
+                    .map(Into::into),
+                IbcModuleMsg::PacketTimeout(m) => self
+                    .wasm
+                    .ibc_packet_timeout(api, contract_addr, storage, self, block, m)
+                    .map(Into::into),
+            },
+        }
+    }
 }
 
 pub struct MockRouter<ExecC, QueryC>(PhantomData<(ExecC, QueryC)>);
@@ -783,6 +915,16 @@
     ) -> AnyResult<AppResponse> {
         panic!("Cannot sudo MockRouters");
     }
+
+    fn ibc(
+        &self,
+        _api: &dyn Api,
+        _storage: &mut dyn Storage,
+        _block: &BlockInfo,
+        _msg: IbcRouterMsg,
+    ) -> AnyResult<IbcResponse> {
+        panic!("Cannot ibc MockRouters");
+    }
 }
 
 pub struct RouterQuerier<'a, ExecC, QueryC> {