feat(voyager): small rpc cli improvements (#3466)

unionlabs · Jan 9, 2025 · 226c6b7 · 226c6b7
2 parents a408b83 + 0c42a14
commit 226c6b7
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 50 deletions.
diff --git a/lib/voyager-core/src/lib.rs b/lib/voyager-core/src/lib.rs
@@ -272,7 +272,7 @@ pub struct ClientInfo {
     /// This is currently only used for threading the checksum for ibc-go
     /// 08-wasm clients, and can likely be removed when support for that IBC
     /// interface is dropped.
-    #[serde(default)]
+    #[serde(default, skip_serializing_if = "Value::is_null")]
     pub metadata: Value,
 }
 

diff --git a/voyager/src/cli.rs b/voyager/src/cli.rs
@@ -187,25 +187,39 @@ pub enum RpcCmd {
     ClientState {
         #[arg(value_parser(|s: &str| ok(ChainId::new(s.to_owned()))))]
         on: ChainId,
-        // #[arg(value_parser(|s: &str| ok(RawClientId::new(s.parse::<Value>().unwrap_or_else(|_| Value::String(s.to_owned()))))))]
-        client_id: RawClientId,
         #[arg(value_parser(|s: &str| ok(IbcSpecId::new(s.to_owned()))))]
         ibc_spec_id: IbcSpecId,
+        client_id: RawClientId,
         #[arg(long, default_value_t = QueryHeight::Latest)]
         height: QueryHeight,
         #[arg(long, short = 'd', default_value_t = false)]
         decode: bool,
     },
-    ConsensusState {
+    ClientMeta {
         #[arg(value_parser(|s: &str| ok(ChainId::new(s.to_owned()))))]
         on: ChainId,
-        // #[arg(value_parser(|s: &str| ok(RawClientId::new(s.parse::<Value>().unwrap_or_else(|_| Value::String(s.to_owned()))))))]
-        client_id: RawClientId,
         #[arg(value_parser(|s: &str| ok(IbcSpecId::new(s.to_owned()))))]
         ibc_spec_id: IbcSpecId,
+        client_id: RawClientId,
         #[arg(long, default_value_t = QueryHeight::Latest)]
         height: QueryHeight,
+    },
+    ClientInfo {
+        #[arg(value_parser(|s: &str| ok(ChainId::new(s.to_owned()))))]
+        on: ChainId,
+        client_id: RawClientId,
+        #[arg(value_parser(|s: &str| ok(IbcSpecId::new(s.to_owned()))))]
+        ibc_spec_id: IbcSpecId,
+    },
+    ConsensusState {
+        #[arg(value_parser(|s: &str| ok(ChainId::new(s.to_owned()))))]
+        on: ChainId,
+        #[arg(value_parser(|s: &str| ok(IbcSpecId::new(s.to_owned()))))]
+        ibc_spec_id: IbcSpecId,
+        client_id: RawClientId,
         trusted_height: Height,
+        #[arg(long, default_value_t = QueryHeight::Latest)]
+        height: QueryHeight,
         #[arg(long, short = 'd', default_value_t = false)]
         decode: bool,
     },

diff --git a/voyager/src/main.rs b/voyager/src/main.rs
@@ -500,22 +500,45 @@ async fn do_main(args: cli::AppArgs) -> anyhow::Result<()> {
                 get_voyager_config()?.voyager.rpc_laddr
             ))?;
 
+            let ibc_handlers = [
+                (IbcClassic::ID, IbcSpecHandler::new::<IbcClassic>()),
+                (IbcUnion::ID, IbcSpecHandler::new::<IbcUnion>()),
+            ]
+            .into_iter()
+            .collect::<HashMap<_, _>>();
+
             match rpc {
                 RpcCmd::Info => print_json(&voyager_client.info().await?),
+                RpcCmd::ClientMeta {
+                    on,
+                    client_id,
+                    ibc_spec_id,
+                    height,
+                } => {
+                    let client_meta = voyager_client
+                        .client_meta(on.clone(), ibc_spec_id.clone(), height, client_id.clone())
+                        .await?;
+
+                    print_json(&client_meta);
+                }
+                RpcCmd::ClientInfo {
+                    on,
+                    client_id,
+                    ibc_spec_id,
+                } => {
+                    let client_info = voyager_client
+                        .client_info(on.clone(), ibc_spec_id.clone(), client_id.clone())
+                        .await?;
+
+                    print_json(&client_info);
+                }
                 RpcCmd::ClientState {
                     on,
                     client_id,
                     ibc_spec_id,
                     height,
                     decode,
                 } => {
-                    let ibc_handlers = [
-                            (IbcClassic::ID, IbcSpecHandler::new::<IbcClassic>()),
-                            (IbcUnion::ID, IbcSpecHandler::new::<IbcUnion>())
-                         ]
-                        .into_iter()
-                        .collect::<HashMap<_, _>>();
-
                     let ibc_state = voyager_client
                         .query_ibc_state(
                             on.clone(),
@@ -550,45 +573,47 @@ async fn do_main(args: cli::AppArgs) -> anyhow::Result<()> {
                     }
                 }
                 RpcCmd::ConsensusState {
-                    // on,
-                    // client_id,
-                    // ibc_spec_id,
-                    // trusted_height,
-                    // height,
-                    // decode,
+                    on,
+                    client_id,
+                    ibc_spec_id,
+                    trusted_height,
+                    height,
+                    decode,
                     ..
                 } => {
-                    // let ibc_state = voyager_client
-                    //     .query_client_consensus_state(
-                    //         on.clone(),
-                    //         height,
-                    //         client_id.clone(),
-                    //         trusted_height,
-                    //     )
-                    //     .await?;
-
-                    // if decode {
-                    //     let client_info = voyager_client
-                    //         .client_info(on, ibc_spec_id, client_id)
-                    //         .await?;
-
-                    //     let decoded = voyager_client
-                    //         .decode_consensus_state(
-                    //             client_info.client_type,
-                    //             client_info.ibc_interface,
-                    //             ibc_state.state,
-                    //         )
-                    //         .await?;
-
-                    //     print_json(&IbcState {
-                    //         height: ibc_state.height,
-                    //         state: decoded,
-                    //     });
-                    // } else {
-                    //     print_json(&ibc_state);
-                    // }
-
-                    todo!()
+                    let ibc_state = voyager_client
+                        .query_ibc_state(
+                            on.clone(),
+                            ibc_spec_id.clone(),
+                            height,
+                            (ibc_handlers.get(&ibc_spec_id).unwrap().consensus_state_path)(
+                                client_id.clone(),
+                                trusted_height.to_string(),
+                            )?,
+                        )
+                        .await?;
+
+                    if decode {
+                        let client_info = voyager_client
+                            .client_info(on, ibc_spec_id.clone(), client_id)
+                            .await?;
+
+                        let decoded = voyager_client
+                            .decode_consensus_state(
+                                client_info.client_type,
+                                client_info.ibc_interface,
+                                ibc_spec_id,
+                                serde_json::from_value(ibc_state.state).unwrap(),
+                            )
+                            .await?;
+
+                        print_json(&IbcState {
+                            height: ibc_state.height,
+                            state: decoded,
+                        });
+                    } else {
+                        print_json(&ibc_state);
+                    }
                 }
             }
         }