Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-02-22 07:39:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Extract blinding factor and key recovery into functions on Transaction

Browse Source
This commit is contained in:
Thomas Eizinger 2021-05-14 13:00:25 +10:00
parent 91f54bf6b5
commit 523ee6088c
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
3 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -2265,7 +2265,7 @@ dependencies = [
[[package]] [[package]]
name = "monero" name = "monero"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/comit-network/monero-rs?branch=clsag#4c3b87d562f4b4119eff2739894a91e8c6e5381d" source = "git+https://github.com/comit-network/monero-rs?branch=open-outputs#e86521d9e4038958349a34765881589028c84dbb"
dependencies = [ dependencies = [
"base58-monero", "base58-monero",
"clear_on_drop", "clear_on_drop",

2
Cargo.toml
View File

@ -3,4 +3,4 @@ members = ["monero-adaptor", "monero-harness", "monero-rpc", "swap", "monero-wal
[patch.crates-io] [patch.crates-io]
torut = { git = "https://github.com/bonomat/torut/", branch = "feature-flag-tor-secret-keys", default-features = false, features = [ "v3", "control" ] } torut = { git = "https://github.com/bonomat/torut/", branch = "feature-flag-tor-secret-keys", default-features = false, features = [ "v3", "control" ] }
monero = { git = "https://github.com/comit-network/monero-rs", branch = "clsag" } monero = { git = "https://github.com/comit-network/monero-rs", branch = "open-outputs" }

43
monero-adaptor/tests/integration_test.rs
View File

@ -9,9 +9,7 @@ use monero::blockdata::transaction::{ExtraField, KeyImage, SubField, TxOutTarget
use monero::cryptonote::onetime_key::{KeyGenerator, MONERO_MUL_FACTOR}; use monero::cryptonote::onetime_key::{KeyGenerator, MONERO_MUL_FACTOR};
use monero::util::key::H; use monero::util::key::H;
use monero::util::ringct::{EcdhInfo, RctSig, RctSigBase, RctSigPrunable, RctType}; use monero::util::ringct::{EcdhInfo, RctSig, RctSigBase, RctSigPrunable, RctType};
use monero::{ use monero::{PrivateKey, PublicKey, Transaction, TransactionPrefix, TxIn, TxOut, VarInt};
PrivateKey, PublicKey, Transaction, TransactionPrefix, TxIn, TxOut, VarInt, ViewPair,
};
use monero_harness::Monero; use monero_harness::Monero;
use monero_rpc::monerod::{GetOutputsOut, MonerodRpc}; use monero_rpc::monerod::{GetOutputsOut, MonerodRpc};
use monero_wallet::MonerodClientExt; use monero_wallet::MonerodClientExt;
@ -64,39 +62,26 @@ async fn monerod_integration_test() {
let lock_tx_hash = transfer.tx_hash.parse().unwrap(); let lock_tx_hash = transfer.tx_hash.parse().unwrap();
let o_indexes_response = client.get_o_indexes(lock_tx_hash).await.unwrap();
let lock_tx = client let lock_tx = client
.get_transactions(&[lock_tx_hash]) .get_transactions(&[lock_tx_hash])
.await .await
.unwrap() .unwrap()
.pop() .pop()
.unwrap(); .unwrap();
let output_indices = client.get_o_indexes(lock_tx_hash).await.unwrap().o_indexes;
dbg!(&lock_tx.prefix.inputs);
let viewpair = ViewPair::from(&lock_kp);
let our_output = lock_tx let our_output = lock_tx
.check_outputs(&viewpair, 0..1, 0..1) .open_outputs(&lock_kp, 0..1, 0..1)
.expect("to have outputs in this transaction") .unwrap()
.pop() .pop()
.expect("to own at least one output"); .unwrap();
let actual_lock_amount = lock_tx.get_amount(&viewpair, &our_output).unwrap(); let actual_signing_key = our_output.signing_key.scalar;
let real_commitment_blinder = our_output.blinding_factor;
// We appear to be using the correct signing key, because we can
// find it in the ring! Conversely, the point corresponding to the
// "original" signing key is not part of the ring
let actual_signing_key = our_output.recover_key(&lock_kp).scalar;
assert_eq!(actual_lock_amount, lock_amount);
let real_key_offset = o_indexes_response.o_indexes[our_output.index];
let (lower, upper) = client.calculate_key_offset_boundaries().await.unwrap(); let (lower, upper) = client.calculate_key_offset_boundaries().await.unwrap();
let mut key_offsets = Vec::with_capacity(11); let mut key_offsets = Vec::with_capacity(11);
key_offsets.push(VarInt(real_key_offset)); key_offsets.push(VarInt(output_indices[our_output.index]));
for _ in 0..10 { for _ in 0..10 {
loop { loop {
@ -228,10 +213,6 @@ async fn monerod_integration_test() {
let pseudo_out = fee_key + out_pk[0].decompress().unwrap() + out_pk[1].decompress().unwrap(); let pseudo_out = fee_key + out_pk[0].decompress().unwrap() + out_pk[1].decompress().unwrap();
let (_, real_commitment_blinder) = lock_tx.clone().rct_signatures.sig.unwrap().ecdh_info
[our_output.index]
.open_commitment(&viewpair, &our_output.tx_pubkey, our_output.index);
let alpha = Scalar::random(&mut rng); let alpha = Scalar::random(&mut rng);
let responses = random_array(|| Scalar::random(&mut rng)); let responses = random_array(|| Scalar::random(&mut rng));
@ -291,7 +272,13 @@ async fn monerod_integration_test() {
I, I,
pseudo_out pseudo_out
)); ));
transaction.rct_signatures.p.as_mut().unwrap().Clsags.push(sig); transaction
.rct_signatures
.p
.as_mut()
.unwrap()
.Clsags
.push(sig);
client.send_raw_transaction(transaction).await.unwrap(); client.send_raw_transaction(transaction).await.unwrap();
} }