apollo_consensus_orchestrator,apollo_consensus_manager: route STRK/USD via L1GasPriceProvider

Goal: PR 5 of 5 in the stack moving the STRK/USD oracle into
L1GasPriceProvider. This is the behavior flip: `compute_snip35_fee_proposal`
now asks the gas-price provider client for the STRK/USD rate instead
of holding its own `ExchangeRateOracleClientTrait` object. With this
in, the orchestrator no longer has direct oracle plumbing — every
external rate goes through the existing `SharedL1GasPriceClient` seam.

Change summary:
- `SequencerConsensusContext::compute_snip35_fee_proposal` calls
  `self.deps.l1_gas_price_provider.get_strk_to_usd_rate(timestamp)`.
  The previous `Option<Arc<dyn ExchangeRateOracleClientTrait>>` outer
  match collapses into a plain `Result` match; the "freeze fee_proposal"
  fallback is preserved on `Err` and zero-rate.
- `SequencerConsensusContextDeps::strk_to_usd_oracle` removed.
- `TestDeps::strk_to_usd_oracle` removed and the `From` impl simplified.
- `consensus_manager.rs` drops the now-invalid `strk_to_usd_oracle: None`
  field initializer.
- Unused imports cleaned up: `ExchangeRateOracleClientTrait` and
  `MockExchangeRateOracleClientTrait` from orchestrator; `debug` from
  `tracing` (only used by the dead `None` branch).
- `setup_default_gas_price_provider` registers a catch-all
  `expect_get_strk_to_usd_rate` returning `DEFAULT_STRK_TO_USD_RATE`
  so existing build_proposal tests keep working without per-test
  expectations.
- The two SNIP-35 fee-proposal tests reorder their per-test mock
  registration to run BEFORE `setup_default_expectations`, since
  mockall matches expectations in oldest-first order — same pattern
  the codebase already uses for state_sync_client.expect_get_block.
- `OracleBehavior::NotConfigured` variant removed; the
  `no_oracle_freezes_at_fee_actual` test case removed (redundant with
  `oracle_err_freezes_at_fee_actual` — both freeze at fee_actual now
  that there is no on/off switch).

Decision points:
- Original 6-PR plan included a "cleanup" PR removing the oracle
  wiring from `apollo_consensus_manager`. That PR collapsed into this
  one because this branch forks from BEFORE the wiring was added, so
  the cleanup is one line and shares the same compile-unit constraint.
- The `setup_default_gas_price_provider` catch-all is needed because
  every build_proposal test now hits `compute_snip35_fee_proposal`,
  which always queries the provider. The alternative (per-test
  expectations) would have churned ~9 build_proposal call sites.
- `DEFAULT_STRK_TO_USD_RATE = 3e17` was picked because the SNIP-35
  test cases treat it as in-bounds.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: ShahakShama

crates/apollo_consensus_manager/src/consensus_manager.rs

@@ -308,7 +308,6 @@ 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_to_usd_oracle: None,
             },
         )
     }

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context.rs

@@ -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::{ExchangeRateOracleClientTrait, L1GasPriceProviderClient};
+use apollo_l1_gas_price_types::L1GasPriceProviderClient;
 use apollo_network::network_manager::{BroadcastTopicClient, BroadcastTopicClientTrait};
 use apollo_protobuf::consensus::{
     BuildParam,
@@ -75,7 +75,7 @@ use tokio::task::JoinHandle;
 use tokio::time::sleep;
 use tokio_util::sync::CancellationToken;
 use tokio_util::task::AbortOnDropHandle;
-use tracing::{debug, error, error_span, info, instrument, trace, warn, Instrument};
+use tracing::{error, error_span, info, instrument, trace, warn, Instrument};
 
 use crate::build_proposal::{build_proposal, BuildProposalError, ProposalBuildArguments};
 use crate::cende::{
@@ -272,10 +272,6 @@ 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 oracle for SNIP-35 dynamic gas pricing. The underlying trait is generic; this
-    /// field's name labels the rate semantics. The instance must be configured with STRK/USD
-    /// URLs at construction time. None if disabled.
-    pub strk_to_usd_oracle: Option<Arc<dyn ExchangeRateOracleClientTrait>>,
 }
 
 #[derive(thiserror::Error, PartialEq, Debug)]
@@ -458,24 +454,19 @@ impl SequencerConsensusContext {
         };
         SNIP35_FEE_ACTUAL.set_lossy(fee_actual.0);
 
-        let fee_target = match &self.deps.strk_to_usd_oracle {
-            Some(oracle) => match oracle.fetch_rate(timestamp).await {
-                Ok(rate) => {
-                    SNIP35_STRK_USD_RATE.set_lossy(rate);
-                    let target = compute_fee_target(TARGET_ATTO_USD_PER_L2_GAS, rate);
-                    match target {
-                        Some(t) => SNIP35_FEE_TARGET.set_lossy(t.0),
-                        None => warn!("STRK/USD oracle returned zero rate, freezing fee_proposal"),
-                    }
-                    target
-                }
-                Err(e) => {
-                    warn!("STRK/USD oracle error: {e:?}, freezing fee_proposal");
-                    None
+        let fee_target = match self.deps.l1_gas_price_provider.get_strk_to_usd_rate(timestamp).await
+        {
+            Ok(rate) => {
+                SNIP35_STRK_USD_RATE.set_lossy(rate);
+                let target = compute_fee_target(TARGET_ATTO_USD_PER_L2_GAS, rate);
+                match target {
+                    Some(t) => SNIP35_FEE_TARGET.set_lossy(t.0),
+                    None => warn!("STRK/USD oracle returned zero rate, freezing fee_proposal"),
                 }
-            },
-            None => {
-                debug!("No STRK/USD oracle configured, freezing fee_proposal");
+                target
+            }
+            Err(e) => {
+                warn!("STRK/USD oracle error: {e:?}, freezing fee_proposal");
                 None
             }
         };

crates/apollo_consensus_orchestrator/src/sequencer_consensus_context_test.rs

@@ -27,11 +27,7 @@ use apollo_l1_gas_price_types::errors::{
     L1GasPriceClientError,
     L1GasPriceProviderError,
 };
-use apollo_l1_gas_price_types::{
-    MockExchangeRateOracleClientTrait,
-    MockL1GasPriceProviderClient,
-    PriceInfo,
-};
+use apollo_l1_gas_price_types::{MockL1GasPriceProviderClient, PriceInfo};
 use apollo_protobuf::consensus::{
     BuildParam,
     CommitmentParts,
@@ -1619,28 +1615,20 @@ async fn test_initialize_fee_proposals_window(
 
 #[derive(Clone)]
 enum OracleBehavior {
-    /// No oracle is configured (`strk_to_usd_oracle = None`).
-    NotConfigured,
-    /// Oracle is configured and `fetch_rate` returns `Ok(rate)`.
+    /// Provider returns `Ok(rate)` for the STRK/USD query.
     Ok(u128),
-    /// Oracle is configured and `fetch_rate` returns `Err(_)`.
+    /// Provider returns `Err(_)` for the STRK/USD query.
     Err,
 }
 
 // fee_actual = 10 gwei => margin bounds [9_980_039_920, 10_020_000_000].
 #[rstest]
 #[case::no_fee_actual_freezes_at_l2_gas_price(
     None,
-    OracleBehavior::NotConfigured,
+    OracleBehavior::Ok(0),
     GasPrice(7_000_000_000),
     GasPrice(7_000_000_000)
 )]
-#[case::no_oracle_freezes_at_fee_actual(
-    Some(GasPrice(10_000_000_000)),
-    OracleBehavior::NotConfigured,
-    GasPrice(7_000_000_000),
-    GasPrice(10_000_000_000)
-)]
 #[case::oracle_zero_rate_freezes_at_fee_actual(
     Some(GasPrice(10_000_000_000)),
     OracleBehavior::Ok(0),
@@ -1679,22 +1667,23 @@ async fn test_compute_snip35_fee_proposal(
     #[case] expected_fee_proposal: GasPrice,
 ) {
     let (mut deps, _network) = create_test_and_network_deps();
-    deps.setup_default_expectations();
-    deps.strk_to_usd_oracle = match oracle_behavior {
-        OracleBehavior::NotConfigured => None,
+    // Register the specific strk_to_usd_rate expectation BEFORE setup_default_expectations so
+    // the catch-all default installed there does not shadow it (mockall matches oldest first).
+    match oracle_behavior {
         OracleBehavior::Ok(rate) => {
-            let mut mock = MockExchangeRateOracleClientTrait::new();
-            mock.expect_fetch_rate().returning(move |_| Ok(rate));
-            Some(Arc::new(mock))
+            deps.l1_gas_price_provider
+                .expect_get_strk_to_usd_rate()
+                .returning(move |_| Ok(rate));
         }
         OracleBehavior::Err => {
-            let mut mock = MockExchangeRateOracleClientTrait::new();
-            mock.expect_fetch_rate().returning(|_| {
-                Err(ExchangeRateOracleClientError::RequestError("test".to_string()))
+            deps.l1_gas_price_provider.expect_get_strk_to_usd_rate().returning(|_| {
+                Err(L1GasPriceClientError::ExchangeRateOracleClientError(
+                    ExchangeRateOracleClientError::RequestError("test".to_string()),
+                ))
             });
-            Some(Arc::new(mock))
         }
-    };
+    }
+    deps.setup_default_expectations();
 
     let mut context = deps.build_context();
     context.l2_gas_price = l2_gas_price;
@@ -1713,16 +1702,17 @@ async fn test_compute_snip35_fee_proposal_converges_to_oracle_target() {
     ];
 
     let (mut deps, _network) = create_test_and_network_deps();
-    deps.setup_default_expectations();
-    let mut mock = MockExchangeRateOracleClientTrait::new();
+    // Register per-phase strk_to_usd_rate expectations BEFORE setup_default_expectations so they
+    // are not shadowed by the catch-all default (mockall matches oldest first).
     let mut seq = mockall::Sequence::new();
     for &(rate, _, n_blocks) in &phases {
-        mock.expect_fetch_rate()
+        deps.l1_gas_price_provider
+            .expect_get_strk_to_usd_rate()
             .times(usize::try_from(n_blocks).unwrap())
             .in_sequence(&mut seq)
             .returning(move |_| Ok(rate));
     }
-    deps.strk_to_usd_oracle = Some(Arc::new(mock));
+    deps.setup_default_expectations();
     let mut context = deps.build_context();
 
     // Bootstrap the window with 75 gwei (the $0.04 target).

crates/apollo_consensus_orchestrator/src/test_utils.rs

@@ -93,6 +93,10 @@ pub(crate) const CHAIN_ID: ChainId = ChainId::Mainnet;
 // values here.
 pub(crate) const ETH_TO_FRI_RATE: u128 = 2 * u128::pow(10, 18);
 
+// A STRK/USD rate that yields an in-bounds SNIP-35 fee target in proposal-building tests
+// where the specific value doesn't matter.
+pub(crate) const DEFAULT_STRK_TO_USD_RATE: u128 = 300_000_000_000_000_000;
+
 pub(crate) static TX_BATCH: LazyLock<Vec<ConsensusTransaction>> =
     LazyLock::new(|| (0..3).map(generate_invoke_tx).collect());
 
@@ -129,8 +133,6 @@ 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_to_usd_oracle:
-        Option<Arc<dyn apollo_l1_gas_price_types::ExchangeRateOracleClientTrait>>,
 }
 
 impl From<TestDeps> for SequencerConsensusContextDeps {
@@ -145,7 +147,6 @@ impl From<TestDeps> for SequencerConsensusContextDeps {
             outbound_proposal_sender: deps.outbound_proposal_sender,
             vote_broadcast_client: deps.vote_broadcast_client,
             config_manager_client: None,
-            strk_to_usd_oracle: deps.strk_to_usd_oracle,
         }
     }
 }
@@ -325,6 +326,9 @@ impl TestDeps {
             blob_fee: GasPrice(TEMP_ETH_BLOB_GAS_FEE_IN_WEI),
         }));
         self.l1_gas_price_provider.expect_get_rate().return_const(Ok(ETH_TO_FRI_RATE));
+        self.l1_gas_price_provider
+            .expect_get_strk_to_usd_rate()
+            .return_const(Ok(DEFAULT_STRK_TO_USD_RATE));
     }
 
     fn setup_default_state_sync_get_block(&mut self) {
@@ -381,7 +385,6 @@ pub(crate) fn create_test_and_network_deps() -> (TestDeps, NetworkDependencies)
         clock,
         outbound_proposal_sender,
         vote_broadcast_client: votes_topic_client,
-        strk_to_usd_oracle: None,
     };
 
     let network_deps =