starknet_api: add fee_proposal to PartialBlockHashComponents

Author: sirandreww-starkware

crates/apollo_batcher/src/batcher.rs

@@ -831,6 +831,7 @@ impl Batcher {
                         sequencer: block_header_without_hash.sequencer,
                         timestamp: block_header_without_hash.timestamp,
                         starknet_version: block_header_without_hash.starknet_version,
+                        fee_proposal: block_header_without_hash.fee_proposal,
                     })
                 }
                 None => return Err(BatcherError::MissingHeaderCommitments { block_number }),

crates/apollo_storage/src/serialization/serializers.rs

@@ -381,6 +381,7 @@ auto_storage_serde! {
         pub sequencer: SequencerContractAddress,
         pub timestamp: BlockTimestamp,
         pub starknet_version: StarknetVersion,
+        pub fee_proposal: GasPrice,
     }
     pub struct PaymasterData(pub Vec<Felt>);
     pub struct PoseidonHash(pub Felt);

crates/apollo_test_utils/src/lib.rs

@@ -748,6 +748,7 @@ auto_impl_get_test_instance! {
         pub sequencer: SequencerContractAddress,
         pub timestamp: BlockTimestamp,
         pub starknet_version: StarknetVersion,
+        pub fee_proposal: GasPrice,
     }
     pub struct PaymasterData(pub Vec<Felt>);
     pub struct PoseidonHash(pub Felt);

crates/starknet_api/src/block_hash/block_hash_calculator.rs

@@ -16,6 +16,7 @@ use crate::block::{
     BlockInfo,
     BlockNumber,
     BlockTimestamp,
+    GasPrice,
     GasPricePerToken,
     StarknetVersion,
 };
@@ -218,6 +219,8 @@ pub struct PartialBlockHashComponents {
     pub sequencer: SequencerContractAddress,
     pub timestamp: BlockTimestamp,
     pub starknet_version: StarknetVersion,
+    /// SNIP-35: proposer's oracle-derived recommended fee.
+    pub fee_proposal: GasPrice,
 }
 
 impl PartialBlockHashComponents {
@@ -231,6 +234,7 @@ impl PartialBlockHashComponents {
             sequencer: SequencerContractAddress(block_info.sequencer_address),
             timestamp: block_info.block_timestamp,
             starknet_version: block_info.starknet_version,
+            fee_proposal: GasPrice::default(),
         }
     }
 }

crates/starknet_api/src/block_hash/block_hash_calculator_test.rs

@@ -2,7 +2,14 @@ use rstest::rstest;
 use starknet_types_core::felt::Felt;
 
 use super::{concat_counts, extract_event_count_from_concatenated_counts};
-use crate::block::{BlockHash, BlockNumber, BlockTimestamp, GasPricePerToken, StarknetVersion};
+use crate::block::{
+    BlockHash,
+    BlockNumber,
+    BlockTimestamp,
+    GasPrice,
+    GasPricePerToken,
+    StarknetVersion,
+};
 use crate::block_hash::block_hash_calculator::{
     calculate_block_commitments,
     calculate_block_hash,
@@ -43,6 +50,7 @@ macro_rules! test_hash_changes {
                 $(
                     $partial_block_hash_components_field: $partial_block_hash_components_value,
                 )*
+                ..Default::default()
             };
             let state_root = $state_root;
             let previous_block_hash = $previous_block_hash;
@@ -101,6 +109,7 @@ async fn test_block_hash_regression(
         l2_gas_price: GasPricePerToken { price_in_fri: 11_u8.into(), price_in_wei: 12_u8.into() },
         starknet_version: block_hash_version.clone().into(),
         header_commitments: block_commitments,
+        fee_proposal: GasPrice::default(),
     };
 
     let expected_hash = match block_hash_version {

crates/starknet_committer_and_os_cli/src/committer_cli/block_hash.rs

@@ -37,6 +37,7 @@ impl BlockHashInput {
                 l2_gas_price: self.header.l2_gas_price,
                 sequencer: self.header.sequencer,
                 timestamp: self.header.timestamp,
+                fee_proposal: self.header.fee_proposal,
             },
             self.header.state_root,
             self.header.parent_hash,

crates/starknet_os/src/hints/hint_implementation/block_hash/test.rs

@@ -136,6 +136,7 @@ fn test_block_hash_cairo() {
         },
         l2_gas_price: GasPricePerToken { price_in_wei: GasPrice(14), price_in_fri: GasPrice(15) },
         starknet_version: StarknetVersion::LATEST,
+        fee_proposal: GasPrice::default(),
     };
     let state_root = Felt::from(16);
     let previous_block_hash = Felt::from(17);