Skip to content

Commit

Permalink
chore: migrate v1alpha1 sequencer apis to v1 (#817)
Browse files Browse the repository at this point in the history
## Summary
Now that we have entered audit over things that use these core types,
these should be considered v1 and breaking changes cannot be allowed.
  • Loading branch information
joroshiba authored Mar 13, 2024
1 parent 7f71b9d commit 9e533ef
Show file tree
Hide file tree
Showing 80 changed files with 150 additions and 152 deletions.
8 changes: 3 additions & 5 deletions crates/astria-celestia-client/src/client.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
celestia::CelestiaSequencerBlobError,
CelestiaRollupBlob,
CelestiaSequencerBlob,
Expand Down Expand Up @@ -103,7 +103,7 @@ pub trait CelestiaClientExt: BlobClient {
}
'blob: {
let raw_blob =
match astria_core::generated::sequencer::v1alpha1::CelestiaSequencerBlob::decode(
match astria_core::generated::sequencer::v1::CelestiaSequencerBlob::decode(
&*blob.data,
) {
Ok(blob) => blob,
Expand Down Expand Up @@ -254,9 +254,7 @@ fn convert_and_filter_rollup_blobs(
continue;
}
let proto_blob =
match astria_core::generated::sequencer::v1alpha1::CelestiaRollupBlob::decode(
&*blob.data,
) {
match astria_core::generated::sequencer::v1::CelestiaRollupBlob::decode(&*blob.data) {
Err(e) => {
debug!(
error = &e as &dyn std::error::Error,
Expand Down
4 changes: 2 additions & 2 deletions crates/astria-celestia-client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pub mod client;
pub mod metrics_init;
pub mod submission;

pub use astria_core::sequencer::v1alpha1::{
pub use astria_core::sequencer::v1::{
CelestiaRollupBlob,
CelestiaSequencerBlob,
};
Expand Down Expand Up @@ -49,7 +49,7 @@ 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: astria_core::sequencer::v1alpha1::RollupId,
rollup_id: astria_core::sequencer::v1::RollupId,
) -> Namespace {
celestia_namespace_v0_from_array(rollup_id.get())
}
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-celestia-client/src/submission.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Logic to convert sequencer blocks to celestia blobs before submission.
use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
RollupId,
SequencerBlock,
};
Expand Down
4 changes: 2 additions & 2 deletions crates/astria-cli/src/commands/sequencer.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
transaction::action::{
Action,
TransferAction,
Expand Down Expand Up @@ -156,7 +156,7 @@ pub(crate) async fn get_block_height(args: &BlockHeightGetArgs) -> eyre::Result<
/// * If the http client cannot be created
/// * If the latest block height cannot be retrieved
pub(crate) async fn send_transfer(args: &TransferArgs) -> eyre::Result<()> {
use astria_core::sequencer::v1alpha1::asset::default_native_asset_id;
use astria_core::sequencer::v1::asset::default_native_asset_id;

// Build the signing_key
let private_key_bytes: [u8; 32] = hex::decode(args.private_key.as_str())
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-composer/src/searcher/collector.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
asset::default_native_asset_id,
transaction::action::SequenceAction,
RollupId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::{
mem,
};

use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
transaction::{
action::SequenceAction,
Action,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#[cfg(test)]
mod sized_bundle_tests {
use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
asset::default_native_asset_id,
transaction::action::SequenceAction,
RollupId,
Expand Down Expand Up @@ -107,7 +107,7 @@ mod sized_bundle_tests {

#[cfg(test)]
mod bundle_factory_tests {
use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
asset::default_native_asset_id,
transaction::action::SequenceAction,
RollupId,
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-composer/src/searcher/executor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::{
time::Duration,
};

use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
transaction::{
action::SequenceAction,
Action,
Expand Down
6 changes: 3 additions & 3 deletions crates/astria-composer/src/searcher/executor/tests.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::time::Duration;

use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
asset::default_native_asset_id,
transaction::action::SequenceAction,
RollupId,
Expand Down Expand Up @@ -65,7 +65,7 @@ static TELEMETRY: Lazy<()> = Lazy::new(|| {

/// Start a mock sequencer server and mount a mock for the `accounts/nonce` query.
async fn setup() -> (MockServer, MockGuard, Config) {
use astria_core::generated::sequencer::v1alpha1::NonceResponse;
use astria_core::generated::sequencer::v1::NonceResponse;
Lazy::force(&TELEMETRY);
let server = MockServer::start().await;
let startup_guard = mount_nonce_query_mock(
Expand Down Expand Up @@ -128,7 +128,7 @@ async fn mount_nonce_query_mock(

/// Convert a `Request` object to a `SignedTransaction`
fn signed_tx_from_request(request: &Request) -> SignedTransaction {
use astria_core::generated::sequencer::v1alpha1::SignedTransaction as RawSignedTransaction;
use astria_core::generated::sequencer::v1::SignedTransaction as RawSignedTransaction;
use prost::Message as _;

let wrapped_tx_sync_req: request::Wrapper<tx_sync::Request> =
Expand Down
4 changes: 2 additions & 2 deletions crates/astria-composer/src/searcher/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::collections::HashMap;

use astria_core::sequencer::v1alpha1::transaction::action::SequenceAction;
use astria_core::sequencer::v1::transaction::action::SequenceAction;
use astria_eyre::eyre::{
self,
WrapErr as _,
Expand Down Expand Up @@ -302,7 +302,7 @@ fn reconnect_exited_collector(
mod tests {
use std::collections::HashMap;

use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
asset::default_native_asset_id,
transaction::action::SequenceAction,
RollupId,
Expand Down
6 changes: 3 additions & 3 deletions crates/astria-composer/tests/blackbox/composer.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::time::Duration;

use astria_core::{
generated::sequencer::v1alpha1::NonceResponse,
sequencer::v1alpha1::{
generated::sequencer::v1::NonceResponse,
sequencer::v1::{
AbciErrorCode,
RollupId,
SignedTransaction,
Expand Down Expand Up @@ -251,7 +251,7 @@ async fn mount_matcher_verifying_tx_integrity(
}

fn signed_tx_from_request(request: &Request) -> SignedTransaction {
use astria_core::generated::sequencer::v1alpha1::SignedTransaction as RawSignedTransaction;
use astria_core::generated::sequencer::v1::SignedTransaction as RawSignedTransaction;
use prost::Message as _;

let wrapped_tx_sync_req: request::Wrapper<tx_sync::Request> =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use wiremock::{
};

pub async fn start() -> (MockServer, MockGuard) {
use astria_core::generated::sequencer::v1alpha1::NonceResponse;
use astria_core::generated::sequencer::v1::NonceResponse;
let server = MockServer::start().await;
let startup_guard = mount_abci_query_mock(
&server,
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-conductor/src/block_cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::{
future::Future,
};

use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
block::FilteredSequencerBlock,
CelestiaSequencerBlob,
};
Expand Down
4 changes: 2 additions & 2 deletions crates/astria-conductor/src/celestia/block_verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ fn verify_vote_signature(
mod test {
use std::collections::BTreeMap;

use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
celestia::UncheckedCelestiaSequencerBlob,
test_utils::make_cometbft_block,
RollupId,
Expand Down Expand Up @@ -405,7 +405,7 @@ mod test {
let rollup_id = RollupId::from_unhashed_bytes(b"test-chain");
let grouped_txs = BTreeMap::from([(rollup_id, vec![test_tx.clone()])]);
let rollup_transactions_tree =
astria_core::sequencer::v1alpha1::derive_merkle_tree_from_rollup_txs(&grouped_txs);
astria_core::sequencer::v1::derive_merkle_tree_from_rollup_txs(&grouped_txs);
let rollup_transactions_root = rollup_transactions_tree.root();
let rollup_ids_root = merkle::Tree::from_leaves(std::iter::once(rollup_id)).root();

Expand Down
2 changes: 1 addition & 1 deletion crates/astria-conductor/src/executor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use astria_core::{
Block,
CommitmentState,
},
sequencer::v1alpha1::{
sequencer::v1::{
block::{
FilteredSequencerBlock,
FilteredSequencerBlockParts,
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-conductor/src/executor/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use astria_core::{
CommitmentState,
GenesisInfo,
},
sequencer::v1alpha1::RollupId,
sequencer::v1::RollupId,
};
use bytes::Bytes;
use celestia_client::celestia_types::Height as CelestiaHeight;
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-conductor/src/executor/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use astria_core::{
GetGenesisInfoRequest,
UpdateCommitmentStateRequest,
},
sequencer::v1alpha1::{
sequencer::v1::{
test_utils::{
make_cometbft_block,
ConfigureCometBftBlock,
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-conductor/src/sequencer/block_stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::{
task::Poll,
};

use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
block::FilteredSequencerBlock,
RollupId,
};
Expand Down
4 changes: 2 additions & 2 deletions crates/astria-conductor/src/sequencer/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
use std::time::Duration;

use astria_core::{
generated::sequencer::v1alpha1::{
generated::sequencer::v1::{
sequencer_service_client::SequencerServiceClient,
GetFilteredSequencerBlockRequest,
},
sequencer::v1alpha1::{
sequencer::v1::{
block::FilteredSequencerBlock,
RollupId,
},
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-conductor/src/sequencer/reporting.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use astria_core::sequencer::v1alpha1::{
use astria_core::sequencer::v1::{
block::{
FilteredSequencerBlock,
RollupTransactions,
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-core/src/execution/v1alpha2/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use prost_types::Timestamp;

use crate::{
generated::execution::v1alpha2 as raw,
sequencer::v1alpha1::{
sequencer::v1::{
IncorrectRollupIdLength,
RollupId,
},
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crates/astria-core/src/generated/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/astria-core/src/sequencer/mod.rs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pub mod v1alpha1;
pub mod v1;
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use super::{
RollupId,
};
use crate::{
sequencer::v1alpha1::{
sequencer::v1::{
are_rollup_ids_included,
are_rollup_txs_included,
asset,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use sha2::Digest as _;

use super::*;
use crate::sequencer::v1alpha1::test_utils::make_cometbft_block;
use crate::sequencer::v1::test_utils::make_cometbft_block;

#[test]
fn sequencer_block_from_cometbft_block_gives_expected_merkle_proofs() {
Expand Down
Loading

0 comments on commit 9e533ef

Please sign in to comment.