diff --git a/Cargo.lock b/Cargo.lock index efb10831ac..48dfb01493 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2287,7 +2287,7 @@ dependencies = [ "curve25519-dalek-derive", "fiat-crypto", "rand_core 0.6.4", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "subtle", "zeroize", ] @@ -2300,7 +2300,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2526,7 +2526,7 @@ checksum = "0a6433aac097572ea8ccc60b3f2e756c661c9aeed9225cdd4d0cb119cb7ff6ba" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -3798,7 +3798,7 @@ checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" dependencies = [ "atomic-polyfill", "hash32", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "serde", "spin 0.9.8", "stable_deref_trait", @@ -7871,7 +7871,7 @@ checksum = "585e5ef40a784ce60b49c67d762110688d211d395d39e096be204535cf64590e" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -8686,7 +8686,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3a27a2152c..8c82c1ce8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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", diff --git a/crates/astria-auctioneer/Cargo.toml b/crates/astria-auctioneer/Cargo.toml index 10068e85f6..73ef9a1f43 100644 --- a/crates/astria-auctioneer/Cargo.toml +++ b/crates/astria-auctioneer/Cargo.toml @@ -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" } diff --git a/crates/astria-auctioneer/src/auction/bid.rs b/crates/astria-auctioneer/src/auction/bid.rs index 5de2bcc231..6802657d98 100644 --- a/crates/astria-auctioneer/src/auction/bid.rs +++ b/crates/astria-auctioneer/src/auction/bid.rs @@ -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, @@ -34,7 +34,7 @@ impl Bundle { unimplemented!() } - pub(crate) fn into_transaction(self) -> SignedTransaction { + pub(crate) fn into_transaction(self) -> Transaction { unimplemented!() } diff --git a/crates/astria-auctioneer/src/auction/driver.rs b/crates/astria-auctioneer/src/auction/driver.rs index 869d19560e..ae0be946b2 100644 --- a/crates/astria-auctioneer/src/auction/driver.rs +++ b/crates/astria-auctioneer/src/auction/driver.rs @@ -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, @@ -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!() } } diff --git a/crates/astria-auctioneer/src/block/mod.rs b/crates/astria-auctioneer/src/block/mod.rs index fa2695a623..f4a2668621 100644 --- a/crates/astria-auctioneer/src/block/mod.rs +++ b/crates/astria-auctioneer/src/block/mod.rs @@ -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, }, @@ -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], } @@ -107,7 +110,7 @@ impl Executed { raw: raw_bundle::ExecuteOptimisticBlockStreamResponse, ) -> eyre::Result { 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")); }; @@ -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 { Ok(Self { sequencer_height: raw.height, @@ -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!() } diff --git a/crates/astria-auctioneer/src/optimistic_executor/optimistic_block_stream/mod.rs b/crates/astria-auctioneer/src/optimistic_executor/optimistic_block_stream/mod.rs index 824e1d486f..45ae392d0c 100644 --- a/crates/astria-auctioneer/src/optimistic_executor/optimistic_block_stream/mod.rs +++ b/crates/astria-auctioneer/src/optimistic_executor/optimistic_block_stream/mod.rs @@ -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, diff --git a/crates/astria-auctioneer/src/optimistic_executor/sequencer_client.rs b/crates/astria-auctioneer/src/optimistic_executor/sequencer_client.rs index f0638e016c..8f6d61e53a 100644 --- a/crates/astria-auctioneer/src/optimistic_executor/sequencer_client.rs +++ b/crates/astria-auctioneer/src/optimistic_executor/sequencer_client.rs @@ -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,