Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
121 changes: 61 additions & 60 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ solana-big-mod-exp = "3.0.0"
solana-bincode = "3.1.0"
solana-blake3-hasher = "3.1.0"
solana-bloom = { path = "bloom", version = "=4.0.0-alpha.0", features = ["agave-unstable-api"] }
solana-bls-signatures = { version = "1.0.0", features = ["serde"] }
solana-bls-signatures = { version = "2.0.0-alpha.1", features = ["serde"] } #TODO: change to 2.0.0 before this gets into 4.0
solana-bn254 = "3.1.2"
solana-borsh = "3.0.0"
solana-bpf-loader-program = { path = "programs/bpf_loader", version = "=4.0.0-alpha.0", features = ["agave-unstable-api"] }
Expand Down
5 changes: 3 additions & 2 deletions dev-bins/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions feature-set/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ impl FeatureSet {
fix_alt_bn128_pairing_length_check: self
.is_active(&fix_alt_bn128_pairing_length_check::id()),
alt_bn128_little_endian: self.is_active(&alt_bn128_little_endian::id()),
bls_pubkey_management_in_vote_account: self
.is_active(&bls_pubkey_management_in_vote_account::id()),
}
}
}
Expand Down Expand Up @@ -1209,6 +1211,10 @@ pub mod alt_bn128_little_endian {
solana_pubkey::declare_id!("bnS3pWfLrxHRJvMyLm6EaYQkP7A2Fe9DxoKv4aGA8YM");
}

pub mod bls_pubkey_management_in_vote_account {
solana_pubkey::declare_id!("EGJLweNUVskAPEwpjvNB7JT6uUi6h4mFhowNYXVSrimG");
}

pub static FEATURE_NAMES: LazyLock<AHashMap<Pubkey, &'static str>> = LazyLock::new(|| {
[
(secp256k1_program_enabled::id(), "secp256k1 program"),
Expand Down Expand Up @@ -2168,6 +2174,10 @@ pub static FEATURE_NAMES: LazyLock<AHashMap<Pubkey, &'static str>> = LazyLock::n
alt_bn128_little_endian::id(),
"SIMD-0284: Add little-endian compatibility for alt_bn128",
),
(
bls_pubkey_management_in_vote_account::id(),
"SIMD-0387: BLS Pubkey Management in Vote Account",
),
/*************** ADD NEW FEATURES HERE ***************/
]
.iter()
Expand Down
6 changes: 5 additions & 1 deletion genesis/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,7 @@ mod tests {
solana_borsh::v1 as borsh1,
solana_genesis_config::GenesisConfig,
solana_stake_interface as stake,
solana_vote_program::vote_state::BLS_PUBLIC_KEY_COMPRESSED_SIZE,
std::{collections::HashMap, fs::remove_file, io::Write, path::Path},
test_case::test_case,
};
Expand Down Expand Up @@ -1438,7 +1439,10 @@ mod tests {
);
} else {
assert!(b64_account.bls_pubkey.is_none());
assert!(vote_state.bls_pubkey_compressed.is_none());
assert_eq!(
vote_state.bls_pubkey_compressed,
Some([0u8; BLS_PUBLIC_KEY_COMPRESSED_SIZE])
);
}

// check stake account
Expand Down
5 changes: 3 additions & 2 deletions programs/sbf/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions programs/vote/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ num-traits = { workspace = true }
serde = { workspace = true }
solana-account = { workspace = true }
solana-bincode = { workspace = true }
solana-bls-signatures = { workspace = true }
solana-clock = { workspace = true }
solana-epoch-schedule = { workspace = true }
solana-frozen-abi = { workspace = true, optional = true, features = [
Expand Down
Loading
Loading