Movement hubble integration (#3806)

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
     ) {
@@ -105,23 +106,23 @@ module ibc::acknowledge_packet {
         assert!(l > 0, 1);
 
         let first_packet = *vector::borrow(&packets, 0);
-        let source_channel = packet::source_channel(&first_packet);
-        let destination_channel = packet::destination_channel(&first_packet);
+        let source_channel_id = packet::source_channel_id(&first_packet);
+        let destination_channel_id = packet::destination_channel_id(&first_packet);
 
-        let channel = ibc::ensure_channel_state(source_channel);
+        let channel = ibc::ensure_channel_state(source_channel_id);
         let client_id = ibc::ensure_connection_state(channel::connection_id(&channel));
 
         let commitment_key;
         let commitment_value;
         if (l == 1) {
             commitment_key = commitment::batch_receipts_commitment_key(
-                destination_channel,
+                destination_channel_id,
                 commitment::commit_packet(&first_packet)
             );
             commitment_value = commitment::commit_ack(*vector::borrow(&acknowledgements, 0));
         } else {
             commitment_key = commitment::batch_receipts_commitment_key(
-                destination_channel,
+                destination_channel_id,
                 commitment::commit_packets(&packets)
             );
             commitment_value = commitment::commit_acks(acknowledgements);
@@ -145,7 +146,7 @@ module ibc::acknowledge_packet {
             let packet = *vector::borrow(&packets, i);
             let commitment_key =
                 commitment::batch_packets_commitment_key(
-                    source_channel, commitment::commit_packet(&packet)
+                    source_channel_id, commitment::commit_packet(&packet)
                 );
             ibc::remove_commitment(commitment_key);
 
@@ -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

@@ -61,7 +61,7 @@
 module ibc::cometbls_lc {
     use std::vector;
     use std::bcs;
-    use std::string::{Self};
+    use std::string::{Self, String};
     use aptos_std::smart_table::{Self, SmartTable};
     use std::object;
     use std::timestamp;
@@ -113,7 +113,7 @@ module ibc::cometbls_lc {
     }
 
     struct ClientState has copy, drop, store {
-        chain_id: string::String,
+        chain_id: String,
         trusting_period: u64,
         max_clock_drift: u64,
         frozen_height: Height,
@@ -137,7 +137,7 @@ module ibc::cometbls_lc {
         client_id: u32,
         client_state_bytes: vector<u8>,
         consensus_state_bytes: vector<u8>
-    ): (vector<u8>, vector<u8>) {
+    ): (vector<u8>, vector<u8>, String) {
         let client_state = decode_client_state(client_state_bytes);
         let consensus_state = decode_consensus_state(consensus_state_bytes);
 
@@ -164,7 +164,7 @@ module ibc::cometbls_lc {
 
         move_to(&client_signer, state);
 
-        (client_state_bytes, consensus_state_bytes)
+        (client_state_bytes, consensus_state_bytes, client_state.chain_id)
     }
 
     public fun latest_height(client_id: u32): u64 acquires State {
@@ -703,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,
@@ -730,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/consensus_state_update.move

@@ -0,0 +1,84 @@
+// License text copyright (c) 2020 MariaDB Corporation Ab, All Rights Reserved.
+// "Business Source License" is a trademark of MariaDB Corporation Ab.
+
+// Parameters
+
+// Licensor:             Union.fi, Labs Inc.
+// Licensed Work:        All files under https://github.com/unionlabs/union's aptos subdirectory                      
+//                       The Licensed Work is (c) 2024 Union.fi, Labs Inc.
+// Change Date:          Four years from the date the Licensed Work is published.
+// Change License:       Apache-2.0
+// 
+
+// For information about alternative licensing arrangements for the Licensed Work,
+// please contact [email protected].
+
+// Notice
+
+// Business Source License 1.1
+
+// Terms
+
+// The Licensor hereby grants you the right to copy, modify, create derivative
+// works, redistribute, and make non-production use of the Licensed Work. The
+// Licensor may make an Additional Use Grant, above, permitting limited production use.
+
+// Effective on the Change Date, or the fourth anniversary of the first publicly
+// available distribution of a specific version of the Licensed Work under this
+// License, whichever comes first, the Licensor hereby grants you rights under
+// the terms of the Change License, and the rights granted in the paragraph
+// above terminate.
+
+// If your use of the Licensed Work does not comply with the requirements
+// currently in effect as described in this License, you must purchase a
+// commercial license from the Licensor, its affiliated entities, or authorized
+// resellers, or you must refrain from using the Licensed Work.
+
+// All copies of the original and modified Licensed Work, and derivative works
+// of the Licensed Work, are subject to this License. This License applies
+// separately for each version of the Licensed Work and the Change Date may vary
+// for each version of the Licensed Work released by Licensor.
+
+// You must conspicuously display this License on each original or modified copy
+// of the Licensed Work. If you receive the Licensed Work in original or
+// modified form from a third party, the terms and conditions set forth in this
+// License apply to your use of that work.
+
+// Any use of the Licensed Work in violation of this License will automatically
+// terminate your rights under this License for the current and all other
+// versions of the Licensed Work.
+
+// This License does not grant you any right in any trademark or logo of
+// Licensor or its affiliates (provided that you may use a trademark or logo of
+// Licensor as expressly required by this License).
+
+// TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+// AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+// EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
+// TITLE.
+
+module ibc::consensus_state_update {
+    struct ConsensusStateUpdate {
+        client_state_commitment: vector<u8>,
+        consensus_state_commitment: vector<u8>,
+        height: u64
+    }
+
+    public fun new(client_state_commitment: vector<u8>, consensus_state_commitment: vector<u8>, height: u64): ConsensusStateUpdate {
+        ConsensusStateUpdate { client_state_commitment, consensus_state_commitment, height }
+    }
+
+    public fun client_state_commitment(update: &ConsensusStateUpdate): vector<u8> {
+        update.client_state_commitment
+    }
+
+    public fun consensus_state_commitment(update: &ConsensusStateUpdate): vector<u8> {
+        update.consensus_state_commitment
+    }
+
+    public fun height(update: &ConsensusStateUpdate): u64 {
+        update.height
+    }
+
+}

aptos/ibc/sources/ibc.move

@@ -146,17 +146,17 @@ module ibc::ibc {
     const E_PACKET_SEQUENCE_ACK_SEQUENCE_MISMATCH: u64 = 1045;
 
     #[event]
-    struct ClientCreatedEvent has copy, drop, store {
+    struct CreateClient has copy, drop, store {
         client_id: u32,
         client_type: String,
-        consensus_height: u64
+        counterparty_chain_id: String
     }
 
     #[event]
-    struct ClientUpdated has copy, drop, store {
+    struct UpdateClient has copy, drop, store {
         client_id: u32,
         client_type: String,
-        height: u64
+        counterparty_height: u64
     }
 
     #[event]
@@ -229,16 +229,20 @@ module ibc::ibc {
 
     #[event]
     struct RecvIntentPacket has drop, store {
-        packet: Packet
+        packet: Packet,
+        maker: address,
+        maker_msg: vector<u8>
     }
 
     #[event]
-    struct RecvPacket has drop, store {
-        packet: Packet
+    struct PacketRecv has drop, store {
+        packet: Packet,
+        maker: address,
+        maker_msg: vector<u8>
     }
 
     #[event]
-    struct SendPacket has drop, store {
+    struct PacketSend has drop, store {
         source_channel: u32,
         destination_channel: u32,
         data: vector<u8>,
@@ -252,13 +256,14 @@ module ibc::ibc {
     }
 
     #[event]
-    struct AcknowledgePacket has drop, store {
+    struct PacketAck has drop, store {
         packet: Packet,
-        acknowledgement: vector<u8>
+        acknowledgement: vector<u8>,
+        maker: address,
     }
 
     #[event]
-    struct WriteAcknowledgement has drop, store {
+    struct WriteAck has drop, store {
         packet: Packet,
         acknowledgement: vector<u8>
     }
@@ -330,7 +335,7 @@ module ibc::ibc {
         let client_id = generate_client_identifier();
         let store = borrow_global_mut<IBCStore>(get_vault_addr());
 
-        let (client_state, consensus_state) =
+        let (client_state, consensus_state, counterparty_chain_id) =
             light_client::create_client(
                 client_type,
                 &get_ibc_signer(),
@@ -360,7 +365,7 @@ module ibc::ibc {
         );
 
         event::emit(
-            ClientCreatedEvent { client_id, client_type, consensus_height: latest_height }
+            CreateClient { client_id, client_type, counterparty_chain_id: counterparty_chain_id }
         );
     }
 
@@ -660,7 +665,7 @@ module ibc::ibc {
                 hash::sha2_256(*vector::borrow(&consensus_states, i))
             );
 
-            event::emit(ClientUpdated { client_id, client_type, height });
+            event::emit(UpdateClient { client_id, client_type, counterparty_height: height });
 
             i = i + 1;
         };
@@ -1032,7 +1037,7 @@ module ibc::ibc {
     }
 
     /// Used for sending a packet to the counterparty chain. Note that this doesn't send the packet directly, it prepares the packet
-    /// and emits a `SendPacket` event such that it's being picked up by a relayer.
+    /// and emits a `PacketSend` event such that it's being picked up by a relayer.
     ///
     /// * `ibc_app`: The signer of the calling contract.
     /// * `source_port`: The address of the calling contract.
@@ -1079,7 +1084,7 @@ module ibc::ibc {
         );
 
         event::emit(
-            SendPacket {
+            PacketSend {
                 source_channel: source_channel,
                 destination_channel: channel::counterparty_channel_id(&channel),
                 data: data,
@@ -1101,11 +1106,11 @@ module ibc::ibc {
     ) acquires IBCStore {
         assert!(!vector::is_empty(&acknowledgement), E_ACKNOWLEDGEMENT_IS_EMPTY);
 
-        ensure_channel_state(packet::destination_channel(&packet));
+        ensure_channel_state(packet::destination_channel_id(&packet));
 
         let commitment_key =
             commitment::batch_receipts_commitment_key(
-                packet::destination_channel(&packet),
+                packet::destination_channel_id(&packet),
                 commitment::commit_packet(&packet)
             );
         inner_write_acknowledgement(commitment_key, packet, acknowledgement);
@@ -1129,7 +1134,7 @@ module ibc::ibc {
             commitment::commit_ack(acknowledgement)
         );
 
-        event::emit(WriteAcknowledgement { packet, acknowledgement });
+        event::emit(WriteAck { packet, acknowledgement });
     }
 
     public(friend) fun timeout_packet<T: key + store + drop>(
@@ -1155,8 +1160,8 @@ module ibc::ibc {
                 packet_timeout_timestamp
             );
 
-        let source_channel = packet::source_channel(&packet);
-        let destination_channel = packet::destination_channel(&packet);
+        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);
@@ -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(RecvPacket { 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(AcknowledgePacket { packet, acknowledgement });
+        event::emit(PacketAck { packet, acknowledgement, maker });
     }
 
     // #[test(ibc_signer = @ibc)]