Gd tn11 uni

Cargo.toml

@@ -10,6 +10,7 @@ members = [
     "wallet/wasm",
     "wallet/bip32",
     "wallet/keys",
+    "wallet/pskt",
     "consensus",
     "consensus/core",
     "consensus/client",
@@ -62,7 +63,7 @@ members = [
 
 [workspace.package]
 rust-version = "1.78.0"
-version = "0.14.1"
+version = "0.14.2"
 authors = ["Kaspa developers"]
 license = "ISC"
 repository = "https://github.com/kaspanet/rusty-kaspa"
@@ -79,62 +80,63 @@ include = [
 ]
 
 [workspace.dependencies]
-# kaspa-testing-integration = { version = "0.14.1", path = "testing/integration" }
-kaspa-addresses = { version = "0.14.1", path = "crypto/addresses" }
-kaspa-addressmanager = { version = "0.14.1", path = "components/addressmanager" }
-kaspa-bip32 = { version = "0.14.1", path = "wallet/bip32" }
-kaspa-resolver = { version = "0.14.1", path = "rpr/wrpc/resolver" }
-kaspa-cli = { version = "0.14.1", path = "cli" }
-kaspa-connectionmanager = { version = "0.14.1", path = "components/connectionmanager" }
-kaspa-consensus = { version = "0.14.1", path = "consensus" }
-kaspa-consensus-core = { version = "0.14.1", path = "consensus/core" }
-kaspa-consensus-client = { version = "0.14.1", path = "consensus/client" }
-kaspa-consensus-notify = { version = "0.14.1", path = "consensus/notify" }
-kaspa-consensus-wasm = { version = "0.14.1", path = "consensus/wasm" }
-kaspa-consensusmanager = { version = "0.14.1", path = "components/consensusmanager" }
-kaspa-core = { version = "0.14.1", path = "core" }
-kaspa-daemon = { version = "0.14.1", path = "daemon" }
-kaspa-database = { version = "0.14.1", path = "database" }
-kaspa-grpc-client = { version = "0.14.1", path = "rpc/grpc/client" }
-kaspa-grpc-core = { version = "0.14.1", path = "rpc/grpc/core" }
-kaspa-grpc-server = { version = "0.14.1", path = "rpc/grpc/server" }
-kaspa-hashes = { version = "0.14.1", path = "crypto/hashes" }
-kaspa-index-core = { version = "0.14.1", path = "indexes/core" }
-kaspa-index-processor = { version = "0.14.1", path = "indexes/processor" }
-kaspa-math = { version = "0.14.1", path = "math" }
-kaspa-merkle = { version = "0.14.1", path = "crypto/merkle" }
-kaspa-metrics-core = { version = "0.14.1", path = "metrics/core" }
-kaspa-mining = { version = "0.14.1", path = "mining" }
-kaspa-mining-errors = { version = "0.14.1", path = "mining/errors" }
-kaspa-muhash = { version = "0.14.1", path = "crypto/muhash" }
-kaspa-notify = { version = "0.14.1", path = "notify" }
-kaspa-p2p-flows = { version = "0.14.1", path = "protocol/flows" }
-kaspa-p2p-lib = { version = "0.14.1", path = "protocol/p2p" }
-kaspa-perf-monitor = { version = "0.14.1", path = "metrics/perf_monitor" }
-kaspa-pow = { version = "0.14.1", path = "consensus/pow" }
-kaspa-rpc-core = { version = "0.14.1", path = "rpc/core" }
-kaspa-rpc-macros = { version = "0.14.1", path = "rpc/macros" }
-kaspa-rpc-service = { version = "0.14.1", path = "rpc/service" }
-kaspa-txscript = { version = "0.14.1", path = "crypto/txscript" }
-kaspa-txscript-errors = { version = "0.14.1", path = "crypto/txscript/errors" }
-kaspa-utils = { version = "0.14.1", path = "utils" }
-kaspa-utils-tower = { version = "0.14.1", path = "utils/tower" }
-kaspa-utxoindex = { version = "0.14.1", path = "indexes/utxoindex" }
-kaspa-wallet = { version = "0.14.1", path = "wallet/native" }
-kaspa-wallet-cli-wasm = { version = "0.14.1", path = "wallet/wasm" }
-kaspa-wallet-keys = { version = "0.14.1", path = "wallet/keys" }
-kaspa-wallet-core = { version = "0.14.1", path = "wallet/core" }
-kaspa-wallet-macros = { version = "0.14.1", path = "wallet/macros" }
-kaspa-wasm = { version = "0.14.1", path = "wasm" }
-kaspa-wasm-core = { version = "0.14.1", path = "wasm/core" }
-kaspa-wrpc-client = { version = "0.14.1", path = "rpc/wrpc/client" }
-kaspa-wrpc-core = { version = "0.14.1", path = "rpc/wrpc/core" }
-kaspa-wrpc-proxy = { version = "0.14.1", path = "rpc/wrpc/proxy" }
-kaspa-wrpc-server = { version = "0.14.1", path = "rpc/wrpc/server" }
-kaspa-wrpc-wasm = { version = "0.14.1", path = "rpc/wrpc/wasm" }
-kaspa-wrpc-example-subscriber = { version = "0.14.1", path = "rpc/wrpc/examples/subscriber" }
-kaspad = { version = "0.14.1", path = "kaspad" }
-kaspa-alloc = { version = "0.14.1", path = "utils/alloc" }
+# kaspa-testing-integration = { version = "0.14.2", path = "testing/integration" }
+kaspa-addresses = { version = "0.14.2", path = "crypto/addresses" }
+kaspa-addressmanager = { version = "0.14.2", path = "components/addressmanager" }
+kaspa-bip32 = { version = "0.14.2", path = "wallet/bip32" }
+kaspa-resolver = { version = "0.14.2", path = "rpr/wrpc/resolver" }
+kaspa-cli = { version = "0.14.2", path = "cli" }
+kaspa-connectionmanager = { version = "0.14.2", path = "components/connectionmanager" }
+kaspa-consensus = { version = "0.14.2", path = "consensus" }
+kaspa-consensus-core = { version = "0.14.2", path = "consensus/core" }
+kaspa-consensus-client = { version = "0.14.2", path = "consensus/client" }
+kaspa-consensus-notify = { version = "0.14.2", path = "consensus/notify" }
+kaspa-consensus-wasm = { version = "0.14.2", path = "consensus/wasm" }
+kaspa-consensusmanager = { version = "0.14.2", path = "components/consensusmanager" }
+kaspa-core = { version = "0.14.2", path = "core" }
+kaspa-daemon = { version = "0.14.2", path = "daemon" }
+kaspa-database = { version = "0.14.2", path = "database" }
+kaspa-grpc-client = { version = "0.14.2", path = "rpc/grpc/client" }
+kaspa-grpc-core = { version = "0.14.2", path = "rpc/grpc/core" }
+kaspa-grpc-server = { version = "0.14.2", path = "rpc/grpc/server" }
+kaspa-hashes = { version = "0.14.2", path = "crypto/hashes" }
+kaspa-index-core = { version = "0.14.2", path = "indexes/core" }
+kaspa-index-processor = { version = "0.14.2", path = "indexes/processor" }
+kaspa-math = { version = "0.14.2", path = "math" }
+kaspa-merkle = { version = "0.14.2", path = "crypto/merkle" }
+kaspa-metrics-core = { version = "0.14.2", path = "metrics/core" }
+kaspa-mining = { version = "0.14.2", path = "mining" }
+kaspa-mining-errors = { version = "0.14.2", path = "mining/errors" }
+kaspa-muhash = { version = "0.14.2", path = "crypto/muhash" }
+kaspa-notify = { version = "0.14.2", path = "notify" }
+kaspa-p2p-flows = { version = "0.14.2", path = "protocol/flows" }
+kaspa-p2p-lib = { version = "0.14.2", path = "protocol/p2p" }
+kaspa-perf-monitor = { version = "0.14.2", path = "metrics/perf_monitor" }
+kaspa-pow = { version = "0.14.2", path = "consensus/pow" }
+kaspa-rpc-core = { version = "0.14.2", path = "rpc/core" }
+kaspa-rpc-macros = { version = "0.14.2", path = "rpc/macros" }
+kaspa-rpc-service = { version = "0.14.2", path = "rpc/service" }
+kaspa-txscript = { version = "0.14.2", path = "crypto/txscript" }
+kaspa-txscript-errors = { version = "0.14.2", path = "crypto/txscript/errors" }
+kaspa-utils = { version = "0.14.2", path = "utils" }
+kaspa-utils-tower = { version = "0.14.2", path = "utils/tower" }
+kaspa-utxoindex = { version = "0.14.2", path = "indexes/utxoindex" }
+kaspa-wallet = { version = "0.14.2", path = "wallet/native" }
+kaspa-wallet-cli-wasm = { version = "0.14.2", path = "wallet/wasm" }
+kaspa-wallet-keys = { version = "0.14.2", path = "wallet/keys" }
+kaspa-wallet-pskt = { version = "0.14.1", path = "wallet/pskt" }
+kaspa-wallet-core = { version = "0.14.2", path = "wallet/core" }
+kaspa-wallet-macros = { version = "0.14.2", path = "wallet/macros" }
+kaspa-wasm = { version = "0.14.2", path = "wasm" }
+kaspa-wasm-core = { version = "0.14.2", path = "wasm/core" }
+kaspa-wrpc-client = { version = "0.14.2", path = "rpc/wrpc/client" }
+kaspa-wrpc-core = { version = "0.14.2", path = "rpc/wrpc/core" }
+kaspa-wrpc-proxy = { version = "0.14.2", path = "rpc/wrpc/proxy" }
+kaspa-wrpc-server = { version = "0.14.2", path = "rpc/wrpc/server" }
+kaspa-wrpc-wasm = { version = "0.14.2", path = "rpc/wrpc/wasm" }
+kaspa-wrpc-example-subscriber = { version = "0.14.2", path = "rpc/wrpc/examples/subscriber" }
+kaspad = { version = "0.14.2", path = "kaspad" }
+kaspa-alloc = { version = "0.14.2", path = "utils/alloc" }
 
 # external
 aes = "0.8.3"
@@ -162,6 +164,7 @@ ctrlc = "3.4.1"
 crypto_box = { version = "0.9.1", features = ["chacha20"] }
 dashmap = "5.5.3"
 derivative = "2.2.0"
+derive_builder = "0.20.0"
 derive_more = "0.99.17"
 dhat = "0.3.2"
 dirs = "5.0.1"
@@ -228,6 +231,7 @@ serde = { version = "1.0.190", features = ["derive", "rc"] }
 serde_bytes = "0.11.12"
 serde_json = "1.0.107"
 serde_repr = "0.1.18"
+serde-value = "0.7.0"
 serde-wasm-bindgen = "0.6.1"
 sha1 = "0.10.6"
 sha2 = "0.10.8"

consensus/Cargo.toml

@@ -53,11 +53,16 @@ serde_json.workspace = true
 flate2.workspace = true
 rand_distr.workspace = true
 kaspa-txscript-errors.workspace = true
+kaspa-addresses.workspace = true
 
 [[bench]]
 name = "hash_benchmarks"
 harness = false
 
+[[bench]]
+name = "check_scripts"
+harness = false
+
 [features]
 html_reports = []
 devnet-prealloc = ["kaspa-consensus-core/devnet-prealloc"]

consensus/benches/check_scripts.rs

@@ -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_thread, check_scripts_single_threaded,
+};
+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 rand::{thread_rng, Rng};
+use secp256k1::Keypair;
+use std::thread::available_parallelism;
+
+// 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.map.write().clear();
+                    check_scripts_single_threaded(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.map.write().clear();
+                    check_scripts_par_iter(black_box(&cache), black_box(&tx.as_verifiable())).unwrap();
+                })
+            });
+
+            for i in (2..=available_parallelism().unwrap().get()).step_by(2) {
+                if inputs_count >= i {
+                    group.bench_function(&format!("rayon, custom threadpool, thread count {i}"), |b| {
+                        let tx = MutableTransaction::with_entries(tx.clone(), utxos.clone());
+                        let cache = Cache::new(inputs_count as u64);
+                        let pool = rayon::ThreadPoolBuilder::new().num_threads(i).build().unwrap();
+                        b.iter(|| {
+                            // Create a custom thread pool with the specified number of threads
+                            cache.map.write().clear();
+                            check_scripts_par_iter_thread(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);

consensus/client/src/sign.rs

@@ -3,7 +3,7 @@ use core::iter::once;
 use itertools::Itertools;
 use kaspa_consensus_core::{
     hashing::{
-        sighash::{calc_schnorr_signature_hash, SigHashReusedValues},
+        sighash::{calc_schnorr_signature_hash, SigHashReusedValuesUnsync},
         sighash_type::SIG_HASH_ALL,
     },
     tx::PopulatedTransaction,
@@ -40,7 +40,7 @@ pub fn sign_with_multiple_v3(tx: Transaction, privkeys: &[[u8; 32]]) -> crate::r
         map.insert(script_pub_key_script, schnorr_key);
     }
 
-    let mut reused_values = SigHashReusedValues::new();
+    let reused_values = SigHashReusedValuesUnsync::new();
     let mut additional_signatures_required = false;
     {
         let input_len = tx.inner().inputs.len();
@@ -55,7 +55,7 @@ pub fn sign_with_multiple_v3(tx: Transaction, privkeys: &[[u8; 32]]) -> crate::r
             };
             let script = script_pub_key.script();
             if let Some(schnorr_key) = map.get(script) {
-                let sig_hash = calc_schnorr_signature_hash(&populated_transaction, i, SIG_HASH_ALL, &mut reused_values);
+                let sig_hash = calc_schnorr_signature_hash(&populated_transaction, i, SIG_HASH_ALL, &reused_values);
                 let msg = secp256k1::Message::from_digest_slice(sig_hash.as_bytes().as_slice()).unwrap();
                 let sig: [u8; 64] = *schnorr_key.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)

consensus/client/src/signing.rs

@@ -75,7 +75,7 @@ impl SigHashCache {
         }
     }
 
-    pub fn sig_op_counts_hash(&mut self, tx: &Transaction, hash_type: SigHashType, reused_values: &mut SigHashReusedValues) -> Hash {
+    pub fn sig_op_counts_hash(&mut self, tx: &Transaction, hash_type: SigHashType, reused_values: &SigHashReusedValues) -> Hash {
         if hash_type.is_sighash_anyone_can_pay() {
             return ZERO_HASH;
         }
@@ -185,16 +185,16 @@ pub fn calc_schnorr_signature_hash(
     let mut hasher = TransactionSigningHash::new();
     hasher
         .write_u16(tx.version)
-        .update(previous_outputs_hash(&tx, hash_type, &mut reused_values))
-        .update(sequences_hash(&tx, hash_type, &mut reused_values))
-        .update(sig_op_counts_hash(&tx, hash_type, &mut reused_values));
+        .update(previous_outputs_hash(&tx, hash_type, &reused_values))
+        .update(sequences_hash(&tx, hash_type, &reused_values))
+        .update(sig_op_counts_hash(&tx, hash_type, &reused_values));
     hash_outpoint(&mut hasher, input.previous_outpoint);
     hash_script_public_key(&mut hasher, &utxo.script_public_key);
     hasher
         .write_u64(utxo.amount)
         .write_u64(input.sequence)
         .write_u8(input.sig_op_count)
-        .update(outputs_hash(&tx, hash_type, &mut reused_values, input_index))
+        .update(outputs_hash(&tx, hash_type, &reused_values, input_index))
         .write_u64(tx.lock_time)
         .update(&tx.subnetwork_id)
         .write_u64(tx.gas)

consensus/core/Cargo.toml

@@ -15,6 +15,7 @@ wasm32-sdk = []
 default = []
 
 [dependencies]
+arc-swap.workspace = true
 async-trait.workspace = true
 borsh.workspace = true
 cfg-if.workspace = true

consensus/core/src/config/constants.rs

@@ -117,7 +117,7 @@ pub mod perf {
 
     /// The default slack interval used by the reachability
     /// algorithm to encounter for blocks out of the selected chain.
-    pub const DEFAULT_REINDEX_SLACK: u64 = 1 << 12;
+    pub const DEFAULT_REINDEX_SLACK: u64 = 1 << 14;
 
     const BASELINE_HEADER_DATA_CACHE_SIZE: usize = 10_000;
     const BASELINE_BLOCK_DATA_CACHE_SIZE: usize = 200;