apollo_protobuf: add fee_proposal_fri to sync proto SignedBlockHeader

Author: sirandreww-starkware

crates/apollo_protobuf/src/converters/header.rs

@@ -9,6 +9,7 @@ use starknet_api::block::{
     BlockHeaderWithoutHash,
     BlockNumber,
     BlockSignature,
+    GasPrice,
     GasPricePerToken,
     StarknetVersion,
 };
@@ -175,6 +176,7 @@ impl TryFrom<protobuf::SignedBlockHeader> for SignedBlockHeader {
             value.next_l2_gas_price.ok_or(missing("SignedBlockHeader::next_l2_gas_price"))?,
         )
         .into();
+        let fee_proposal_fri = value.fee_proposal_fri.map(|v| GasPrice(u128::from(v)));
 
         let receipt_commitment = value
             .receipts
@@ -205,7 +207,7 @@ impl TryFrom<protobuf::SignedBlockHeader> for SignedBlockHeader {
                     timestamp,
                     l1_da_mode,
                     starknet_version,
-                    fee_proposal_fri: None,
+                    fee_proposal_fri,
                 },
                 state_diff_commitment,
                 state_diff_length,
@@ -287,6 +289,10 @@ impl From<(BlockHeader, Vec<BlockSignature>)> for protobuf::SignedBlockHeader {
             ),
             l2_gas_consumed: header.block_header_without_hash.l2_gas_consumed.0,
             next_l2_gas_price: Some(header.block_header_without_hash.next_l2_gas_price.0.into()),
+            fee_proposal_fri: header
+                .block_header_without_hash
+                .fee_proposal_fri
+                .map(|gp| gp.0.into()),
             signatures: signatures.iter().map(|signature| (*signature).into()).collect(),
         }
     }

crates/apollo_protobuf/src/converters/header_test.rs

@@ -2,13 +2,7 @@ use apollo_test_utils::{get_rng, GetTestInstance};
 
 use crate::sync::{DataOrFin, HeaderQuery, SignedBlockHeader};
 
-// TODO(AndrewL): the sync proto's `SignedBlockHeader` does not carry `fee_proposal_fri`,
-// so the field is dropped on roundtrip and the equality assertion fails. Remove the
-// `#[should_panic]` (and this TODO) in the follow-up PR that adds `fee_proposal_fri = 22`
-// to `apollo_protobuf/src/proto/p2p/proto/sync/header.proto` and plumbs it through the
-// converter at `apollo_protobuf/src/converters/header.rs`.
 #[test]
-#[should_panic(expected = "fee_proposal_fri")]
 fn block_header_to_bytes_and_back() {
     let mut rng = get_rng();
     let signed_block_header = SignedBlockHeader::get_test_instance(&mut rng);
@@ -18,9 +12,7 @@ fn block_header_to_bytes_and_back() {
     assert_eq!(res_data, data);
 }
 
-// TODO(AndrewL): see the TODO above `block_header_to_bytes_and_back`.
 #[test]
-#[should_panic(expected = "fee_proposal_fri")]
 fn block_header_without_commitments_to_bytes_and_back() {
     let mut rng = get_rng();
     let mut signed_block_header = SignedBlockHeader::get_test_instance(&mut rng);

crates/apollo_protobuf/src/proto/p2p/proto/sync/header.proto

@@ -31,6 +31,8 @@ message SignedBlockHeader {
     L1DataAvailabilityMode l1_data_availability_mode = 20;
     // for now, we assume a small consensus, so this fits in 1M. Else, these will be repeated and extracted from this message.
     repeated ConsensusSignature signatures = 21;
+    // SNIP-35: proposer's oracle-derived recommended fee. Absent for pre-V0_14_3 blocks.
+    optional Uint128 fee_proposal_fri = 22;
     // can be more explicit here about the signature structure as this is not part of account abstraction
 }
 

crates/apollo_protobuf/src/protobuf/protoc_output.rs

@@ -1218,10 +1218,13 @@ pub struct SignedBlockHeader {
     #[prost(enumeration = "L1DataAvailabilityMode", tag = "20")]
     pub l1_data_availability_mode: i32,
     /// for now, we assume a small consensus, so this fits in 1M. Else, these will be repeated and extracted from this message.
-    ///
-    /// can be more explicit here about the signature structure as this is not part of account abstraction
     #[prost(message, repeated, tag = "21")]
     pub signatures: ::prost::alloc::vec::Vec<ConsensusSignature>,
+    /// SNIP-35: proposer's oracle-derived recommended fee. Absent for pre-V0_14_3 blocks.
+    ///
+    /// can be more explicit here about the signature structure as this is not part of account abstraction
+    #[prost(message, optional, tag = "22")]
+    pub fee_proposal_fri: ::core::option::Option<Uint128>,
 }
 /// sent to all peers (except the ones this was received from, if any).
 /// for a fraction of peers, also send the GetBlockHeaders response (as if they asked for it for this block)