Skip to content
Merged
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
20 changes: 13 additions & 7 deletions src/strategies/keystore.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use rand::seq::IteratorRandom;
use rand::seq::SliceRandom;
use std::collections::HashMap;
use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
Expand Down Expand Up @@ -80,13 +81,18 @@ impl KeyStore {

pub async fn acquire_key(&self) -> Result<(String, PrivateKey), KeyStoreError> {
loop {
for (public_address, key_mutex) in &self.keys {
let mut key_data = key_mutex.lock().await;
let (private_key, in_use) = &mut *key_data;
if !*in_use {
*in_use = true;
self.keys_in_use_count.fetch_add(1, Ordering::Relaxed);
return Ok((public_address.clone(), private_key.clone()));
// Create a randomized list of keys to check
let mut shuffled_keys: Vec<_> = self.keys.iter().collect();
shuffled_keys.shuffle(&mut rand::thread_rng());

for (public_address, key_mutex) in shuffled_keys {
if let Ok(mut key_data) = key_mutex.try_lock() {
let (private_key, in_use) = &mut *key_data;
if !*in_use {
*in_use = true;
self.keys_in_use_count.fetch_add(1, Ordering::Relaxed);
return Ok((public_address.clone(), private_key.clone()));
}
}
}
info!("No keys available, waiting for notification");
Expand Down