mirror of
https://github.com/serai-dex/serai.git
synced 2025-12-10 05:09:22 +00:00
Split reporting Batches to the signer from the Batch test
This commit is contained in:
@@ -5,17 +5,13 @@ use blake2::{digest::typenum::U32, Digest, Blake2b};
|
||||
use scale::Encode;
|
||||
use serai_db::{DbTxn, Db};
|
||||
|
||||
use serai_validator_sets_primitives::Session;
|
||||
use serai_in_instructions_primitives::{MAX_BATCH_SIZE, Batch};
|
||||
|
||||
use primitives::{EncodableG, task::ContinuallyRan};
|
||||
use crate::{
|
||||
db::{
|
||||
Returnable, ScannerGlobalDb, InInstructionData, ScanToBatchDb, BatchData, BatchToReportDb,
|
||||
BatchesToSign,
|
||||
},
|
||||
db::{Returnable, ScannerGlobalDb, InInstructionData, ScanToBatchDb, BatchData, BatchToReportDb},
|
||||
scan::next_to_scan_for_outputs_block,
|
||||
substrate, ScannerFeed, KeyFor,
|
||||
ScannerFeed, KeyFor,
|
||||
};
|
||||
|
||||
mod db;
|
||||
@@ -175,76 +171,6 @@ impl<D: Db, S: ScannerFeed> ContinuallyRan for BatchTask<D, S> {
|
||||
txn.commit();
|
||||
}
|
||||
|
||||
// TODO: This should be its own task. The above doesn't error, doesn't return early, so this
|
||||
// is fine, but this is precarious and would be better as its own task
|
||||
loop {
|
||||
let mut txn = self.db.txn();
|
||||
let Some(BatchData {
|
||||
session_to_sign_batch,
|
||||
external_key_for_session_to_sign_batch,
|
||||
batch,
|
||||
}) = BatchToReportDb::<S>::try_recv_batch(&mut txn)
|
||||
else {
|
||||
break;
|
||||
};
|
||||
|
||||
/*
|
||||
If this is the handover Batch, the first Batch signed by a session which retires the
|
||||
prior validator set, then this should only be signed after the prior validator set's
|
||||
actions are fully validated.
|
||||
|
||||
The new session will only be responsible for signing this Batch if the prior key has
|
||||
retired, successfully completed all its on-external-network actions.
|
||||
|
||||
We check here the prior session has successfully completed all its on-Serai-network
|
||||
actions by ensuring we've validated all Batches expected from it. Only then do we sign
|
||||
the Batch confirming the handover.
|
||||
|
||||
We also wait for the Batch confirming the handover to be accepted on-chain, ensuring we
|
||||
don't verify the prior session's Batches, sign the handover Batch and the following
|
||||
Batch, have the prior session publish a malicious Batch where our handover Batch should
|
||||
be, before our following Batch becomes our handover Batch.
|
||||
*/
|
||||
if session_to_sign_batch != Session(0) {
|
||||
// We may have Session(1)'s first Batch be Batch 0 if Session(0) never publishes a
|
||||
// Batch. This is fine as we'll hit the distinct Session check and then set the correct
|
||||
// values into this DB entry. All other sessions must complete the handover process,
|
||||
// which requires having published at least one Batch
|
||||
let (last_session, first_batch) =
|
||||
BatchDb::<S>::last_session_to_sign_batch_and_first_batch(&txn)
|
||||
.unwrap_or((Session(0), 0));
|
||||
// Because this boolean was expanded, we lose short-circuiting. That's fine
|
||||
let handover_batch = last_session != session_to_sign_batch;
|
||||
let batch_after_handover_batch =
|
||||
(last_session == session_to_sign_batch) && ((first_batch + 1) == batch.id);
|
||||
if handover_batch || batch_after_handover_batch {
|
||||
let verified_prior_batch = substrate::last_acknowledged_batch::<S>(&txn)
|
||||
// Since `batch.id = 0` in the Session(0)-never-published-a-Batch case, we don't
|
||||
// check `last_acknowledged_batch >= (batch.id - 1)` but instead this
|
||||
.map(|last_acknowledged_batch| (last_acknowledged_batch + 1) >= batch.id)
|
||||
// We've never verified any Batches
|
||||
.unwrap_or(false);
|
||||
if !verified_prior_batch {
|
||||
// Drop the txn to restore the Batch to report to the DB
|
||||
drop(txn);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// If this is the handover Batch, update the last session to sign a Batch
|
||||
if handover_batch {
|
||||
BatchDb::<S>::set_last_session_to_sign_batch_and_first_batch(
|
||||
&mut txn,
|
||||
session_to_sign_batch,
|
||||
batch.id,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
BatchesToSign::send(&mut txn, &external_key_for_session_to_sign_batch.0, &batch);
|
||||
txn.commit();
|
||||
}
|
||||
|
||||
// Run dependents if were able to batch any blocks
|
||||
Ok(next_block_to_batch <= highest_batchable)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user