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
2 changes: 1 addition & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ iota-rosetta = { path = "crates/iota-rosetta" }
iota-rpc-loadgen = { path = "crates/iota-rpc-loadgen" }
iota-sdk = { path = "crates/iota-sdk" }
# core-types with json format for REST API
iota-sdk2 = { package = "iota-rust-sdk", git = "https://github.com/iotaledger/iota-rust-sdk.git", rev = "cd97687c9316045351d7db8b389ea381a5c335e1", features = ["hash", "serde", "schemars"] }
iota-sdk2 = { package = "iota-rust-sdk", git = "https://github.com/iotaledger/iota-rust-sdk.git", rev = "93580286f3714248398d17e4481daf608508856a", features = ["hash", "serde", "schemars"] }
iota-simulator = { path = "crates/iota-simulator" }
iota-snapshot = { path = "crates/iota-snapshot" }
iota-source-validation = { path = "crates/iota-source-validation" }
Expand Down
1 change: 1 addition & 0 deletions crates/iota-core/benches/batch_verification_bench.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ fn async_verifier_bench(c: &mut Criterion) {
true, // accept_zklogin_in_multisig
true, // accept_passkey_in_multisig
Some(30),
true,
));

b.iter(|| {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,7 @@ impl AuthorityPerEpochStore {
protocol_config.accept_zklogin_in_multisig(),
protocol_config.accept_passkey_in_multisig(),
protocol_config.zklogin_max_epoch_upper_bound_delta(),
protocol_config.additional_multisig_checks(),
);

let authenticator_state_exists = epoch_start_configuration
Expand Down
7 changes: 7 additions & 0 deletions crates/iota-core/src/signature_verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ struct ZkLoginParams {
pub accept_passkey_in_multisig: bool,
/// Value that sets the upper bound for max_epoch in zkLogin signature.
pub zklogin_max_epoch_upper_bound_delta: Option<u64>,
/// Flag to determine whether additional multisig checks are performed.
pub additional_multisig_checks: bool,
}

impl SignatureVerifier {
Expand All @@ -137,6 +139,7 @@ impl SignatureVerifier {
accept_zklogin_in_multisig: bool,
accept_passkey_in_multisig: bool,
zklogin_max_epoch_upper_bound_delta: Option<u64>,
additional_multisig_checks: bool,
) -> Self {
Self {
committee,
Expand All @@ -163,6 +166,7 @@ impl SignatureVerifier {
accept_zklogin_in_multisig,
accept_passkey_in_multisig,
zklogin_max_epoch_upper_bound_delta,
additional_multisig_checks,
},
}
}
Expand All @@ -174,6 +178,7 @@ impl SignatureVerifier {
accept_zklogin_in_multisig: bool,
accept_passkey_in_multisig: bool,
zklogin_max_epoch_upper_bound_delta: Option<u64>,
additional_multisig_checks: bool,
) -> Self {
Self::new_with_batch_size(
committee,
Expand All @@ -183,6 +188,7 @@ impl SignatureVerifier {
accept_zklogin_in_multisig,
accept_passkey_in_multisig,
zklogin_max_epoch_upper_bound_delta,
additional_multisig_checks,
)
}

Expand Down Expand Up @@ -390,6 +396,7 @@ impl SignatureVerifier {
self.zk_login_params.accept_zklogin_in_multisig,
self.zk_login_params.accept_passkey_in_multisig,
self.zk_login_params.zklogin_max_epoch_upper_bound_delta,
self.zk_login_params.additional_multisig_checks,
);
verify_sender_signed_data_message_signatures(
signed_tx,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ async fn test_async_verifier() {
true, // accept_zklogin_in_multisig
true, // accept_passkey_in_multisig
Some(30),
true,
));

let tasks: Vec<_> = (0..32)
Expand Down
Loading
Loading