bump astria and penumbra deps (#5)

* bump astria and penumbra deps * bump astria dep to latest * address comments * update todo
astriaorg · Jul 2, 2024 · 2813f96 · 2813f96
1 parent 5bc550a
commit 2813f96
Show file tree

Hide file tree

Showing 7 changed files with 137 additions and 59 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml
@@ -24,13 +24,13 @@ 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 = "21cc874ca499c1f4afa8576f8640a9c8deac7690" }
-astria-sequencer-client = { git = "https://github.com/astriaorg/astria", rev = "21cc874ca499c1f4afa8576f8640a9c8deac7690", features = [ "http" ] }
+astria-core = { git = "https://github.com/astriaorg/astria", rev = "e73db6304c0146c9891a77fbc24b92d49f3eb211" }
+astria-sequencer-client = { git = "https://github.com/astriaorg/astria", rev = "e73db6304c0146c9891a77fbc24b92d49f3eb211", features = [ "http" ] }
 ed25519-consensus = "2.1.0"
 ibc-types = "0.12.0"
 jmt = "0.6"
-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" }
+penumbra-ibc = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.78.0", default-features = false }
+penumbra-proto = { git = "https://github.com/penumbra-zone/penumbra.git", tag = "v0.78.0" }
 pbjson-types = "0.6"
 
 subtle-encoding = "0.5"

diff --git a/crates/relayer/src/chain/astria/endpoint.rs b/crates/relayer/src/chain/astria/endpoint.rs
@@ -231,13 +231,16 @@ impl AstriaEndpoint {
 
     async fn broadcast_messages(&mut self, tracked_msgs: TrackedMsgs) -> Result<TxResponse, Error> {
         use astria_core::{
-            generated::sequencer::v1::Ics20Withdrawal as RawIcs20Withdrawal,
-            sequencer::v1::{
-                transaction::{
-                    action::Ics20Withdrawal,
-                    Action,
-                },
-                Address,
+            crypto::{
+                SigningKey,
+                VerificationKey,
+            },
+            generated::protocol::transaction::v1alpha1::Ics20Withdrawal as RawIcs20Withdrawal,
+            primitive::v1::Address,
+            protocol::transaction::v1alpha1::{
+                action::Ics20Withdrawal,
+                Action,
+                TransactionParams,
                 UnsignedTransaction,
             },
         };
@@ -270,19 +273,28 @@ impl AstriaEndpoint {
 
         let signing_key: ed25519_consensus::SigningKey =
             (*self.get_key()?.signing_key().as_bytes()).into(); // TODO cache this
-        let address = Address::from_verification_key(signing_key.verification_key());
+        let verification_key = VerificationKey::try_from(signing_key.verification_key().to_bytes())
+            .map_err(|e| Error::other(e.into()))?;
+        let address = Address::builder()
+            .verification_key(&verification_key)
+            .prefix("astria")
+            .try_build()
+            .map_err(|e| Error::other(e.into()))?;
         let nonce = self
             .sequencer_client
             .get_latest_nonce(address)
             .await
             .map_err(|e| Error::other(Box::new(e)))?;
 
         let unsigned_tx = UnsignedTransaction {
-            nonce: nonce.nonce,
+            params: TransactionParams::builder()
+                .nonce(nonce.nonce)
+                .chain_id(self.id().to_string())
+                .build(),
             actions,
         };
 
-        let signed_tx = unsigned_tx.into_signed(&signing_key);
+        let signed_tx = unsigned_tx.into_signed(&SigningKey::from(signing_key.to_bytes()));
         let tx_bytes = signed_tx.into_raw().encode_to_vec();
 
         let resp = self
@@ -586,20 +598,30 @@ impl ChainEndpoint for AstriaEndpoint {
         _key_name: Option<&str>,
         denom: Option<&str>,
     ) -> Result<Balance, Error> {
-        use astria_core::sequencer::v1::account::AssetBalance;
+        use astria_core::{
+            crypto::VerificationKey,
+            protocol::account::v1alpha1::AssetBalance,
+        };
         use astria_sequencer_client::{
             Address,
             SequencerClientExt as _,
         };
 
         let signing_key: ed25519_consensus::SigningKey =
             (*self.get_key()?.signing_key().as_bytes()).into(); // TODO cache this
-        let address = Address::from_verification_key(signing_key.verification_key());
+        let verification_key = VerificationKey::try_from(signing_key.verification_key().to_bytes())
+            .map_err(|e| Error::other(e.into()))?;
+        let address = Address::builder()
+            .verification_key(&verification_key)
+            .prefix("astria")
+            .try_build()
+            .map_err(|e| Error::other(e.into()))?;
         let balance = self
             .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::v1::asset::DEFAULT_NATIVE_ASSET_DENOM);
+        // TODO: set this via the config
+        let denom = denom.unwrap_or("nria");
 
         let balance: Vec<AssetBalance> = balance
             .balances

diff --git a/crates/relayer/src/event.rs b/crates/relayer/src/event.rs
@@ -503,6 +503,8 @@ mod tests {
         timestamp::Timestamp,
     };
 
+    use super::*;
+
     #[test]
     fn extract_header() {
         let header = get_dummy_ics07_header();

diff --git a/crates/relayer/src/keyring/ed25519_key_pair.rs b/crates/relayer/src/keyring/ed25519_key_pair.rs
@@ -158,12 +158,19 @@ impl SigningKeyPair for Ed25519KeyPair {
                 bs58::encode(&self.signing_key.verifying_key()).into_string()
             }
             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"),
-                ))
+                use astria_core::{
+                    crypto::VerificationKey,
+                    primitive::v1::Address,
+                };
+                let verification_key =
+                    VerificationKey::try_from(self.signing_key.verifying_key().to_bytes())
+                        .expect("can convert ed25519 public key bytes to astria verification key");
+                let address = Address::builder()
+                    .array(verification_key.address_bytes())
+                    .prefix("astria")
+                    .try_build()
+                    .expect("can build astria address from ed25519 public key");
+                address.to_string()
             }
         }
     }
@@ -176,3 +183,18 @@ impl SigningKeyPair for Ed25519KeyPair {
         self
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn ed25519_keypair_astria_account() {
+        let signing_key = ed25519_dalek::SigningKey::from_bytes(&[99u8; 32]);
+        let keypair = Ed25519KeyPair {
+            signing_key,
+            address_type: Ed25519AddressType::Astria,
+        };
+        let _address = keypair.account();
+    }
+}