Chain Runtime implementation

Cargo.toml

@@ -9,4 +9,19 @@ members = [
 
 exclude = [
     "proto-compiler"
-]
+]
+
+[patch.crates-io]
+tendermint              = { git = "https://github.com/informalsystems/tendermint-rs", branch = "romac/prost-dev" }
+tendermint-rpc          = { git = "https://github.com/informalsystems/tendermint-rs", branch = "romac/prost-dev" }
+tendermint-proto        = { git = "https://github.com/informalsystems/tendermint-rs", branch = "romac/prost-dev" }
+tendermint-light-client = { git = "https://github.com/informalsystems/tendermint-rs", branch = "romac/prost-dev" }
+
+bytes = { git = "https://github.com/tokio-rs/bytes", tag = "v0.6.0" }
+
+tonic = { git = "https://github.com/romac/tonic", branch = "romac/hyper-0.14-dev" }
+
+prost        = { git = "https://github.com/danburkert/prost", branch = "master" }
+prost-types  = { git = "https://github.com/danburkert/prost", branch = "master" }
+prost-build  = { git = "https://github.com/danburkert/prost", branch = "master" }
+prost-derive = { git = "https://github.com/danburkert/prost", branch = "master" }

modules/src/events.rs

@@ -122,13 +122,16 @@ fn extract_helper(events: &HashMap<String, Vec<String>>) -> Result<Vec<(String,
     Ok(result)
 }
 
-pub fn get_all_events(result: RpcEvent) -> Result<Vec<IBCEvent>, String> {
-    let mut vals: Vec<IBCEvent> = vec![];
+pub fn get_all_events(result: RpcEvent) -> Result<Vec<(Height, IBCEvent)>, String> {
+    let mut vals: Vec<(Height, IBCEvent)> = vec![];
 
     match &result.data {
         RpcEventData::NewBlock { block, .. } => {
             let block = block.as_ref().ok_or("missing block")?;
-            vals.push(NewBlock::new(block.header.height).into());
+            vals.push((
+                block.header.height,
+                NewBlock::new(block.header.height).into(),
+            ));
         }
 
         RpcEventData::Tx { .. } => {
@@ -142,21 +145,20 @@ pub fn get_all_events(result: RpcEvent) -> Result<Vec<IBCEvent>, String> {
 
             let actions_and_indices = extract_helper(&events)?;
             for action in actions_and_indices {
-                let event = build_event(RawObject::new(
+                match build_event(RawObject::new(
                     height,
                     action.0,
                     action.1 as usize,
                     events.clone(),
-                ));
-
-                match event {
-                    Ok(event) => vals.push(event),
+                )) {
+                    Ok(event) => vals.push((height, event)),
                     Err(e) => warn!("error while building event {}", e.to_string()),
                 }
             }
         }
         _ => {}
     }
+
     Ok(vals)
 }
 

modules/src/ics02_client/client_def.rs

@@ -117,6 +117,10 @@ impl Header for AnyHeader {
             Self::Mock(header) => header.height(),
         }
     }
+
+    fn wrap_any(self) -> AnyHeader {
+        self
+    }
 }
 
 impl Protobuf<Any> for AnyHeader {}
@@ -246,6 +250,10 @@ impl ClientState for AnyClientState {
             AnyClientState::Mock(mock_state) => mock_state.is_frozen(),
         }
     }
+
+    fn wrap_any(self) -> AnyClientState {
+        self
+    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -318,6 +326,10 @@ impl ConsensusState for AnyConsensusState {
     fn validate_basic(&self) -> Result<(), Box<dyn std::error::Error>> {
         todo!()
     }
+
+    fn wrap_any(self) -> AnyConsensusState {
+        self
+    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]

modules/src/ics02_client/header.rs

@@ -1,12 +1,17 @@
 use crate::ics02_client::client_type::ClientType;
 use crate::Height;
 
+use super::client_def::AnyHeader;
+
 /// Abstract of consensus state update information
 #[dyn_clonable::clonable]
-pub trait Header: Clone + std::fmt::Debug {
+pub trait Header: Clone + std::fmt::Debug + Send + Sync {
     /// The type of client (eg. Tendermint)
     fn client_type(&self) -> ClientType;
 
     /// The height of the consensus state
     fn height(&self) -> Height;
+
+    /// Wrap into an `AnyHeader`
+    fn wrap_any(self) -> AnyHeader;
 }

modules/src/ics02_client/state.rs

@@ -1,9 +1,12 @@
-use super::client_type::ClientType;
+use super::{
+    client_def::{AnyClientState, AnyConsensusState},
+    client_type::ClientType,
+};
 use crate::ics23_commitment::commitment::CommitmentRoot;
 use crate::Height;
 
 #[dyn_clonable::clonable]
-pub trait ConsensusState: Clone + std::fmt::Debug {
+pub trait ConsensusState: Clone + std::fmt::Debug + Send + Sync {
     /// Type of client associated with this consensus state (eg. Tendermint)
     fn client_type(&self) -> ClientType;
 
@@ -12,10 +15,13 @@ pub trait ConsensusState: Clone + std::fmt::Debug {
 
     /// Performs basic validation of the consensus state
     fn validate_basic(&self) -> Result<(), Box<dyn std::error::Error>>;
+
+    /// Wrap into an `AnyConsensusState`
+    fn wrap_any(self) -> AnyConsensusState;
 }
 
 #[dyn_clonable::clonable]
-pub trait ClientState: Clone + std::fmt::Debug {
+pub trait ClientState: Clone + std::fmt::Debug + Send + Sync {
     /// Client ID of this state
     fn chain_id(&self) -> String;
 
@@ -27,4 +33,7 @@ pub trait ClientState: Clone + std::fmt::Debug {
 
     /// Freeze status of the client
     fn is_frozen(&self) -> bool;
+
+    /// Wrap into an `AnyClientState`
+    fn wrap_any(self) -> AnyClientState;
 }

modules/src/ics03_connection/handler/conn_open_ack.rs

@@ -162,7 +162,7 @@ mod tests {
         // Parametrize the (correct) host chain to have a height at least as recent as the
         // the height of the proofs in the Ack msg.
         let correct_context = MockContext::new(
-            ChainId::new("mockgaia", 1).unwrap(),
+            ChainId::new("mockgaia".to_string(), 1),
             HostType::Mock,
             5,
             Height::new(1, msg_ack.proofs().height().increment().version_height),

modules/src/ics03_connection/handler/conn_open_try.rs

@@ -124,7 +124,7 @@ mod tests {
 
         let host_chain_height = Height::new(1, 35);
         let context = MockContext::new(
-            ChainId::new("mockgaia", 1).unwrap(),
+            ChainId::new("mockgaia".to_string(), 1),
             HostType::Mock,
             5,
             host_chain_height,

modules/src/ics07_tendermint/client_state.rs

@@ -6,12 +6,12 @@ use tendermint::consensus::Params;
 use tendermint_light_client::types::TrustThreshold;
 use tendermint_proto::Protobuf;
 
-use crate::Height;
-
+use crate::ics02_client::client_def::AnyClientState;
 use crate::ics02_client::client_type::ClientType;
 use crate::ics07_tendermint::error::{Error, Kind};
 use crate::ics07_tendermint::header::Header;
 use crate::ics23_commitment::merkle::cosmos_specs;
+use crate::Height;
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ClientState {
@@ -123,6 +123,10 @@ impl crate::ics02_client::state::ClientState for ClientState {
         // If 'frozen_height' is set to a non-zero value, then the client state is frozen.
         !self.frozen_height.is_zero()
     }
+
+    fn wrap_any(self) -> AnyClientState {
+        AnyClientState::Tendermint(self)
+    }
 }
 
 impl TryFrom<RawClientState> for ClientState {
@@ -360,7 +364,7 @@ pub mod test_util {
                 Duration::from_secs(128000),
                 Duration::from_millis(3000),
                 Height::new(
-                    ChainId::chain_version(tm_header.chain_id.to_string()),
+                    ChainId::chain_version(tm_header.chain_id.as_str()),
                     u64::from(tm_header.height),
                 ),
                 Height::zero(),

modules/src/ics07_tendermint/consensus_state.rs

@@ -7,7 +7,7 @@ use tendermint::time::Time;
 use tendermint::Hash;
 use tendermint_proto::Protobuf;
 
-use crate::ics02_client::client_type::ClientType;
+use crate::ics02_client::{client_def::AnyConsensusState, client_type::ClientType};
 use crate::ics07_tendermint::error::{Error, Kind};
 use crate::ics07_tendermint::header::Header;
 use crate::ics23_commitment::commitment::CommitmentRoot;
@@ -42,6 +42,10 @@ impl crate::ics02_client::state::ConsensusState for ConsensusState {
     fn validate_basic(&self) -> Result<(), Box<dyn std::error::Error>> {
         unimplemented!()
     }
+
+    fn wrap_any(self) -> AnyConsensusState {
+        AnyConsensusState::Tendermint(self)
+    }
 }
 
 impl Protobuf<RawConsensusState> for ConsensusState {}

modules/src/ics07_tendermint/header.rs

@@ -6,7 +6,7 @@ use tendermint_proto::Protobuf;
 
 use ibc_proto::ibc::lightclients::tendermint::v1::Header as RawHeader;
 
-use crate::ics02_client::client_type::ClientType;
+use crate::ics02_client::{client_def::AnyHeader, client_type::ClientType};
 use crate::ics07_tendermint::error::{Error, Kind};
 use crate::ics24_host::identifier::ChainId;
 use crate::Height;
@@ -27,10 +27,14 @@ impl crate::ics02_client::header::Header for Header {
 
     fn height(&self) -> Height {
         Height::new(
-            ChainId::chain_version(self.signed_header.header.chain_id.to_string()),
+            ChainId::chain_version(self.signed_header.header.chain_id.as_str()),
             u64::from(self.signed_header.header.height),
         )
     }
+
+    fn wrap_any(self) -> AnyHeader {
+        AnyHeader::Tendermint(self)
+    }
 }
 
 impl Protobuf<RawHeader> for Header {}

modules/src/ics18_relayer/utils.rs

@@ -81,7 +81,7 @@ mod tests {
 
         // Create two mock contexts, one for each chain.
         let mut ctx_a = MockContext::new(
-            ChainId::new("mockgaiaA", 1).unwrap(),
+            ChainId::new("mockgaiaA".to_string(), 1),
             HostType::Mock,
             5,
             chain_a_start_height,
@@ -93,7 +93,7 @@ mod tests {
             Some(client_on_a_for_b_height),
         );
         let mut ctx_b = MockContext::new(
-            ChainId::new("mockgaiaB", 1).unwrap(),
+            ChainId::new("mockgaiaB".to_string(), 1),
             HostType::SyntheticTendermint,
             5,
             chain_b_start_height,

modules/src/ics23_commitment/commitment.rs

@@ -5,6 +5,8 @@ use ibc_proto::ibc::core::commitment::v1::MerkleProof as RawMerkleProof;
 
 use crate::ics23_commitment::error::{Error, Kind};
 
+use super::merkle::MerkleProof;
+
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct CommitmentRoot(pub Vec<u8>); // Todo: write constructor
 impl CommitmentRoot {
@@ -45,6 +47,13 @@ impl From<CommitmentProof> for Vec<u8> {
     }
 }
 
+impl From<MerkleProof> for CommitmentProof {
+    fn from(proof: MerkleProof) -> Self {
+        let raw_proof: RawMerkleProof = proof.into();
+        raw_proof.into()
+    }
+}
+
 impl From<RawMerkleProof> for CommitmentProof {
     fn from(proof: RawMerkleProof) -> Self {
         let mut buf = Vec::new();
@@ -64,8 +73,9 @@ impl TryFrom<CommitmentProof> for RawMerkleProof {
     }
 }
 
+// TODO: decent getter or Protobuf trait implementation
 #[derive(Clone, PartialEq, Eq)]
-pub struct CommitmentPrefix(pub Vec<u8>); // Todo: decent getter or DomainType trait implementation
+pub struct CommitmentPrefix(pub Vec<u8>);
 
 impl CommitmentPrefix {
     pub fn is_empty(&self) -> bool {