2024-09-12 18:40:10 -04:00
|
|
|
use std::io;
|
|
|
|
|
|
2025-11-22 08:54:46 -05:00
|
|
|
use ciphersuite::{
|
|
|
|
|
group::{ff::PrimeField, GroupEncoding},
|
|
|
|
|
WrappedGroup,
|
|
|
|
|
};
|
2025-08-25 09:17:29 -04:00
|
|
|
use dalek_ff_group::Ed25519;
|
2024-09-12 18:40:10 -04:00
|
|
|
|
|
|
|
|
use monero_wallet::WalletOutput;
|
|
|
|
|
|
|
|
|
|
use borsh::{BorshSerialize, BorshDeserialize};
|
|
|
|
|
|
2025-11-04 19:02:37 -05:00
|
|
|
use serai_primitives::{
|
|
|
|
|
coin::ExternalCoin,
|
|
|
|
|
balance::{Amount, ExternalBalance},
|
2024-09-12 18:40:10 -04:00
|
|
|
};
|
2025-11-04 19:02:37 -05:00
|
|
|
use serai_client_monero::Address;
|
2024-09-12 18:40:10 -04:00
|
|
|
|
|
|
|
|
use primitives::{OutputType, ReceivedOutput};
|
|
|
|
|
|
2024-09-13 02:12:32 -04:00
|
|
|
use crate::{EXTERNAL_SUBADDRESS, BRANCH_SUBADDRESS, CHANGE_SUBADDRESS, FORWARDED_SUBADDRESS};
|
|
|
|
|
|
2025-09-02 02:16:21 -04:00
|
|
|
#[derive(Clone, Copy, PartialEq, Eq, Default, Hash, Debug, BorshSerialize, BorshDeserialize)]
|
2024-09-12 18:40:10 -04:00
|
|
|
pub(crate) struct OutputId(pub(crate) [u8; 32]);
|
|
|
|
|
impl AsRef<[u8]> for OutputId {
|
|
|
|
|
fn as_ref(&self) -> &[u8] {
|
|
|
|
|
self.0.as_ref()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
impl AsMut<[u8]> for OutputId {
|
|
|
|
|
fn as_mut(&mut self) -> &mut [u8] {
|
|
|
|
|
self.0.as_mut()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[derive(Clone, PartialEq, Eq, Debug)]
|
2024-09-13 05:11:07 -04:00
|
|
|
pub(crate) struct Output(pub(crate) WalletOutput);
|
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
|
|
|
impl ReceivedOutput<<Ed25519 as WrappedGroup>::G, Address> for Output {
|
2024-09-12 18:40:10 -04:00
|
|
|
type Id = OutputId;
|
|
|
|
|
type TransactionId = [u8; 32];
|
|
|
|
|
|
|
|
|
|
fn kind(&self) -> OutputType {
|
2024-09-14 01:38:31 -04:00
|
|
|
let subaddress = self.0.subaddress().unwrap();
|
|
|
|
|
if subaddress == EXTERNAL_SUBADDRESS {
|
2024-09-13 02:12:32 -04:00
|
|
|
return OutputType::External;
|
|
|
|
|
}
|
2024-09-14 01:38:31 -04:00
|
|
|
if subaddress == BRANCH_SUBADDRESS {
|
2024-09-13 02:12:32 -04:00
|
|
|
return OutputType::Branch;
|
|
|
|
|
}
|
2024-09-14 01:38:31 -04:00
|
|
|
if subaddress == CHANGE_SUBADDRESS {
|
2024-09-13 02:12:32 -04:00
|
|
|
return OutputType::Change;
|
|
|
|
|
}
|
2024-09-14 01:38:31 -04:00
|
|
|
if subaddress == FORWARDED_SUBADDRESS {
|
2024-09-13 02:12:32 -04:00
|
|
|
return OutputType::Forwarded;
|
|
|
|
|
}
|
|
|
|
|
unreachable!("scanned output to unknown subaddress");
|
2024-09-12 18:40:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn id(&self) -> Self::Id {
|
|
|
|
|
OutputId(self.0.key().compress().to_bytes())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn transaction_id(&self) -> Self::TransactionId {
|
|
|
|
|
self.0.transaction()
|
|
|
|
|
}
|
|
|
|
|
|
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
|
|
|
fn key(&self) -> <Ed25519 as WrappedGroup>::G {
|
2024-09-12 18:40:10 -04:00
|
|
|
// The spend key will be a key we generated, so it'll be in the prime-order subgroup
|
|
|
|
|
// The output's key is the spend key + (key_offset * G), so it's in the prime-order subgroup if
|
|
|
|
|
// the spend key is
|
2025-11-22 08:54:46 -05:00
|
|
|
dalek_ff_group::EdwardsPoint::from_bytes(&self.0.key().compress().to_bytes()).unwrap() -
|
|
|
|
|
dalek_ff_group::EdwardsPoint(
|
|
|
|
|
*<Ed25519 as WrappedGroup>::generator() *
|
|
|
|
|
dalek_ff_group::Scalar::from_repr(<[u8; 32]>::from(self.0.key_offset())).unwrap(),
|
|
|
|
|
)
|
2024-09-12 18:40:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn presumed_origin(&self) -> Option<Address> {
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
|
2025-01-30 03:14:24 -05:00
|
|
|
fn balance(&self) -> ExternalBalance {
|
|
|
|
|
ExternalBalance { coin: ExternalCoin::Monero, amount: Amount(self.0.commitment().amount) }
|
2024-09-12 18:40:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn data(&self) -> &[u8] {
|
|
|
|
|
self.0.arbitrary_data().first().map_or(&[], Vec::as_slice)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn write<W: io::Write>(&self, writer: &mut W) -> io::Result<()> {
|
|
|
|
|
self.0.write(writer)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn read<R: io::Read>(reader: &mut R) -> io::Result<Self> {
|
|
|
|
|
WalletOutput::read(reader).map(Self)
|
|
|
|
|
}
|
|
|
|
|
}
|