Skip to content

fix(store): reject future sync block ranges #2123

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
Mr-kay-cloud2 wants to merge 1 commit into
base: next
Choose a base branch
from
Open

fix(store): reject future sync block ranges #2123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
- [BREAKING] Renamed `SubmitProvenBatch` RPC endpoint to `SubmitProvenTxBatch` ([#2094](https://github.com/0xMiden/node/pull/2094)).
- Fixed block producer mempool panic when selecting transactions that depend on notes created by pruned committed transactions ([#2097](https://github.com/0xMiden/node/pull/2097)).
- Implemented filtering based on the network account note script root allowlist in ntx-builder ([#2042](https://github.com/0xMiden/node/issues/2042)).
- Validated sync endpoint block ranges against the committed chain tip before querying state ([#1866](https://github.com/0xMiden/node/issues/1866)).

- [BREAKING] Renamed `ExplorerStatusDetails` fields in the network monitor's `/status` payload from `number_of_*` to `total_*` (`total_transactions`, `total_nullifiers`, `total_notes`, `total_account_updates`). The values now represent network-wide cumulative totals from the explorer's `overviewStats` query instead of last-block counts.
- [BREAKING] Removed `--wallet-filepath` / `--counter-filepath` flags and the `MIDEN_MONITOR_WALLET_FILEPATH` / `MIDEN_MONITOR_COUNTER_FILEPATH` env vars from the network monitor. The monitor now keeps wallet and counter accounts fully in memory and regenerates them on every startup; the dashboard's counter value resets to zero on restart.
Expand Down
20 changes: 20 additions & 0 deletions crates/store/src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,11 @@ pub enum SyncNullifiersError {
DatabaseError(#[from] DatabaseError),
#[error("invalid block range")]
InvalidBlockRange(#[from] InvalidBlockRange),
#[error("block_to ({block_to}) is greater than chain tip ({chain_tip})")]
FutureBlock {
chain_tip: BlockNumber,
block_to: BlockNumber,
},
#[error("unsupported prefix length: {0} (only 16-bit prefixes are supported)")]
InvalidPrefixLength(u32),
#[error("malformed nullifier prefix")]
Expand All @@ -375,6 +380,11 @@ pub enum SyncAccountVaultError {
DatabaseError(#[from] DatabaseError),
#[error("invalid block range")]
InvalidBlockRange(#[from] InvalidBlockRange),
#[error("block_to ({block_to}) is greater than chain tip ({chain_tip})")]
FutureBlock {
chain_tip: BlockNumber,
block_to: BlockNumber,
},
#[error("malformed account ID")]
DeserializationFailed(#[from] ConversionError),
#[error("account {0} is not public")]
Expand All @@ -391,6 +401,11 @@ pub enum SyncAccountStorageMapsError {
DatabaseError(#[from] DatabaseError),
#[error("invalid block range")]
InvalidBlockRange(#[from] InvalidBlockRange),
#[error("block_to ({block_to}) is greater than chain tip ({chain_tip})")]
FutureBlock {
chain_tip: BlockNumber,
block_to: BlockNumber,
},
#[error("malformed account ID")]
DeserializationFailed(#[from] ConversionError),
#[error("account {0} not found")]
Expand Down Expand Up @@ -485,6 +500,11 @@ pub enum SyncTransactionsError {
DatabaseError(#[from] DatabaseError),
#[error("invalid block range")]
InvalidBlockRange(#[from] InvalidBlockRange),
#[error("block_to ({block_to}) is greater than chain tip ({chain_tip})")]
FutureBlock {
chain_tip: BlockNumber,
block_to: BlockNumber,
},
#[error("malformed account ID")]
DeserializationFailed(#[from] ConversionError),
#[error("account {0} not found")]
Expand Down
31 changes: 23 additions & 8 deletions crates/store/src/server/rpc_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ impl rpc_server::Rpc for StoreApi {
read_block_range::<SyncNullifiersError>(request.block_range, "SyncNullifiersRequest")?
.into_inclusive_range::<SyncNullifiersError>()?;

let chain_tip = self.state.chain_tip(Finality::Committed).await;
if *block_range.end() > chain_tip {
Err(SyncNullifiersError::FutureBlock { chain_tip, block_to: *block_range.end() })?;
}

let (nullifiers, block_num) = self
.state
.sync_nullifiers(request.prefix_len, request.nullifiers, block_range)
Expand All @@ -138,8 +143,6 @@ impl rpc_server::Rpc for StoreApi {
})
.collect();

let chain_tip = self.state.chain_tip(Finality::Committed).await;

Ok(Response::new(proto::rpc::SyncNullifiersResponse {
pagination_info: Some(proto::rpc::PaginationInfo {
chain_tip: chain_tip.as_u32(),
Expand Down Expand Up @@ -314,6 +317,11 @@ impl rpc_server::Rpc for StoreApi {
)?
.into_inclusive_range::<SyncAccountVaultError>()?;

let chain_tip = self.state.chain_tip(Finality::Committed).await;
if *block_range.end() > chain_tip {
Err(SyncAccountVaultError::FutureBlock { chain_tip, block_to: *block_range.end() })?;
}

let (last_included_block, updates) = self
.state
.sync_account_vault(account_id, block_range)
Expand All @@ -332,8 +340,6 @@ impl rpc_server::Rpc for StoreApi {
})
.collect();

let chain_tip = self.state.chain_tip(Finality::Committed).await;

Ok(Response::new(proto::rpc::SyncAccountVaultResponse {
pagination_info: Some(proto::rpc::PaginationInfo {
chain_tip: chain_tip.as_u32(),
Expand Down Expand Up @@ -367,6 +373,14 @@ impl rpc_server::Rpc for StoreApi {
)?
.into_inclusive_range::<SyncAccountStorageMapsError>()?;

let chain_tip = self.state.chain_tip(Finality::Committed).await;
if *block_range.end() > chain_tip {
Err(SyncAccountStorageMapsError::FutureBlock {
chain_tip,
block_to: *block_range.end(),
})?;
}

let storage_maps_page = self
.state
.sync_account_storage_maps(account_id, block_range)
Expand All @@ -384,8 +398,6 @@ impl rpc_server::Rpc for StoreApi {
})
.collect();

let chain_tip = self.state.chain_tip(Finality::Committed).await;

Ok(Response::new(proto::rpc::SyncAccountStorageMapsResponse {
pagination_info: Some(proto::rpc::PaginationInfo {
chain_tip: chain_tip.as_u32(),
Expand Down Expand Up @@ -440,6 +452,11 @@ impl rpc_server::Rpc for StoreApi {
)?
.into_inclusive_range::<SyncTransactionsError>()?;

let chain_tip = self.state.chain_tip(Finality::Committed).await;
if *block_range.end() > chain_tip {
Err(SyncTransactionsError::FutureBlock { chain_tip, block_to: *block_range.end() })?;
}

let account_ids: Vec<AccountId> =
read_account_ids::<SyncTransactionsError, _>(request.account_ids)?;

Expand All @@ -459,8 +476,6 @@ impl rpc_server::Rpc for StoreApi {
.map(crate::db::TransactionRecord::into_proto)
.collect();

let chain_tip = self.state.chain_tip(Finality::Committed).await;

Ok(Response::new(proto::rpc::SyncTransactionsResponse {
pagination_info: Some(proto::rpc::PaginationInfo {
chain_tip: chain_tip.as_u32(),
Expand Down
Loading