apollo_protobuf: add fee_proposal to ProposalInit and L2GasInfo

Author: sirandreww-starkware

crates/apollo_consensus_orchestrator/src/build_proposal.rs

@@ -176,6 +176,7 @@ async fn initiate_build(args: &mut ProposalBuildArguments) -> BuildProposalResul
         starknet_version: starknet_api::block::StarknetVersion::LATEST,
         // TODO(Asmaa): Put the real value once we have it.
         version_constant_commitment: Default::default(),
+        fee_proposal: GasPrice::default(),
     };
 
     let retrospective_block_hash = wait_for_retrospective_block_hash(

crates/apollo_consensus_orchestrator/src/test_utils.rs

@@ -411,6 +411,7 @@ pub(crate) fn proposal_init(height: BlockNumber, round: u32) -> ProposalInit {
         l1_data_gas_price_wei,
         starknet_version: starknet_api::block::StarknetVersion::LATEST,
         version_constant_commitment: Default::default(),
+        fee_proposal: GasPrice::default(),
     }
 }
 

crates/apollo_consensus_orchestrator/src/utils_test.rs

@@ -5,7 +5,7 @@ use apollo_state_sync_types::communication::StateSyncClientError;
 use apollo_state_sync_types::errors::StateSyncError;
 use assert_matches::assert_matches;
 use blockifier::abi::constants::STORED_BLOCK_HASH_BUFFER;
-use starknet_api::block::{BlockHash, BlockHashAndNumber, BlockNumber};
+use starknet_api::block::{BlockHash, BlockHashAndNumber, BlockNumber, GasPrice};
 use starknet_types_core::felt::Felt;
 
 use crate::build_proposal::ProposalBuildArguments;
@@ -47,6 +47,7 @@ async fn get_proposal_init(args: &ProposalBuildArguments) -> ProposalInit {
         l1_data_gas_price_fri: l1_prices_fri.l1_data_gas_price,
         starknet_version: starknet_api::block::StarknetVersion::LATEST,
         version_constant_commitment: Default::default(),
+        fee_proposal: GasPrice::default(),
     }
 }
 

crates/apollo_protobuf/src/consensus.rs

@@ -122,6 +122,8 @@ pub struct ProposalInit {
     pub starknet_version: starknet_api::block::StarknetVersion,
     /// Version constant commitment.
     pub version_constant_commitment: StarkHash,
+    /// SNIP-35: proposer's recommended fee for future blocks.
+    pub fee_proposal: GasPrice,
 }
 
 /// A temporary constant to use as a validator ID. Zero is not a valid contract address.
@@ -156,6 +158,7 @@ impl Default for ProposalInit {
             l1_data_gas_price_wei: Default::default(),
             starknet_version: starknet_api::block::StarknetVersion::LATEST,
             version_constant_commitment: Default::default(),
+            fee_proposal: Default::default(),
         }
     }
 }

crates/apollo_protobuf/src/converters/consensus.rs

@@ -241,6 +241,7 @@ impl TryFrom<protobuf::ProposalInit> for ProposalInit {
             l1_data_gas_price_wei,
             starknet_version,
             version_constant_commitment,
+            fee_proposal: GasPrice(value.fee_proposal.map(u128::from).unwrap_or(0)),
         })
     }
 }
@@ -262,6 +263,7 @@ impl From<ProposalInit> for protobuf::ProposalInit {
             l1_data_gas_price_wei: Some(value.l1_data_gas_price_wei.0.into()),
             starknet_version: value.starknet_version.to_string(),
             version_constant_commitment: Some(value.version_constant_commitment.into()),
+            fee_proposal: Some(value.fee_proposal.0.into()),
         }
     }
 }

crates/apollo_protobuf/src/converters/test_instances.rs

@@ -80,6 +80,7 @@ auto_impl_get_test_instance! {
         pub l1_data_gas_price_wei: GasPrice,
         pub starknet_version: StarknetVersion,
         pub version_constant_commitment: StarkHash,
+        pub fee_proposal: GasPrice,
     }
     pub enum ProposalPart {
         Init(ProposalInit) = 0,

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

@@ -59,6 +59,8 @@ message ProposalInit {
     Uint128 l1_data_gas_price_wei     = 12;
     string starknet_version           = 13;
     Hash version_constant_commitment   = 14;
+    // SNIP-35: proposer's recommended fee for future blocks.
+    optional Uint128 fee_proposal      = 15;
 }
 
 message TransactionBatch {

crates/apollo_protobuf/src/protobuf/protoc_output.rs

@@ -479,6 +479,9 @@ pub struct ProposalInit {
     pub starknet_version: ::prost::alloc::string::String,
     #[prost(message, optional, tag = "14")]
     pub version_constant_commitment: ::core::option::Option<Hash>,
+    /// SNIP-35: proposer's recommended fee for future blocks.
+    #[prost(message, optional, tag = "15")]
+    pub fee_proposal: ::core::option::Option<Uint128>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]