apollo_consensus_orchestrator: add SNIP-35 fee_proposals sliding window

Author: sirandreww-starkware

crates/apollo_consensus_manager/src/consensus_manager.rs

@@ -304,6 +304,7 @@ impl ConsensusManager {
                 outbound_proposal_sender: outbound_internal_sender,
                 vote_broadcast_client: votes_broadcast_channels.broadcast_topic_client.clone(),
                 config_manager_client: Some(Arc::clone(&config_manager_client)),
+                strk_price_oracle: None,
             },
         )
     }

crates/apollo_consensus_orchestrator/src/fee_market/mod.rs

@@ -28,6 +28,9 @@ const FRI_DECIMALS_SCALE: u128 = 10u128.pow(18);
 /// Denominator for parts-per-thousand calculations in SNIP-35 fee_proposal bounds.
 pub(crate) const PPT_DENOMINATOR: u128 = 1000;
 
+/// Number of fee_proposal values used to compute fee_actual (SNIP-35).
+pub(crate) const FEE_PROPOSAL_WINDOW_SIZE: usize = 10;
+
 /// Fee market information for the next block.
 #[derive(Debug, Default, Serialize)]
 pub struct FeeMarketInfo {

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs

@@ -6,7 +6,7 @@
 mod sequencer_consensus_context_test;
 
 use std::cmp::max;
-use std::collections::{BTreeMap, HashMap};
+use std::collections::{BTreeMap, HashMap, VecDeque};
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
@@ -23,7 +23,7 @@ use apollo_config::behavior_mode::BehaviorMode;
 use apollo_config_manager_types::communication::SharedConfigManagerClient;
 use apollo_consensus::types::{ConsensusContext, ConsensusError, ProposalCommitment, Round};
 use apollo_consensus_orchestrator_config::config::ContextConfig;
-use apollo_l1_gas_price_types::L1GasPriceProviderClient;
+use apollo_l1_gas_price_types::{L1GasPriceProviderClient, PriceOracleClientTrait};
 use apollo_network::network_manager::{BroadcastTopicClient, BroadcastTopicClientTrait};
 use apollo_protobuf::consensus::{
     BuildParam,
@@ -77,7 +77,11 @@ use crate::cende::{
     InternalTransactionWithReceipt,
     N_BLOCK_HASHES_BACK_IN_BLOB,
 };
-use crate::fee_market::{calculate_next_l2_gas_price_for_fin, FeeMarketInfo};
+use crate::fee_market::{
+    calculate_next_l2_gas_price_for_fin,
+    FeeMarketInfo,
+    FEE_PROPOSAL_WINDOW_SIZE,
+};
 use crate::metrics::{
     record_build_proposal_failure,
     record_validate_proposal_failure,
@@ -228,6 +232,8 @@ pub struct SequencerConsensusContext {
     l2_gas_price: GasPrice,
     l1_da_mode: L1DataAvailabilityMode,
     previous_proposal_init: Option<PreviousProposalInitInfo>,
+    /// SNIP-35: sliding window of recent fee_proposal values (size from config).
+    fee_proposals_window: VecDeque<GasPrice>,
 }
 
 #[derive(Clone)]
@@ -244,6 +250,8 @@ pub struct SequencerConsensusContextDeps {
     // Used to broadcast votes to other consensus nodes.
     pub vote_broadcast_client: BroadcastTopicClient<Vote>,
     pub config_manager_client: Option<SharedConfigManagerClient>,
+    /// STRK/USD price oracle for SNIP-35 dynamic gas pricing. None if disabled.
+    pub strk_price_oracle: Option<Arc<dyn PriceOracleClientTrait>>,
 }
 
 #[derive(thiserror::Error, PartialEq, Debug)]
@@ -274,7 +282,16 @@ impl SequencerConsensusContext {
             l2_gas_price: VersionedConstants::latest_constants().min_gas_price,
             l1_da_mode,
             previous_proposal_init: None,
+            fee_proposals_window: VecDeque::with_capacity(FEE_PROPOSAL_WINDOW_SIZE),
+        }
+    }
+
+    /// SNIP-35: push a fee_proposal into the sliding window, evicting the oldest if full.
+    fn push_fee_proposal(&mut self, fee_proposal: GasPrice) {
+        if self.fee_proposals_window.len() >= FEE_PROPOSAL_WINDOW_SIZE {
+            self.fee_proposals_window.pop_front();
         }
+        self.fee_proposals_window.push_back(fee_proposal);
     }
 
     async fn start_stream(&mut self, stream_id: HeightAndRound) -> StreamSender {
@@ -377,6 +394,7 @@ impl SequencerConsensusContext {
         let DecisionReachedResponse { state_diff, central_objects } = decision_reached_response;
 
         self.update_l2_gas_price(height, l2_gas_used);
+        self.push_fee_proposal(init.fee_proposal);
 
         // A hash map of (possibly failed) transactions, where the key is the transaction hash
         // and the value is the transaction itself.
@@ -783,6 +801,9 @@ impl ConsensusContext for SequencerConsensusContext {
             sync_block.block_header_without_hash.next_l2_gas_price,
             VersionedConstants::latest_constants().min_gas_price,
         );
+        // SNIP-35: push fee_proposal from synced block into the sliding window.
+        self.push_fee_proposal(sync_block.block_header_without_hash.fee_proposal);
+
         // TODO(Asmaa): validate starknet_version and parent_hash when they are stored.
         let block_number = sync_block.block_header_without_hash.block_number;
         let timestamp = sync_block.block_header_without_hash.timestamp;
@@ -828,6 +849,21 @@ impl ConsensusContext for SequencerConsensusContext {
         // First or a new (higher) height.
         if self.current_height.is_none_or(|h| height > h) {
             self.update_dynamic_config().await;
+            // SNIP-35: on first height (startup), backfill the fee_proposals window from stored
+            // blocks so fee_actual can be computed immediately. Sequential to maintain insertion
+            // order (oldest first).
+            if self.current_height.is_none() && self.fee_proposals_window.is_empty() {
+                #[allow(clippy::as_conversions)] // FEE_PROPOSAL_WINDOW_SIZE is a small constant.
+                let start = height.0.saturating_sub(FEE_PROPOSAL_WINDOW_SIZE as u64);
+                for h in start..height.0 {
+                    match self.deps.state_sync_client.get_block(BlockNumber(h)).await {
+                        Ok(block) => {
+                            self.push_fee_proposal(block.block_header_without_hash.fee_proposal);
+                        }
+                        Err(_) => break,
+                    }
+                }
+            }
             self.current_height = Some(height);
             self.current_round = round;
             self.queued_proposals.clear();

crates/apollo_consensus_orchestrator/src/test_utils.rs

@@ -127,6 +127,7 @@ pub(crate) struct TestDeps {
     pub clock: Arc<dyn Clock>,
     pub outbound_proposal_sender: mpsc::Sender<(HeightAndRound, mpsc::Receiver<ProposalPart>)>,
     pub vote_broadcast_client: BroadcastTopicClient<Vote>,
+    pub strk_price_oracle: Option<Arc<dyn apollo_l1_gas_price_types::PriceOracleClientTrait>>,
 }
 
 impl From<TestDeps> for SequencerConsensusContextDeps {
@@ -141,6 +142,7 @@ impl From<TestDeps> for SequencerConsensusContextDeps {
             outbound_proposal_sender: deps.outbound_proposal_sender,
             vote_broadcast_client: deps.vote_broadcast_client,
             config_manager_client: None,
+            strk_price_oracle: deps.strk_price_oracle,
         }
     }
 }
@@ -170,6 +172,7 @@ impl TestDeps {
         self.setup_default_transaction_converter();
         self.setup_default_cende_ambassador();
         self.setup_default_gas_price_provider();
+        self.setup_default_state_sync_get_block();
     }
 
     pub(crate) fn setup_deps_for_build(&mut self, args: SetupDepsArgs) {
@@ -321,24 +324,37 @@ impl TestDeps {
         self.l1_gas_price_provider.expect_get_price().return_const(Ok(ETH_TO_FRI_RATE));
     }
 
+    /// Default get_block returns NotFound for all blocks. Used by SNIP-35 backfill on startup.
+    fn setup_default_state_sync_get_block(&mut self) {
+        self.state_sync_client.expect_get_block().returning(|block_number| {
+            Err(apollo_state_sync_types::communication::StateSyncClientError::StateSyncError(
+                apollo_state_sync_types::errors::StateSyncError::BlockNotFound(block_number),
+            ))
+        });
+    }
+
     pub(crate) fn setup_default_batcher_get_block_hash(&mut self) {
         self.batcher.expect_get_block_hash().returning(|block_number| {
             Err(BatcherClientError::BatcherError(BatcherError::BlockHashNotFound(block_number)))
         });
     }
 
     pub(crate) fn build_context(self) -> SequencerConsensusContext {
-        SequencerConsensusContext::new(
-            ContextConfig {
-                static_config: ContextStaticConfig {
-                    proposal_buffer_size: CHANNEL_SIZE,
-                    chain_id: CHAIN_ID,
-                    ..Default::default()
-                },
+        self.build_context_with_config(ContextConfig {
+            static_config: ContextStaticConfig {
+                proposal_buffer_size: CHANNEL_SIZE,
+                chain_id: CHAIN_ID,
                 ..Default::default()
             },
-            self.into(),
-        )
+            ..Default::default()
+        })
+    }
+
+    pub(crate) fn build_context_with_config(
+        self,
+        config: ContextConfig,
+    ) -> SequencerConsensusContext {
+        SequencerConsensusContext::new(config, self.into())
     }
 }
 
@@ -367,6 +383,7 @@ pub(crate) fn create_test_and_network_deps() -> (TestDeps, NetworkDependencies)
         clock,
         outbound_proposal_sender,
         vote_broadcast_client: votes_topic_client,
+        strk_price_oracle: None,
     };
 
     let network_deps =