diff --git a/coins/monero/src/transaction/mixins.rs b/coins/monero/src/transaction/decoys.rs similarity index 79% rename from coins/monero/src/transaction/mixins.rs rename to coins/monero/src/transaction/decoys.rs index 6d283028..d34bb3e6 100644 --- a/coins/monero/src/transaction/mixins.rs +++ b/coins/monero/src/transaction/decoys.rs @@ -17,7 +17,7 @@ const BLOCK_TIME: usize = 120; const BLOCKS_PER_YEAR: usize = 365 * 24 * 60 * 60 / BLOCK_TIME; const TIP_APPLICATION: f64 = (LOCK_WINDOW * BLOCK_TIME) as f64; -const MIXINS: usize = 11; +const DECOYS: usize = 11; lazy_static! { static ref GAMMA: Gamma = Gamma::new(19.28, 1.0 / 1.61).unwrap(); @@ -60,11 +60,11 @@ async fn select_single( } // Uses VarInt as this is solely used for key_offsets which is serialized by monero-rs -fn offset(mixins: &[u64]) -> Vec { - let mut res = vec![VarInt(mixins[0])]; - res.resize(mixins.len(), VarInt(0)); - for m in (1 .. mixins.len()).rev() { - res[m] = VarInt(mixins[m] - mixins[m - 1]); +fn offset(decoys: &[u64]) -> Vec { + let mut res = vec![VarInt(decoys[0])]; + res.resize(decoys.len(), VarInt(0)); + for m in (1 .. decoys.len()).rev() { + res[m] = VarInt(decoys[m] - decoys[m - 1]); } res } @@ -99,44 +99,44 @@ pub(crate) async fn select( let mut res = Vec::with_capacity(inputs.len()); for (i, o) in outputs.iter().enumerate() { - let mut mixins = Vec::with_capacity(MIXINS); - for _ in 0 .. MIXINS { - mixins.push(select_single(rng, rpc, height, &distribution, high, per_second, &mut used).await?); + let mut decoys = Vec::with_capacity(DECOYS); + for _ in 0 .. DECOYS { + decoys.push(select_single(rng, rpc, height, &distribution, high, per_second, &mut used).await?); } - mixins.sort_by(|a, b| a.0.cmp(&b.0)); + decoys.sort_by(|a, b| a.0.cmp(&b.0)); // Make sure the TX passes the sanity check that the median output is within the last 40% // This actually checks the median is within the last third, a slightly more aggressive boundary, // as the height used in this calculation will be slightly under the height this is sanity // checked against - while mixins[MIXINS / 2].0 < (high * 2 / 3) { + while decoys[DECOYS / 2].0 < (high * 2 / 3) { // If it's not, update the bottom half with new values to ensure the median only moves up - for m in 0 .. MIXINS / 2 { + for m in 0 .. DECOYS / 2 { // We could not remove this, saving CPU time and removing low values as possibilities, yet - // it'd increase the amount of mixins required to create this transaction and some banned + // it'd increase the amount of decoys required to create this transaction and some banned // outputs may be the best options - used.remove(&mixins[m].0); - mixins[m] = select_single(rng, rpc, height, &distribution, high, per_second, &mut used).await?; + used.remove(&decoys[m].0); + decoys[m] = select_single(rng, rpc, height, &distribution, high, per_second, &mut used).await?; } - mixins.sort_by(|a, b| a.0.cmp(&b.0)); + decoys.sort_by(|a, b| a.0.cmp(&b.0)); } // Replace the closest selected decoy with the actual let mut replace = 0; let mut distance = u64::MAX; - for m in 0 .. mixins.len() { - let diff = mixins[m].0.abs_diff(o.0); + for m in 0 .. decoys.len() { + let diff = decoys[m].0.abs_diff(o.0); if diff < distance { replace = m; distance = diff; } } - mixins[replace] = outputs[i]; + decoys[replace] = outputs[i]; res.push(( - offset(&mixins.iter().map(|output| output.0).collect::>()), + offset(&decoys.iter().map(|output| output.0).collect::>()), u8::try_from(replace).unwrap(), - mixins.iter().map(|output| output.1).collect() + decoys.iter().map(|output| output.1).collect() )); } diff --git a/coins/monero/src/transaction/mod.rs b/coins/monero/src/transaction/mod.rs index 25a842d7..08f5c8d3 100644 --- a/coins/monero/src/transaction/mod.rs +++ b/coins/monero/src/transaction/mod.rs @@ -37,7 +37,7 @@ use crate::{ #[cfg(feature = "multisig")] use crate::frost::MultisigError; -mod mixins; +mod decoys; #[cfg(feature = "multisig")] mod multisig; @@ -203,8 +203,8 @@ async fn prepare_inputs( let mut signable = Vec::with_capacity(inputs.len()); - // Select mixins - let mixins = mixins::select( + // Select decoys + let decoys = decoys::select( rng, rpc, rpc.get_height().await.map_err(|e| TransactionError::RpcError(e))? - 10, @@ -215,8 +215,8 @@ async fn prepare_inputs( signable.push(( spend + input.key_offset, clsag::Input::new( - mixins[i].2.clone(), - mixins[i].1, + decoys[i].2.clone(), + decoys[i].1, input.commitment ).map_err(|e| TransactionError::ClsagError(e))?, key_image::generate(&(spend + input.key_offset)) @@ -224,7 +224,7 @@ async fn prepare_inputs( tx.prefix.inputs.push(TxIn::ToKey { amount: VarInt(0), - key_offsets: mixins[i].0.clone(), + key_offsets: decoys[i].0.clone(), k_image: KeyImage { image: Hash(signable[i].2.compress().to_bytes()) } }); } diff --git a/coins/monero/src/transaction/multisig.rs b/coins/monero/src/transaction/multisig.rs index fcf2abc0..52c27143 100644 --- a/coins/monero/src/transaction/multisig.rs +++ b/coins/monero/src/transaction/multisig.rs @@ -19,7 +19,7 @@ use crate::{ frost::{Transcript, Ed25519}, key_image, bulletproofs, clsag, rpc::Rpc, - transaction::{TransactionError, SignableTransaction, mixins} + transaction::{TransactionError, SignableTransaction, decoys} }; pub struct TransactionMachine { @@ -78,9 +78,9 @@ impl SignableTransaction { // Not only is this an output, but this locks to the base keys to be complete with the above key offsets transcript.append_message(b"change", &self.change.as_bytes()); - // Select mixins - let mixins = mixins::select( - &mut ChaCha12Rng::from_seed(transcript.rng_seed(b"mixins", None)), + // Select decoys + let decoys = decoys::select( + &mut ChaCha12Rng::from_seed(transcript.rng_seed(b"decoys", None)), rpc, height, &self.inputs @@ -99,8 +99,8 @@ impl SignableTransaction { clsag::Multisig::new( transcript.clone(), clsag::Input::new( - mixins[i].2.clone(), - mixins[i].1, + decoys[i].2.clone(), + decoys[i].1, input.commitment ).map_err(|e| TransactionError::ClsagError(e))?, msg.clone(), @@ -113,7 +113,7 @@ impl SignableTransaction { inputs.push(TxIn::ToKey { amount: VarInt(0), - key_offsets: mixins[i].0.clone(), + key_offsets: decoys[i].0.clone(), k_image: KeyImage { image: Hash([0; 32]) } }); }