Connection impl

Cargo.toml

@@ -10,6 +10,8 @@ members = [
     "client-impls/mock/meta",
     "client-impls/qbft",
     "client-impls/qbft/meta",
+    "connection",
+    "connection/meta",
     "host",
     "host/meta"
 ]

client-impls/client-common/src/lib.rs

@@ -1,6 +1,6 @@
 #![no_std]
 
-use common_types::{channel_types::height, Hash, Timestamp};
+use common_types::{channel_types::height, ClientId, Hash, Timestamp};
 
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
@@ -10,21 +10,44 @@ pub struct ConsensusStateUpdate<M: ManagedTypeApi> {
     pub height: height::Data,
 }
 
-#[derive(TypeAbi, TopEncode, TopDecode, NestedEncode, PartialEq)]
+#[derive(TypeAbi, TopEncode, TopDecode, NestedEncode, NestedDecode, PartialEq)]
 pub enum ClientStatus {
     None,
     Active,
     Expired,
     Frozen,
 }
 
-#[derive(TypeAbi, TopEncode)]
+#[derive(TypeAbi, TopEncode, TopDecode)]
 pub struct GetLatestInfoResultType {
     pub latest_height: height::Data,
     pub latest_timestamp: Timestamp,
     pub client_status: ClientStatus,
 }
 
+#[derive(TypeAbi, TopEncode, TopDecode)]
+pub struct VerifyMembershipArgs<M: ManagedTypeApi> {
+    pub client_id: ClientId<M>,
+    pub height: height::Data,
+    pub delay_time_period: Timestamp,
+    pub delay_block_period: u64,
+    pub proof: Hash<M>,
+    pub prefix: ManagedBuffer<M>,
+    pub path: ManagedBuffer<M>,
+    pub value: ManagedBuffer<M>,
+}
+
+#[derive(TypeAbi, TopEncode, TopDecode)]
+pub struct VerifyNonMembershipArgs<M: ManagedTypeApi> {
+    pub client_id: ClientId<M>,
+    pub height: height::Data,
+    pub delay_time_period: Timestamp,
+    pub delay_block_period: u64,
+    pub proof: Hash<M>,
+    pub prefix: ManagedBuffer<M>,
+    pub path: ManagedBuffer<M>,
+}
+
 #[multiversx_sc::module]
 pub trait CommonClientLogicModule {
     fn set_ibc_handler(&self, ibc_handler: &ManagedAddress) {

client-impls/local-host/src/views.rs

@@ -1,4 +1,6 @@
-use client_common::{ClientStatus, GetLatestInfoResultType};
+use client_common::{
+    ClientStatus, GetLatestInfoResultType, VerifyMembershipArgs, VerifyNonMembershipArgs,
+};
 use common_types::{channel_types::height, ClientId, Hash, Timestamp};
 use host::{host_views::ProxyTrait as _, storage::ProxyTrait as _};
 
@@ -74,60 +76,41 @@ pub trait ViewsModule:
     ///
     /// Proof uses "DEFAULT_PROOF_BYTES"
     #[view(verifyMembership)]
-    fn verify_membership(
-        &self,
-        client_id: ClientId<Self::Api>,
-        height: height::Data,
-        _delay_time_period: Timestamp,
-        _delay_block_period: u64,
-        proof: Hash<Self::Api>,
-        prefix: ManagedBuffer,
-        path: ManagedBuffer,
-        value: ManagedBuffer,
-    ) -> bool {
-        self.require_valid_client_id(&client_id);
-        let _ = self.get_timestamp_at_height(&client_id, &height);
-        self.require_ibc_prefix(&prefix);
+    fn verify_membership(&self, args: VerifyMembershipArgs<Self::Api>) -> bool {
+        self.require_valid_client_id(&args.client_id);
+        let _ = self.get_timestamp_at_height(&args.client_id, &args.height);
+        self.require_ibc_prefix(&args.prefix);
 
         let default_proof = self
             .crypto()
             .keccak256(ManagedBuffer::from(DEFAULT_PROOF_BYTES));
-        require!(proof == default_proof, "Invalid proof");
+        require!(args.proof == default_proof, "Invalid proof");
 
         let ibc_handler = self.ibc_handler().get();
-        let hashed_path = self.crypto().keccak256(path);
+        let hashed_path = self.crypto().keccak256(args.path);
         let hash: Hash<Self::Api> = self
             .host_proxy(ibc_handler)
             .get_commitment(&hashed_path)
             .execute_on_dest_context();
 
-        hash == self.crypto().keccak256(value)
+        hash == self.crypto().keccak256(args.value)
     }
 
     /// A generic proof verification method which verifies the absence of a given CommitmentPath at a specified height
     ///
     /// The caller is expected to construct the full CommitmentPath from a CommitmentPrefix and a standardized path (as defined in ICS 24)
     #[view(verifyNonMembership)]
-    fn verify_non_membership(
-        &self,
-        client_id: ClientId<Self::Api>,
-        height: height::Data,
-        _delay_time_period: Timestamp,
-        _delay_block_period: u64,
-        proof: Hash<Self::Api>,
-        prefix: ManagedBuffer,
-        path: ManagedBuffer,
-    ) -> bool {
-        let _ = self.get_timestamp_at_height(&client_id, &height);
-        self.require_ibc_prefix(&prefix);
+    fn verify_non_membership(&self, args: VerifyNonMembershipArgs<Self::Api>) -> bool {
+        let _ = self.get_timestamp_at_height(&args.client_id, &args.height);
+        self.require_ibc_prefix(&args.prefix);
 
         let default_proof = self
             .crypto()
             .keccak256(ManagedBuffer::from(DEFAULT_PROOF_BYTES));
-        require!(proof == default_proof, "Invalid proof");
+        require!(args.proof == default_proof, "Invalid proof");
 
         let ibc_handler = self.ibc_handler().get();
-        let hashed_path = self.crypto().keccak256(path);
+        let hashed_path = self.crypto().keccak256(args.path);
         let hash: Hash<Self::Api> = self
             .host_proxy(ibc_handler)
             .get_commitment(&hashed_path)

client-impls/mock/src/views.rs

@@ -1,4 +1,6 @@
-use client_common::{ClientStatus, GetLatestInfoResultType};
+use client_common::{
+    ClientStatus, GetLatestInfoResultType, VerifyMembershipArgs, VerifyNonMembershipArgs,
+};
 use common_types::{channel_types::height, ClientId, Hash, Timestamp};
 use host::host_views::ProxyTrait as _;
 
@@ -58,43 +60,29 @@ pub trait ViewsModule:
     ///
     /// The caller is expected to construct the full CommitmentPath from a CommitmentPrefix and a standardized path (as defined in ICS 24)
     #[view(verifyMembership)]
-    fn verify_membership(
-        &self,
-        client_id: ClientId<Self::Api>,
-        height: height::Data,
-        _delay_time_period: Timestamp,
-        _delay_block_period: u64,
-        proof: Hash<Self::Api>,
-        prefix: ManagedBuffer,
-        path: ManagedBuffer,
-        value: ManagedBuffer,
-    ) -> bool {
-        let _ = self.get_timestamp_at_height(&client_id, &height);
-        self.require_ibc_prefix(&prefix);
-
-        let local_proof = self.encode_and_hash(&height, &prefix, &path, &value);
-        local_proof == proof
+    fn verify_membership(&self, args: VerifyMembershipArgs<Self::Api>) -> bool {
+        let _ = self.get_timestamp_at_height(&args.client_id, &args.height);
+        self.require_ibc_prefix(&args.prefix);
+
+        let local_proof = self.encode_and_hash(&args.height, &args.prefix, &args.path, &args.value);
+        local_proof == args.proof
     }
 
     /// A generic proof verification method which verifies the absence of a given CommitmentPath at a specified height
     ///
     /// The caller is expected to construct the full CommitmentPath from a CommitmentPrefix and a standardized path (as defined in ICS 24)
     #[view(verifyNonMembership)]
-    fn verify_non_membership(
-        &self,
-        client_id: ClientId<Self::Api>,
-        height: height::Data,
-        _delay_time_period: Timestamp,
-        _delay_block_period: u64,
-        proof: Hash<Self::Api>,
-        prefix: ManagedBuffer,
-        path: ManagedBuffer,
-    ) -> bool {
-        let _ = self.get_timestamp_at_height(&client_id, &height);
-        self.require_ibc_prefix(&prefix);
-
-        let local_proof = self.encode_and_hash(&height, &prefix, &path, &ManagedBuffer::new());
-        local_proof == proof
+    fn verify_non_membership(&self, args: VerifyNonMembershipArgs<Self::Api>) -> bool {
+        let _ = self.get_timestamp_at_height(&args.client_id, &args.height);
+        self.require_ibc_prefix(&args.prefix);
+
+        let local_proof = self.encode_and_hash(
+            &args.height,
+            &args.prefix,
+            &args.path,
+            &ManagedBuffer::new(),
+        );
+        local_proof == args.proof
     }
 
     /// returns the clientState corresponding to `clientId`

client/src/create_and_update_clients.rs

@@ -68,8 +68,6 @@ pub trait CreateAndUpdateClientsModule:
         let client_impl_mapper = self.client_registry(&args.client_type);
         require!(!client_impl_mapper.is_empty(), "Client not registered");
 
-        // TODO: Check register function
-
         let client_impl = client_impl_mapper.get();
         let client_id = self.generate_client_identifier(&args.client_type);
         self.client_info(&client_id).set(ClientInfo {
@@ -123,12 +121,7 @@ pub trait CreateAndUpdateClientsModule:
         &self,
         client_type: &ClientType<Self::Api>,
     ) -> ClientId<Self::Api> {
-        let next_client_seq = self.host_info().update(|host_info| {
-            let returned_val = host_info.next_client_seq;
-            host_info.next_client_seq += 1;
-
-            returned_val
-        });
+        let next_client_seq = self.get_next_client_seq();
 
         sc_format!("{}-{}", client_type, next_client_seq)
     }

client/wasm/src/lib.rs

@@ -6,9 +6,9 @@
 
 // Init:                                 1
 // Upgrade:                              1
-// Endpoints:                            7
+// Endpoints:                           10
 // Async Callback (empty):               1
-// Total number of exported functions:  10
+// Total number of exported functions:  13
 
 #![no_std]
 
@@ -23,6 +23,9 @@ multiversx_sc_wasm_adapter::endpoints! {
         createClient => create_client
         updateClient => update_client
         updateClientCommitments => update_client_commitments
+        setExpectedTimePerBlock => set_expected_time_per_block
+        registerClient => register_client
+        bindPort => bind_port
         getHostTimestamp => get_host_timestamp
         getCommitmentPrefix => get_commitment_prefix
         checkAndGetClient => check_and_get_client

common/common-modules/src/utils.rs

@@ -20,4 +20,11 @@ pub trait UtilsModule {
             None => sc_panic!("Overlow!!!"),
         }
     }
+
+    fn encode_to_buffer<T: TopEncode>(&self, value: &T) -> ManagedBuffer {
+        let mut encoded_value = ManagedBuffer::new();
+        let _ = value.top_encode(&mut encoded_value);
+
+        encoded_value
+    }
 }

common/common-types/src/channel_types.rs

@@ -6,20 +6,20 @@ pub mod channel {
 
     #[derive(TypeAbi, TopEncode, TopDecode, NestedEncode, NestedDecode)]
     pub enum State {
-        StateUninitializedUnspecified,
-        StateInit,
-        StateTryOpen,
-        StateOpen,
-        StateClosed,
-        StateFlushing,
-        StateFlushComplete,
+        UninitializedUnspecified,
+        Init,
+        TryOpen,
+        Open,
+        Closed,
+        Flushing,
+        FlushComplete,
     }
 
     #[derive(TypeAbi, TopEncode, TopDecode, NestedEncode, NestedDecode)]
     pub enum Order {
-        OrderNoneUnspecified,
-        OrderUnordered,
-        OrderOrdered,
+        NoneUnspecified,
+        Unordered,
+        Ordered,
     }
 
     #[derive(TypeAbi, TopEncode, TopDecode, NestedEncode, NestedDecode)]