chore(movement-hubble): fixed wrong event names & params

Signed-off-by: Kaan Caglan <[email protected]>

Author: Caglankaan

aptos/ibc/sources/acknowledge_packet.move

@@ -78,6 +78,7 @@ module ibc::acknowledge_packet {
         packet_timeout_heights: vector<u64>,
         packet_timeout_timestamps: vector<u64>,
         acknowledgements: vector<vector<u8>>,
+        maker: address,
         proof: vector<u8>,
         proof_height: u64
     ) {
@@ -157,7 +158,7 @@ module ibc::acknowledge_packet {
 
             dispatcher::delete_storage<T>();
 
-            ibc::emit_acknowledge_packet(packet, acknowledgement);
+            ibc::emit_acknowledge_packet(packet, acknowledgement, maker);
 
             i = i + 1;
         }

aptos/ibc/sources/cometbls_lc.move

@@ -70,7 +70,6 @@ module ibc::cometbls_lc {
     use ibc::bcs_utils;
     use ibc::groth16_verifier::{Self, ZKP};
     use ibc::height::{Self, Height};
-    use ibc::consensus_state_update::{Self, ConsensusStateUpdate};
 
     const E_INVALID_CLIENT_STATE: u64 = 35100;
     const E_CONSENSUS_STATE_TIMESTAMP_ZERO: u64 = 35101;
@@ -138,7 +137,7 @@ module ibc::cometbls_lc {
         client_id: u32,
         client_state_bytes: vector<u8>,
         consensus_state_bytes: vector<u8>
-    ): (ConsensusStateUpdate, String) {
+    ): (vector<u8>, vector<u8>, String) {
         let client_state = decode_client_state(client_state_bytes);
         let consensus_state = decode_consensus_state(consensus_state_bytes);
 
@@ -164,12 +163,8 @@ module ibc::cometbls_lc {
         let client_signer = object::generate_signer(&store_constructor);
 
         move_to(&client_signer, state);
-        let state_update = ConsensusStateUpdate {
-            client_state_commitment: encode_client_state(&client_state),
-            consensus_state_commitment: encode_consensus_state(&consensus_state),
-            height: client_state.latest_height
-        };
-        (state_update, client_state.chain_id)
+
+        (client_state_bytes, consensus_state_bytes, client_state.chain_id)
     }
 
     public fun latest_height(client_id: u32): u64 acquires State {
@@ -708,7 +703,7 @@ module ibc::cometbls_lc {
             next_validators_hash: x"0000000000000000000000000000000000000000000000000000000000000000"
         };
 
-        let (cs, cons) =
+        let (cs, cons, _counterparty_channel_id) =
             create_client(
                 ibc_signer,
                 0,
@@ -735,7 +730,7 @@ module ibc::cometbls_lc {
         client_state.trusting_period = 2;
         consensus_state.timestamp = 20000;
 
-        let (cs, cons) =
+        let (cs, cons, _counterparty_channel_id) =
             create_client(
                 ibc_signer,
                 2,

aptos/ibc/sources/ibc.move

@@ -149,7 +149,7 @@ module ibc::ibc {
     struct CreateClient has copy, drop, store {
         client_id: u32,
         client_type: String,
-        counterpaty_chain_id: String
+        counterparty_chain_id: String
     }
 
     #[event]
@@ -229,18 +229,22 @@ module ibc::ibc {
 
     #[event]
     struct RecvIntentPacket has drop, store {
-        packet: Packet
+        packet: Packet,
+        maker: address,
+        maker_msg: vector<u8>
     }
 
     #[event]
     struct PacketRecv has drop, store {
-        packet: Packet
+        packet: Packet,
+        maker: address,
+        maker_msg: vector<u8>
     }
 
     #[event]
     struct PacketSend has drop, store {
-        source_channel_id: u32,
-        destination_channel_id: u32,
+        source_channel: u32,
+        destination_channel: u32,
         data: vector<u8>,
         timeout_height: u64,
         timeout_timestamp: u64
@@ -254,7 +258,8 @@ module ibc::ibc {
     #[event]
     struct PacketAck has drop, store {
         packet: Packet,
-        acknowledgement: vector<u8>
+        acknowledgement: vector<u8>,
+        maker: address,
     }
 
     #[event]
@@ -330,7 +335,7 @@ module ibc::ibc {
         let client_id = generate_client_identifier();
         let store = borrow_global_mut<IBCStore>(get_vault_addr());
 
-        let (update, counterparty_chain_id) =
+        let (client_state, consensus_state, counterparty_chain_id) =
             light_client::create_client(
                 client_type,
                 &get_ibc_signer(),
@@ -348,19 +353,19 @@ module ibc::ibc {
         table::upsert(
             &mut store.commitments,
             commitment::client_state_commitment_key(client_id),
-            update.client_state_commitment
+            client_state
         );
 
         let latest_height = light_client::latest_height(client_type, client_id);
 
         table::upsert(
             &mut store.commitments,
             commitment::consensus_state_commitment_key(client_id, latest_height),
-            update.consensus_state_commitment
+            consensus_state
         );
 
         event::emit(
-            CreateClient { client_id, client_type, counterpaty_chain_id: latest_height }
+            CreateClient { client_id, client_type, counterparty_chain_id: counterparty_chain_id }
         );
     }
 
@@ -1036,7 +1041,7 @@ module ibc::ibc {
     ///
     /// * `ibc_app`: The signer of the calling contract.
     /// * `source_port`: The address of the calling contract.
-    /// * `source_channel_id`: The source channel that will be used for sending this packet.
+    /// * `source_channel`: The source channel that will be used for sending this packet.
     /// * `timeout_height`: The height in the COUNTERPARTY chain when this packet will time out. `0` means none, but note that both
     ///   `timeout_height` and `timeout_timestamp` cannot be `0`.
     /// * `timeout_timestamp`: The timestamp when this packet will time out. `0` means none, but note that both `timeout_height`
@@ -1045,7 +1050,7 @@ module ibc::ibc {
     public fun send_packet(
         ibc_app: &signer,
         source_port: address,
-        source_channel_id: u32,
+        source_channel: u32,
         timeout_height: u64,
         timeout_timestamp: u64,
         data: vector<u8>
@@ -1056,21 +1061,21 @@ module ibc::ibc {
             abort E_TIMEOUT_MUST_BE_SET
         };
 
-        let channel = ensure_channel_state(source_channel_id);
+        let channel = ensure_channel_state(source_channel);
 
         let store = borrow_global_mut<IBCStore>(get_vault_addr());
 
         let packet =
             packet::new(
-                source_channel_id,
+                source_channel,
                 channel::counterparty_channel_id(&channel),
                 data,
                 timeout_height,
                 timeout_timestamp
             );
         let commitment_key =
             commitment::batch_packets_commitment_key(
-                source_channel_id, commitment::commit_packet(&packet)
+                source_channel, commitment::commit_packet(&packet)
             );
         table::upsert(
             &mut store.commitments,
@@ -1080,8 +1085,8 @@ module ibc::ibc {
 
         event::emit(
             PacketSend {
-                source_channel_id: source_channel_id,
-                destination_channel_id: channel::counterparty_channel_id(&channel),
+                source_channel: source_channel,
+                destination_channel: channel::counterparty_channel_id(&channel),
                 data: data,
                 timeout_height: timeout_height,
                 timeout_timestamp: timeout_timestamp
@@ -1155,9 +1160,9 @@ module ibc::ibc {
                 packet_timeout_timestamp
             );
 
-        let source_channel_id = packet::source_channel_id(&packet);
-        let destination_channel_id = packet::destination_channel_id(&packet);
-        let channel = ensure_channel_state(source_channel_id);
+        let source_channel = packet::source_channel_id(&packet);
+        let destination_channel = packet::destination_channel_id(&packet);
+        let channel = ensure_channel_state(source_channel);
         let client_id = ensure_connection_state(channel::connection_id(&channel));
         let client_type = client_id_to_type(client_id);
 
@@ -1167,7 +1172,7 @@ module ibc::ibc {
 
         let commitment_key =
             commitment::batch_receipts_commitment_key(
-                destination_channel_id, commitment::commit_packet(&packet)
+                destination_channel, commitment::commit_packet(&packet)
             );
         let err =
             verify_absent_commitment(
@@ -1195,7 +1200,7 @@ module ibc::ibc {
 
         let commitment_key =
             commitment::batch_packets_commitment_key(
-                source_channel_id, commitment::commit_packet(&packet)
+                source_channel, commitment::commit_packet(&packet)
             );
         table::remove(
             &mut borrow_global_mut<IBCStore>(get_vault_addr()).commitments,
@@ -1345,12 +1350,12 @@ module ibc::ibc {
     }
 
     fun set_next_sequence_recv(
-        destination_channel_id: u32, received_sequence: u64
+        destination_channel: u32, received_sequence: u64
     ) acquires IBCStore {
         let store = borrow_global_mut<IBCStore>(get_vault_addr());
 
         let next_sequence_recv_key =
-            commitment::next_sequence_recv_commitment_key(destination_channel_id);
+            commitment::next_sequence_recv_commitment_key(destination_channel);
 
         let expected_recv_sequence =
             from_bcs::to_u64(
@@ -1368,10 +1373,10 @@ module ibc::ibc {
         );
     }
 
-    fun set_next_sequence_ack(source_channel_id: u32, ack_sequence: u64) acquires IBCStore {
+    fun set_next_sequence_ack(source_channel: u32, ack_sequence: u64) acquires IBCStore {
         let store = borrow_global_mut<IBCStore>(get_vault_addr());
 
-        let commitment_key = commitment::next_sequence_ack_commitment_key(source_channel_id);
+        let commitment_key = commitment::next_sequence_ack_commitment_key(source_channel);
 
         let expected_ack_sequence =
             from_bcs::to_u64(*table::borrow(&store.commitments, commitment_key));
@@ -1583,18 +1588,18 @@ module ibc::ibc {
         string_utils::to_string(&bcs::to_bytes(&addr))
     }
 
-    public(friend) fun emit_recv_packet(packet: Packet) {
-        event::emit(PacketRecv { packet })
+    public(friend) fun emit_recv_packet(packet: Packet, maker: address, maker_msg: vector<u8>) {
+        event::emit(PacketRecv { packet, maker, maker_msg })
     }
 
-    public(friend) fun emit_recv_intent_packet(packet: Packet) {
-        event::emit(RecvIntentPacket { packet })
+    public(friend) fun emit_recv_intent_packet(packet: Packet, maker: address, maker_msg: vector<u8>) {
+        event::emit(RecvIntentPacket { packet, maker, maker_msg })
     }
 
     public(friend) fun emit_acknowledge_packet(
-        packet: Packet, acknowledgement: vector<u8>
+        packet: Packet, acknowledgement: vector<u8>, maker: address
     ) {
-        event::emit(PacketAck { packet, acknowledgement });
+        event::emit(PacketAck { packet, acknowledgement, maker });
     }
 
     // #[test(ibc_signer = @ibc)]

aptos/ibc/sources/light_client.move

@@ -62,7 +62,6 @@ module ibc::light_client {
     use ibc::cometbls_lc;
     use ibc::state_lens_ics23_mpt_lc;
     use ibc::state_lens_ics23_ics23_lc;
-    use ibc::consensus_state_update::{ConsensusStateUpdate, Self};
     use std::string::{Self, String};
 
     const E_UNKNOWN_CLIENT_TYPE: u64 = 1;
@@ -76,34 +75,34 @@ module ibc::light_client {
         client_id: u32,
         client_state_bytes: vector<u8>,
         consensus_state_bytes: vector<u8>
-    ): (ConsensusStateUpdate, String) {
+    ): (vector<u8>, vector<u8>, String) {
         if (string::bytes(&client_type) == &CLIENT_TYPE_COMETBLS) {
-            let (client_state, counterpaty_chain_id) =
+            let (client_state, consensus_state, counterparty_chain_id) =
                 cometbls_lc::create_client(
                     ibc_signer,
                     client_id,
                     client_state_bytes,
                     consensus_state_bytes
                 );
-            return (client_state, counterpaty_chain_id)
+            return (client_state, consensus_state, counterparty_chain_id)
         } else if (string::bytes(&client_type) == &CLIENT_TYPE_STATE_LENS_ICS23_MPT) {
-            let (client_state, counterpaty_chain_id) =
+            let (client_state, consensus_state, counterparty_chain_id) =
                 state_lens_ics23_mpt_lc::create_client(
                     ibc_signer,
                     client_id,
                     client_state_bytes,
                     consensus_state_bytes
                 );
-            return (client_state, counterpaty_chain_id)
+            return (client_state, consensus_state, counterparty_chain_id)
         } else if (string::bytes(&client_type) == &CLIENT_TYPE_STATE_LENS_ICS23_ICS23) {
-            let (client_state, counterpaty_chain_id) =
+            let (client_state, consensus_state, counterparty_chain_id) =
                 state_lens_ics23_ics23_lc::create_client(
                     ibc_signer,
                     client_id,
                     client_state_bytes,
                     consensus_state_bytes
                 );
-            return (client_state, counterpaty_chain_id)
+            return (client_state, consensus_state, counterparty_chain_id)
         };
         abort E_UNKNOWN_CLIENT_TYPE
 

aptos/ibc/sources/recv_packet.move

@@ -84,6 +84,8 @@ module ibc::recv_packet {
         packet_data: vector<vector<u8>>,
         packet_timeout_heights: vector<u64>,
         packet_timeout_timestamps: vector<u64>,
+        relayer_msgs: vector<vector<u8>>,
+        relayer: address,
         proof: vector<u8>,
         proof_height: u64
     ) {
@@ -106,11 +108,13 @@ module ibc::recv_packet {
             i = i + 1;
         };
 
-        process_receive<T>(packets, proof_height, proof, false);
+        process_receive<T>(packets, relayer, relayer_msgs, proof_height, proof, false);
     }
 
     public fun process_receive<T: key + store + drop>(
         packets: vector<Packet>,
+        maker: address,
+        maker_msgs: vector<vector<u8>>,
         proof_height: u64,
         proof: vector<u8>,
         intent: bool
@@ -183,6 +187,7 @@ module ibc::recv_packet {
                 );
 
             if (!set_packet_receive(commitment_key)) {
+                let maker_msg = *vector::borrow(&maker_msgs, i);
                 let acknowledgement =
                     if (intent) {
                         let param = helpers::pack_recv_intent_packet_params(packet, @ibc, b"");
@@ -191,7 +196,7 @@ module ibc::recv_packet {
                         let ack = dispatcher::get_return_value<T>();
 
                         dispatcher::delete_storage<T>();
-                        ibc::emit_recv_intent_packet(packet);
+                        ibc::emit_recv_intent_packet(packet, maker, maker_msg);
                         ack
                     } else {
                         let param = helpers::pack_recv_packet_params(packet, @ibc, b"");
@@ -200,7 +205,7 @@ module ibc::recv_packet {
                         let ack = dispatcher::get_return_value<T>();
 
                         dispatcher::delete_storage<T>();
-                        ibc::emit_recv_packet(packet);
+                        ibc::emit_recv_packet(packet, maker, maker_msg);
                         ack
                     };
                 if (vector::length(&acknowledgement) > 0) {