Validate max block range eth_getLogs RPC (#245)

Author: snowmead

client/rpc/src/eth/filter.rs

@@ -49,6 +49,7 @@ pub struct EthFilter<B: BlockT, C, BE, P> {
 	filter_pool: FilterPool,
 	max_stored_filters: usize,
 	max_past_logs: u32,
+	max_block_range: u32,
 	block_data_cache: Arc<EthBlockDataCacheTask<B>>,
 	_marker: PhantomData<BE>,
 }
@@ -61,6 +62,7 @@ impl<B: BlockT, C, BE, P: TransactionPool> EthFilter<B, C, BE, P> {
 		filter_pool: FilterPool,
 		max_stored_filters: usize,
 		max_past_logs: u32,
+		max_block_range: u32,
 		block_data_cache: Arc<EthBlockDataCacheTask<B>>,
 	) -> Self {
 		Self {
@@ -70,6 +72,7 @@ impl<B: BlockT, C, BE, P: TransactionPool> EthFilter<B, C, BE, P> {
 			filter_pool,
 			max_stored_filters,
 			max_past_logs,
+			max_block_range,
 			block_data_cache,
 			_marker: PhantomData,
 		}
@@ -504,6 +507,14 @@ where
 				.map(|s| s.unique_saturated_into())
 				.unwrap_or(best_number);
 
+			let block_range = current_number.saturating_sub(from_number);
+			if block_range > self.max_block_range.into() {
+				return Err(internal_err(format!(
+					"block range is too wide (maximum {})",
+					self.max_block_range
+				)));
+			}
+
 			if backend.is_indexed() {
 				let _ = filter_range_logs_indexed(
 					client.as_ref(),

template/node/src/eth.rs

@@ -46,6 +46,10 @@ pub struct EthConfiguration {
 	#[arg(long, default_value = "10000")]
 	pub max_past_logs: u32,
 
+	/// Maximum block range to query logs from.
+	#[arg(long, default_value = "1024")]
+	pub max_block_range: u32,
+
 	/// Maximum fee history cache size.
 	#[arg(long, default_value = "2048")]
 	pub fee_history_limit: u64,

template/node/src/rpc/eth.rs

@@ -52,6 +52,8 @@ pub struct EthDeps<B: BlockT, C, P, CT, CIDP> {
 	pub filter_pool: Option<FilterPool>,
 	/// Maximum number of logs in a query.
 	pub max_past_logs: u32,
+	/// Maximum block range for eth_getLogs.
+	pub max_block_range: u32,
 	/// Fee history cache.
 	pub fee_history_cache: FeeHistoryCache,
 	/// Maximum fee history cache size.
@@ -113,6 +115,7 @@ where
 		block_data_cache,
 		filter_pool,
 		max_past_logs,
+		max_block_range,
 		fee_history_cache,
 		fee_history_cache_limit,
 		execute_gas_limit_multiplier,
@@ -157,6 +160,7 @@ where
 				filter_pool,
 				500_usize, // max stored filters
 				max_past_logs,
+				max_block_range,
 				block_data_cache.clone(),
 			)
 			.into_rpc(),

template/node/src/service.rs

@@ -424,6 +424,7 @@ where
 		let is_authority = role.is_authority();
 		let enable_dev_signer = eth_config.enable_dev_signer;
 		let max_past_logs = eth_config.max_past_logs;
+		let max_block_range = eth_config.max_block_range;
 		let execute_gas_limit_multiplier = eth_config.execute_gas_limit_multiplier;
 		let filter_pool = filter_pool.clone();
 		let frontier_backend = frontier_backend.clone();
@@ -470,6 +471,7 @@ where
 				block_data_cache: block_data_cache.clone(),
 				filter_pool: filter_pool.clone(),
 				max_past_logs,
+				max_block_range,
 				fee_history_cache: fee_history_cache.clone(),
 				fee_history_cache_limit,
 				execute_gas_limit_multiplier,