Merge pull request #14298 from starkware-libs/nimrod/merge-main-v0.14.3-into-main-1780407216

Merge main-v0.14.3 into main

Author: dorimedini-starkware

Cargo.lock

@@ -335,8 +335,8 @@ phf = "0.11"
 pretty_assertions = "1.4.0"
 primitive-types = "0.12.1"
 privacy-circuit-verify-v0 = { package = "privacy-circuit-verify", git = "https://github.com/starkware-libs/proving-utils", rev = "580135e" }
-privacy-circuit-verify-v1 = { package = "privacy-circuit-verify", git = "https://github.com/starkware-libs/proving-utils", rev = "1e0f8fc" }
-privacy-prove = { git = "https://github.com/starkware-libs/proving-utils", rev = "1e0f8fc" }
+privacy-circuit-verify-v1 = { package = "privacy-circuit-verify", git = "https://github.com/starkware-libs/proving-utils", tag = "v0.14.3-rc-1" }
+privacy-prove = { git = "https://github.com/starkware-libs/proving-utils", tag = "v0.14.3-rc-1" }
 proc-macro2 = "1.0"
 prometheus-parse = "0.2.4"
 prost = "0.12.1"

Cargo.toml

@@ -5,7 +5,7 @@
 //! - `compute_fee_actual`: the base fee for this block, calculated as the median of the most recent
 //!   `fee_proposal` values across `window_size` blocks.
 //! - `compute_fee_target`: the fee we'd *like* for this block, derived from the STRK/USD oracle
-//!   quote and a fixed USD-cost target.
+//!   quote and a configurable USD-cost target.
 //! - `compute_fee_proposal`: the target, clamped within a fixed multiplicative margin of
 //!   `fee_actual` (so a proposer cannot move the fee too far per round).
 //!
@@ -44,10 +44,6 @@ const FRI_DECIMALS_SCALE: u128 = 10u128.pow(18);
 /// 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]`.
 ///

crates/apollo_consensus_orchestrator/src/dynamic_gas_price/mod.rs

@@ -1,5 +1,6 @@
 use std::collections::BTreeMap;
 
+use apollo_consensus_orchestrator_config::config::DEFAULT_SNIP35_TARGET_ATTO_USD_PER_L2_GAS;
 use apollo_versioned_constants::VersionedConstants;
 use rand::{RngExt, SeedableRng};
 use rand_chacha::ChaCha8Rng;
@@ -13,7 +14,6 @@ use crate::dynamic_gas_price::{
     compute_fee_target,
     FeeProposalInfo,
     PPT_DENOMINATOR,
-    TARGET_ATTO_USD_PER_L2_GAS,
 };
 
 const TEST_FEE_PROPOSAL_WINDOW_SIZE: u64 = 10;
@@ -228,7 +228,7 @@ fn test_honest_proposer_always_passes_validation_fuzzed() {
         let fee_actual_value = rng.random_range(1u128..1_000_000_000_000_000_000);
         let strk_usd_rate = rng.random_range(1u128..2 * 10u128.pow(18));
         let fee_actual = GasPrice(fee_actual_value);
-        let target = compute_fee_target(TARGET_ATTO_USD_PER_L2_GAS, strk_usd_rate);
+        let target = compute_fee_target(DEFAULT_SNIP35_TARGET_ATTO_USD_PER_L2_GAS, strk_usd_rate);
         let oracle_result = if rng.random_bool(0.1) { None } else { target };
         let proposal = compute_fee_proposal(oracle_result, fee_actual, margin_ppt);
         assert!(