fix(ci, core)!: ensure committed and code generated from protobuf spec match

crates/astria-bridge-withdrawer/src/bridge_withdrawer/mod.rs

@@ -4,7 +4,7 @@ use std::{
     time::Duration,
 };
 
-use astria_core::generated::sequencerblock::v1::sequencer_service_client::SequencerServiceClient;
+use astria_core::generated::astria::sequencerblock::v1::sequencer_service_client::SequencerServiceClient;
 use astria_eyre::eyre::{
     self,
     WrapErr as _,

crates/astria-bridge-withdrawer/src/bridge_withdrawer/startup.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use astria_core::{
-    generated::sequencerblock::v1::sequencer_service_client::{
+    generated::astria::sequencerblock::v1::sequencer_service_client::{
         self,
         SequencerServiceClient,
     },
@@ -270,20 +270,21 @@ impl Startup {
              the sequencer logic."
         );
 
-        let proto_tx = astria_core::generated::protocol::transaction::v1::Transaction::decode(
-            &*last_transaction.tx,
-        )
-        .wrap_err_with(|| {
-            format!(
+        let proto_tx =
+            astria_core::generated::astria::protocol::transaction::v1::Transaction::decode(
+                &*last_transaction.tx,
+            )
+            .wrap_err_with(|| {
+                format!(
                 "failed to decode data in Sequencer CometBFT transaction as `{}`",
-                astria_core::generated::protocol::transaction::v1::Transaction::full_name(),
+                astria_core::generated::astria::protocol::transaction::v1::Transaction::full_name(),
             )
-        })?;
+            })?;
 
         let tx = Transaction::try_from_raw(proto_tx).wrap_err_with(|| {
             format!(
                 "failed to verify {}",
-                astria_core::generated::protocol::transaction::v1::Transaction::full_name()
+                astria_core::generated::astria::protocol::transaction::v1::Transaction::full_name()
             )
         })?;
 

crates/astria-bridge-withdrawer/src/bridge_withdrawer/submitter/builder.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use astria_core::generated::sequencerblock::v1::sequencer_service_client::SequencerServiceClient;
+use astria_core::generated::astria::sequencerblock::v1::sequencer_service_client::SequencerServiceClient;
 use astria_eyre::eyre::{
     self,
     Context as _,

crates/astria-bridge-withdrawer/src/bridge_withdrawer/submitter/mod.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use astria_core::{
-    generated::sequencerblock::v1::{
+    generated::astria::sequencerblock::v1::{
         sequencer_service_client::{
             self,
             SequencerServiceClient,

crates/astria-bridge-withdrawer/tests/blackbox/helpers/mock_cometbft.rs

@@ -332,7 +332,7 @@ fn prepare_broadcast_tx_sync_response(response: tx_sync::Response) -> Mock {
 
 /// Convert a wiremock request to an astria transaction
 pub fn tx_from_request(request: &wiremock::Request) -> Transaction {
-    use astria_core::generated::protocol::transaction::v1::Transaction as RawTransaction;
+    use astria_core::generated::astria::protocol::transaction::v1::Transaction as RawTransaction;
     use prost::Message as _;
 
     let wrapped_tx_sync_req: tendermint_rpc::request::Wrapper<tx_sync::Request> =

crates/astria-bridge-withdrawer/tests/blackbox/helpers/mock_sequencer.rs

@@ -5,7 +5,7 @@ use std::{
 
 use astria_core::{
     self,
-    generated::sequencerblock::v1::{
+    generated::astria::sequencerblock::v1::{
         sequencer_service_server::{
             SequencerService,
             SequencerServiceServer,

crates/astria-cli/src/sequencer/threshold/sign.rs

@@ -1,6 +1,6 @@
 use std::collections::BTreeMap;
 
-use astria_core::generated::protocol::transaction::v1::{
+use astria_core::generated::astria::protocol::transaction::v1::{
     Transaction,
     TransactionBody,
 };

crates/astria-cli/src/sequencer/threshold/verify.rs

@@ -1,4 +1,4 @@
-use astria_core::generated::protocol::transaction::v1::TransactionBody;
+use astria_core::generated::astria::protocol::transaction::v1::TransactionBody;
 use color_eyre::eyre::{
     self,
     WrapErr as _,

crates/astria-composer/src/collectors/grpc.rs

@@ -3,7 +3,7 @@
 use std::sync::Arc;
 
 use astria_core::{
-    generated::composer::v1::{
+    generated::astria::composer::v1::{
         grpc_collector_service_server::GrpcCollectorService,
         SubmitRollupTransactionRequest,
         SubmitRollupTransactionResponse,

crates/astria-composer/src/executor/builder.rs

@@ -6,7 +6,7 @@ use std::{
 
 use astria_core::{
     crypto::SigningKey,
-    generated::sequencerblock::v1::sequencer_service_client::SequencerServiceClient,
+    generated::astria::sequencerblock::v1::sequencer_service_client::SequencerServiceClient,
     primitive::v1::Address,
     protocol::transaction::v1::action::RollupDataSubmission,
 };

crates/astria-composer/src/executor/mod.rs

@@ -12,7 +12,7 @@ use std::{
 
 use astria_core::{
     crypto::SigningKey,
-    generated::sequencerblock::v1::{
+    generated::astria::sequencerblock::v1::{
         sequencer_service_client::{
             self,
             SequencerServiceClient,

crates/astria-composer/src/grpc.rs

@@ -9,7 +9,7 @@
 use std::net::SocketAddr;
 
 use astria_core::{
-    generated::composer::v1::grpc_collector_service_server::GrpcCollectorServiceServer,
+    generated::astria::composer::v1::grpc_collector_service_server::GrpcCollectorServiceServer,
     primitive::v1::asset,
 };
 use astria_eyre::{

crates/astria-composer/tests/blackbox/grpc_collector.rs

@@ -1,7 +1,7 @@
 use std::time::Duration;
 
 use astria_core::{
-    generated::composer::v1::{
+    generated::astria::composer::v1::{
         grpc_collector_service_client::GrpcCollectorServiceClient,
         SubmitRollupTransactionRequest,
     },

crates/astria-composer/tests/blackbox/helper/mock_grpc_sequencer.rs

@@ -5,7 +5,7 @@ use std::{
 
 use astria_core::{
     self,
-    generated::sequencerblock::v1::{
+    generated::astria::sequencerblock::v1::{
         sequencer_service_server::{
             SequencerService,
             SequencerServiceServer,

crates/astria-composer/tests/blackbox/helper/mod.rs

@@ -207,7 +207,7 @@ pub async fn loop_until_composer_is_ready(addr: SocketAddr) {
 }
 
 fn signed_tx_from_request(request: &Request) -> Transaction {
-    use astria_core::generated::protocol::transaction::v1::Transaction as RawTransaction;
+    use astria_core::generated::astria::protocol::transaction::v1::Transaction as RawTransaction;
     use prost::Message as _;
 
     let wrapped_tx_sync_req: request::Wrapper<tx_sync::Request> =

crates/astria-conductor/src/celestia/block_verifier.rs

@@ -1,4 +1,4 @@
 use std::collections::HashMap;
 
 use astria_core::crypto::{
     Signature,
@@ -221,7 +221,7 @@
     use std::collections::BTreeMap;
 
     use astria_core::{
-        generated::sequencerblock::v1::SequencerBlockHeader as RawSequencerBlockHeader,
+        generated::astria::sequencerblock::v1::SequencerBlockHeader as RawSequencerBlockHeader,
         primitive::v1::RollupId,
         sequencerblock::v1::{
             block::SequencerBlockHeader,

crates/astria-conductor/src/celestia/convert.rs

@@ -1,6 +1,6 @@
 use astria_core::{
     brotli::decompress_bytes,
-    generated::sequencerblock::v1::{
+    generated::astria::sequencerblock::v1::{
         SubmittedMetadataList,
         SubmittedRollupDataList,
     },

crates/astria-conductor/src/executor/client.rs

@@ -1,4 +1,4 @@
 use std::time::Duration;
 
 use astria_core::{
     execution::v1::{
@@ -6,7 +6,7 @@
         CommitmentState,
         GenesisInfo,
     },
-    generated::{
+    generated::astria::{
         execution::{
             v1 as raw,
             v1::execution_service_client::ExecutionServiceClient,

crates/astria-conductor/src/executor/state.rs

@@ -1,4 +1,4 @@
 //! After being created the state must be primed with [`State::init`] before any of
 //! the other methods can be used. Otherwise, they will panic.
 //!
 //! The inner state must not be unset after having been set.
@@ -344,7 +344,7 @@
 #[cfg(test)]
 mod tests {
     use astria_core::{
-        generated::execution::v1 as raw,
+        generated::astria::execution::v1 as raw,
         Protobuf as _,
     };
     use pbjson_types::Timestamp;

crates/astria-conductor/src/executor/tests.rs

@@ -1,11 +1,11 @@
 use astria_core::{
     self,
     execution::v1::{
         Block,
         CommitmentState,
         GenesisInfo,
     },
-    generated::execution::v1 as raw,
+    generated::astria::execution::v1 as raw,
     Protobuf as _,
 };
 use bytes::Bytes;

crates/astria-conductor/src/sequencer/client.rs

@@ -1,9 +1,9 @@
 //! A thin wrapper around a [`SequencerServiceClient`].
 
 use std::time::Duration;
 
 use astria_core::{
-    generated::sequencerblock::v1::{
+    generated::astria::sequencerblock::v1::{
         sequencer_service_client::SequencerServiceClient,
         GetFilteredSequencerBlockRequest,
     },

crates/astria-conductor/tests/blackbox/firm_only.rs

@@ -5,7 +5,7 @@ use astria_conductor::{
     Conductor,
     Config,
 };
-use astria_core::generated::execution::v1::{
+use astria_core::generated::astria::execution::v1::{
     GetCommitmentStateRequest,
     GetGenesisInfoRequest,
 };

crates/astria-conductor/tests/blackbox/helpers/macros.rs

@@ -1,7 +1,7 @@
 #[macro_export]
 macro_rules! block {
     (number: $number:expr,hash: $hash:expr,parent: $parent:expr $(,)?) => {
-        ::astria_core::generated::execution::v1::Block {
+        ::astria_core::generated::astria::execution::v1::Block {
             number: $number,
             hash: ::bytes::Bytes::from(Vec::from($hash)),
             parent_block_hash: ::bytes::Bytes::from(Vec::from($parent)),
@@ -59,7 +59,7 @@ macro_rules! commitment_state {
         soft: (number: $soft_number:expr,hash: $soft_hash:expr,parent: $soft_parent:expr $(,)?),
         base_celestia_height: $base_celestia_height:expr $(,)?
     ) => {
-       ::astria_core::generated::execution::v1::CommitmentState {
+       ::astria_core::generated::astria::execution::v1::CommitmentState {
             firm: Some($crate::block!(
                 number: $firm_number,
                 hash: $firm_hash,
@@ -98,7 +98,7 @@ macro_rules! genesis_info {
         $sequencer_height:expr,celestia_block_variance:
         $variance:expr $(,)?
     ) => {
-        ::astria_core::generated::execution::v1::GenesisInfo {
+        ::astria_core::generated::astria::execution::v1::GenesisInfo {
             rollup_id: Some($crate::ROLLUP_ID.to_raw()),
             sequencer_genesis_block_height: $sequencer_height,
             celestia_block_variance: $variance,
@@ -312,7 +312,7 @@ macro_rules! mount_get_filtered_sequencer_block {
     ($test_env:ident, sequencer_height: $height:expr, delay: $delay:expr $(,)?) => {
         $test_env
             .mount_get_filtered_sequencer_block(
-                ::astria_core::generated::sequencerblock::v1::GetFilteredSequencerBlockRequest {
+                ::astria_core::generated::astria::sequencerblock::v1::GetFilteredSequencerBlockRequest {
                     height: $height,
                     rollup_ids: vec![$crate::ROLLUP_ID.to_raw()],
                 },
@@ -385,12 +385,12 @@ macro_rules! mount_get_block {
             hash: $hash,
             parent: $parent,
         );
-        let identifier = ::astria_core::generated::execution::v1::BlockIdentifier {
+        let identifier = ::astria_core::generated::astria::execution::v1::BlockIdentifier {
             identifier: Some(
-                ::astria_core::generated::execution::v1::block_identifier::Identifier::BlockNumber(block.number)
+                ::astria_core::generated::astria::execution::v1::block_identifier::Identifier::BlockNumber(block.number)
         )};
         $test_env.mount_get_block(
-            ::astria_core::generated::execution::v1::GetBlockRequest {
+            ::astria_core::generated::astria::execution::v1::GetBlockRequest {
                 identifier: Some(identifier),
             },
             block,

crates/astria-conductor/tests/blackbox/helpers/mock_grpc.rs

@@ -3,7 +3,7 @@ use std::{
     sync::Arc,
 };
 
-use astria_core::generated::{
+use astria_core::generated::astria::{
     execution::v1::{
         execution_service_server::{
             ExecutionService,

crates/astria-conductor/tests/blackbox/helpers/mod.rs

@@ -12,7 +12,7 @@ use astria_conductor::{
 };
 use astria_core::{
     brotli::compress_bytes,
-    generated::{
+    generated::astria::{
         execution::v1::{
             Block,
             CommitmentState,
@@ -179,7 +179,7 @@ impl TestConductor {
     pub async fn mount_get_block<S: serde::Serialize>(
         &self,
         expected_pbjson: S,
-        block: astria_core::generated::execution::v1::Block,
+        block: astria_core::generated::astria::execution::v1::Block,
     ) {
         use astria_grpc_mock::{
             matcher::message_partial_pbjson,
@@ -306,7 +306,7 @@ impl TestConductor {
     }
 
     pub async fn mount_get_genesis_info(&self, genesis_info: GenesisInfo) {
-        use astria_core::generated::execution::v1::GetGenesisInfoRequest;
+        use astria_core::generated::astria::execution::v1::GetGenesisInfoRequest;
         astria_grpc_mock::Mock::for_rpc_given(
             "get_genesis_info",
             astria_grpc_mock::matcher::message_type::<GetGenesisInfoRequest>(),
@@ -318,7 +318,7 @@ impl TestConductor {
     }
 
     pub async fn mount_get_commitment_state(&self, commitment_state: CommitmentState) {
-        use astria_core::generated::execution::v1::GetCommitmentStateRequest;
+        use astria_core::generated::astria::execution::v1::GetCommitmentStateRequest;
 
         astria_grpc_mock::Mock::for_rpc_given(
             "get_commitment_state",
@@ -381,7 +381,7 @@ impl TestConductor {
         commitment_state: CommitmentState,
         expected_calls: u64,
     ) -> astria_grpc_mock::MockGuard {
-        use astria_core::generated::execution::v1::UpdateCommitmentStateRequest;
+        use astria_core::generated::astria::execution::v1::UpdateCommitmentStateRequest;
         use astria_grpc_mock::{
             matcher::message_partial_pbjson,
             response::constant_response,
@@ -567,7 +567,7 @@ pub struct Blobs {
 
 #[must_use]
 pub fn make_blobs(heights: &[u32]) -> Blobs {
-    use astria_core::generated::sequencerblock::v1::{
+    use astria_core::generated::astria::sequencerblock::v1::{
         SubmittedMetadataList,
         SubmittedRollupDataList,
     };

crates/astria-conductor/tests/blackbox/soft_only.rs

@@ -5,7 +5,7 @@ use astria_conductor::{
     Conductor,
     Config,
 };
-use astria_core::generated::execution::v1::{
+use astria_core::generated::astria::execution::v1::{
     GetCommitmentStateRequest,
     GetGenesisInfoRequest,
 };

crates/astria-core/CHANGELOG.md

@@ -15,6 +15,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added method `TracePrefixed::leading_channel` to read the left-most channel of
   a trace prefixed ICS20 asset [#1768](https://github.com/astriaorg/astria/pull/1768)
 
+### Changed
+
+- Move all Astria APIs generated from the Protobuf spec from `astria_core::generated`
+  to `astria_core::generated::astria`
+  [#1825](https://github.com/astriaorg/astria/pull/1825)
+
 ### Removed
 
 - Removed method `TracePrefixed::last_channel` [#1768](https://github.com/astriaorg/astria/pull/1768)

crates/astria-core/src/execution/v1/mod.rs

@@ -2,7 +2,7 @@ use bytes::Bytes;
 use pbjson_types::Timestamp;
 
 use crate::{
-    generated::execution::v1 as raw,
+    generated::astria::execution::v1 as raw,
     primitive::v1::{
         IncorrectRollupIdLength,
         RollupId,
@@ -43,7 +43,7 @@ enum GenesisInfoErrorKind {
 #[cfg_attr(feature = "serde", derive(serde::Serialize))]
 #[cfg_attr(
     feature = "serde",
-    serde(into = "crate::generated::execution::v1::GenesisInfo")
+    serde(into = "crate::generated::astria::execution::v1::GenesisInfo")
 )]
 pub struct GenesisInfo {
     /// The rollup id which is used to identify the rollup txs.
@@ -148,7 +148,7 @@ enum BlockErrorKind {
 #[cfg_attr(feature = "serde", derive(serde::Serialize))]
 #[cfg_attr(
     feature = "serde",
-    serde(into = "crate::generated::execution::v1::Block")
+    serde(into = "crate::generated::astria::execution::v1::Block")
 )]
 pub struct Block {
     /// The block number
@@ -380,7 +380,7 @@ impl CommitmentStateBuilder<WithFirm, WithSoft, WithCelestiaBaseHeight> {
 #[cfg_attr(feature = "serde", derive(serde::Serialize))]
 #[cfg_attr(
     feature = "serde",
-    serde(into = "crate::generated::execution::v1::CommitmentState")
+    serde(into = "crate::generated::astria::execution::v1::CommitmentState")
 )]
 pub struct CommitmentState {
     /// Soft commitment is the rollup block matching latest sequencer block.