apollo_consensus_orchestrator: convert_to_sn_api_block_info returns a Result (#7582)

Author: guy-starkware

crates/apollo_consensus/src/types.rs

@@ -161,6 +161,8 @@ pub enum ConsensusError {
     // For example the state machine and SHC are out of sync.
     #[error("{0}")]
     InternalInconsistency(String),
+    #[error("Block info conversion error: {0}")]
+    BlockInfoConversion(#[from] starknet_api::StarknetApiError),
     #[error("{0}")]
     Other(String),
 }

crates/apollo_consensus_orchestrator/src/build_proposal.rs

@@ -32,6 +32,7 @@ use starknet_api::consensus_transaction::InternalConsensusTransaction;
 use starknet_api::core::ContractAddress;
 use starknet_api::data_availability::L1DataAvailabilityMode;
 use starknet_api::transaction::TransactionHash;
+use starknet_api::StarknetApiError;
 use tokio_util::sync::CancellationToken;
 use tokio_util::task::AbortOnDropHandle;
 use tracing::{debug, error, info, trace, warn};
@@ -86,6 +87,8 @@ pub(crate) enum BuildProposalError {
     CendeWriteError(String),
     #[error("Failed to convert transactions: {0}")]
     TransactionConverterError(#[from] TransactionConverterError),
+    #[error("Block info conversion error: {0}")]
+    BlockInfoConversion(#[from] StarknetApiError),
 }
 
 // Handles building a new proposal without blocking consensus:
@@ -159,7 +162,7 @@ async fn initiate_build(args: &ProposalBuildArguments) -> BuildProposalResult<Co
         proposal_id: args.proposal_id,
         deadline: args.deps.clock.now() + batcher_timeout,
         retrospective_block_hash,
-        block_info: convert_to_sn_api_block_info(&block_info),
+        block_info: convert_to_sn_api_block_info(&block_info)?,
         proposal_round: args.proposal_round,
     };
     debug!("Initiating build proposal: {build_proposal_input:?}");

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs

@@ -468,7 +468,8 @@ impl ConsensusContext for SequencerConsensusContext {
         let gas_price_u64 = u64::try_from(self.l2_gas_price.0).unwrap_or(u64::MAX);
         CONSENSUS_L2_GAS_PRICE.set_lossy(gas_price_u64);
 
-        let cende_block_info = convert_to_sn_api_block_info(&block_info);
+        // The conversion should never fail, if we already managed to get a decision.
+        let cende_block_info = convert_to_sn_api_block_info(&block_info)?;
         let l1_gas_price = GasPricePerToken {
             price_in_fri: cende_block_info.gas_prices.strk_gas_prices.l1_gas_price.get(),
             price_in_wei: cende_block_info.gas_prices.eth_gas_prices.l1_gas_price.get(),

crates/apollo_consensus_orchestrator/src/utils.rs

@@ -24,6 +24,7 @@ use starknet_api::block::{
 };
 use starknet_api::consensus_transaction::InternalConsensusTransaction;
 use starknet_api::data_availability::L1DataAvailabilityMode;
+use starknet_api::StarknetApiError;
 use tracing::{info, warn};
 
 use crate::build_proposal::BuildProposalError;
@@ -148,27 +149,21 @@ fn apply_fee_transformations(price_info: &mut PriceInfo, gas_price_params: &GasP
     .clamp(gas_price_params.min_l1_data_gas_price_wei, gas_price_params.max_l1_data_gas_price_wei);
 }
 
-// TODO(guyn): this function should return a Result, then replace all unwraps with ?
 pub(crate) fn convert_to_sn_api_block_info(
     block_info: &ConsensusBlockInfo,
-) -> starknet_api::block::BlockInfo {
-    let l1_gas_price_fri = NonzeroGasPrice::new(
-        block_info.l1_gas_price_wei.wei_to_fri(block_info.eth_to_fri_rate).unwrap(),
-    )
-    .unwrap();
+) -> Result<starknet_api::block::BlockInfo, StarknetApiError> {
+    let l1_gas_price_fri =
+        NonzeroGasPrice::new(block_info.l1_gas_price_wei.wei_to_fri(block_info.eth_to_fri_rate)?)?;
     let l1_data_gas_price_fri = NonzeroGasPrice::new(
-        block_info.l1_data_gas_price_wei.wei_to_fri(block_info.eth_to_fri_rate).unwrap(),
-    )
-    .unwrap();
-    let l2_gas_price_fri = NonzeroGasPrice::new(block_info.l2_gas_price_fri).unwrap();
-    let l2_gas_price_wei = NonzeroGasPrice::new(
-        block_info.l2_gas_price_fri.fri_to_wei(block_info.eth_to_fri_rate).unwrap(),
-    )
-    .unwrap();
-    let l1_gas_price_wei = NonzeroGasPrice::new(block_info.l1_gas_price_wei).unwrap();
-    let l1_data_gas_price_wei = NonzeroGasPrice::new(block_info.l1_data_gas_price_wei).unwrap();
-
-    starknet_api::block::BlockInfo {
+        block_info.l1_data_gas_price_wei.wei_to_fri(block_info.eth_to_fri_rate)?,
+    )?;
+    let l2_gas_price_fri = NonzeroGasPrice::new(block_info.l2_gas_price_fri)?;
+    let l2_gas_price_wei =
+        NonzeroGasPrice::new(block_info.l2_gas_price_fri.fri_to_wei(block_info.eth_to_fri_rate)?)?;
+    let l1_gas_price_wei = NonzeroGasPrice::new(block_info.l1_gas_price_wei)?;
+    let l1_data_gas_price_wei = NonzeroGasPrice::new(block_info.l1_data_gas_price_wei)?;
+
+    Ok(starknet_api::block::BlockInfo {
         block_number: block_info.height,
         block_timestamp: BlockTimestamp(block_info.timestamp),
         sequencer_address: block_info.builder,
@@ -185,7 +180,7 @@ pub(crate) fn convert_to_sn_api_block_info(
             },
         },
         use_kzg_da: block_info.l1_da_mode == L1DataAvailabilityMode::Blob,
-    }
+    })
 }
 
 pub(crate) async fn retrospective_block_hash(

crates/apollo_consensus_orchestrator/src/validate_proposal.rs

@@ -22,6 +22,7 @@ use starknet_api::block::{BlockHash, BlockNumber, GasPrice};
 use starknet_api::consensus_transaction::InternalConsensusTransaction;
 use starknet_api::data_availability::L1DataAvailabilityMode;
 use starknet_api::transaction::TransactionHash;
+use starknet_api::StarknetApiError;
 use tokio_util::sync::CancellationToken;
 use tracing::{debug, error, info, instrument, warn};
 
@@ -85,6 +86,8 @@ pub(crate) enum ValidateProposalError {
     EthToStrkOracle(#[from] EthToStrkOracleClientError),
     #[error("L1GasPriceProvider error: {0}")]
     L1GasPriceProvider(#[from] L1GasPriceClientError),
+    #[error("Block info conversion error: {0}")]
+    BlockInfoConversion(#[from] StarknetApiError),
 }
 
 pub(crate) async fn validate_proposal(mut args: ProposalValidateArguments) {
@@ -344,7 +347,7 @@ async fn initiate_validation(
         proposal_id,
         deadline: clock.now() + chrono_timeout,
         retrospective_block_hash: retrospective_block_hash(state_sync_client, &block_info).await?,
-        block_info: convert_to_sn_api_block_info(&block_info),
+        block_info: convert_to_sn_api_block_info(&block_info)?,
     };
     debug!("Initiating validate proposal: input={input:?}");
     batcher.validate_block(input).await?;