bump penumbra and astria deps

astriaorg · Apr 4, 2024 · 5bc550a · 5bc550a
1 parent 41694ad
commit 5bc550a
Show file tree

Hide file tree

Showing 12 changed files with 748 additions and 1,045 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/chain-registry/Cargo.toml b/crates/chain-registry/Cargo.toml
@@ -13,12 +13,12 @@ description  = """
 
 [dependencies]
 ibc-relayer-types = { version = "0.26.4", path = "../relayer-types" }
-ibc-proto         = { version = "0.40.0", features = ["serde"] }
+ibc-proto         = { version = "0.41.0", features = ["serde"] }
 tendermint-rpc    = { version = "0.34.0", features = ["http-client", "websocket-client"] }
 
 async-trait = "0.1.72"
 flex-error  = { version = "0.4.4", default-features = false }
-futures     = { version = "0.3.27", features = ["executor"] }
+futures     = { version = "0.3", features = ["executor"] }
 http        = "0.2"
 itertools   = "0.10.5"
 reqwest     = { version = "0.11.13", features = ["rustls-tls", "json"], default-features = false }

diff --git a/crates/relayer-cli/Cargo.toml b/crates/relayer-cli/Cargo.toml
@@ -40,7 +40,7 @@ dialoguer                = "0.10.3"
 dirs-next                = "2.0.0"
 eyre                     = "0.6.8"
 flex-error               = { version = "0.4.4", default-features = false, features = ["std", "eyre_tracer"] }
-futures                  = "0.3.27"
+futures                  = "0.3"
 hdpath                   = "0.6.3"
 http                     = "0.2"
 humantime                = "2.1"

diff --git a/crates/relayer-cli/src/conclude.rs b/crates/relayer-cli/src/conclude.rs
@@ -171,7 +171,7 @@ impl Output {
     /// Builder-style method for attaching a result to an output object.
     pub fn with_result<R>(mut self, result: R) -> Self
     where
-        R: Serialize + core::fmt::Debug + 'static,
+        R: Serialize + fmt::Debug + 'static,
     {
         if json() {
             self.result = Result::Json(serialize_result(result));
@@ -192,7 +192,7 @@ impl Output {
     /// input `result`.
     pub fn success<R>(result: R) -> Self
     where
-        R: Serialize + core::fmt::Debug + 'static,
+        R: Serialize + fmt::Debug + 'static,
     {
         Output::with_success().with_result(result)
     }
@@ -236,7 +236,7 @@ impl Output {
 }
 
 /// Helper to serialize a result into a `serde_json::Value`.
-fn serialize_result(res: impl Serialize + core::fmt::Debug) -> serde_json::Value {
+fn serialize_result(res: impl Serialize + fmt::Debug) -> serde_json::Value {
     let last_resort = format!("{res:#?}");
 
     match serde_json::to_value(res) {

diff --git a/crates/relayer-types/Cargo.toml b/crates/relayer-types/Cargo.toml
@@ -24,7 +24,7 @@ mocks = ["tendermint-testgen", "clock"]
 
 [dependencies]
 # Proto definitions for all IBC-related interfaces, e.g., connections or channels.
-ibc-proto = { version = "0.40.0", features = ["serde"] }
+ibc-proto = { version = "0.41.0", features = ["serde"] }
 ics23 = { version = "0.11.0", features = ["std", "host-functions"] }
 time = { version = "0.3" }
 serde_derive = { version = "1.0.104" }

diff --git a/crates/relayer-types/src/applications/transfer/msgs/mod.rs b/crates/relayer-types/src/applications/transfer/msgs/mod.rs
@@ -1,4 +1,4 @@
 pub mod send;
 pub mod transfer;
 
-pub const ASTRIA_WITHDRAWAL_TYPE_URL: &str = "/astria.sequencer.v1alpha1.Ics20Withdrawal";
+pub const ASTRIA_WITHDRAWAL_TYPE_URL: &str = "/astria.sequencer.v1.Ics20Withdrawal";
diff --git a/crates/relayer-types/src/lib.rs b/crates/relayer-types/src/lib.rs
@@ -60,7 +60,7 @@ pub mod utils;
 mod serializers;
 
 /// Re-export of ICS 002 Height domain type
-pub type Height = crate::core::ics02_client::height::Height;
+pub type Height = core::ics02_client::height::Height;
 
 #[cfg(test)]
 mod test;

diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml
@@ -20,17 +20,17 @@ default   = ["flex-error/std", "flex-error/eyre_tracer"]
 telemetry = ["ibc-telemetry"]
 
 [dependencies]
-ibc-proto         = { version = "0.40.0", features = ["serde"] }
+ibc-proto         = { version = "0.41.0", features = ["serde"] }
 ibc-telemetry     = { version = "0.26.4", path = "../telemetry", optional = true }
 ibc-relayer-types = { version = "0.26.4", path = "../relayer-types", features = ["mocks"] }
 
-astria-core = { git = "https://github.com/astriaorg/astria", rev = "112a66d6f9bb6638cce4935c949834e1d35416bb" }
-astria-sequencer-client = { git = "https://github.com/astriaorg/astria", rev = "112a66d6f9bb6638cce4935c949834e1d35416bb", features = [ "http" ] }
+astria-core = { git = "https://github.com/astriaorg/astria", rev = "21cc874ca499c1f4afa8576f8640a9c8deac7690" }
+astria-sequencer-client = { git = "https://github.com/astriaorg/astria", rev = "21cc874ca499c1f4afa8576f8640a9c8deac7690", features = [ "http" ] }
 ed25519-consensus = "2.1.0"
-ibc-types = "0.11.1"
+ibc-types = "0.12.0"
 jmt = "0.6"
-penumbra-ibc = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.68.1", default-features = false }
-penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.68.1" }
+penumbra-ibc = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.69.1", default-features = false }
+penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.69.1" }
 pbjson-types = "0.6"
 
 subtle-encoding = "0.5"
@@ -45,7 +45,7 @@ serde_json = { version = "1" }
 bytes = "1.4.0"
 prost = { version = "0.12" }
 tonic = { version = "0.10", features = ["tls", "tls-roots"] }
-futures = "0.3.27"
+futures = "0.3"
 crossbeam-channel = "0.5.11"
 hex = "0.4"
 bitcoin = { version = "0.31.1", features = ["serde"] }

diff --git a/crates/relayer/src/chain/astria/endpoint.rs b/crates/relayer/src/chain/astria/endpoint.rs
@@ -231,8 +231,8 @@ impl AstriaEndpoint {
 
     async fn broadcast_messages(&mut self, tracked_msgs: TrackedMsgs) -> Result<TxResponse, Error> {
         use astria_core::{
-            generated::sequencer::v1alpha1::Ics20Withdrawal as RawIcs20Withdrawal,
-            sequencer::v1alpha1::{
+            generated::sequencer::v1::Ics20Withdrawal as RawIcs20Withdrawal,
+            sequencer::v1::{
                 transaction::{
                     action::Ics20Withdrawal,
                     Action,
@@ -586,7 +586,7 @@ impl ChainEndpoint for AstriaEndpoint {
         _key_name: Option<&str>,
         denom: Option<&str>,
     ) -> Result<Balance, Error> {
-        use astria_core::sequencer::v1alpha1::account::AssetBalance;
+        use astria_core::sequencer::v1::account::AssetBalance;
         use astria_sequencer_client::{
             Address,
             SequencerClientExt as _,
@@ -599,8 +599,7 @@ impl ChainEndpoint for AstriaEndpoint {
             .block_on(self.sequencer_client.get_latest_balance(address))
             .map_err(|e| Error::other(Box::new(e)))?;
 
-        let denom =
-            denom.unwrap_or(astria_core::sequencer::v1alpha1::asset::DEFAULT_NATIVE_ASSET_DENOM);
+        let denom = denom.unwrap_or(astria_core::sequencer::v1::asset::DEFAULT_NATIVE_ASSET_DENOM);
 
         let balance: Vec<AssetBalance> = balance
             .balances

diff --git a/crates/relayer/src/keyring/ed25519_key_pair.rs b/crates/relayer/src/keyring/ed25519_key_pair.rs
@@ -157,14 +157,14 @@ impl SigningKeyPair for Ed25519KeyPair {
             Ed25519AddressType::Solana => {
                 bs58::encode(&self.signing_key.verifying_key()).into_string()
             }
-            Ed25519AddressType::Astria => hex::encode(
-                astria_core::sequencer::v1alpha1::Address::from_verification_key(
+            Ed25519AddressType::Astria => {
+                hex::encode(astria_core::sequencer::v1::Address::from_verification_key(
                     ed25519_consensus::VerificationKey::try_from(
                         self.signing_key.verifying_key().to_bytes(),
                     )
                     .expect("can convert between ed25519 keys"),
-                ),
-            ),
+                ))
+            }
         }
     }
 

diff --git a/crates/relayer/src/keyring/pub_key.rs b/crates/relayer/src/keyring/pub_key.rs
@@ -72,7 +72,7 @@ impl FromStr for EncodedPubKey {
                 );
 
                 // Ethermint pubkey types:
-                // e.g. "/ethermint.crypto.v1alpha1.ethsecp256k1.PubKey", "/injective.crypto.v1beta1.ethsecp256k1.PubKey"
+                // e.g. "/ethermint.crypto.v1.ethsecp256k1.PubKey", "/injective.crypto.v1beta1.ethsecp256k1.PubKey"
                 // "/ethermint.crypto.v1beta1.ethsecp256k1.PubKey", "/ethermint.crypto.v1.ethsecp256k1.PubKey",
                 // "/cosmos.crypto.ethsecp256k1.PubKey"
                 // TODO: to be restricted after the Cosmos SDK release with ethsecp256k1

diff --git a/crates/relayer/src/transfer.rs b/crates/relayer/src/transfer.rs
@@ -195,21 +195,21 @@ fn build_transfer_message_astria(
     timeout_height: TimeoutHeight,
     timeout_timestamp: Timestamp,
 ) -> Any {
-    use astria_core::sequencer::v1alpha1::asset::default_native_asset_id;
+    use astria_core::sequencer::v1::asset::default_native_asset_id;
 
     let timeout_height = match timeout_height {
         // TODO: update astria IbcHeight to support optional?
-        TimeoutHeight::At(height) => astria_core::generated::sequencer::v1alpha1::IbcHeight {
+        TimeoutHeight::At(height) => astria_core::generated::sequencer::v1::IbcHeight {
             revision_number: height.revision_number(),
             revision_height: height.revision_height(),
         },
-        TimeoutHeight::Never => astria_core::generated::sequencer::v1alpha1::IbcHeight {
+        TimeoutHeight::Never => astria_core::generated::sequencer::v1::IbcHeight {
             revision_number: 0,
             revision_height: u64::MAX,
         },
     };
 
-    let msg = astria_core::generated::sequencer::v1alpha1::Ics20Withdrawal {
+    let msg = astria_core::generated::sequencer::v1::Ics20Withdrawal {
         source_channel: src_channel_id.to_string(),
         denom: denom,
         amount: Some(
@@ -221,7 +221,7 @@ fn build_transfer_message_astria(
         return_address: hex::decode(sender.to_string()).expect("sender address is hex"),
         timeout_height: Some(timeout_height),
         timeout_time: timeout_timestamp.nanoseconds(),
-        fee_asset_id: default_native_asset_id().as_bytes().to_vec(),
+        fee_asset_id: default_native_asset_id().as_ref().to_vec(),
     };
 
     Any {