Ecosystem/serai
Ecosystem/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-01-22 02:34:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Stop attempting to call set_keys if another validator does

Browse source 
This prevents this function from hanging ad-infinitum.
This commit is contained in:
Luke Parker 2023-08-14 06:53:20 -04:00
parent 5e02f936e4
commit acc19e2817
No known key found for this signature in database
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
coordinator/src/main.rs
View file

@ -196,13 +196,20 @@ pub async fn scan_tributaries<D: Db, Pro: Processors, P: P2p>(
loop { loop {
match serai.publish(&tx).await { match serai.publish(&tx).await {
Ok(hash) => { Ok(hash) => {
log::info!("set key pair for {:?} in TX {}", set, hex::encode(hash)) log::info!("set key pair for {:?} in TX {}", set, hex::encode(hash));
break;
} }
// This is assumed to be some ephemeral error due to the assumed fault-free // This is assumed to be some ephemeral error due to the assumed fault-free
// creation // creation
// TODO: Differentiate connection errors from already published to an invariant // TODO: Differentiate connection errors from invariants
Err(e) => { Err(e) => {
log::error!("couldn't connect to Serai node to publish vote TX: {:?}", e); // Check if this failed because the keys were already set by someone else
if matches!(serai.get_keys(spec.set()).await, Ok(Some(_))) {
log::info!("other party set key pair for {:?}", set);
break;
}
log::error!("couldn't connect to Serai node to publish set_keys TX: {:?}", e);
tokio::time::sleep(Duration::from_secs(10)).await; tokio::time::sleep(Duration::from_secs(10)).await;
} }
} }
@ -566,8 +573,9 @@ pub async fn handle_processors<D: Db, Pro: Processors, P: P2p>(
// TODO: Check this key's key pair's substrate key is authorized to publish batches // TODO: Check this key's key pair's substrate key is authorized to publish batches
// TODO: Check the batch ID is an atomic increment // TODO: Check the batch ID is an atomic increment
let tx = Serai::execute_batch(batch.clone());
loop { loop {
match serai.publish(&Serai::execute_batch(batch.clone())).await { match serai.publish(&tx).await {
Ok(hash) => { Ok(hash) => {
log::info!( log::info!(
"executed batch {:?} {} (block {}) in TX {}", "executed batch {:?} {} (block {}) in TX {}",
@ -579,6 +587,8 @@ pub async fn handle_processors<D: Db, Pro: Processors, P: P2p>(
break; break;
} }
Err(e) => { Err(e) => {
// TODO: Check if this failed because the batch was already published by someone
// else
log::error!("couldn't connect to Serai node to publish batch TX: {:?}", e); log::error!("couldn't connect to Serai node to publish batch TX: {:?}", e);
tokio::time::sleep(Duration::from_secs(10)).await; tokio::time::sleep(Duration::from_secs(10)).await;
} }