astriaorg · SuperFluffy · Dec 19, 2023 · Dec 6, 2023
@@ -8,9 +8,9 @@ members = [
   "crates/astria-composer",
   "crates/astria-conductor",
   "crates/astria-config",
+  "crates/astria-core",
   "crates/astria-merkle",
   "crates/astria-optimism",
-  "crates/astria-proto",
   "crates/astria-sequencer",
   "crates/astria-sequencer-client",
   "crates/astria-sequencer-relayer",

@@ -18,8 +18,8 @@ tendermint = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 
+astria-core = { path = "../astria-core" }
 merkle = { package = "astria-merkle", path = "../astria-merkle" }
-proto = { package = "astria-proto", path = "../astria-proto" }
 
 ### Celestia specific imports
 #
@@ -28,6 +28,7 @@ proto = { package = "astria-proto", path = "../astria-proto" }
 # As none of them are reexported it is important to keep these in sync
 # when updating.
 jsonrpsee = { version = "0.20", features = ["client-core", "macros"] }
+prost = { workspace = true }
 
 [dependencies.celestia-rpc]
 git = "https://github.com/eigerco/celestia-node-rs"

@@ -1,3 +1,9 @@
+use astria_core::sequencer::v1alpha1::{
+    CelestiaRollupBlob,
+    CelestiaSequencerBlob,
+    CelestiaSequencerBlobError,
+    SequencerBlock,
+};
 use async_trait::async_trait;
 use base64::{
     display::Base64Display,
@@ -10,13 +16,7 @@ use celestia_types::{
     Blob,
     Commitment,
 };
-use proto::{
-    native::sequencer::v1alpha1::{
-        CelestiaRollupBlob,
-        CelestiaSequencerBlob,
-        CelestiaSequencerBlobError,
-        SequencerBlock,
-    },
+use prost::{
     DecodeError,
     Message as _,
 };
@@ -94,7 +94,7 @@ pub trait CelestiaClientExt: BlobClient {
             }
             'blob: {
                 let raw_blob =
-                    match proto::generated::sequencer::v1alpha1::CelestiaSequencerBlob::decode(
+                    match astria_core::generated::sequencer::v1alpha1::CelestiaSequencerBlob::decode(
                         &*blob.data,
                     ) {
                         Ok(blob) => blob,
@@ -283,7 +283,9 @@ fn convert_and_filter_rollup_blobs(
             continue;
         }
         let proto_blob =
-            match proto::generated::sequencer::v1alpha1::CelestiaRollupBlob::decode(&*blob.data) {
+            match astria_core::generated::sequencer::v1alpha1::CelestiaRollupBlob::decode(
+                &*blob.data,
+            ) {
                 Err(e) => {
                     warn!(
                         error = &e as &dyn std::error::Error,

@@ -1,5 +1,9 @@
 pub mod client;
 
+pub use astria_core::sequencer::v1alpha1::{
+    CelestiaRollupBlob,
+    CelestiaSequencerBlob,
+};
 pub use celestia_rpc;
 pub use celestia_tendermint;
 pub use celestia_types;
@@ -9,11 +13,6 @@ use celestia_types::nmt::{
 };
 pub use client::CelestiaClientExt;
 pub use jsonrpsee;
-use proto::native::sequencer::v1alpha1::RollupId;
-pub use proto::native::sequencer::v1alpha1::{
-    CelestiaRollupBlob,
-    CelestiaSequencerBlob,
-};
 
 #[must_use = "a celestia namespace must be used in order to be useful"]
 pub const fn celestia_namespace_v0_from_array<const N: usize>(bytes: [u8; N]) -> Namespace {
@@ -30,7 +29,9 @@ pub const fn celestia_namespace_v0_from_array<const N: usize>(bytes: [u8; N]) ->
 }
 
 #[must_use = "a celestia namespace must be used in order to be useful"]
-pub const fn celestia_namespace_v0_from_rollup_id(rollup_id: RollupId) -> Namespace {
+pub const fn celestia_namespace_v0_from_rollup_id(
+    rollup_id: astria_core::sequencer::v1alpha1::RollupId,
+) -> Namespace {
     celestia_namespace_v0_from_array(rollup_id.get())
 }
 

@@ -10,7 +10,7 @@ bench = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-proto = { package = "astria-proto", path = "../astria-proto" }
+astria-core = { path = "../astria-core" }
 
 clap = { workspace = true, features = ["derive", "env"] }
 color-eyre = { workspace = true }

@@ -1,3 +1,8 @@
+use astria_core::sequencer::v1alpha1::{
+    Action,
+    TransferAction,
+    UnsignedTransaction,
+};
 use astria_sequencer_client::{
     Address,
     HttpClient,
@@ -12,11 +17,6 @@ use color_eyre::{
     },
 };
 use ed25519_consensus::SigningKey;
-use proto::native::sequencer::v1alpha1::{
-    Action,
-    TransferAction,
-    UnsignedTransaction,
-};
 use rand::rngs::OsRng;
 
 use crate::cli::sequencer::{
@@ -178,9 +178,9 @@ pub(crate) async fn send_transfer(args: &TransferArgs) -> eyre::Result<()> {
         actions: vec![Action::Transfer(TransferAction {
             to: to_address,
             amount: args.amount,
-            asset_id: proto::native::sequencer::asset::default_native_asset_id(),
+            asset_id: astria_core::sequencer::asset::default_native_asset_id(),
         })],
-        fee_asset_id: proto::native::sequencer::asset::default_native_asset_id(),
+        fee_asset_id: astria_core::sequencer::asset::default_native_asset_id(),
     }
     .into_signed(&sequencer_key);
     let res = sequencer_client

@@ -7,8 +7,8 @@ rust-version = "1.70.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+astria-core = { path = "../astria-core" }
 config = { package = "astria-config", path = "../astria-config" }
-proto = { package = "astria-proto", path = "../astria-proto" }
 telemetry = { package = "astria-telemetry", path = "../astria-telemetry" }
 
 pin-project-lite = "0.2.13"
@@ -42,6 +42,7 @@ tokio = { workspace = true, features = [
 tokio-util = { workspace = true, features = ["rt"] }
 tracing = { workspace = true, features = ["attributes"] }
 tryhard = { workspace = true }
+prost.workspace = true
 
 [dependencies.sequencer-client]
 package = "astria-sequencer-client"
@@ -56,7 +57,6 @@ path = "../astria-sequencer-types"
 config = { package = "astria-config", path = "../astria-config", features = [
   "tests",
 ] }
-proto = { package = "astria-proto", path = "../astria-proto" }
 test_utils = { package = "astria-test-utils", path = "../astria-test-utils", features = [
   "geth",
 ] }

@@ -1,3 +1,4 @@
+use astria_core::sequencer::v1alpha1::RollupId;
 use color_eyre::eyre::{
     self,
     WrapErr as _,
@@ -7,7 +8,6 @@ use ethers::providers::{
     ProviderError,
     Ws,
 };
-use proto::native::sequencer::v1alpha1::RollupId;
 use tokio::sync::{
     mpsc::{
         error::SendTimeoutError,

@@ -9,6 +9,12 @@ use std::{
     time::Duration,
 };
 
+use astria_core::sequencer::v1alpha1::{
+    asset::default_native_asset_id,
+    Action,
+    SignedTransaction,
+    UnsignedTransaction,
+};
 use color_eyre::eyre::{
     self,
     eyre,
@@ -25,15 +31,7 @@ use futures::{
     Future,
 };
 use pin_project_lite::pin_project;
-use proto::{
-    native::sequencer::v1alpha1::{
-        asset::default_native_asset_id,
-        Action,
-        SignedTransaction,
-        UnsignedTransaction,
-    },
-    Message as _,
-};
+use prost::Message as _;
 use secrecy::{
     ExposeSecret as _,
     SecretString,