merge w main

Cargo.toml

@@ -83,10 +83,9 @@ itoa = "1.0.10"
 jsonrpsee = { version = "0.20" }
 pbjson-types = "0.6"
 # Note that when updating the penumbra versions, vendored types in `proto/sequencerapis/astria_vendored` may need to be updated as well.
-# can update to a tagged version when https://github.com/penumbra-zone/penumbra/commit/ac7abacc9bb09503d6fd6a396bc0b6850079084e is released
-penumbra-ibc = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "ac7abacc9bb09503d6fd6a396bc0b6850079084e", default-features = false }
-penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "ac7abacc9bb09503d6fd6a396bc0b6850079084e" }
-penumbra-tower-trace = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "ac7abacc9bb09503d6fd6a396bc0b6850079084e" }
+penumbra-ibc = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "686fa5b53e8ad306736d2de61d1ffb6d11722e2b", default-features = false }
+penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "686fa5b53e8ad306736d2de61d1ffb6d11722e2b" }
+penumbra-tower-trace = { git = "https://github.com/penumbra-zone/penumbra.git", rev = "686fa5b53e8ad306736d2de61d1ffb6d11722e2b" }
 pin-project-lite = "0.2.13"
 prost = "0.12"
 rand = "0.8.5"

crates/astria-cli/src/sequencer/sudo/mod.rs

@@ -3,6 +3,7 @@ use color_eyre::eyre;
 mod fee_asset;
 mod ibc_relayer;
 mod ibc_sudo_change;
+mod recover_ibc_client;
 mod sudo_address_change;
 mod validator_update;
 
@@ -19,6 +20,7 @@ impl Command {
             SubCommand::FeeAsset(fee_asset) => fee_asset.run().await,
             SubCommand::SudoAddressChange(sudo_address_change) => sudo_address_change.run().await,
             SubCommand::ValidatorUpdate(validator_update) => validator_update.run().await,
+            SubCommand::RecoverIbcClient(recover_ibc_client) => recover_ibc_client.run().await,
             SubCommand::IbcSudoAddressChange(ibc_sudo_address_change) => {
                 ibc_sudo_address_change.run().await
             }
@@ -32,5 +34,6 @@ enum SubCommand {
     FeeAsset(fee_asset::Command),
     SudoAddressChange(sudo_address_change::Command),
     ValidatorUpdate(validator_update::Command),
+    RecoverIbcClient(recover_ibc_client::Command),
     IbcSudoAddressChange(ibc_sudo_change::Command),
 }

crates/astria-cli/src/sequencer/sudo/recover_ibc_client.rs

@@ -0,0 +1,58 @@
+use astria_core::protocol::transaction::v1::{
+    action::RecoverIbcClient,
+    Action,
+};
+use color_eyre::eyre::{
+    self,
+    WrapErr as _,
+};
+
+use crate::utils::submit_transaction;
+
+#[derive(Debug, clap::Args)]
+pub(super) struct Command {
+    /// The bech32m prefix that will be used for constructing addresses using the private key
+    #[arg(long, default_value = "astria")]
+    prefix: String,
+    // TODO: https://github.com/astriaorg/astria/issues/594
+    // Don't use a plain text private, prefer wrapper like from
+    // the secrecy crate with specialized `Debug` and `Drop` implementations
+    // that overwrite the key on drop and don't reveal it when printing.
+    #[arg(long, env = "SEQUENCER_PRIVATE_KEY")]
+    private_key: String,
+    /// The url of the Sequencer node
+    #[arg(long, env = "SEQUENCER_URL")]
+    sequencer_url: String,
+    /// The chain id of the sequencing chain being used
+    #[arg(long = "sequencer.chain-id", env = "ROLLUP_SEQUENCER_CHAIN_ID")]
+    sequencer_chain_id: String,
+
+    /// The client id of the client to be replaced
+    #[arg(long)]
+    client_id: String,
+
+    /// The client id of the client to replace the subject client
+    #[arg(long)]
+    replacement_client_id: String,
+}
+
+impl Command {
+    pub(super) async fn run(self) -> eyre::Result<()> {
+        let res = submit_transaction(
+            self.sequencer_url.as_str(),
+            self.sequencer_chain_id.clone(),
+            &self.prefix,
+            self.private_key.as_str(),
+            Action::RecoverIbcClient(RecoverIbcClient {
+                client_id: self.client_id.parse()?,
+                replacement_client_id: self.replacement_client_id.parse()?,
+            }),
+        )
+        .await
+        .wrap_err("failed to submit RecoverIbcClient transaction")?;
+
+        println!("RecoverIbcClient completed!");
+        println!("Included in block: {}", res.height);
+        Ok(())
+    }
+}