Skip to content

Commit

Permalink
bump versions to use v1
Browse files Browse the repository at this point in the history
  • Loading branch information
itamarreif committed Oct 23, 2024
1 parent 4acb5cd commit 2101b1a
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 19 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ members = [
# Specify default members so that cargo invocations in github actions will
# not act on lints
default-members = [
"crates/astria-auctioneer",
"crates/astria-bridge-contracts",
"crates/astria-bridge-withdrawer",
"crates/astria-build-info",
Expand Down
2 changes: 1 addition & 1 deletion crates/astria-auctioneer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ name = "astria-auctioneer"

[dependencies]
astria-build-info = { path = "../astria-build-info", features = ["runtime"] }
astria-core = { path = "../astria-core", features = ["serde", "server"] }
astria-core = { path = "../astria-core", features = ["serde", "client"] }
astria-eyre = { path = "../astria-eyre" }
config = { package = "astria-config", path = "../astria-config" }
sequencer_client = { package = "astria-sequencer-client", path = "../astria-sequencer-client" }
Expand Down
4 changes: 2 additions & 2 deletions crates/astria-auctioneer/src/auction/bid.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use astria_core::{
generated::bundle::v1alpha1 as raw,
protocol::transaction::v1alpha1::SignedTransaction,
protocol::transaction::v1::Transaction,
};
use astria_eyre::eyre::{
self,
Expand Down Expand Up @@ -34,7 +34,7 @@ impl Bundle {
unimplemented!()
}

pub(crate) fn into_transaction(self) -> SignedTransaction {
pub(crate) fn into_transaction(self) -> Transaction {
unimplemented!()
}

Expand Down
4 changes: 2 additions & 2 deletions crates/astria-auctioneer/src/auction/driver.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::time::Duration;

use astria_core::protocol::transaction::v1alpha1::SignedTransaction;
use astria_core::protocol::transaction::v1::Transaction;
use astria_eyre::eyre::{
self,
eyre,
Expand Down Expand Up @@ -174,7 +174,7 @@ impl Driver {
submission_result
}

async fn submit_transaction(&self, _transaction: SignedTransaction) -> eyre::Result<()> {
async fn submit_transaction(&self, _transaction: Transaction) -> eyre::Result<()> {
unimplemented!()
}
}
15 changes: 9 additions & 6 deletions crates/astria-auctioneer/src/block/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ use astria_core::{
execution,
generated::{
bundle::v1alpha1 as raw_bundle,
sequencerblock::v1alpha1 as raw_sequencer_block,
sequencerblock::{
v1 as raw_sequencer_block,
v1::optimisticblock::v1alpha1 as raw_optimistic_block,
},
},
primitive::v1::RollupId,
sequencerblock::v1alpha1::block::{
sequencerblock::v1::block::{
FilteredSequencerBlock,
FilteredSequencerBlockParts,
},
Expand Down Expand Up @@ -98,7 +101,7 @@ impl Optimistic {

#[derive(Debug, Clone)]
pub(crate) struct Executed {
block: execution::v1alpha2::Block,
block: execution::v1::Block,
sequencer_block_hash: [u8; 32],
}

Expand All @@ -107,7 +110,7 @@ impl Executed {
raw: raw_bundle::ExecuteOptimisticBlockStreamResponse,
) -> eyre::Result<Self> {
let block = if let Some(raw_block) = raw.block {
execution::v1alpha2::Block::try_from_raw(raw_block).wrap_err("invalid rollup block")?
execution::v1::Block::try_from_raw(raw_block).wrap_err("invalid rollup block")?
} else {
return Err(eyre!("missing block"));
};
Expand Down Expand Up @@ -137,7 +140,7 @@ pub(crate) struct Committed {

impl Committed {
pub(crate) fn try_from_raw(
raw: raw_sequencer_block::SequencerBlockCommit,
raw: raw_optimistic_block::SequencerBlockCommit,
) -> eyre::Result<Self> {
Ok(Self {
sequencer_height: raw.height,
Expand All @@ -149,7 +152,7 @@ impl Committed {
})
}

pub(crate) fn into_raw(self) -> raw_sequencer_block::SequencerBlockCommit {
pub(crate) fn into_raw(self) -> raw_optimistic_block::SequencerBlockCommit {
unimplemented!()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::pin::Pin;

use astria_core::generated::sequencerblock::v1alpha1::GetOptimisticBlockStreamResponse;
use astria_core::generated::sequencerblock::v1::optimisticblock::v1alpha1::GetOptimisticBlockStreamResponse;
use astria_eyre::eyre::{
self,
eyre,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::time::Duration;

use astria_core::{
generated::sequencerblock::v1alpha1::{
generated::sequencerblock::v1::optimisticblock::v1alpha1::{
optimistic_block_service_client::OptimisticBlockServiceClient,
GetBlockCommitmentStreamRequest,
GetBlockCommitmentStreamResponse,
Expand Down

0 comments on commit 2101b1a

Please sign in to comment.