Add hooks to the main loop

Lets the Ethereum processor track the first key set as soon as it's set.
This commit is contained in:
Luke Parker
2024-09-19 01:31:52 -04:00
parent a691be21c8
commit 1367e41510
9 changed files with 67 additions and 23 deletions

View File

@@ -13,7 +13,13 @@ use alloy_simple_request_transport::SimpleRequest;
use alloy_rpc_client::ClientBuilder;
use alloy_provider::{Provider, RootProvider};
use serai_client::validator_sets::primitives::Session;
use serai_env as env;
use serai_db::{Get, DbTxn, create_db};
use ::primitives::EncodableG;
use ::key_gen::KeyGenParams as KeyGenParamsTrait;
mod primitives;
pub(crate) use crate::primitives::*;
@@ -27,6 +33,28 @@ use scheduler::{SmartContract, Scheduler};
mod publisher;
use publisher::TransactionPublisher;
create_db! {
EthereumProcessor {
// The initial key for Serai on Ethereum
InitialSeraiKey: () -> EncodableG<k256::ProjectivePoint>,
}
}
struct SetInitialKey;
impl bin::Hooks for SetInitialKey {
fn on_message(txn: &mut impl DbTxn, msg: &messages::CoordinatorMessage) {
if let messages::CoordinatorMessage::Substrate(
messages::substrate::CoordinatorMessage::SetKeys { session, key_pair, .. },
) = msg
{
assert_eq!(*session, Session(0));
let key = KeyGenParams::decode_key(key_pair.1.as_ref())
.expect("invalid Ethereum key confirmed on Substrate");
InitialSeraiKey::set(txn, &EncodableG(key));
}
}
}
#[tokio::main]
async fn main() {
let db = bin::init();
@@ -45,11 +73,11 @@ async fn main() {
}
};
bin::main_loop::<_, KeyGenParams, _>(
db,
bin::main_loop::<SetInitialKey, _, KeyGenParams, _>(
db.clone(),
Rpc { provider: provider.clone() },
Scheduler::new(SmartContract { chain_id }),
TransactionPublisher::new(provider, {
TransactionPublisher::new(db, provider, {
let relayer_hostname = env::var("ETHEREUM_RELAYER_HOSTNAME")
.expect("ethereum relayer hostname wasn't specified")
.to_string();

View File

@@ -6,7 +6,7 @@ use serai_client::networks::ethereum::Address;
use primitives::{ReceivedOutput, EventualityTracker};
use ethereum_router::Executed;
use ethereum_router::{InInstruction as EthereumInInstruction, Executed};
use crate::{output::Output, transaction::Eventuality};
@@ -43,7 +43,7 @@ impl primitives::BlockHeader for Epoch {
#[derive(Clone, PartialEq, Eq, Debug)]
pub(crate) struct FullEpoch {
epoch: Epoch,
outputs: Vec<Output>,
instructions: Vec<EthereumInInstruction>,
executed: Vec<Executed>,
}
@@ -72,7 +72,7 @@ impl primitives::Block for FullEpoch {
// Associate all outputs with the latest active key
// We don't associate these with the current key within the SC as that'll cause outputs to be
// marked for forwarding if the SC is delayed to actually rotate
todo!("TODO")
self.instructions.iter().cloned().map(|instruction| Output { key, instruction }).collect()
}
#[allow(clippy::type_complexity)]

View File

@@ -13,22 +13,27 @@ use tokio::{
net::TcpStream,
};
use serai_db::Db;
use ethereum_schnorr::PublicKey;
use ethereum_router::{OutInstructions, Router};
use crate::transaction::{Action, Transaction};
use crate::{
InitialSeraiKey,
transaction::{Action, Transaction},
};
#[derive(Clone)]
pub(crate) struct TransactionPublisher {
initial_serai_key: PublicKey,
pub(crate) struct TransactionPublisher<D: Db> {
db: D,
rpc: Arc<RootProvider<SimpleRequest>>,
router: Arc<RwLock<Option<Router>>>,
relayer_url: String,
}
impl TransactionPublisher {
pub(crate) fn new(rpc: Arc<RootProvider<SimpleRequest>>, relayer_url: String) -> Self {
Self { initial_serai_key: todo!("TODO"), rpc, router: Arc::new(RwLock::new(None)), relayer_url }
impl<D: Db> TransactionPublisher<D> {
pub(crate) fn new(db: D, rpc: Arc<RootProvider<SimpleRequest>>, relayer_url: String) -> Self {
Self { db, rpc, router: Arc::new(RwLock::new(None)), relayer_url }
}
// This will always return Ok(Some(_)) or Err(_), never Ok(None)
@@ -43,7 +48,12 @@ impl TransactionPublisher {
let mut router = self.router.write().await;
// Check again if it's None in case a different task already did this
if router.is_none() {
let Some(router_actual) = Router::new(self.rpc.clone(), &self.initial_serai_key).await?
let Some(router_actual) = Router::new(
self.rpc.clone(),
&PublicKey::new(InitialSeraiKey::get(&self.db).unwrap().0)
.expect("initial key used by Serai wasn't representable on Ethereum"),
)
.await?
else {
Err(TransportErrorKind::Custom(
"publishing transaction yet couldn't find router on chain. was our node reset?"
@@ -60,7 +70,7 @@ impl TransactionPublisher {
}
}
impl signers::TransactionPublisher<Transaction> for TransactionPublisher {
impl<D: Db> signers::TransactionPublisher<Transaction> for TransactionPublisher<D> {
type EphemeralError = RpcError<TransportErrorKind>;
fn publish(