feat(voyager): fixes and improvements

unionlabs · Dec 20, 2024 · 7158fbb · 7158fbb
1 parent dcea7c0
commit 7158fbb
Show file tree

Hide file tree

Showing 12 changed files with 673 additions and 402 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cosmwasm/union-ibc/README.md b/cosmwasm/union-ibc/README.md
@@ -1,3 +1,3 @@
 - `union-ibc`: [union17e93ukhcyesrvu72cgfvamdhyracghrx4f7ww89rqjg944ntdegscxepme](https://explorer.testnet-9.union.build/union/cosmwasm/0/transactions?contract=union17e93ukhcyesrvu72cgfvamdhyracghrx4f7ww89rqjg944ntdegscxepme)
 - `etheruem-light-client`: [union198amaja0zfw53czzfph55xlhwf736qkrcvppx6y3a5rkqmxaj9fshqmczk](https://explorer.testnet-9.union.build/union/cosmwasm/0/transactions?contract=union198amaja0zfw53czzfph55xlhwf736qkrcvppx6y3a5rkqmxaj9fshqmczk)
-- `union-ibc-ucs00-pingpong`: [union194e3rchcaqyynwcj6qr6647ge7lheymrgkhq9tdknw35050ufhuqzqz2he](https://explorer.testnet-9.union.build/union/cosmwasm/0/transactions?contract=union194e3rchcaqyynwcj6qr6647ge7lheymrgkhq9tdknw35050ufhuqzqz2he)
+- `union-ibc-ucs00-pingpong`: [union1aj2z8mf6ppg4pjsj787t69phxy3mx8p7ce8ncem05lls5j29haxsumypzd](https://explorer.testnet-9.union.build/union/cosmwasm/0/transactions?contract=union194e3rchcaqyynwcj6qr6647ge7lheymrgkhq9tdknw35050ufhuqzqz2he)
diff --git a/cosmwasm/union-ibc/core/src/contract.rs b/cosmwasm/union-ibc/core/src/contract.rs
@@ -44,9 +44,9 @@ type ContractResult = Result<Response, ContractError>;
 
 pub mod events {
     pub mod client {
-        pub const REGISTER: &str = "client_register";
-        pub const CREATE: &str = "client_create";
-        pub const UPDATE: &str = "client_update";
+        pub const REGISTER: &str = "register_client";
+        pub const CREATE: &str = "create_client";
+        pub const UPDATE: &str = "update_client";
     }
     pub mod connection {
         pub const OPEN_INIT: &str = "connection_open_init";
@@ -76,7 +76,7 @@ pub mod events {
         pub const CONNECTION_ID: &str = "connection_id";
         pub const CHANNEL_ID: &str = "channel_id";
         pub const COUNTERPARTY_CHANNEL_ID: &str = "counterparty_channel_id";
-        pub const HEIGHT: &str = "height";
+        pub const COUNTERPARTY_HEIGHT: &str = "counterparty_height";
         pub const PACKET: &str = "packet";
         pub const PACKETS: &str = "packets";
         pub const ACKS: &str = "acks";
@@ -771,7 +771,10 @@ fn update_client(
     Ok(
         Response::new().add_event(Event::new(events::client::UPDATE).add_attributes([
             (events::attribute::CLIENT_ID, client_id.to_string()),
-            (events::attribute::HEIGHT, update.height.to_string()),
+            (
+                events::attribute::COUNTERPARTY_HEIGHT,
+                update.height.to_string(),
+            ),
         ])),
     )
 }

diff --git a/lib/ibc-union-spec/Cargo.toml b/lib/ibc-union-spec/Cargo.toml
@@ -12,8 +12,12 @@ macros       = { workspace = true }
 schemars     = { workspace = true, features = ["derive"] }
 serde        = { workspace = true, features = ["derive"] }
 sha3         = { workspace = true }
+tracing      = { workspace = true, optional = true }
 unionlabs    = { workspace = true }
 voyager-core = { workspace = true }
 
 [lints]
 workspace = true
+
+[features]
+tracing = ["dep:tracing"]
diff --git a/lib/ibc-union-spec/src/lib.rs b/lib/ibc-union-spec/src/lib.rs
diff --git a/voyager/plugins/event-source/cosmos-sdk/src/ibc_events.rs b/voyager/plugins/event-source/cosmos-sdk/src/ibc_events.rs
@@ -266,7 +266,7 @@ event! {
 
         // events for the union IBC specification, emitted by the cosmwasm contract implementation.
 
-        #[event(tag = "wasm-client_create")]
+        #[event(tag = "wasm-create_client")]
         UnionCreateClient {
             #[parse(u32::from_str)]
             client_id: u32,
@@ -276,12 +276,12 @@ event! {
             // height: u64,
         },
 
-        #[event(tag = "wasm-client_update")]
+        #[event(tag = "wasm-update_client")]
         UnionUpdateClient {
             #[parse(u32::from_str)]
             client_id: u32,
             #[parse(u64::from_str)]
-            height: u64,
+            counterparty_height: u64,
         },
 
         #[event(tag = "wasm-connection_open_init")]
@@ -385,7 +385,7 @@ event! {
             connection_id: u32,
         },
 
-        #[event(tag = "wasm-send_packet")]
+        #[event(tag = "wasm-packet_send")]
         UnionSendPacket {
             #[parse(serde_json::from_str)]
             packet: ibc_solidity::Packet,