diff --git a/crates/node/core/src/args/gas_price_oracle.rs b/crates/node/core/src/args/gas_price_oracle.rs index b7a704cdf55..5d675d4dc1a 100644 --- a/crates/node/core/src/args/gas_price_oracle.rs +++ b/crates/node/core/src/args/gas_price_oracle.rs @@ -25,17 +25,22 @@ pub struct GasPriceOracleArgs { /// The percentile of gas prices to use for the estimate #[arg(long = "gpo.percentile", default_value_t = DEFAULT_GAS_PRICE_PERCENTILE)] pub percentile: u32, + + /// The default gas price to use if there are no blocks to use + #[arg(long = "gpo.default-suggested-fee")] + pub default_suggested_fee: Option, } impl GasPriceOracleArgs { /// Returns a [`GasPriceOracleConfig`] from the arguments. pub fn gas_price_oracle_config(&self) -> GasPriceOracleConfig { - let Self { blocks, ignore_price, max_price, percentile } = self; + let Self { blocks, ignore_price, max_price, percentile, default_suggested_fee } = self; GasPriceOracleConfig { max_price: Some(U256::from(*max_price)), ignore_price: Some(U256::from(*ignore_price)), percentile: *percentile, blocks: *blocks, + default_suggested_fee: *default_suggested_fee, ..Default::default() } } @@ -48,6 +53,7 @@ impl Default for GasPriceOracleArgs { ignore_price: DEFAULT_IGNORE_GAS_PRICE.to(), max_price: DEFAULT_MAX_GAS_PRICE.to(), percentile: DEFAULT_GAS_PRICE_PERCENTILE, + default_suggested_fee: None, } } } @@ -73,6 +79,7 @@ mod tests { ignore_price: DEFAULT_IGNORE_GAS_PRICE.to(), max_price: DEFAULT_MAX_GAS_PRICE.to(), percentile: DEFAULT_GAS_PRICE_PERCENTILE, + default_suggested_fee: None, } ); } diff --git a/crates/rpc/rpc-eth-types/src/gas_oracle.rs b/crates/rpc/rpc-eth-types/src/gas_oracle.rs index 00df9f7360b..95eca0ffd1c 100644 --- a/crates/rpc/rpc-eth-types/src/gas_oracle.rs +++ b/crates/rpc/rpc-eth-types/src/gas_oracle.rs @@ -49,7 +49,7 @@ pub struct GasPriceOracleConfig { pub max_reward_percentile_count: u64, /// The default gas price to use if there are no blocks to use - pub default: Option, + pub default_suggested_fee: Option, /// The maximum gas price to use for the estimate pub max_price: Option, @@ -66,7 +66,7 @@ impl Default for GasPriceOracleConfig { max_header_history: MAX_HEADER_HISTORY, max_block_history: MAX_HEADER_HISTORY, max_reward_percentile_count: MAX_REWARD_PERCENTILE_COUNT, - default: None, + default_suggested_fee: None, max_price: Some(DEFAULT_MAX_GAS_PRICE), ignore_price: Some(DEFAULT_IGNORE_GAS_PRICE), } @@ -112,7 +112,12 @@ where // this is the number of blocks that we will cache the values for let cached_values = (oracle_config.blocks * 5).max(oracle_config.max_block_history as u32); let inner = Mutex::new(GasPriceOracleInner { - last_price: Default::default(), + last_price: GasPriceOracleResult { + block_hash: B256::ZERO, + price: oracle_config + .default_suggested_fee + .unwrap_or_else(|| GasPriceOracleResult::default().price), + }, lowest_effective_tip_cache: EffectiveTipLruCache(LruMap::new(ByLength::new( cached_values, ))), diff --git a/docs/vocs/docs/pages/cli/reth/node.mdx b/docs/vocs/docs/pages/cli/reth/node.mdx index 31be2e8c936..cbfaa615bbb 100644 --- a/docs/vocs/docs/pages/cli/reth/node.mdx +++ b/docs/vocs/docs/pages/cli/reth/node.mdx @@ -462,6 +462,9 @@ Gas Price Oracle: [default: 60] + --gpo.default-suggested-fee + The default gas price to use if there are no blocks to use + TxPool: --txpool.pending-max-count Max number of transaction in the pending sub-pool