Skip to content

fix: fix start trusted set #58

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

Merged
fakedev9999 merged 3 commits into from
Oct 3, 2025
Merged

fix: fix start trusted set #58

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54ef4d5
fix: fix start trusted set
fakedev9999 Oct 3, 2025
ccfa1e6
fix: filter non-commit votes
fakedev9999 Oct 3, 2025
eed2e67
fix: check threshold for trusted validators as well
fakedev9999 Oct 3, 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
21 changes: 13 additions & 8 deletions script/src/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,21 +78,22 @@ pub async fn find_block_to_request(

// If the consensus threshold is not met with the transition from the start block to the ideal block,
// the first block to match the threshold will be used as the block to request.
let start_block_validators = client.fetch_validators(start_block + 1).await?;
let start_validator_set = Set::new(start_block_validators, None);

let mut curr_end_block = ideal_block_to_request;
loop {
if curr_end_block - start_block == 1 {
return Ok(Some(curr_end_block));
}
let start_block_validators = client.fetch_validators(start_block).await?;
let start_validator_set = Set::new(start_block_validators, None);
let target_block_validators = client.fetch_validators(curr_end_block).await?;
let target_validator_set = Set::new(target_block_validators, None);
let target_block_commit = client.fetch_commit(curr_end_block).await?;

if is_valid_skip(
start_validator_set,
target_validator_set,
target_block_commit.result.signed_header.commit,
&start_validator_set,
&target_validator_set,
&target_block_commit.result.signed_header.commit,
) {
return Ok(Some(curr_end_block));
}
Expand Down Expand Up @@ -281,9 +282,9 @@ async fn fetch_light_block(

/// Determines if a valid skip is possible between start_block and target_block.
pub fn is_valid_skip(
start_validator_set: TendermintValidatorSet,
target_validator_set: TendermintValidatorSet,
target_block_commit: Commit,
start_validator_set: &TendermintValidatorSet,
target_validator_set: &TendermintValidatorSet,
target_block_commit: &Commit,
) -> bool {
let threshold = 2_f64 / 3_f64;
let mut shared_voting_power = 0_u64;
Expand All @@ -301,6 +302,10 @@ pub fn is_valid_skip(
{
// Confirm that the validator has signed on target_block.
for sig in target_block_commit.signatures.iter() {
if !sig.is_commit() {
continue;
}

if let Some(validator_address) = sig.validator_address() {
if validator_address == target_block_validator.address {
// Add the shared voting power to the validator
Expand Down
Loading