2024-09-12 18:40:10 -04:00
|
|
|
use std::collections::HashMap;
|
|
|
|
|
|
Smash the singular `Ciphersuite` trait into multiple
This helps identify where the various functionalities are used, or rather, not
used. The `Ciphersuite` trait present in `patches/ciphersuite`, facilitating
the entire FCMP++ tree, only requires the markers _and_ canonical point
decoding. I've opened a PR to upstream such a trait into `group`
(https://github.com/zkcrypto/group/pull/68).
`WrappedGroup` is still justified for as long as `Group::generator` exists.
Moving `::generator()` to its own trait, on an independent structure (upstream)
would be massively appreciated. @tarcieri also wanted to update from
`fn generator()` to `const GENERATOR`, which would encourage further discussion
on https://github.com/zkcrypto/group/issues/32 and
https://github.com/zkcrypto/group/issues/45, which have been stagnant.
The `Id` trait is occasionally used yet really should be first off the chopping
block.
Finally, `WithPreferredHash` is only actually used around a third of the time,
which more than justifies it being a separate trait.
---
Updates `dalek_ff_group::Scalar` to directly re-export
`curve25519_dalek::Scalar`, as without issue. `dalek_ff_group::RistrettoPoint`
also could be replaced with an export of `curve25519_dalek::RistrettoPoint`,
yet the coordinator relies on how we implemented `Hash` on it for the hell of
it so it isn't worth it at this time. `dalek_ff_group::EdwardsPoint` can't be
replaced for an re-export of `curve25519_dalek::SubgroupPoint` as it doesn't
implement `zeroize`, `subtle` traits within a released, non-yanked version.
Relevance to https://github.com/serai-dex/serai/issues/201 and
https://github.com/dalek-cryptography/curve25519-dalek/issues/811#issuecomment-3247732746.
Also updates the `Ristretto` ciphersuite to prefer `Blake2b-512` over
`SHA2-512`. In order to maintain compliance with FROST's IETF standard,
`modular-frost` defines its own ciphersuite for Ristretto which still uses
`SHA2-512`.
2025-09-03 12:25:37 -04:00
|
|
|
use ciphersuite::*;
|
2025-08-25 09:17:29 -04:00
|
|
|
use dalek_ff_group::Ed25519;
|
2024-09-12 18:40:10 -04:00
|
|
|
|
2024-09-13 05:11:07 -04:00
|
|
|
use monero_wallet::{
|
2024-09-14 01:38:31 -04:00
|
|
|
block::Block as MBlock, rpc::ScannableBlock as MScannableBlock, ScanError, GuaranteedScanner,
|
2024-09-13 05:11:07 -04:00
|
|
|
};
|
2024-09-12 18:40:10 -04:00
|
|
|
|
|
|
|
|
use serai_client::networks::monero::Address;
|
|
|
|
|
|
|
|
|
|
use primitives::{ReceivedOutput, EventualityTracker};
|
2024-09-13 05:11:07 -04:00
|
|
|
use crate::{
|
2024-09-14 01:38:31 -04:00
|
|
|
EXTERNAL_SUBADDRESS, BRANCH_SUBADDRESS, CHANGE_SUBADDRESS, FORWARDED_SUBADDRESS, view_pair,
|
|
|
|
|
output::Output, transaction::Eventuality,
|
2024-09-13 05:11:07 -04:00
|
|
|
};
|
2024-09-12 18:40:10 -04:00
|
|
|
|
|
|
|
|
#[derive(Clone, Debug)]
|
|
|
|
|
pub(crate) struct BlockHeader(pub(crate) MBlock);
|
|
|
|
|
impl primitives::BlockHeader for BlockHeader {
|
|
|
|
|
fn id(&self) -> [u8; 32] {
|
|
|
|
|
self.0.hash()
|
|
|
|
|
}
|
|
|
|
|
fn parent(&self) -> [u8; 32] {
|
|
|
|
|
self.0.header.previous
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Clone, Debug)]
|
2024-09-13 05:11:07 -04:00
|
|
|
pub(crate) struct Block(pub(crate) MScannableBlock);
|
2024-09-12 18:40:10 -04:00
|
|
|
|
|
|
|
|
impl primitives::Block for Block {
|
|
|
|
|
type Header = BlockHeader;
|
|
|
|
|
|
Smash the singular `Ciphersuite` trait into multiple
This helps identify where the various functionalities are used, or rather, not
used. The `Ciphersuite` trait present in `patches/ciphersuite`, facilitating
the entire FCMP++ tree, only requires the markers _and_ canonical point
decoding. I've opened a PR to upstream such a trait into `group`
(https://github.com/zkcrypto/group/pull/68).
`WrappedGroup` is still justified for as long as `Group::generator` exists.
Moving `::generator()` to its own trait, on an independent structure (upstream)
would be massively appreciated. @tarcieri also wanted to update from
`fn generator()` to `const GENERATOR`, which would encourage further discussion
on https://github.com/zkcrypto/group/issues/32 and
https://github.com/zkcrypto/group/issues/45, which have been stagnant.
The `Id` trait is occasionally used yet really should be first off the chopping
block.
Finally, `WithPreferredHash` is only actually used around a third of the time,
which more than justifies it being a separate trait.
---
Updates `dalek_ff_group::Scalar` to directly re-export
`curve25519_dalek::Scalar`, as without issue. `dalek_ff_group::RistrettoPoint`
also could be replaced with an export of `curve25519_dalek::RistrettoPoint`,
yet the coordinator relies on how we implemented `Hash` on it for the hell of
it so it isn't worth it at this time. `dalek_ff_group::EdwardsPoint` can't be
replaced for an re-export of `curve25519_dalek::SubgroupPoint` as it doesn't
implement `zeroize`, `subtle` traits within a released, non-yanked version.
Relevance to https://github.com/serai-dex/serai/issues/201 and
https://github.com/dalek-cryptography/curve25519-dalek/issues/811#issuecomment-3247732746.
Also updates the `Ristretto` ciphersuite to prefer `Blake2b-512` over
`SHA2-512`. In order to maintain compliance with FROST's IETF standard,
`modular-frost` defines its own ciphersuite for Ristretto which still uses
`SHA2-512`.
2025-09-03 12:25:37 -04:00
|
|
|
type Key = <Ed25519 as WrappedGroup>::G;
|
2024-09-12 18:40:10 -04:00
|
|
|
type Address = Address;
|
|
|
|
|
type Output = Output;
|
|
|
|
|
type Eventuality = Eventuality;
|
|
|
|
|
|
|
|
|
|
fn id(&self) -> [u8; 32] {
|
2024-09-13 05:11:07 -04:00
|
|
|
self.0.block.hash()
|
2024-09-12 18:40:10 -04:00
|
|
|
}
|
|
|
|
|
|
2024-09-19 01:00:31 -04:00
|
|
|
fn scan_for_outputs_unordered(
|
|
|
|
|
&self,
|
|
|
|
|
_latest_active_key: Self::Key,
|
|
|
|
|
key: Self::Key,
|
|
|
|
|
) -> Vec<Self::Output> {
|
2024-09-14 01:38:31 -04:00
|
|
|
let mut scanner = GuaranteedScanner::new(view_pair(key));
|
|
|
|
|
scanner.register_subaddress(EXTERNAL_SUBADDRESS);
|
|
|
|
|
scanner.register_subaddress(BRANCH_SUBADDRESS);
|
|
|
|
|
scanner.register_subaddress(CHANGE_SUBADDRESS);
|
|
|
|
|
scanner.register_subaddress(FORWARDED_SUBADDRESS);
|
2024-09-13 05:11:07 -04:00
|
|
|
match scanner.scan(self.0.clone()) {
|
|
|
|
|
Ok(outputs) => outputs.not_additionally_locked().into_iter().map(Output).collect(),
|
2024-09-13 19:24:45 -04:00
|
|
|
Err(ScanError::UnsupportedProtocol(version)) => {
|
|
|
|
|
panic!("Monero unexpectedly hard-forked (version {version})")
|
|
|
|
|
}
|
|
|
|
|
Err(ScanError::InvalidScannableBlock(reason)) => {
|
|
|
|
|
panic!("fetched an invalid scannable block from the RPC: {reason}")
|
|
|
|
|
}
|
2024-09-13 05:11:07 -04:00
|
|
|
}
|
2024-09-12 18:40:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[allow(clippy::type_complexity)]
|
|
|
|
|
fn check_for_eventuality_resolutions(
|
|
|
|
|
&self,
|
|
|
|
|
eventualities: &mut EventualityTracker<Self::Eventuality>,
|
|
|
|
|
) -> HashMap<
|
|
|
|
|
<Self::Output as ReceivedOutput<Self::Key, Self::Address>>::TransactionId,
|
|
|
|
|
Self::Eventuality,
|
|
|
|
|
> {
|
2024-09-13 05:11:07 -04:00
|
|
|
let mut res = HashMap::new();
|
|
|
|
|
assert_eq!(self.0.block.transactions.len(), self.0.transactions.len());
|
|
|
|
|
for (hash, tx) in self.0.block.transactions.iter().zip(&self.0.transactions) {
|
|
|
|
|
if let Some(eventuality) = eventualities.active_eventualities.get(&tx.prefix().extra) {
|
|
|
|
|
if eventuality.eventuality.matches(tx) {
|
2024-09-13 19:24:45 -04:00
|
|
|
res.insert(*hash, eventualities.active_eventualities.remove(&tx.prefix().extra).unwrap());
|
2024-09-13 05:11:07 -04:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
res
|
2024-09-12 18:40:10 -04:00
|
|
|
}
|
|
|
|
|
}
|