Skip to content

Commit

Permalink
Merge branch 'main' into ma/simple-stake-table
Browse files Browse the repository at this point in the history
  • Loading branch information
imabdulbasit authored Dec 9, 2024
2 parents 53810bd + 006ce0c commit 27bf006
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion contracts/rust/adapter/src/jellyfish.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ impl From<VerifyingKey<Bn254>> for ParsedVerifyingKey {
// ```rust
// let srs = ark_srs::kzg10::aztec20::setup(2u64.pow(6) as usize + 2).expect("Aztec SRS fail to load");
// println!("{}", hex::encode(jf_utils::to_bytes!(&srs.beta_h).unwrap()));
// ````
// ```
assert_eq!(
g2_lsb.encode_hex::<String>(),
String::from("b0838893ec1f237e8b07323b0744599f4e97b598b3b589bcc2bc37b8d5c41801")
Expand Down
2 changes: 1 addition & 1 deletion marketplace-solver/src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ impl UpdateSolverState for GlobalState {
registration.body.active = active;
}

// The given signature key should also be from the database `signature_keys`.`
// The given signature key should also be from the database `signature_keys`.
if !registration.body.signature_keys.contains(&signature_key) {
return Err(SolverError::SignatureKeysMismatch(
signature_key.to_string(),
Expand Down
8 changes: 4 additions & 4 deletions sequencer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ use espresso_types::{
traits::EventConsumer, BackoffParams, L1ClientOptions, NodeState, PubKey, SeqTypes,
SolverAuctionResultsProvider, ValidatedState,
};
use futures::FutureExt;
use genesis::L1Finalized;
use hotshot::traits::election::static_committee::StaticCommittee;
use hotshot_types::traits::election::Membership;
use std::sync::Arc;
use tokio::select;
// Should move `STAKE_TABLE_CAPACITY` in the sequencer repo when we have variate stake table support
use libp2p::Multiaddr;
use network::libp2p::split_off_peer_id;
Expand Down Expand Up @@ -457,11 +457,11 @@ pub async fn init_node<P: SequencerPersistence, V: Versions>(
})?;

tracing::warn!("Waiting for at least one connection to be initialized");
futures::select! {
_ = cdn_network.wait_for_ready().fuse() => {
select! {
_ = cdn_network.wait_for_ready() => {
tracing::warn!("CDN connection initialized");
},
_ = p2p_network.wait_for_ready().fuse() => {
_ = p2p_network.wait_for_ready() => {
tracing::warn!("P2P connection initialized");
},
};
Expand Down

0 comments on commit 27bf006

Please sign in to comment.