absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-08 12:19:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split FinalizedBlock into ExternalBlock and SeraiBlock

Browse Source 
Also re-arranges their orders.
This commit is contained in:
Luke Parker
2023-04-20 06:59:42 -04:00
parent 9c2a44f9df
commit a26ca1a92f
3 changed files with 76 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
coordinator/src/tributary/mod.rs
View File

@@ -157,13 +157,17 @@ pub enum Transaction {
DkgCommitments(u32, Vec<u8>, Signed),
DkgShares(u32, HashMap<Participant, Vec<u8>>, Signed),
SignPreprocess(SignData),
SignShare(SignData),
FinalizedBlock(u64),
// When an external block is finalized, we can allow the associated batch IDs
ExternalBlock(u64),
// When a Serai block is finalized, with the contained batches, we can allow the associated plan
// IDs
SeraiBlock(u64),
BatchPreprocess(SignData),
BatchShare(SignData),
SignPreprocess(SignData),
SignShare(SignData),
}
impl ReadWrite for Transaction {
@@ -218,17 +222,24 @@ impl ReadWrite for Transaction {
Ok(Transaction::DkgShares(attempt, shares, signed))
}
2 => SignData::read(reader).map(Transaction::SignPreprocess),
3 => SignData::read(reader).map(Transaction::SignShare),
4 => {
2 => {
let mut block = [0; 8];
reader.read_exact(&mut block)?;
Ok(Transaction::FinalizedBlock(u64::from_le_bytes(block)))
Ok(Transaction::ExternalBlock(u64::from_le_bytes(block)))
}
5 => SignData::read(reader).map(Transaction::BatchPreprocess),
6 => SignData::read(reader).map(Transaction::BatchShare),
3 => {
let mut block = [0; 8];
reader.read_exact(&mut block)?;
Ok(Transaction::SeraiBlock(u64::from_le_bytes(block)))
}
4 => SignData::read(reader).map(Transaction::BatchPreprocess),
5 => SignData::read(reader).map(Transaction::BatchShare),
6 => SignData::read(reader).map(Transaction::SignPreprocess),
7 => SignData::read(reader).map(Transaction::SignShare),
_ => Err(io::Error::new(io::ErrorKind::Other, "invalid transaction type")),
}
}
@@ -274,28 +285,33 @@ impl ReadWrite for Transaction {
signed.write(writer)
}
Transaction::SignPreprocess(data) => {
Transaction::ExternalBlock(block) => {
writer.write_all(&[2])?;
data.write(writer)
}
Transaction::SignShare(data) => {
writer.write_all(&[3])?;
data.write(writer)
writer.write_all(&block.to_le_bytes())
}
Transaction::FinalizedBlock(block) => {
writer.write_all(&[4])?;
Transaction::SeraiBlock(block) => {
writer.write_all(&[3])?;
writer.write_all(&block.to_le_bytes())
}
Transaction::BatchPreprocess(data) => {
writer.write_all(&[5])?;
writer.write_all(&[4])?;
data.write(writer)
}
Transaction::BatchShare(data) => {
writer.write_all(&[5])?;
data.write(writer)
}
Transaction::SignPreprocess(data) => {
writer.write_all(&[6])?;
data.write(writer)
}
Transaction::SignShare(data) => {
writer.write_all(&[7])?;
data.write(writer)
}
}
}
}
@@ -306,13 +322,15 @@ impl TransactionTrait for Transaction {
Transaction::DkgCommitments(_, _, signed) => TransactionKind::Signed(signed),
Transaction::DkgShares(_, _, signed) => TransactionKind::Signed(signed),
Transaction::SignPreprocess(data) => TransactionKind::Signed(&data.signed),
Transaction::SignShare(data) => TransactionKind::Signed(&data.signed),
Transaction::FinalizedBlock(_) => TransactionKind::Provided,
// TODO: Tributary requires these be perfectly ordered, yet they have two separate clocks
Transaction::ExternalBlock(_) => TransactionKind::Provided,
Transaction::SeraiBlock(_) => TransactionKind::Provided,
Transaction::BatchPreprocess(data) => TransactionKind::Signed(&data.signed),
Transaction::BatchShare(data) => TransactionKind::Signed(&data.signed),
Transaction::SignPreprocess(data) => TransactionKind::Signed(&data.signed),
Transaction::SignShare(data) => TransactionKind::Signed(&data.signed),
}
}