apollo_protobuf: add starknet_version field to ConsensusBlockInfo (#11711)

Author: asmaastarkware

crates/apollo_consensus_orchestrator/src/build_proposal.rs

@@ -172,6 +172,7 @@ async fn initiate_build(
         l1_data_gas_price_wei: l1_prices_wei.l1_data_gas_price,
         l1_gas_price_fri: l1_prices_fri.l1_gas_price,
         l1_data_gas_price_fri: l1_prices_fri.l1_data_gas_price,
+        starknet_version: starknet_api::block::StarknetVersion::LATEST,
     };
 
     let retrospective_block_hash = wait_for_retrospective_block_hash(

crates/apollo_consensus_orchestrator/src/test_utils.rs

@@ -377,6 +377,7 @@ pub(crate) fn block_info(height: BlockNumber, round: u32) -> ConsensusBlockInfo
         l1_data_gas_price_fri,
         l1_gas_price_wei,
         l1_data_gas_price_wei,
+        starknet_version: starknet_api::block::StarknetVersion::LATEST,
     }
 }
 

crates/apollo_consensus_orchestrator/src/utils.rs

@@ -359,8 +359,7 @@ pub(crate) fn convert_to_sn_api_block_info(
             },
         },
         use_kzg_da: block_info.l1_da_mode.is_use_kzg_da(),
-        // TODO(Shahak): Add starknet_version to ConsensusBlockInfo and pass it through here.
-        starknet_version: starknet_api::block::StarknetVersion::LATEST,
+        starknet_version: block_info.starknet_version,
     })
 }
 

crates/apollo_consensus_orchestrator/src/utils_test.rs

@@ -47,6 +47,7 @@ async fn get_block_info(args: &ProposalBuildArguments) -> ConsensusBlockInfo {
         l1_data_gas_price_wei: l1_prices_wei.l1_data_gas_price,
         l1_gas_price_fri: l1_prices_fri.l1_gas_price,
         l1_data_gas_price_fri: l1_prices_fri.l1_data_gas_price,
+        starknet_version: starknet_api::block::StarknetVersion::LATEST,
     }
 }
 

crates/apollo_protobuf/src/consensus.rs

@@ -116,6 +116,8 @@ pub struct ConsensusBlockInfo {
     pub l1_gas_price_wei: GasPrice,
     /// L1 data gas price in WEI.
     pub l1_data_gas_price_wei: GasPrice,
+    /// Starknet protocol version.
+    pub starknet_version: starknet_api::block::StarknetVersion,
 }
 
 /// A temporary constant to use as a validator ID. Zero is not a valid contract address.
@@ -148,6 +150,7 @@ impl Default for ConsensusBlockInfo {
             l1_data_gas_price_fri: Default::default(),
             l1_gas_price_wei: Default::default(),
             l1_data_gas_price_wei: Default::default(),
+            starknet_version: starknet_api::block::StarknetVersion::LATEST,
         }
     }
 }

crates/apollo_protobuf/src/converters/consensus.rs

@@ -5,7 +5,7 @@ mod consensus_test;
 use std::convert::{TryFrom, TryInto};
 
 use prost::Message;
-use starknet_api::block::{BlockNumber, GasPrice};
+use starknet_api::block::{BlockNumber, GasPrice, StarknetVersion};
 use starknet_api::consensus_transaction::ConsensusTransaction;
 use starknet_api::hash::StarkHash;
 
@@ -208,6 +208,15 @@ impl TryFrom<protobuf::BlockInfo> for ConsensusBlockInfo {
             GasPrice(value.l1_gas_price_wei.ok_or(missing("l1_gas_price_wei"))?.into());
         let l1_data_gas_price_wei =
             GasPrice(value.l1_data_gas_price_wei.ok_or(missing("l1_data_gas_price_wei"))?.into());
+        let starknet_version = match StarknetVersion::try_from(value.starknet_version.to_owned()) {
+            Ok(version) => version,
+            Err(_) => {
+                return Err(ProtobufConversionError::OutOfRangeValue {
+                    type_description: "starknet version",
+                    value_as_str: value.starknet_version,
+                });
+            }
+        };
         Ok(ConsensusBlockInfo {
             height,
             round,
@@ -221,6 +230,7 @@ impl TryFrom<protobuf::BlockInfo> for ConsensusBlockInfo {
             l1_data_gas_price_fri,
             l1_gas_price_wei,
             l1_data_gas_price_wei,
+            starknet_version,
         })
     }
 }
@@ -240,6 +250,7 @@ impl From<ConsensusBlockInfo> for protobuf::BlockInfo {
             l1_data_gas_price_fri: Some(value.l1_data_gas_price_fri.0.into()),
             l1_gas_price_wei: Some(value.l1_gas_price_wei.0.into()),
             l1_data_gas_price_wei: Some(value.l1_data_gas_price_wei.0.into()),
+            starknet_version: value.starknet_version.to_string(),
         }
     }
 }

crates/apollo_protobuf/src/converters/test_instances.rs

@@ -3,7 +3,7 @@ use std::fmt::Display;
 use apollo_test_utils::{auto_impl_get_test_instance, get_number_of_variants, GetTestInstance};
 use prost::DecodeError;
 use rand::Rng;
-use starknet_api::block::{BlockNumber, GasPrice};
+use starknet_api::block::{BlockNumber, GasPrice, StarknetVersion};
 use starknet_api::consensus_transaction::ConsensusTransaction;
 use starknet_api::core::ContractAddress;
 use starknet_api::crypto::utils::RawSignature;
@@ -57,6 +57,7 @@ auto_impl_get_test_instance! {
         pub l1_data_gas_price_fri: GasPrice,
         pub l1_gas_price_wei: GasPrice,
         pub l1_data_gas_price_wei: GasPrice,
+        pub starknet_version: StarknetVersion,
     }
     pub enum ProposalPart {
         BlockInfo(ConsensusBlockInfo) = 0,

crates/apollo_protobuf/src/proto/p2p/proto/consensus/consensus.proto

@@ -56,6 +56,7 @@ message BlockInfo {
     Uint128 l1_data_gas_price_fri     = 10;
     Uint128 l1_gas_price_wei          = 11;
     Uint128 l1_data_gas_price_wei     = 12;
+    string starknet_version           = 13;
 }
 
 message TransactionBatch {

crates/apollo_protobuf/src/protobuf/protoc_output.rs

@@ -461,6 +461,8 @@ pub struct BlockInfo {
     pub l1_gas_price_wei: ::core::option::Option<Uint128>,
     #[prost(message, optional, tag = "12")]
     pub l1_data_gas_price_wei: ::core::option::Option<Uint128>,
+    #[prost(string, tag = "13")]
+    pub starknet_version: ::prost::alloc::string::String,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]