apollo_consensus_orchestrator: wire SNIP-35 fee_proposal into build_proposal

Author: sirandreww-starkware

crates/apollo_consensus_orchestrator/src/build_proposal.rs

@@ -76,6 +76,10 @@ pub(crate) struct ProposalBuildArguments {
     pub override_l2_gas_price_fri: Option<u128>,
     pub min_l2_gas_price_per_height: Vec<PricePerHeight>,
     pub compare_retrospective_block_hash: bool,
+    /// SNIP-35: proposer's fee_proposal for this block.
+    pub fee_proposal: GasPrice,
+    /// SNIP-35: current fee_actual from the sliding window.
+    pub fee_actual: Option<GasPrice>,
 }
 
 type BuildProposalResult<T> = Result<T, BuildProposalError>;
@@ -176,7 +180,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(),
+        fee_proposal: args.fee_proposal,
     };
 
     let retrospective_block_hash = wait_for_retrospective_block_hash(
@@ -319,7 +323,7 @@ async fn get_proposal_content(
                     info.l2_gas_used,
                     args.override_l2_gas_price_fri,
                     &args.min_l2_gas_price_per_height,
-                    None,
+                    args.fee_actual,
                 );
                 let fin_payload = ProposalFinPayload {
                     commitment_parts: CommitmentParts::from(&info),

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs

@@ -70,7 +70,7 @@ use tokio::task::JoinHandle;
 use tokio::time::sleep;
 use tokio_util::sync::CancellationToken;
 use tokio_util::task::AbortOnDropHandle;
-use tracing::{error, error_span, info, instrument, trace, warn, Instrument};
+use tracing::{debug, error, error_span, info, instrument, trace, warn, Instrument};
 
 use crate::build_proposal::{build_proposal, BuildProposalError, ProposalBuildArguments};
 use crate::cende::{
@@ -89,8 +89,21 @@ use crate::metrics::{
     record_validate_proposal_failure,
     register_metrics,
     CONSENSUS_L2_GAS_PRICE,
+    SNIP35_FEE_ACTUAL,
+    SNIP35_FEE_PROPOSAL,
+    SNIP35_FEE_TARGET,
+    SNIP35_STRK_USD_RATE,
+};
+use crate::snip35::{
+    compute_fee_actual,
+    compute_fee_proposal,
+    compute_fee_target,
+    FEE_PROPOSAL_MARGIN_PPT,
+    FEE_PROPOSAL_WINDOW_SIZE,
+    ORACLE_L2_GAS_FLOOR_MAX_FRI,
+    ORACLE_L2_GAS_FLOOR_MIN_FRI,
+    TARGET_ATTO_USD_PER_L2_GAS,
 };
-use crate::snip35::FEE_PROPOSAL_WINDOW_SIZE;
 use crate::utils::{
     convert_to_sn_api_block_info,
     make_gas_price_params,
@@ -352,6 +365,7 @@ impl SequencerConsensusContext {
             sequencer,
             timestamp: BlockTimestamp(init.timestamp),
             l1_da_mode: init.l1_da_mode,
+            fee_proposal: init.fee_proposal,
             // TODO(guy.f): Figure out where/if to get the values below from and fill them.
             ..Default::default()
         };
@@ -370,16 +384,64 @@ impl SequencerConsensusContext {
     /// Returns the next L2 gas price without mutating context. Used when building the fin and when
     /// updating at decision time.
     fn calculate_next_l2_gas_price(&self, height: BlockNumber, l2_gas_used: GasAmount) -> GasPrice {
+        let fee_actual = self.compute_fee_actual();
         calculate_next_l2_gas_price_for_fin(
             self.l2_gas_price,
             height,
             l2_gas_used,
             self.config.dynamic_config.override_l2_gas_price_fri,
             &self.config.dynamic_config.min_l2_gas_price_per_height,
-            None,
+            fee_actual,
         )
     }
 
+    /// SNIP-35: compute fee_actual from the sliding window of fee_proposals.
+    fn compute_fee_actual(&self) -> Option<GasPrice> {
+        let proposals: Vec<GasPrice> = self.fee_proposals_window.iter().copied().collect();
+        compute_fee_actual(&proposals, FEE_PROPOSAL_WINDOW_SIZE)
+    }
+
+    /// SNIP-35: compute the fee_proposal this node should publish.
+    async fn compute_snip35_fee_proposal(&self, timestamp: u64) -> GasPrice {
+        // compute_fee_actual returns None for zero median or insufficient data, falling back to
+        // the current l2_gas_price. This ensures proposer and validator use the same fallback.
+        let fee_actual = self.compute_fee_actual().unwrap_or(self.l2_gas_price);
+        SNIP35_FEE_ACTUAL.set_lossy(fee_actual.0);
+
+        // The oracle reuses PriceOracleClientTrait configured with a STRK/USD endpoint.
+        let fee_target = match &self.deps.strk_price_oracle {
+            Some(oracle) => match oracle.eth_to_fri_rate(timestamp).await {
+                Ok(rate) if rate > 0 => {
+                    SNIP35_STRK_USD_RATE.set_lossy(rate);
+                    let target = compute_fee_target(
+                        TARGET_ATTO_USD_PER_L2_GAS,
+                        rate,
+                        ORACLE_L2_GAS_FLOOR_MIN_FRI,
+                        ORACLE_L2_GAS_FLOOR_MAX_FRI,
+                    );
+                    SNIP35_FEE_TARGET.set_lossy(target.0);
+                    Some(target)
+                }
+                Ok(_) => {
+                    warn!("STRK/USD oracle returned zero rate, freezing fee_proposal");
+                    None
+                }
+                Err(e) => {
+                    warn!("STRK/USD oracle error: {e:?}, freezing fee_proposal");
+                    None
+                }
+            },
+            None => {
+                debug!("No STRK/USD oracle configured, freezing fee_proposal");
+                None
+            }
+        };
+
+        let proposal = compute_fee_proposal(fee_target, fee_actual, FEE_PROPOSAL_MARGIN_PPT);
+        SNIP35_FEE_PROPOSAL.set_lossy(proposal.0);
+        proposal
+    }
+
     fn update_l2_gas_price(&mut self, height: BlockNumber, l2_gas_used: GasAmount) {
         self.l2_gas_price = self.calculate_next_l2_gas_price(height, l2_gas_used);
         let gas_price_u64 = u64::try_from(self.l2_gas_price.0).unwrap_or(u64::MAX);
@@ -610,6 +672,7 @@ impl ConsensusContext for SequencerConsensusContext {
             BehaviorMode::Echonet => true,
             BehaviorMode::Starknet => false,
         };
+        let fee_proposal = self.compute_snip35_fee_proposal(self.deps.clock.unix_now()).await;
         let round = build_param.round;
         let args = ProposalBuildArguments {
             deps: self.deps.clone(),
@@ -643,6 +706,8 @@ impl ConsensusContext for SequencerConsensusContext {
                 .config
                 .dynamic_config
                 .compare_retrospective_block_hash,
+            fee_proposal,
+            fee_actual: self.compute_fee_actual(),
         };
 
         let handle = tokio::spawn(

crates/apollo_consensus_orchestrator/src/snip35/mod.rs

@@ -24,6 +24,18 @@ 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;
 
+/// Maximum fee_proposal change per block in parts per thousand (SNIP-35: 0.2%).
+pub(crate) const FEE_PROPOSAL_MARGIN_PPT: u128 = 2;
+
+/// Target USD cost per L2 gas unit in atto-USD ($3e-9 = 3_000_000_000 atto-USD).
+pub(crate) const TARGET_ATTO_USD_PER_L2_GAS: u128 = 3_000_000_000;
+
+/// Hard minimum for the oracle-derived floor (FRI).
+pub(crate) const ORACLE_L2_GAS_FLOOR_MIN_FRI: u128 = 8_000_000_000; // 8 gwei, matches MIN_ALLOWED_GAS_PRICE
+
+/// Hard maximum for the oracle-derived floor (FRI).
+pub(crate) const ORACLE_L2_GAS_FLOOR_MAX_FRI: u128 = u128::MAX;
+
 /// Compute fee_actual from the last `window_size` fee_proposal values (SNIP-35).
 /// Returns the average of the two middle values, rounded down.
 /// Returns `None` if fewer than `window_size` proposals are available.

crates/apollo_consensus_orchestrator/src/test_utils.rs

@@ -509,6 +509,8 @@ impl From<TestProposalBuildArguments> for ProposalBuildArguments {
             override_l2_gas_price_fri: args.override_l2_gas_price_fri,
             min_l2_gas_price_per_height: args.min_l2_gas_price_per_height,
             compare_retrospective_block_hash: args.compare_retrospective_block_hash,
+            fee_proposal: GasPrice::default(),
+            fee_actual: None,
         }
     }
 }