-
Notifications
You must be signed in to change notification settings - Fork 153
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into utxo-retaddr
- Loading branch information
Showing
33 changed files
with
1,236 additions
and
913 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| use criterion::{black_box, criterion_group, criterion_main, Criterion, SamplingMode}; | ||
| use kaspa_addresses::{Address, Prefix, Version}; | ||
| use kaspa_consensus::processes::transaction_validator::transaction_validator_populated::{ | ||
| check_scripts_par_iter, check_scripts_par_iter_pool, check_scripts_sequential, | ||
| }; | ||
| use kaspa_consensus_core::hashing::sighash::{calc_schnorr_signature_hash, SigHashReusedValuesUnsync}; | ||
| use kaspa_consensus_core::hashing::sighash_type::SIG_HASH_ALL; | ||
| use kaspa_consensus_core::subnets::SubnetworkId; | ||
| use kaspa_consensus_core::tx::{MutableTransaction, Transaction, TransactionInput, TransactionOutpoint, UtxoEntry}; | ||
| use kaspa_txscript::caches::Cache; | ||
| use kaspa_txscript::pay_to_address_script; | ||
| use kaspa_utils::iter::parallelism_in_power_steps; | ||
| use rand::{thread_rng, Rng}; | ||
| use secp256k1::Keypair; | ||
|
|
||
| // You may need to add more detailed mocks depending on your actual code. | ||
| fn mock_tx(inputs_count: usize, non_uniq_signatures: usize) -> (Transaction, Vec<UtxoEntry>) { | ||
| let reused_values = SigHashReusedValuesUnsync::new(); | ||
| let dummy_prev_out = TransactionOutpoint::new(kaspa_hashes::Hash::from_u64_word(1), 1); | ||
| let mut tx = Transaction::new( | ||
| 0, | ||
| vec![], | ||
| vec![], | ||
| 0, | ||
| SubnetworkId::from_bytes([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]), | ||
| 0, | ||
| vec![], | ||
| ); | ||
| let mut utxos = vec![]; | ||
| let mut kps = vec![]; | ||
| for _ in 0..inputs_count - non_uniq_signatures { | ||
| let kp = Keypair::new(secp256k1::SECP256K1, &mut thread_rng()); | ||
| tx.inputs.push(TransactionInput { previous_outpoint: dummy_prev_out, signature_script: vec![], sequence: 0, sig_op_count: 1 }); | ||
| let address = Address::new(Prefix::Mainnet, Version::PubKey, &kp.x_only_public_key().0.serialize()); | ||
| utxos.push(UtxoEntry { | ||
| amount: thread_rng().gen::<u32>() as u64, | ||
| script_public_key: pay_to_address_script(&address), | ||
| block_daa_score: 333, | ||
| is_coinbase: false, | ||
| }); | ||
| kps.push(kp); | ||
| } | ||
| for _ in 0..non_uniq_signatures { | ||
| let kp = kps.last().unwrap(); | ||
| tx.inputs.push(TransactionInput { previous_outpoint: dummy_prev_out, signature_script: vec![], sequence: 0, sig_op_count: 1 }); | ||
| let address = Address::new(Prefix::Mainnet, Version::PubKey, &kp.x_only_public_key().0.serialize()); | ||
| utxos.push(UtxoEntry { | ||
| amount: thread_rng().gen::<u32>() as u64, | ||
| script_public_key: pay_to_address_script(&address), | ||
| block_daa_score: 444, | ||
| is_coinbase: false, | ||
| }); | ||
| } | ||
| for (i, kp) in kps.iter().enumerate().take(inputs_count - non_uniq_signatures) { | ||
| let mut_tx = MutableTransaction::with_entries(&tx, utxos.clone()); | ||
| let sig_hash = calc_schnorr_signature_hash(&mut_tx.as_verifiable(), i, SIG_HASH_ALL, &reused_values); | ||
| let msg = secp256k1::Message::from_digest_slice(sig_hash.as_bytes().as_slice()).unwrap(); | ||
| let sig: [u8; 64] = *kp.sign_schnorr(msg).as_ref(); | ||
| // This represents OP_DATA_65 <SIGNATURE+SIGHASH_TYPE> (since signature length is 64 bytes and SIGHASH_TYPE is one byte) | ||
| tx.inputs[i].signature_script = std::iter::once(65u8).chain(sig).chain([SIG_HASH_ALL.to_u8()]).collect(); | ||
| } | ||
| let length = tx.inputs.len(); | ||
| for i in (inputs_count - non_uniq_signatures)..length { | ||
| let kp = kps.last().unwrap(); | ||
| let mut_tx = MutableTransaction::with_entries(&tx, utxos.clone()); | ||
| let sig_hash = calc_schnorr_signature_hash(&mut_tx.as_verifiable(), i, SIG_HASH_ALL, &reused_values); | ||
| let msg = secp256k1::Message::from_digest_slice(sig_hash.as_bytes().as_slice()).unwrap(); | ||
| let sig: [u8; 64] = *kp.sign_schnorr(msg).as_ref(); | ||
| // This represents OP_DATA_65 <SIGNATURE+SIGHASH_TYPE> (since signature length is 64 bytes and SIGHASH_TYPE is one byte) | ||
| tx.inputs[i].signature_script = std::iter::once(65u8).chain(sig).chain([SIG_HASH_ALL.to_u8()]).collect(); | ||
| } | ||
| (tx, utxos) | ||
| } | ||
|
|
||
| fn benchmark_check_scripts(c: &mut Criterion) { | ||
| for inputs_count in [100, 50, 25, 10, 5, 2] { | ||
| for non_uniq_signatures in [0, inputs_count / 2] { | ||
| let (tx, utxos) = mock_tx(inputs_count, non_uniq_signatures); | ||
| let mut group = c.benchmark_group(format!("inputs: {inputs_count}, non uniq: {non_uniq_signatures}")); | ||
| group.sampling_mode(SamplingMode::Flat); | ||
|
|
||
| group.bench_function("single_thread", |b| { | ||
| let tx = MutableTransaction::with_entries(&tx, utxos.clone()); | ||
| let cache = Cache::new(inputs_count as u64); | ||
| b.iter(|| { | ||
| cache.clear(); | ||
| check_scripts_sequential(black_box(&cache), black_box(&tx.as_verifiable())).unwrap(); | ||
| }) | ||
| }); | ||
|
|
||
| group.bench_function("rayon par iter", |b| { | ||
| let tx = MutableTransaction::with_entries(tx.clone(), utxos.clone()); | ||
| let cache = Cache::new(inputs_count as u64); | ||
| b.iter(|| { | ||
| cache.clear(); | ||
| check_scripts_par_iter(black_box(&cache), black_box(&tx.as_verifiable())).unwrap(); | ||
| }) | ||
| }); | ||
|
|
||
| // Iterate powers of two up to available parallelism | ||
| for i in parallelism_in_power_steps() { | ||
| if inputs_count >= i { | ||
| group.bench_function(format!("rayon, custom thread pool, thread count {i}"), |b| { | ||
| let tx = MutableTransaction::with_entries(tx.clone(), utxos.clone()); | ||
| // Create a custom thread pool with the specified number of threads | ||
| let pool = rayon::ThreadPoolBuilder::new().num_threads(i).build().unwrap(); | ||
| let cache = Cache::new(inputs_count as u64); | ||
| b.iter(|| { | ||
| cache.clear(); | ||
| check_scripts_par_iter_pool(black_box(&cache), black_box(&tx.as_verifiable()), black_box(&pool)).unwrap(); | ||
| }) | ||
| }); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| criterion_group! { | ||
| name = benches; | ||
| // This can be any expression that returns a `Criterion` object. | ||
| config = Criterion::default().with_output_color(true).measurement_time(std::time::Duration::new(20, 0)); | ||
| targets = benchmark_check_scripts | ||
| } | ||
|
|
||
| criterion_main!(benches); |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| use criterion::{black_box, criterion_group, criterion_main, Criterion}; | ||
| use itertools::Itertools; | ||
| use kaspa_consensus_core::{ | ||
| muhash::MuHashExtensions, | ||
| subnets::SUBNETWORK_ID_NATIVE, | ||
| tx::{ScriptPublicKey, SignableTransaction, Transaction, TransactionInput, TransactionOutpoint, TransactionOutput, UtxoEntry}, | ||
| }; | ||
| use kaspa_hashes::TransactionID; | ||
| use kaspa_muhash::MuHash; | ||
| use kaspa_utils::iter::parallelism_in_power_steps; | ||
| use rayon::prelude::*; | ||
|
|
||
| fn generate_transaction(ins: usize, outs: usize, randomness: u64) -> SignableTransaction { | ||
| let mut tx = Transaction::new(0, vec![], vec![], 0, SUBNETWORK_ID_NATIVE, 0, vec![]); | ||
| let mut entries = vec![]; | ||
| for i in 0..ins { | ||
| let mut hasher = TransactionID::new(); | ||
| hasher.write(i.to_le_bytes()); | ||
| hasher.write(randomness.to_le_bytes()); | ||
| let input = TransactionInput::new(TransactionOutpoint::new(hasher.finalize(), 0), vec![10; 66], 0, 1); | ||
| let entry = UtxoEntry::new(22222222, ScriptPublicKey::from_vec(0, vec![99; 34]), 23456, false); | ||
| tx.inputs.push(input); | ||
| entries.push(entry); | ||
| } | ||
| for _ in 0..outs { | ||
| let output = TransactionOutput::new(23456, ScriptPublicKey::from_vec(0, vec![101; 34])); | ||
| tx.outputs.push(output); | ||
| } | ||
| tx.finalize(); | ||
| SignableTransaction::with_entries(tx, entries) | ||
| } | ||
|
|
||
| pub fn parallel_muhash_benchmark(c: &mut Criterion) { | ||
| let mut group = c.benchmark_group("muhash txs"); | ||
| let txs = (0..256).map(|i| generate_transaction(2, 2, i)).collect_vec(); | ||
| group.bench_function("seq", |b| { | ||
| b.iter(|| { | ||
| let mut mh = MuHash::new(); | ||
| for tx in txs.iter() { | ||
| mh.add_transaction(&tx.as_verifiable(), 222); | ||
| } | ||
| black_box(mh) | ||
| }) | ||
| }); | ||
|
|
||
| for threads in parallelism_in_power_steps() { | ||
| group.bench_function(format!("par {threads}"), |b| { | ||
| let pool = rayon::ThreadPoolBuilder::new().num_threads(threads).build().unwrap(); | ||
| b.iter(|| { | ||
| pool.install(|| { | ||
| let mh = | ||
| txs.par_iter().map(|tx| MuHash::from_transaction(&tx.as_verifiable(), 222)).reduce(MuHash::new, |mut a, b| { | ||
| a.combine(&b); | ||
| a | ||
| }); | ||
| black_box(mh) | ||
| }) | ||
| }) | ||
| }); | ||
| } | ||
|
|
||
| group.finish(); | ||
| } | ||
|
|
||
| criterion_group!(benches, parallel_muhash_benchmark); | ||
| criterion_main!(benches); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.