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

Respond to 2 3

Browse Source 
We now use `FrostError::InternalError` instead of a panic to represent the mask
not being set.
This commit is contained in:
Luke Parker
2025-07-23 10:03:11 -04:00
parent cb1e6535cb
commit feb18d64a7
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
networks/monero/ringct/clsag/src/multisig.rs
View File

@@ -56,8 +56,7 @@ impl ClsagContext {
/// A channel to send the mask to use for the pseudo-out (rerandomized commitment) with. /// A channel to send the mask to use for the pseudo-out (rerandomized commitment) with.
/// ///
/// A mask must be sent along this channel before any preprocess addendums are handled. Breaking /// A mask must be sent along this channel before any preprocess addendums are handled.
/// this rule will cause a panic.
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct ClsagMultisigMaskSender { pub struct ClsagMultisigMaskSender {
buf: Arc<Mutex<Option<Scalar>>>, buf: Arc<Mutex<Option<Scalar>>>,
@@ -78,8 +77,8 @@ impl ClsagMultisigMaskSender {
} }
} }
impl ClsagMultisigMaskReceiver { impl ClsagMultisigMaskReceiver {
fn recv(self) -> Scalar { fn recv(self) -> Option<Scalar> {
self.buf.lock().unwrap() *self.buf.lock()
} }
} }
@@ -114,7 +113,7 @@ struct Interim {
/// FROST-inspired algorithm for producing a CLSAG signature. /// FROST-inspired algorithm for producing a CLSAG signature.
/// ///
/// Before this has its `process_addendum` called, a mask must be set. Else this will panic. /// Before this has its `process_addendum` called, a mask must be set.
/// ///
/// The message signed is expected to be a 32-byte value. Per Monero, it's the keccak256 hash of /// The message signed is expected to be a 32-byte value. Per Monero, it's the keccak256 hash of
/// the transaction data which is signed. This will panic if the message is not a 32-byte value. /// the transaction data which is signed. This will panic if the message is not a 32-byte value.
@@ -218,7 +217,14 @@ impl Algorithm<Ed25519> for ClsagMultisig {
// Fetch the mask from the Mutex // Fetch the mask from the Mutex
// We set it to a variable to ensure our view of it is consistent // We set it to a variable to ensure our view of it is consistent
// It was this or a mpsc channel... std doesn't have oneshot :/ // It was this or a mpsc channel... std doesn't have oneshot :/
self.mask = Some(self.mask_recv.take().unwrap().recv()); self.mask = Some(
self
.mask_recv
.take()
.unwrap()
.recv()
.ok_or(FrostError::InternalError("CLSAG mask was not provided"))?,
);
// Transcript the mask // Transcript the mask
self.transcript.append_message(b"mask", self.mask.expect("mask wasn't set").to_bytes()); self.transcript.append_message(b"mask", self.mask.expect("mask wasn't set").to_bytes());