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

Update procesor/correct prior commit

Browse Source
This commit is contained in:
Luke Parker
2023-03-25 04:06:25 -04:00
parent 839734354a
commit 9157f8d0a0
11 changed files with 64 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
processor/src/coins/bitcoin.rs
View File

@@ -36,7 +36,10 @@ use bitcoin_serai::bitcoin::{
PackedLockTime, Sequence, Script, Witness, TxIn, TxOut, Address as BAddress,
};
use serai_client::{primitives::MAX_DATA_LEN, coins::bitcoin::Address};
use serai_client::{
primitives::{MAX_DATA_LEN, BITCOIN, Amount, Balance},
coins::bitcoin::Address,
};
use crate::{
coins::{
@@ -93,8 +96,8 @@ impl OutputTrait for Output {
res
}
fn amount(&self) -> u64 {
self.output.value()
fn balance(&self) -> Balance {
Balance { coin: BITCOIN, amount: Amount(self.output.value()) }
}
fn data(&self) -> &[u8] {
@@ -342,7 +345,7 @@ impl Coin for Bitcoin {
let offset_repr_ref: &[u8] = offset_repr.as_ref();
let kind = kinds[offset_repr_ref];
let data = if kind == OutputType::External {
let mut data = if kind == OutputType::External {
(|| {
for output in &tx.output {
if output.script_pubkey.is_op_return() {

7
processor/src/coins/mod.rs
View File

@@ -10,6 +10,8 @@ use frost::{
sign::PreprocessMachine,
};
use serai_client::primitives::Balance;
#[cfg(feature = "bitcoin")]
pub mod bitcoin;
#[cfg(feature = "bitcoin")]
@@ -94,8 +96,11 @@ pub trait Output: Send + Sync + Sized + Clone + PartialEq + Eq + Debug {
fn kind(&self) -> OutputType;
fn id(&self) -> Self::Id;
fn amount(&self) -> u64;
fn balance(&self) -> Balance;
fn amount(&self) -> u64 {
self.balance().amount.0
}
fn data(&self) -> &[u8];
fn write<W: io::Write>(&self, writer: &mut W) -> io::Result<()>;

9
processor/src/coins/monero.rs
View File

@@ -25,7 +25,10 @@ use monero_serai::{
use tokio::time::sleep;
pub use serai_client::{primitives::MAX_DATA_LEN, coins::monero::Address};
pub use serai_client::{
primitives::{MAX_DATA_LEN, MONERO, Amount, Balance},
coins::monero::Address,
};
use crate::{
Payment, Plan, additional_key,
@@ -62,8 +65,8 @@ impl OutputTrait for Output {
self.0.output.data.key.compress().to_bytes()
}
fn amount(&self) -> u64 {
self.0.commitment().amount
fn balance(&self) -> Balance {
Balance { coin: MONERO, amount: Amount(self.0.commitment().amount) }
}
fn data(&self) -> &[u8] {