feat: suggest gas price based on latest block's transactions (#220)

yiweichi · georgehao · web-flow · commit ee349a7c2471 · 2025-07-31T16:03:34.000+08:00
* feat: suggest gas price based on latest block's transactions

* update dependencies

* fix typos

---------

Co-authored-by: georgehao &lt;haohongfan@gmail.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -155,7 +155,6 @@ reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", defa
 reth-provider = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
 reth-rpc-builder = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
 reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
-reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
 reth-tasks = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
 reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
 reth-tracing = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
diff --git a/crates/network/Cargo.toml b/crates/network/Cargo.toml
@@ -17,7 +17,7 @@ reth-network-api.workspace = true
 reth-network-types = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
 reth-network-peers.workspace = true
 reth-primitives-traits.workspace = true
-reth-storage-api = { workspace = true, default-features = false }
+reth-storage-api = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
 
 # scroll
 reth-scroll-chainspec.workspace = true
diff --git a/crates/node/src/add_ons/mod.rs b/crates/node/src/add_ons/mod.rs
@@ -1,5 +1,7 @@
 //! The [`ScrollRollupNodeAddOns`] implementation for the Scroll rollup node.
 
+use crate::constants;
+
 use super::args::ScrollRollupNodeConfig;
 use reth_evm::{ConfigureEvm, EvmFactory, EvmFactoryFor};
 use reth_network::NetworkProtocols;
@@ -65,6 +67,10 @@ where
     ) -> Self {
         let rpc_add_ons = RpcAddOns::new(
             ScrollEthApiBuilder::default()
+                .with_min_suggested_priority_fee(
+                    config.gas_price_oracle_args.default_suggested_priority_fee,
+                )
+                .with_payload_size_limit(constants::DEFAULT_PAYLOAD_SIZE_LIMIT)
                 .with_sequencer(config.network_args.sequencer_url.clone()),
             Default::default(),
             Default::default(),
diff --git a/crates/node/src/args.rs b/crates/node/src/args.rs
@@ -66,6 +66,9 @@ pub struct ScrollRollupNodeConfig {
     /// The signer arguments
     #[command(flatten)]
     pub signer_args: SignerArgs,
+    /// The gas price oracle args
+    #[command(flatten)]
+    pub gas_price_oracle_args: GasPriceOracleArgs,
 }
 
 impl ScrollRollupNodeConfig {
@@ -483,6 +486,15 @@ impl SignerArgs {
     }
 }
 
+/// The arguments for the sequencer.
+#[derive(Debug, Default, Clone, clap::Args)]
+pub struct GasPriceOracleArgs {
+    /// Minimum suggested priority fee (tip) in wei, default `100`
+    #[arg(long, default_value_t = 100)]
+    #[arg(long = "gpo.default-suggest-priority-fee", id = "default_suggest_priority_fee", value_name = "DEFAULT_SUGGEST_PRIORITY_FEE", default_value_t = constants::DEFAULT_SUGGEST_PRIORITY_FEE)]
+    pub default_suggested_priority_fee: u64,
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -499,6 +511,7 @@ mod tests {
             l1_provider_args: L1ProviderArgs::default(),
             beacon_provider_args: BeaconProviderArgs::default(),
             network_args: NetworkArgs::default(),
+            gas_price_oracle_args: GasPriceOracleArgs::default(),
         };
 
         let result = config.validate();
@@ -522,6 +535,7 @@ mod tests {
             l1_provider_args: L1ProviderArgs::default(),
             beacon_provider_args: BeaconProviderArgs::default(),
             network_args: NetworkArgs::default(),
+            gas_price_oracle_args: GasPriceOracleArgs::default(),
         };
 
         let result = config.validate();
@@ -545,6 +559,7 @@ mod tests {
             l1_provider_args: L1ProviderArgs::default(),
             beacon_provider_args: BeaconProviderArgs::default(),
             network_args: NetworkArgs::default(),
+            gas_price_oracle_args: GasPriceOracleArgs::default(),
         };
 
         assert!(config.validate().is_ok());
@@ -561,6 +576,7 @@ mod tests {
             l1_provider_args: L1ProviderArgs::default(),
             beacon_provider_args: BeaconProviderArgs::default(),
             network_args: NetworkArgs::default(),
+            gas_price_oracle_args: GasPriceOracleArgs::default(),
         };
 
         assert!(config.validate().is_ok());
@@ -577,6 +593,7 @@ mod tests {
             l1_provider_args: L1ProviderArgs::default(),
             beacon_provider_args: BeaconProviderArgs::default(),
             network_args: NetworkArgs::default(),
+            gas_price_oracle_args: GasPriceOracleArgs::default(),
         };
 
         assert!(config.validate().is_ok());
@@ -593,6 +610,7 @@ mod tests {
             l1_provider_args: L1ProviderArgs::default(),
             beacon_provider_args: BeaconProviderArgs::default(),
             network_args: NetworkArgs::default(),
+            gas_price_oracle_args: GasPriceOracleArgs::default(),
         };
 
         assert!(config.validate().is_ok());
diff --git a/crates/node/src/constants.rs b/crates/node/src/constants.rs
@@ -21,3 +21,6 @@ pub(crate) const DEFAULT_MAX_L1_MESSAGES_PER_BLOCK: u64 = 4;
 
 /// The gap in blocks between the P2P and EN which triggers sync.
 pub(crate) const BLOCK_GAP_TRIGGER: u64 = 500_000;
+
+/// The default suggested priority fee for the gas price oracle.
+pub(crate) const DEFAULT_SUGGEST_PRIORITY_FEE: u64 = 100;
diff --git a/crates/node/src/test_utils.rs b/crates/node/src/test_utils.rs
@@ -1,5 +1,7 @@
 //! This crate contains utilities for running end-to-end tests for the scroll reth node.
 
+use crate::GasPriceOracleArgs;
+
 use super::{
     BeaconProviderArgs, DatabaseArgs, EngineDriverArgs, L1ProviderArgs, ScrollRollupNode,
     ScrollRollupNodeConfig, SequencerArgs,
@@ -149,6 +151,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
             ..Default::default()
         },
         signer_args: Default::default(),
+        gas_price_oracle_args: GasPriceOracleArgs::default(),
     }
 }
 
@@ -173,5 +176,6 @@ pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeCon
             ..Default::default()
         },
         signer_args: Default::default(),
+        gas_price_oracle_args: GasPriceOracleArgs::default(),
     }
 }
diff --git a/crates/node/tests/e2e.rs b/crates/node/tests/e2e.rs
@@ -13,7 +13,7 @@ use rollup_node::{
         default_sequencer_test_scroll_rollup_node_config, default_test_scroll_rollup_node_config,
         generate_tx, setup_engine,
     },
-    BeaconProviderArgs, DatabaseArgs, EngineDriverArgs, L1ProviderArgs,
+    BeaconProviderArgs, DatabaseArgs, EngineDriverArgs, GasPriceOracleArgs, L1ProviderArgs,
     NetworkArgs as ScrollNetworkArgs, ScrollRollupNodeConfig, SequencerArgs,
 };
 use rollup_node_manager::{RollupManagerCommand, RollupManagerEvent, RollupManagerHandle};
@@ -52,6 +52,7 @@ async fn can_bridge_l1_messages() -> eyre::Result<()> {
             ..Default::default()
         },
         signer_args: Default::default(),
+        gas_price_oracle_args: GasPriceOracleArgs::default(),
     };
     let (mut nodes, _tasks, _wallet) = setup_engine(node_args, 1, chain_spec, false, false).await?;
     let node = nodes.pop().unwrap();
@@ -121,6 +122,7 @@ async fn can_sequence_and_gossip_blocks() {
             ..Default::default()
         },
         signer_args: Default::default(),
+        gas_price_oracle_args: GasPriceOracleArgs::default(),
     };
 
     let (nodes, _tasks, wallet) =
diff --git a/crates/node/tests/sync.rs b/crates/node/tests/sync.rs
@@ -12,8 +12,8 @@ use rollup_node::{
         default_sequencer_test_scroll_rollup_node_config, default_test_scroll_rollup_node_config,
         setup_engine,
     },
-    BeaconProviderArgs, DatabaseArgs, EngineDriverArgs, L1ProviderArgs, NetworkArgs,
-    ScrollRollupNode, ScrollRollupNodeConfig, SequencerArgs,
+    BeaconProviderArgs, DatabaseArgs, EngineDriverArgs, GasPriceOracleArgs, L1ProviderArgs,
+    NetworkArgs, ScrollRollupNode, ScrollRollupNodeConfig, SequencerArgs,
 };
 use rollup_node_manager::{RollupManagerCommand, RollupManagerEvent};
 use rollup_node_providers::BlobSource;
@@ -58,6 +58,7 @@ async fn test_should_consolidate_to_block_15k() -> eyre::Result<()> {
             blob_source: BlobSource::Beacon,
         },
         signer_args: Default::default(),
+        gas_price_oracle_args: GasPriceOracleArgs::default(),
     };
 
     let chain_spec = (*SCROLL_SEPOLIA).clone();
diff --git a/crates/sequencer/tests/e2e.rs b/crates/sequencer/tests/e2e.rs
@@ -10,8 +10,8 @@ use reth_scroll_chainspec::SCROLL_DEV;
 use reth_scroll_node::test_utils::setup;
 use rollup_node::{
     test_utils::{default_test_scroll_rollup_node_config, setup_engine},
-    BeaconProviderArgs, DatabaseArgs, EngineDriverArgs, L1ProviderArgs, NetworkArgs,
-    ScrollRollupNodeConfig, SequencerArgs, SignerArgs,
+    BeaconProviderArgs, DatabaseArgs, EngineDriverArgs, GasPriceOracleArgs, L1ProviderArgs,
+    NetworkArgs, ScrollRollupNodeConfig, SequencerArgs, SignerArgs,
 };
 use rollup_node_manager::RollupManagerEvent;
 use rollup_node_primitives::{sig_encode_hash, BlockInfo, L1MessageEnvelope};
@@ -454,6 +454,7 @@ async fn can_sequence_blocks_with_private_key_file() -> eyre::Result<()> {
             key_file: Some(temp_file.path().to_path_buf()),
             aws_kms_key_id: None,
         },
+        gas_price_oracle_args: GasPriceOracleArgs::default(),
     };
 
     let (nodes, _tasks, wallet) =
@@ -542,6 +543,7 @@ async fn can_sequence_blocks_with_hex_key_file_without_prefix() -> eyre::Result<
             key_file: Some(temp_file.path().to_path_buf()),
             aws_kms_key_id: None,
         },
+        gas_price_oracle_args: GasPriceOracleArgs::default(),
     };
 
     let (nodes, _tasks, wallet) =

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`//! This crate contains utilities for running end-to-end tests for the scroll reth node.`
`2`	`2`
	`3`	`+use crate::GasPriceOracleArgs;`
	`4`	`+`
`3`	`5`	`use super::{`
`4`	`6`	`BeaconProviderArgs, DatabaseArgs, EngineDriverArgs, L1ProviderArgs, ScrollRollupNode,`
`5`	`7`	`ScrollRollupNodeConfig, SequencerArgs,`
`@@ -149,6 +151,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {`
`149`	`151`	`..Default::default()`
`150`	`152`	`},`
`151`	`153`	`signer_args: Default::default(),`
	`154`	`+ gas_price_oracle_args: GasPriceOracleArgs::default(),`
`152`	`155`	`}`
`153`	`156`	`}`
`154`	`157`
`@@ -173,5 +176,6 @@ pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeCon`
`173`	`176`	`..Default::default()`
`174`	`177`	`},`
`175`	`178`	`signer_args: Default::default(),`
	`179`	`+ gas_price_oracle_args: GasPriceOracleArgs::default(),`
`176`	`180`	`}`
`177`	`181`	`}`