break proto changes into v2

crates/astria-conductor/src/conductor/inner.rs

@@ -236,7 +236,7 @@ fn should_restart_or_shutdown(
 
 #[cfg(test)]
 mod tests {
-    use astria_core::generated::astria::execution::v1::{
+    use astria_core::generated::astria::execution::v2::{
         Block,
         CommitmentState,
         GenesisInfo,

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

@@ -1,15 +1,15 @@
 use std::time::Duration;
 
 use astria_core::{
-    execution::v1::{
+    execution::v2::{
         Block,
         CommitmentState,
         GenesisInfo,
     },
     generated::astria::{
         execution::{
-            v1 as raw,
-            v1::execution_service_client::ExecutionServiceClient,
+            v2 as raw,
+            v2::execution_service_client::ExecutionServiceClient,
         },
         sequencerblock::v1::RollupData,
     },

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

@@ -4,7 +4,7 @@ use std::{
 };
 
 use astria_core::{
-    execution::v1::{
+    execution::v2::{
         Block,
         CommitmentState,
     },

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

@@ -5,7 +5,7 @@
 use std::num::NonZeroU64;
 
 use astria_core::{
-    execution::v1::{
+    execution::v2::{
         Block,
         CommitmentState,
         GenesisInfo,

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

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

crates/astria-conductor/src/test_utils.rs

@@ -1,5 +1,5 @@
 use astria_core::{
-    generated::astria::execution::v1::{
+    generated::astria::execution::v2::{
         CommitmentState,
         GenesisInfo,
     },
@@ -10,7 +10,7 @@ use astria_core::{
 use crate::executor::State;
 
 pub(crate) fn make_commitment_state() -> CommitmentState {
-    let firm = astria_core::generated::astria::execution::v1::Block {
+    let firm = astria_core::generated::astria::execution::v2::Block {
         number: 1,
         hash: vec![42u8; 32].into(),
         parent_block_hash: vec![41u8; 32].into(),
@@ -19,7 +19,7 @@ pub(crate) fn make_commitment_state() -> CommitmentState {
             nanos: 789,
         }),
     };
-    let soft = astria_core::generated::astria::execution::v1::Block {
+    let soft = astria_core::generated::astria::execution::v2::Block {
         number: 2,
         hash: vec![43u8; 32].into(),
         parent_block_hash: vec![42u8; 32].into(),
@@ -54,8 +54,8 @@ pub(crate) fn make_rollup_state(
     genesis_info: GenesisInfo,
     commitment_state: CommitmentState,
 ) -> State {
-    let genesis_info = astria_core::execution::v1::GenesisInfo::try_from_raw(genesis_info).unwrap();
+    let genesis_info = astria_core::execution::v2::GenesisInfo::try_from_raw(genesis_info).unwrap();
     let commitment_state =
-        astria_core::execution::v1::CommitmentState::try_from_raw(commitment_state).unwrap();
+        astria_core::execution::v2::CommitmentState::try_from_raw(commitment_state).unwrap();
     State::try_from_genesis_info_and_commitment_state(genesis_info, commitment_state).unwrap()
 }

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

@@ -5,7 +5,7 @@ use astria_conductor::{
     Conductor,
     Config,
 };
-use astria_core::generated::astria::execution::v1::{
+use astria_core::generated::astria::execution::v2::{
     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::astria::execution::v1::Block {
+        ::astria_core::generated::astria::execution::v2::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::astria::execution::v1::CommitmentState {
+       ::astria_core::generated::astria::execution::v2::CommitmentState {
             firm: Some($crate::block!(
                 number: $firm_number,
                 hash: $firm_hash,
@@ -116,7 +116,7 @@ macro_rules! genesis_info {
         rollup_stop_block_number: $rollup_stop_block_number:expr,
         halt_at_rollup_stop_number: $halt_at_rollup_stop_number:expr $(,)?
     ) => {
-        ::astria_core::generated::astria::execution::v1::GenesisInfo {
+        ::astria_core::generated::astria::execution::v2::GenesisInfo {
             rollup_id: Some($crate::ROLLUP_ID.to_raw()),
             sequencer_start_height: $start_height,
             celestia_block_variance: $variance,
@@ -489,12 +489,12 @@ macro_rules! mount_get_block {
             hash: $hash,
             parent: $parent,
         );
-        let identifier = ::astria_core::generated::astria::execution::v1::BlockIdentifier {
+        let identifier = ::astria_core::generated::astria::execution::v2::BlockIdentifier {
             identifier: Some(
-                ::astria_core::generated::astria::execution::v1::block_identifier::Identifier::BlockNumber(block.number)
+                ::astria_core::generated::astria::execution::v2::block_identifier::Identifier::BlockNumber(block.number)
         )};
         $test_env.mount_get_block(
-            ::astria_core::generated::astria::execution::v1::GetBlockRequest {
+            ::astria_core::generated::astria::execution::v2::GetBlockRequest {
                 identifier: Some(identifier),
             },
             block,

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

@@ -4,7 +4,7 @@ use std::{
 };
 
 use astria_core::generated::astria::{
-    execution::v1::{
+    execution::v2::{
         execution_service_server::{
             ExecutionService,
             ExecutionServiceServer,

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

@@ -13,7 +13,7 @@ use astria_conductor::{
 use astria_core::{
     brotli::compress_bytes,
     generated::astria::{
-        execution::v1::{
+        execution::v2::{
             Block,
             CommitmentState,
             GenesisInfo,
@@ -179,7 +179,7 @@ impl TestConductor {
     pub async fn mount_get_block<S: serde::Serialize>(
         &self,
         expected_pbjson: S,
-        block: astria_core::generated::astria::execution::v1::Block,
+        block: astria_core::generated::astria::execution::v2::Block,
     ) {
         use astria_grpc_mock::{
             matcher::message_partial_pbjson,
@@ -311,7 +311,7 @@ impl TestConductor {
         up_to_n_times: u64,
         expected_calls: u64,
     ) {
-        use astria_core::generated::astria::execution::v1::GetGenesisInfoRequest;
+        use astria_core::generated::astria::execution::v2::GetGenesisInfoRequest;
         astria_grpc_mock::Mock::for_rpc_given(
             "get_genesis_info",
             astria_grpc_mock::matcher::message_type::<GetGenesisInfoRequest>(),
@@ -328,7 +328,7 @@ impl TestConductor {
         commitment_state: CommitmentState,
         up_to_n_times: u64,
     ) {
-        use astria_core::generated::astria::execution::v1::GetCommitmentStateRequest;
+        use astria_core::generated::astria::execution::v2::GetCommitmentStateRequest;
 
         astria_grpc_mock::Mock::for_rpc_given(
             "get_commitment_state",
@@ -393,7 +393,7 @@ impl TestConductor {
         commitment_state: CommitmentState,
         expected_calls: impl Into<astria_grpc_mock::Times>,
     ) -> astria_grpc_mock::MockGuard {
-        use astria_core::generated::astria::execution::v1::UpdateCommitmentStateRequest;
+        use astria_core::generated::astria::execution::v2::UpdateCommitmentStateRequest;
         use astria_grpc_mock::{
             matcher::message_partial_pbjson,
             response::constant_response,

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

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

crates/astria-core/CHANGELOG.md

@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add method `TracePrefixed::leading_channel` to read the left-most channel of
   a trace prefixed ICS20 asset [#1768](https://github.com/astriaorg/astria/pull/1768).
 - Add `impl Protobuf for Address<Bech32m>` [#1802](https://github.com/astriaorg/astria/pull/1802).
+- Add v2 execution API, with notable changes to `astria_core::execution::v1::GenesisInfo`
+to accomodate conductor stop height restart logic [#1928](https://github.com/astriaorg/astria/pull/1928).
 
 ### Changed
 
@@ -30,8 +32,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update `idna` dependency to resolve cargo audit warning [#1869](https://github.com/astriaorg/astria/pull/1869).
 - Replaced all instances of `[u8; 32]` by newtype
   `astria_core::sequencerblock::v1::block::Hash` where appropriate [#1884](https://github.com/astriaorg/astria/pull/1884).
-- Updated domain type `astria_core::execution::v1::GenesisInfo` to accomodate conductor
-  stop height restart logic; removed `GenesisInfo::sequencer_genesis_height` [#1928](https://github.com/astriaorg/astria/pull/1928).
 
 ### Removed
 

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

@@ -1 +1,2 @@
 pub mod v1;
+pub mod v2;