Skip to content

Refactored Kate RPC module to remove code duplication across query_rows, query_proof, and query_multiproof methods. #783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
letmehateu wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Refactored Kate RPC module to remove code duplication across query_rows, query_proof, and query_multiproof methods. #783

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49f93e9
Update lib.rs
letmehateu Nov 11, 2025
2216804
Update lib.rs
letmehateu Nov 11, 2025
f7642cf
Update lib.rs
letmehateu Nov 11, 2025
8679c1c
Update lib.rs
letmehateu Nov 11, 2025
dba22d5
Update lib.rs
letmehateu Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 41 additions & 49 deletions rpc/kate-rpc/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,39 @@ where
}
}


/// Checks if the block has non-empty commitments.
fn ensure_has_commitments(&self, header: &<Block as BlockT>::Header, at: Block::Hash) -> RpcResult<()> {
match header.extension() {
HeaderExtension::V3(ext) => {
if ext.commitment.commitment.is_empty() {
return Err(internal_err!("Requested block {at} has empty commitments"));
}
},
};
Ok(())
}

/// Validates that the requested number of cells doesn't exceed the configured limit.
fn validate_cells_limit(&self, cells_count: usize) -> RpcResult<()> {
if cells_count > self.max_cells_size {
return Err(internal_err!(
"Cannot query ({}) more than {} amount of cells per request. Either increase the max cells size (--kate-max-cells-size) or query less amount of cells per request.",
cells_count,
self.max_cells_size
));
}
Ok(())
}

/// Converts cells to position tuples (row, col).
fn cells_to_positions(cells: Cells) -> Vec<(u32, u32)> {
cells
.into_iter()
.map(|cell| (cell.row.0, cell.col.0))
.collect()
}

#[async_trait]
impl<Client, Block> KateApiServer<Block> for Kate<Client, Block>
where
Expand All @@ -206,15 +239,8 @@ where
let _metric_observer = MetricObserver::new(ObserveKind::KateQueryRows);

let (api, at, number, block_len, extrinsics, header) = self.scope(at)?;

match header.extension() {
HeaderExtension::V3(ext) => {
if ext.commitment.commitment.is_empty() {
return Err(internal_err!("Requested block {at} has empty commitments"));
}
},
};

self.ensure_has_commitments(&header, at)?;

let grid_rows = api
.rows(at, number, extrinsics, block_len, rows.into())
.map_err(|kate_err| internal_err!("Failed Kate rows: {kate_err:?}"))?
Expand All @@ -228,31 +254,14 @@ where
cells: Cells,
at: Option<HashOf<Block>>,
) -> RpcResult<Vec<GDataProof>> {
if cells.len() > self.max_cells_size {
return Err(
internal_err!(
"Cannot query ({}) more than {} amount of cells per request. Either increase the max cells size (--kate-max-cells-size) or query less amount of cells per request.",
cells.len(),
self.max_cells_size
)
);
}
self.validate_cells_limit(cells.len())?;

let _metric_observer = MetricObserver::new(ObserveKind::KateQueryProof);

let (api, at, number, block_len, extrinsics, header) = self.scope(at)?;
match header.extension() {
HeaderExtension::V3(ext) => {
if ext.commitment.commitment.is_empty() {
return Err(internal_err!("Requested block {at} has empty commitments"));
}
},
};
self.ensure_has_commitments(&header, at)?;

let cells = cells
.into_iter()
.map(|cell| (cell.row.0, cell.col.0))
.collect::<Vec<_>>();
let cells = Self::cells_to_positions(cells);
let proof = api
.proof(at, number, extrinsics, block_len, cells)
.map_err(|kate_err| internal_err!("KateApi::proof failed: {kate_err:?}"))?
Expand All @@ -266,31 +275,14 @@ where
cells: Cells,
at: Option<HashOf<Block>>,
) -> RpcResult<Vec<(GMultiProof, GCellBlock)>> {
if cells.len() > self.max_cells_size {
return Err(
internal_err!(
"Cannot query ({}) more than {} amount of cells per request. Either increase the max cells size (--kate-max-cells-size) or query less amount of cells per request.",
cells.len(),
self.max_cells_size
)
);
}
self.validate_cells_limit(cells.len())?;

let _metric_observer = MetricObserver::new(ObserveKind::KateQueryProof);

let (api, at, number, block_len, extrinsics, header) = self.scope(at)?;
match header.extension() {
HeaderExtension::V3(ext) => {
if ext.commitment.commitment.is_empty() {
return Err(internal_err!("Requested block {at} has empty commitments"));
}
},
};
self.ensure_has_commitments(&header, at)?;

let cells = cells
.into_iter()
.map(|cell| (cell.row.0, cell.col.0))
.collect::<Vec<_>>();
let cells = Self::cells_to_positions(cells);
let proof = api
.multiproof(at, number, extrinsics, block_len, cells)
.map_err(|kate_err| internal_err!("KateApi::proof failed: {kate_err:?}"))?
Expand Down