Skip to content

Check state height check before querying reward proofs #3826

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
imabdulbasit wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Check state height check before querying reward proofs #3826

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
88 changes: 50 additions & 38 deletions sequencer/src/api/sql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,27 +120,33 @@ impl RewardAccountProofDataSource for SqlStorage {
"cannot get accounts for height {height}: no blocks available"
);

// Check if we have the desired state snapshot. If so, we can load the desired accounts
// directly.
if height < block_height {
let (tree, _) = load_v1_reward_accounts(self, height, &[account])
.await
.with_context(|| {
format!("failed to load v1 reward account {account:?} at height {height}")
})?;
ensure!(
height < block_height,
"requested height {height} is not yet available. latest block height: {block_height}"
);

let (proof, balance) = RewardAccountProofV1::prove(&tree, account.into())
.with_context(|| {
format!("reward account {account:?} not available at height {height}")
})?;
let merklized_state_height = tx
.get_last_state_height()
.await
.context("getting merklized state height")? as u64;
ensure!(
height <= merklized_state_height,
"requested height {height} is not yet available. latest merklized state height: \
{merklized_state_height}"
);

Ok(RewardAccountQueryDataV1 { balance, proof })
} else {
bail!(
"requested height {height} is not yet available (latest block height: \
{block_height})"
);
}
let (tree, _) = load_v1_reward_accounts(self, height, &[account])
.await
.with_context(|| {
format!("failed to load v1 reward account {account:?} at height {height}")
})?;

let (proof, balance) =
RewardAccountProofV1::prove(&tree, account.into()).with_context(|| {
format!("reward account {account:?} not available at height {height}")
})?;

Ok(RewardAccountQueryDataV1 { balance, proof })
}

async fn load_v2_reward_account_proof(
Expand All @@ -160,27 +166,33 @@ impl RewardAccountProofDataSource for SqlStorage {
"cannot get accounts for height {height}: no blocks available"
);

// Check if we have the desired state snapshot. If so, we can load the desired accounts
// directly.
if height < block_height {
let (tree, _) = load_v2_reward_accounts(self, height, &[account])
.await
.with_context(|| {
format!("failed to load v2 reward account {account:?} at height {height}")
})?;
ensure!(
height < block_height,
"requested height {height} is not yet available. latest block height: {block_height}"
);

let (proof, balance) = RewardAccountProofV2::prove(&tree, account.into())
.with_context(|| {
format!("reward account {account:?} not available at height {height}")
})?;
let merklized_state_height = tx
.get_last_state_height()
.await
.context("getting merklized state height")? as u64;
ensure!(
height <= merklized_state_height,
"requested height {height} is not yet available. latest merklized state height: \
{merklized_state_height}"
);

Ok(RewardAccountQueryDataV2 { balance, proof })
} else {
bail!(
"requested height {height} is not yet available (latest block height: \
{block_height})"
);
}
let (tree, _) = load_v2_reward_accounts(self, height, &[account])
.await
.with_context(|| {
format!("failed to load v2 reward account {account:?} at height {height}")
})?;

let (proof, balance) =
RewardAccountProofV2::prove(&tree, account.into()).with_context(|| {
format!("reward account {account:?} not available at height {height}")
})?;

Ok(RewardAccountQueryDataV2 { balance, proof })
}
}
impl CatchupStorage for SqlStorage {
Expand Down
Loading