chore!: update to v1 protos

astriaorg · Oct 16, 2024 · 735d5dc · 735d5dc
1 parent f6189cd
commit 735d5dc
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -10,6 +10,9 @@ on:
       - "v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+"
       - "v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+"
       - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+"
+  pull_request:
+    branches:
+      - astria
 
 env:
   REGISTRY: ghcr.io

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml
@@ -24,8 +24,8 @@ 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", branch = "ENG-912/rename-signed-transaction" }
-astria-sequencer-client = { git = "https://github.com/astriaorg/astria", branch = "ENG-912/rename-signed-transaction", features = [ "http" ] }
+astria-core = { git = "https://github.com/astriaorg/astria", branch = "joroshiba/proto-v1-upgrade" }
+astria-sequencer-client = { git = "https://github.com/astriaorg/astria", branch = "joroshiba/proto-v1-upgrade", features = [ "http" ] }
 ed25519-consensus = "2.1.0"
 ibc-types = "0.12.0"
 jmt = "0.6"

diff --git a/crates/relayer/src/chain/astria/endpoint.rs b/crates/relayer/src/chain/astria/endpoint.rs
@@ -235,9 +235,9 @@ impl AstriaEndpoint {
                 SigningKey,
                 VerificationKey,
             },
-            generated::protocol::transaction::v1alpha1::Ics20Withdrawal as RawIcs20Withdrawal,
+            generated::protocol::transaction::v1::Ics20Withdrawal as RawIcs20Withdrawal,
             primitive::v1::Address,
-            protocol::transaction::v1alpha1::{
+            protocol::transaction::v1::{
                 action::Ics20Withdrawal,
                 Action,
                 TransactionBody,
@@ -599,7 +599,7 @@ impl ChainEndpoint for AstriaEndpoint {
     ) -> Result<Balance, Error> {
         use astria_core::{
             crypto::VerificationKey,
-            protocol::account::v1alpha1::AssetBalance,
+            protocol::account::v1::AssetBalance,
         };
         use astria_sequencer_client::{
             Address,

diff --git a/crates/relayer/src/transfer.rs b/crates/relayer/src/transfer.rs
@@ -208,20 +208,20 @@ fn build_transfer_message_astria(
     let timeout_height = match timeout_height {
         // TODO: update astria IbcHeight to support optional?
         TimeoutHeight::At(height) => {
-            astria_core::generated::protocol::transaction::v1alpha1::IbcHeight {
+            astria_core::generated::protocol::transaction::v1::IbcHeight {
                 revision_number: height.revision_number(),
                 revision_height: height.revision_height(),
             }
         }
         TimeoutHeight::Never => {
-            astria_core::generated::protocol::transaction::v1alpha1::IbcHeight {
+            astria_core::generated::protocol::transaction::v1::IbcHeight {
                 revision_number: 0,
                 revision_height: u64::MAX,
             }
         }
     };
 
-    let msg = astria_core::generated::protocol::transaction::v1alpha1::Ics20Withdrawal {
+    let msg = astria_core::generated::protocol::transaction::v1::Ics20Withdrawal {
         source_channel: src_channel_id.to_string(),
         denom,
         amount: Some(