Ecosystem/serai
Ecosystem/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2024-11-17 01:17:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Have Coin::get_outputs return by transaction, not by block

Browse source
This commit is contained in:
Luke Parker 2023-01-07 03:13:54 -05:00
parent b303649f9d
commit 9662e9e1af
No known key found for this signature in database
2 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
processor/src/coin/mod.rs
View file

@ -69,7 +69,7 @@ pub trait Coin {
&self, &self,
block: &Self::Block, block: &Self::Block,
key: <Self::Curve as Ciphersuite>::G, key: <Self::Curve as Ciphersuite>::G,
) -> Result<Vec<Self::Output>, CoinError>; ) -> Result<Vec<Vec<Self::Output>>, CoinError>;
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
async fn prepare_send( async fn prepare_send(

42
processor/src/coin/monero.rs
View file

@ -169,25 +169,33 @@ impl Coin for Monero {
&self, &self,
block: &Self::Block, block: &Self::Block,
key: dfg::EdwardsPoint, key: dfg::EdwardsPoint,
) -> Result<Vec<Self::Output>, CoinError> { ) -> Result<Vec<Vec<Self::Output>>, CoinError> {
Ok( let mut transactions = self
self .scanner(key)
.scanner(key) .scan(&self.rpc, block)
.scan(&self.rpc, block) .await
.await .map_err(|_| CoinError::ConnectionError)?
.map_err(|_| CoinError::ConnectionError)? .iter()
.iter() .map(|outputs| outputs.not_locked())
.flat_map(|outputs| outputs.not_locked()) .collect::<Vec<_>>();
// This should be pointless as we shouldn't be able to scan for any other subaddress
// This just ensures nothing invalid makes it in // This should be pointless as we shouldn't be able to scan for any other subaddress
.filter_map(|output| { // This just ensures nothing invalid makes it through
if ![EXTERNAL_SUBADDRESS, BRANCH_SUBADDRESS, CHANGE_SUBADDRESS] for transaction in transactions.iter_mut() {
*transaction = transaction
.drain(..)
.filter(|output| {
[EXTERNAL_SUBADDRESS, BRANCH_SUBADDRESS, CHANGE_SUBADDRESS]
.contains(&output.output.metadata.subaddress) .contains(&output.output.metadata.subaddress)
{
return None;
}
Some(Output::from(output))
}) })
.collect();
}
transactions = transactions.drain(..).filter(|outputs| !outputs.is_empty()).collect();
Ok(
transactions
.drain(..)
.map(|mut transaction| transaction.drain(..).map(Output::from).collect())
.collect(), .collect(),
) )
} }