Batch rows RPC requests

availproject · Feb 6, 2025 · 9e98b10 · 9e98b10
1 parent c9a413a
commit 9e98b10
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/CHANGELOG.md b/client/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.12.6
+
+- Update `avail-light-core` to 1.2.1
+
 ## [1.12.5](https://github.com/availproject/avail-light/releases/tag/avail-light-client-v1.12.5) - 2025-01-23
 
 - Update `avail-light-core` to 1.2.0

diff --git a/compatibility-tests/src/main.rs b/compatibility-tests/src/main.rs
@@ -6,7 +6,7 @@ use avail_light_core::{
 	},
 	shutdown::Controller,
 };
-use avail_rust::kate_recovery::matrix::Position;
+use avail_rust::{kate_recovery::matrix::Position, primitives::kate::Rows};
 use clap::Parser;
 use color_eyre::Result;
 use std::time::Duration;
@@ -111,7 +111,9 @@ async fn main() -> Result<()> {
 	res_helper(&res, &mut correct);
 
 	print!("Testing get_kate_row for row 0... ");
-	let res = rpc_client.request_kate_rows(vec![0], hash).await;
+	let res = rpc_client
+		.request_kate_rows(Rows::try_from(vec![0]).unwrap(), hash)
+		.await;
 	res_helper(&res, &mut correct);
 
 	println!("Done");

diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.1
+
+- Batch rows RPC requests
+
 ## [1.2.0](https://github.com/availproject/avail-light/tree/avail-light-core-v1.2.0) - 2025-02-06
 
 - Remove multiaddress metric attribute

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "avail-light-core"
-version = "1.2.0"
+version = "1.2.1"
 edition = "2021"
 description = "Avail Light core driving library"
 

diff --git a/core/src/app_client.rs b/core/src/app_client.rs
@@ -26,6 +26,8 @@ use avail_rust::{
 		data::{Cell, DataCell},
 		matrix::{Dimensions, Position},
 	},
+	primitives::kate::{MaxRows, Rows},
+	sp_core::Get,
 	H256,
 };
 use color_eyre::{
@@ -200,14 +202,19 @@ impl<T: Database + Sync> Client for AppClient<T> {
 		dimensions: Dimensions,
 		block_hash: H256,
 	) -> Result<Vec<Option<Vec<u8>>>> {
-		let rows = rows
-			.clone()
-			.into_iter()
-			.zip(self.rpc_client.request_kate_rows(rows, block_hash).await?);
+		let max_rows = <MaxRows as Get<u32>>::get() as usize;
+		let expect_message = format!("Rows count is less or equal to {max_rows}");
+
 		let mut result = vec![None; dimensions.extended_rows() as usize];
-		for (i, row) in rows {
-			result[i as usize] = Some(row);
+		for chunk in rows.chunks(max_rows) {
+			let rows = Rows::try_from(chunk.to_vec()).expect(&expect_message);
+			debug!("Requesting rows: {chunk:?}");
+			let rpc_result = self.rpc_client.request_kate_rows(rows, block_hash).await?;
+			for (&i, row) in chunk.iter().zip(rpc_result) {
+				result[i as usize] = Some(row);
+			}
 		}
+
 		Ok(result)
 	}
 }

diff --git a/core/src/network/rpc/client.rs b/core/src/network/rpc/client.rs
@@ -586,12 +586,7 @@ impl<D: Database> Client<D> {
 		self.get_header_by_hash(finalized_hash).await
 	}
 
-	pub async fn request_kate_rows(
-		&self,
-		rows: Vec<u32>,
-		block_hash: H256,
-	) -> Result<Vec<Vec<u8>>> {
-		let rows = Rows::try_from(rows).unwrap();
+	pub async fn request_kate_rows(&self, rows: Rows, block_hash: H256) -> Result<Vec<Vec<u8>>> {
 		self.with_retries(|client| {
 			let rows = rows.clone();
 			async move {