backport fix to perm-client-v0.44.1 (#3266)

* Add block range validation to eth_getLogs RPC (#3250)

* add basic test

* add max block range

* validate error in test

---------

Co-authored-by: snowmead <[email protected]>
Co-authored-by: Michael Assaf <[email protected]>

* fix CI

* fix CI

---------

Co-authored-by: snowmead <[email protected]>

Author: RomarQ

.github/workflow-templates/cargo-build/action.yml

@@ -12,7 +12,7 @@ runs:
   using: "composite"
   steps:
     - name: Run sccache-cache
-      uses: mozilla-actions/[email protected].4
+      uses: mozilla-actions/[email protected].9
     - name: Setup Variables
       shell: bash
       run: |

.github/workflows/build.yml

@@ -493,7 +493,7 @@ jobs:
         with:
           ref: ${{ needs.set-tags.outputs.git_ref }}
       - name: Run sccache-cache
-        uses: mozilla-actions/[email protected].7
+        uses: mozilla-actions/[email protected].9
       - name: Setup Variables
         shell: bash
         run: |

Cargo.lock

@@ -107,6 +107,7 @@ pub struct RpcConfig {
 	pub eth_statuses_cache: usize,
 	pub fee_history_limit: u64,
 	pub max_past_logs: u32,
+	pub max_block_range: u32,
 	pub relay_chain_rpc_urls: Vec<url::Url>,
 	pub tracing_raw_max_memory_usage: usize,
 	pub frontier_backend_config: FrontierBackendConfig,

node/cli-opt/src/lib.rs

@@ -295,6 +295,10 @@ pub struct RunCmd {
 	#[clap(long, default_value = "10000")]
 	pub max_past_logs: u32,
 
+	/// Maximum block range to query logs from.
+	#[clap(long, default_value = "1024")]
+	pub max_block_range: u32,
+
 	/// Force using Moonbase native runtime.
 	#[clap(long = "force-moonbase")]
 	pub force_moonbase: bool,
@@ -351,6 +355,7 @@ impl RunCmd {
 			eth_statuses_cache: self.eth_statuses_cache,
 			fee_history_limit: self.fee_history_limit,
 			max_past_logs: self.max_past_logs,
+			max_block_range: self.max_block_range,
 			relay_chain_rpc_urls: self.base.relay_chain_rpc_urls.clone(),
 			tracing_raw_max_memory_usage: self.tracing_raw_max_memory_usage,
 			frontier_backend_config: match self.frontier_backend_type {

node/cli/src/cli.rs

@@ -761,6 +761,7 @@ where
 		let sync = sync_service.clone();
 		let ethapi_cmd = ethapi_cmd.clone();
 		let max_past_logs = rpc_config.max_past_logs;
+		let max_block_range = rpc_config.max_block_range;
 		let overrides = overrides.clone();
 		let fee_history_cache = fee_history_cache.clone();
 		let block_data_cache = block_data_cache.clone();
@@ -783,6 +784,7 @@ where
 				pool: pool.clone(),
 				is_authority: collator,
 				max_past_logs,
+				max_block_range,
 				fee_history_limit,
 				fee_history_cache: fee_history_cache.clone(),
 				network: network.clone(),

node/service/src/lazy_loading/mod.rs

@@ -790,6 +790,7 @@ where
 		let backend = backend.clone();
 		let ethapi_cmd = ethapi_cmd.clone();
 		let max_past_logs = rpc_config.max_past_logs;
+		let max_block_range = rpc_config.max_block_range;
 		let overrides = overrides.clone();
 		let fee_history_cache = fee_history_cache.clone();
 		let block_data_cache = block_data_cache.clone();
@@ -831,6 +832,7 @@ where
 				pool: pool.clone(),
 				is_authority: collator,
 				max_past_logs,
+				max_block_range,
 				fee_history_limit,
 				fee_history_cache: fee_history_cache.clone(),
 				network: network.clone(),
@@ -1538,6 +1540,7 @@ where
 		let sync = sync_service.clone();
 		let ethapi_cmd = ethapi_cmd.clone();
 		let max_past_logs = rpc_config.max_past_logs;
+		let max_block_range = rpc_config.max_block_range;
 		let overrides = overrides.clone();
 		let fee_history_cache = fee_history_cache.clone();
 		let block_data_cache = block_data_cache.clone();
@@ -1559,6 +1562,7 @@ where
 				pool: pool.clone(),
 				is_authority: collator,
 				max_past_logs,
+				max_block_range,
 				fee_history_limit,
 				fee_history_cache: fee_history_cache.clone(),
 				network: network.clone(),

node/service/src/lib.rs

@@ -122,6 +122,8 @@ pub struct FullDeps<C, P, A: ChainApi, BE> {
 	pub command_sink: Option<futures::channel::mpsc::Sender<EngineCommand<Hash>>>,
 	/// Maximum number of logs in a query.
 	pub max_past_logs: u32,
+	/// Maximum block range in a query.
+	pub max_block_range: u32,
 	/// Maximum fee history cache size.
 	pub fee_history_limit: u64,
 	/// Fee history cache.
@@ -195,6 +197,7 @@ where
 		frontier_backend,
 		backend: _,
 		max_past_logs,
+		max_block_range,
 		fee_history_limit,
 		fee_history_cache,
 		dev_rpc_data,
@@ -275,6 +278,7 @@ where
 				filter_pool,
 				500_usize, // max stored filters
 				max_past_logs,
+				max_block_range,
 				block_data_cache,
 			)
 			.into_rpc(),

node/service/src/rpc.rs

@@ -0,0 +1,34 @@
+import { beforeAll, customDevRpcRequest, describeSuite, expect } from "@moonwall/cli";
+
+describeSuite({
+  id: "T20",
+  title: "Test eth_getLogs RPC",
+  foundationMethods: "dev",
+  testCases: ({ context, it }) => {
+    beforeAll(async () => {
+      // This variable needs to be modified if `--max-blocks-range` CLI parameter is changed
+      // Using the default of 1024
+      let blocksToCreate = 1025;
+      for (; blocksToCreate > 0; blocksToCreate--) {
+        await context.createBlock();
+      }
+    });
+
+    it({
+      id: "T01",
+      title: "Validate eth_getLogs block range limit",
+      test: async function () {
+        expect(
+          async () =>
+            await customDevRpcRequest("eth_getLogs", [
+              {
+                fromBlock: "0x0",
+                toBlock: "latest",
+                topics: [],
+              },
+            ])
+        ).rejects.toThrowError("block range is too wide (maximum 1024)");
+      },
+    });
+  },
+});