apollo_consensus_orchestrator: rename snip35 module to dynamic_gas_price, scrub SNIP-35 comments

Author: sirandreww-starkware

crates/apollo_consensus_manager/src/consensus_manager.rs

@@ -170,7 +170,7 @@ impl ConsensusManager {
         consensus_context
             .initialize_fee_proposals_window(current_height.height)
             .await
-            .expect("Failed to bootstrap SNIP-35 fee_proposals window");
+            .expect("Failed to bootstrap fee_proposals window");
         let run_consensus_args = self.create_run_consensus_args(current_height.height);
 
         let network_task =

crates/apollo_consensus_orchestrator/src/build_proposal.rs

@@ -39,9 +39,9 @@ use tokio_util::sync::CancellationToken;
 use tokio_util::task::AbortOnDropHandle;
 use tracing::{debug, info, trace, warn};
 
+use crate::dynamic_gas_price::proposal_commitment_from;
 use crate::fee_market::calculate_next_l2_gas_price_for_fin;
 use crate::sequencer_consensus_context::{BuiltProposals, SequencerConsensusContextDeps};
-use crate::snip35::proposal_commitment_from;
 use crate::utils::{
     convert_to_sn_api_block_info,
     get_l1_prices_in_fri_and_wei,
@@ -77,9 +77,9 @@ 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.
+    /// Proposer's fee_proposal for this block.
     pub fee_proposal: GasPrice,
-    /// SNIP-35: current fee_actual from the sliding window.
+    /// Current fee_actual from the sliding window.
     pub fee_actual: Option<GasPrice>,
 }
 

crates/apollo_consensus_orchestrator/src/build_proposal_test.rs

@@ -18,7 +18,7 @@ use starknet_api::execution_resources::GasAmount;
 use tokio_util::task::AbortOnDropHandle;
 
 use crate::build_proposal::{build_proposal, BuildProposalError};
-use crate::snip35::proposal_commitment_from;
+use crate::dynamic_gas_price::proposal_commitment_from;
 use crate::test_utils::{create_proposal_build_arguments, INTERNAL_TX_BATCH, PARTIAL_BLOCK_HASH};
 
 #[tokio::test]

crates/apollo_consensus_orchestrator/src/cende/central_objects.rs

@@ -49,8 +49,8 @@ use starknet_api::transaction::TransactionHash;
 use starknet_types_core::felt::Felt;
 
 use super::{CendeAmbassadorError, CendeAmbassadorResult};
+use crate::dynamic_gas_price::FeeProposalInfo;
 use crate::fee_market::FeeMarketInfo;
-use crate::snip35::FeeProposalInfo;
 
 /// Central objects are required in order to continue processing the block by the centralized
 /// Python pipline. These objects are written to the Aerospike database and are used by python

crates/apollo_consensus_orchestrator/src/cende/mod.rs

@@ -45,6 +45,7 @@ use tokio::task::{self, JoinHandle};
 use tracing::{info, warn, Instrument};
 use url::Url;
 
+use crate::dynamic_gas_price::FeeProposalInfo;
 use crate::fee_market::FeeMarketInfo;
 use crate::metrics::{
     record_write_failure,
@@ -54,7 +55,6 @@ use crate::metrics::{
     CENDE_WRITE_BLOB_SUCCESS,
     CENDE_WRITE_PREV_HEIGHT_BLOB_LATENCY,
 };
-use crate::snip35::FeeProposalInfo;
 
 #[derive(thiserror::Error, Debug)]
 pub enum CendeAmbassadorError {

…consensus_orchestrator/src/snip35/mod.rs …rchestrator/src/dynamic_gas_price/mod.rscrates/apollo_consensus_orchestrator/src/snip35/mod.rs renamed to crates/apollo_consensus_orchestrator/src/dynamic_gas_price/mod.rs crates/apollo_consensus_orchestrator/src/snip35/mod.rs renamed to crates/apollo_consensus_orchestrator/src/dynamic_gas_price/mod.rs

@@ -1,4 +1,4 @@
-//! SNIP-35 dynamic L2 gas pricing primitives.
+//! Dynamic L2 gas pricing primitives.
 //!
 //! Spec: <https://community.starknet.io/t/snip-35-automatically-adjust-base-fee-to-strk-price/116168>
 //!
@@ -26,33 +26,33 @@ use tracing::warn;
 #[cfg(test)]
 mod test;
 
-/// SNIP-35 proposer-stated fee value for a block, as it travels in the cende blob to the
+/// Proposer-stated fee value for a block, as it travels in the cende blob to the
 /// centralized recorder. Mirrors the `FeeProposalInfo` Marshmallow dataclass on the centralized
 /// (Python) side; the wire JSON shape must agree across the language boundary.
 #[cfg_attr(any(feature = "testing", test), derive(serde::Deserialize, PartialEq))]
 #[derive(Debug, Default, Serialize)]
 pub struct FeeProposalInfo {
-    /// `None` for pre-V0_14_3 blocks (no value stated by the proposer); `Some(...)` for SNIP-35
-    /// era blocks. The centralized side persists this independently of `FeeMarketInfo` so
+    /// `None` for pre-V0_14_3 blocks (no value stated by the proposer); `Some(...)` for V0_14_3+
+    /// blocks. The centralized side persists this independently of `FeeMarketInfo` so
     /// existing fee market storage blobs are untouched.
     pub fee_proposal_fri: Option<GasPrice>,
 }
 
 /// Scale factor for 18-decimal fixed-point conversion (1 STRK = 10^18 FRI).
 const FRI_DECIMALS_SCALE: u128 = 10u128.pow(18);
 
-/// Denominator for parts-per-thousand calculations in SNIP-35 fee_proposal bounds.
+/// Denominator for parts-per-thousand calculations in fee_proposal bounds.
 pub(crate) const PPT_DENOMINATOR: u128 = 1000;
 
 /// Target USD cost per L2 gas unit in atto-USD ($3e-9 = 3_000_000_000 atto-USD).
 // TODO(AndrewL): consider moving this to a dynamic config.
 pub(crate) const TARGET_ATTO_USD_PER_L2_GAS: u128 = 3_000_000_000;
 
 /// Compute fee_actual for `height` as the median of the `fee_proposal` values
-/// recorded for heights `[height - window_size, height - 1]` (SNIP-35).
+/// recorded for heights `[height - window_size, height - 1]`.
 ///
 /// Returns `None` (after logging a warning) when any of those heights is missing from
-/// `fee_proposals_window` or recorded as `None` (e.g., pre-SNIP-35 blocks). The `None`
+/// `fee_proposals_window` or recorded as `None` (e.g., pre-V0_14_3 blocks). The `None`
 /// case triggers the `l2_gas_price` fallback in both proposer and validator paths.
 ///
 /// Median rule for even `window_size`: average of the two middle values rounded down;
@@ -95,7 +95,7 @@ pub fn compute_fee_actual(
     Some(median)
 }
 
-/// Compute the fee target from STRK/USD price and a USD cost target (SNIP-35).
+/// Compute the fee target from STRK/USD price and a USD cost target.
 ///
 /// `target_atto_usd_per_l2_gas` is in atto-USD (atto = 10⁻¹⁸; so a value of
 /// `3_000_000_000` means 3·10⁻⁹ USD = 3 nanodollars per L2 gas unit).
@@ -116,7 +116,7 @@ pub fn compute_fee_target(
     Some(GasPrice(u128::try_from(floor).unwrap_or(u128::MAX)))
 }
 
-/// Compute the fee_proposal an honest proposer should publish (SNIP-35).
+/// Compute the fee_proposal an honest proposer should publish.
 /// - If oracle failed (`fee_target` is `None`): freeze at `fee_actual`.
 /// - Otherwise: clamp `fee_target` into the geometric bounds returned by `fee_proposal_bounds`.
 pub fn compute_fee_proposal(
@@ -131,7 +131,7 @@ pub fn compute_fee_proposal(
     GasPrice(fee_target.0.clamp(lower, upper))
 }
 
-/// Geometric bounds for SNIP-35 fee_proposal: returns `(lower, upper)` where
+/// Geometric bounds for fee_proposal: returns `(lower, upper)` where
 /// - `upper = fee_actual * (1 + margin)` (multiplicative widening), and
 /// - `lower = fee_actual / (1 + margin)` (the reciprocal — multiplicative narrowing),
 ///
@@ -154,7 +154,7 @@ pub(crate) fn fee_proposal_bounds(fee_actual: GasPrice, margin_ppt: u128) -> (u1
     (lower, upper)
 }
 
-/// SNIP-35: bind `fee_proposal_fri` to the proposal commitment hash.
+/// Bind `fee_proposal_fri` to the proposal commitment hash.
 ///
 /// Pre-V0_14_3 blocks have `fee_proposal = None` and the commitment is just `partial.0`,
 /// preserving on-chain behavior. From V0_14_3 onward, the commitment is

…onsensus_orchestrator/src/snip35/test.rs …chestrator/src/dynamic_gas_price/test.rscrates/apollo_consensus_orchestrator/src/snip35/test.rs renamed to crates/apollo_consensus_orchestrator/src/dynamic_gas_price/test.rs crates/apollo_consensus_orchestrator/src/snip35/test.rs renamed to crates/apollo_consensus_orchestrator/src/dynamic_gas_price/test.rs

@@ -7,7 +7,7 @@ use rstest::rstest;
 use starknet_api::block::{BlockNumber, GasPrice};
 use starknet_api::versioned_constants_logic::VersionedConstantsTrait;
 
-use crate::snip35::{
+use crate::dynamic_gas_price::{
     compute_fee_actual,
     compute_fee_proposal,
     compute_fee_target,
@@ -79,7 +79,7 @@ fn test_compute_fee_actual_random_window() {
     window_from((0u64..10).filter(|h| *h != 5).map(|h| (h, Some(GasPrice(100))))),
     BlockNumber(10),
 )]
-// Heights [0, 9] needed; height 7 is recorded as None (pre-SNIP-35 block).
+// Heights [0, 9] needed; height 7 is recorded as None (pre-V0_14_3 block).
 #[case::none_entry(
     window_from((0u64..10).map(|h| (h, (h != 7).then_some(GasPrice(100))))),
     BlockNumber(10),
@@ -192,7 +192,7 @@ fn test_compute_fee_actual_lone_adversary_cannot_skew_median() {
 }
 
 /// The validator's accept predicate. Must stay in sync with
-/// `validate_proposal::is_proposal_init_valid` SNIP-35 bounds check.
+/// `validate_proposal::is_proposal_init_valid` fee_proposal bounds check.
 fn validator_accepts(fee_actual: GasPrice, fee_proposal: GasPrice, margin_ppt: u128) -> bool {
     let lower = fee_actual.0.saturating_mul(PPT_DENOMINATOR) / (PPT_DENOMINATOR + margin_ppt);
     let upper = fee_actual.0.saturating_mul(PPT_DENOMINATOR + margin_ppt) / PPT_DENOMINATOR;

crates/apollo_consensus_orchestrator/src/lib.rs

@@ -18,8 +18,8 @@ pub mod cende;
 /// Fee market logic.
 pub mod fee_market;
 
-/// SNIP-35 dynamic L2 gas pricing (consensus-level fee mechanism).
-pub mod snip35;
+/// Dynamic L2 gas pricing (consensus-level fee mechanism).
+pub mod dynamic_gas_price;
 
 #[allow(missing_docs)]
 pub mod metrics;

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs

@@ -84,6 +84,14 @@ use crate::cende::{
     InternalTransactionWithReceipt,
     N_BLOCK_HASHES_BACK_IN_BLOB,
 };
+use crate::dynamic_gas_price::{
+    compute_fee_actual,
+    compute_fee_proposal,
+    compute_fee_target,
+    proposal_commitment_from,
+    FeeProposalInfo,
+    TARGET_ATTO_USD_PER_L2_GAS,
+};
 use crate::fee_market::{
     calculate_next_l2_gas_price_for_fin,
     get_min_gas_price_for_height,
@@ -98,14 +106,6 @@ use crate::metrics::{
     SNIP35_FEE_PROPOSAL,
     SNIP35_FEE_TARGET,
 };
-use crate::snip35::{
-    compute_fee_actual,
-    compute_fee_proposal,
-    compute_fee_target,
-    proposal_commitment_from,
-    FeeProposalInfo,
-    TARGET_ATTO_USD_PER_L2_GAS,
-};
 use crate::utils::{
     convert_to_sn_api_block_info,
     make_gas_price_params,
@@ -251,7 +251,7 @@ pub struct SequencerConsensusContext {
     l2_gas_price: GasPrice,
     l1_da_mode: L1DataAvailabilityMode,
     previous_proposal_init: Option<PreviousProposalInitInfo>,
-    /// SNIP-35 fee_proposals window. `None` = pre-V0_14_3.
+    /// fee_proposals window. `None` = pre-V0_14_3.
     fee_proposals_window: BTreeMap<BlockNumber, Option<GasPrice>>,
 }
 
@@ -438,10 +438,10 @@ impl SequencerConsensusContext {
         )
     }
 
-    /// SNIP-35 fee_proposal: clamp the oracle's `fee_target` to a margin around `fee_actual`.
-    /// When `fee_actual` is `None` (window incomplete), freeze at `l2_gas_price`; the validator
-    /// derives the same fallback so both sides agree.
-    async fn compute_snip35_fee_proposal(
+    /// Compute the proposer's fee_proposal: clamp the oracle's `fee_target` to a margin around
+    /// `fee_actual`. When `fee_actual` is `None` (window incomplete), freeze at `l2_gas_price`; the
+    /// validator derives the same fallback so both sides agree.
+    async fn compute_proposer_fee_proposal(
         &self,
         fee_actual: Option<GasPrice>,
         timestamp: u64,
@@ -579,18 +579,18 @@ impl SequencerConsensusContext {
                     l2_gas_consumed: l2_gas_used,
                     next_l2_gas_price: self.l2_gas_price,
                 },
-                // SNIP-35: forward the proposer's stated fee_proposal_fri (from ProposalInit)
+                // Forward the proposer's stated fee_proposal_fri (from ProposalInit)
                 // to the centralized cende pipeline. The centralized side persists this in
                 // its own storage namespace, separate from FeeMarketInfo. Pre-V0_14_3 blocks
                 // have `init.fee_proposal_fri == None`.
                 fee_proposal_info: FeeProposalInfo { fee_proposal_fri: init.fee_proposal_fri },
                 compiled_class_hashes_for_migration: central_objects
                     .compiled_class_hashes_for_migration,
                 proposal_commitment: commitment,
-                // TODO(SNIP-35): plumb the parent block's `fee_proposal_fri` here once
+                // TODO(AndrewL): plumb the parent block's `fee_proposal_fri` here once
                 // `central_objects.parent_proposal_commitment` carries it (or read from
                 // BlockHeaderWithoutHash storage). Today we pass `None`, which means
-                // pre-V0_14_3 commitments — correct for non-SNIP-35 deployments only.
+                // pre-V0_14_3 commitments — correct for pre-V0_14_3 deployments only.
                 parent_proposal_commitment: central_objects
                     .parent_proposal_commitment
                     .map(|c| proposal_commitment_from(c.partial_block_hash, None)),
@@ -723,7 +723,7 @@ impl ConsensusContext for SequencerConsensusContext {
             VersionedConstants::latest_constants().fee_proposal_window_size,
         );
         let fee_proposal =
-            self.compute_snip35_fee_proposal(fee_actual, self.deps.clock.unix_now()).await;
+            self.compute_proposer_fee_proposal(fee_actual, self.deps.clock.unix_now()).await;
         let round = build_param.round;
         let args = ProposalBuildArguments {
             deps: self.deps.clone(),

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context_test.rs

@@ -63,12 +63,12 @@ use starknet_api::state::ThinStateDiff;
 use starknet_api::versioned_constants_logic::VersionedConstantsTrait;
 
 use crate::cende::{MockCendeContext, N_BLOCK_HASHES_BACK_IN_BLOB};
+use crate::dynamic_gas_price::proposal_commitment_from;
 use crate::metrics::CONSENSUS_L2_GAS_PRICE;
 use crate::sequencer_consensus_context::{
     SequencerConsensusContext,
     SequencerConsensusContextDeps,
 };
-use crate::snip35::proposal_commitment_from;
 use crate::test_utils::{
     create_test_and_network_deps,
     proposal_init,
@@ -90,12 +90,12 @@ fn expected_l2_gas_info_for_build_proposal_defaults() -> L2GasInfo {
         l2_gas_used: GasAmount(0),
     }
 }
-use crate::snip35::compute_fee_actual;
+use crate::dynamic_gas_price::compute_fee_actual;
 use crate::utils::{apply_fee_transformations, make_gas_price_params};
 
 static TEST_PROPOSAL_COMMITMENT: LazyLock<ProposalCommitment> = LazyLock::new(|| {
     // Default test setup: empty fee_proposals_window → `compute_fee_actual` returns `None` →
-    // `compute_snip35_fee_proposal` falls back to `self.l2_gas_price` (default
+    // `compute_proposer_fee_proposal` falls back to `self.l2_gas_price` (default
     // `min_gas_price` = 8 gwei = 8_000_000_000 FRI). The orchestrator chains this value into
     // the proposal commitment via `proposal_commitment_from`. The `proposal_init` test helper
     // produces an init with `fee_proposal_fri = Some(8 gwei)` to match what the proposer emits.
@@ -1582,7 +1582,7 @@ fn test_prune_fee_proposals_window(
 #[case::all_some(BlockNumber(100), window_of(90..100))]
 // v0.14.2 era: every block recorded with `fee_proposal_fri = None`.
 #[case::all_none(BlockNumber(100), (90u64..100).map(|h| (BlockNumber(h), None)).collect())]
-// Transition: heights < 95 are pre-SNIP-35 (None), heights >= 95 are SNIP-35 (Some).
+// Transition: heights < 95 are pre-V0_14_3 (None), heights >= 95 are V0_14_3+ (Some).
 #[case::mixed_transition(
     BlockNumber(100),
     (90u64..100)
@@ -1660,7 +1660,7 @@ enum OracleBehavior {
     GasPrice(9_980_039_920)
 )]
 #[tokio::test]
-async fn test_compute_snip35_fee_proposal(
+async fn test_compute_proposer_fee_proposal(
     #[case] fee_actual: Option<GasPrice>,
     #[case] oracle_behavior: OracleBehavior,
     #[case] l2_gas_price: GasPrice,
@@ -1685,12 +1685,12 @@ async fn test_compute_snip35_fee_proposal(
 
     let mut context = deps.build_context();
     context.l2_gas_price = l2_gas_price;
-    let proposal = context.compute_snip35_fee_proposal(fee_actual, 0).await;
+    let proposal = context.compute_proposer_fee_proposal(fee_actual, 0).await;
     assert_eq!(proposal, expected_fee_proposal);
 }
 
 #[tokio::test]
-async fn test_compute_snip35_fee_proposal_converges_to_oracle_target() {
+async fn test_compute_proposer_fee_proposal_converges_to_oracle_target() {
     // (strk_usd_rate, fee_target, n_blocks_until_convergence_with_buffer).
     // 75 gwei bootstrap -> 100 gwei target at +33% reaches by block ~795.
     // 100 gwei -> 60 gwei at -40% reaches by block ~1410.
@@ -1725,7 +1725,7 @@ async fn test_compute_snip35_fee_proposal_converges_to_oracle_target() {
             let h = BlockNumber(height);
             let fee_actual = compute_fee_actual(&context.fee_proposals_window, h, window_size)
                 .expect("window stays complete across the loop");
-            let proposal = context.compute_snip35_fee_proposal(Some(fee_actual), 0).await;
+            let proposal = context.compute_proposer_fee_proposal(Some(fee_actual), 0).await;
             context.record_fee_proposal(h, Some(proposal));
             height += 1;
         }