Bump to version 0.17.2 + misc (kaspanet#661)

* retention bug fix upgrade logic (minor; see kaspanet#657)

* minor refactor for improved readability

* trigger activation upper-bounds/after calcs for mainnet as well

* align test with activation triggering (which moves tight parents limit check to in-context validation)

* rothschild: add payload size config

* rothschild: reduce compounding phase to 8 inputs for simulating more reasonable average behavior

* bump version to 0.17.2

Author: michaelsutton

Cargo.lock

@@ -63,7 +63,7 @@ members = [
 
 [workspace.package]
 rust-version = "1.82.0"
-version = "0.17.1"
+version = "0.17.2"
 authors = ["Kaspa developers"]
 license = "ISC"
 repository = "https://github.com/kaspanet/rusty-kaspa"
@@ -80,62 +80,62 @@ include = [
 ]
 
 [workspace.dependencies]
-# kaspa-testing-integration = { version = "0.17.1", path = "testing/integration" }
-kaspa-addresses = { version = "0.17.1", path = "crypto/addresses" }
-kaspa-addressmanager = { version = "0.17.1", path = "components/addressmanager" }
-kaspa-bip32 = { version = "0.17.1", path = "wallet/bip32" }
-kaspa-cli = { version = "0.17.1", path = "cli" }
-kaspa-connectionmanager = { version = "0.17.1", path = "components/connectionmanager" }
-kaspa-consensus = { version = "0.17.1", path = "consensus" }
-kaspa-consensus-core = { version = "0.17.1", path = "consensus/core" }
-kaspa-consensus-client = { version = "0.17.1", path = "consensus/client" }
-kaspa-consensus-notify = { version = "0.17.1", path = "consensus/notify" }
-kaspa-consensus-wasm = { version = "0.17.1", path = "consensus/wasm" }
-kaspa-consensusmanager = { version = "0.17.1", path = "components/consensusmanager" }
-kaspa-core = { version = "0.17.1", path = "core" }
-kaspa-daemon = { version = "0.17.1", path = "daemon" }
-kaspa-database = { version = "0.17.1", path = "database" }
-kaspa-grpc-client = { version = "0.17.1", path = "rpc/grpc/client" }
-kaspa-grpc-core = { version = "0.17.1", path = "rpc/grpc/core" }
-kaspa-grpc-server = { version = "0.17.1", path = "rpc/grpc/server" }
-kaspa-hashes = { version = "0.17.1", path = "crypto/hashes" }
-kaspa-index-core = { version = "0.17.1", path = "indexes/core" }
-kaspa-index-processor = { version = "0.17.1", path = "indexes/processor" }
-kaspa-math = { version = "0.17.1", path = "math" }
-kaspa-merkle = { version = "0.17.1", path = "crypto/merkle" }
-kaspa-metrics-core = { version = "0.17.1", path = "metrics/core" }
-kaspa-mining = { version = "0.17.1", path = "mining" }
-kaspa-mining-errors = { version = "0.17.1", path = "mining/errors" }
-kaspa-muhash = { version = "0.17.1", path = "crypto/muhash" }
-kaspa-notify = { version = "0.17.1", path = "notify" }
-kaspa-p2p-flows = { version = "0.17.1", path = "protocol/flows" }
-kaspa-p2p-lib = { version = "0.17.1", path = "protocol/p2p" }
-kaspa-p2p-mining = { version = "0.17.1", path = "protocol/mining" }
-kaspa-perf-monitor = { version = "0.17.1", path = "metrics/perf_monitor" }
-kaspa-pow = { version = "0.17.1", path = "consensus/pow" }
-kaspa-rpc-core = { version = "0.17.1", path = "rpc/core" }
-kaspa-rpc-macros = { version = "0.17.1", path = "rpc/macros" }
-kaspa-rpc-service = { version = "0.17.1", path = "rpc/service" }
-kaspa-txscript = { version = "0.17.1", path = "crypto/txscript" }
-kaspa-txscript-errors = { version = "0.17.1", path = "crypto/txscript/errors" }
-kaspa-utils = { version = "0.17.1", path = "utils" }
-kaspa-utils-tower = { version = "0.17.1", path = "utils/tower" }
-kaspa-utxoindex = { version = "0.17.1", path = "indexes/utxoindex" }
-kaspa-wallet = { version = "0.17.1", path = "wallet/native" }
-kaspa-wallet-cli-wasm = { version = "0.17.1", path = "wallet/wasm" }
-kaspa-wallet-keys = { version = "0.17.1", path = "wallet/keys" }
-kaspa-wallet-pskt = { version = "0.17.1", path = "wallet/pskt" }
-kaspa-wallet-core = { version = "0.17.1", path = "wallet/core" }
-kaspa-wallet-macros = { version = "0.17.1", path = "wallet/macros" }
-kaspa-wasm = { version = "0.17.1", path = "wasm" }
-kaspa-wasm-core = { version = "0.17.1", path = "wasm/core" }
-kaspa-wrpc-client = { version = "0.17.1", path = "rpc/wrpc/client" }
-kaspa-wrpc-proxy = { version = "0.17.1", path = "rpc/wrpc/proxy" }
-kaspa-wrpc-server = { version = "0.17.1", path = "rpc/wrpc/server" }
-kaspa-wrpc-wasm = { version = "0.17.1", path = "rpc/wrpc/wasm" }
-kaspa-wrpc-example-subscriber = { version = "0.17.1", path = "rpc/wrpc/examples/subscriber" }
-kaspad = { version = "0.17.1", path = "kaspad" }
-kaspa-alloc = { version = "0.17.1", path = "utils/alloc" }
+# kaspa-testing-integration = { version = "0.17.2", path = "testing/integration" }
+kaspa-addresses = { version = "0.17.2", path = "crypto/addresses" }
+kaspa-addressmanager = { version = "0.17.2", path = "components/addressmanager" }
+kaspa-bip32 = { version = "0.17.2", path = "wallet/bip32" }
+kaspa-cli = { version = "0.17.2", path = "cli" }
+kaspa-connectionmanager = { version = "0.17.2", path = "components/connectionmanager" }
+kaspa-consensus = { version = "0.17.2", path = "consensus" }
+kaspa-consensus-core = { version = "0.17.2", path = "consensus/core" }
+kaspa-consensus-client = { version = "0.17.2", path = "consensus/client" }
+kaspa-consensus-notify = { version = "0.17.2", path = "consensus/notify" }
+kaspa-consensus-wasm = { version = "0.17.2", path = "consensus/wasm" }
+kaspa-consensusmanager = { version = "0.17.2", path = "components/consensusmanager" }
+kaspa-core = { version = "0.17.2", path = "core" }
+kaspa-daemon = { version = "0.17.2", path = "daemon" }
+kaspa-database = { version = "0.17.2", path = "database" }
+kaspa-grpc-client = { version = "0.17.2", path = "rpc/grpc/client" }
+kaspa-grpc-core = { version = "0.17.2", path = "rpc/grpc/core" }
+kaspa-grpc-server = { version = "0.17.2", path = "rpc/grpc/server" }
+kaspa-hashes = { version = "0.17.2", path = "crypto/hashes" }
+kaspa-index-core = { version = "0.17.2", path = "indexes/core" }
+kaspa-index-processor = { version = "0.17.2", path = "indexes/processor" }
+kaspa-math = { version = "0.17.2", path = "math" }
+kaspa-merkle = { version = "0.17.2", path = "crypto/merkle" }
+kaspa-metrics-core = { version = "0.17.2", path = "metrics/core" }
+kaspa-mining = { version = "0.17.2", path = "mining" }
+kaspa-mining-errors = { version = "0.17.2", path = "mining/errors" }
+kaspa-muhash = { version = "0.17.2", path = "crypto/muhash" }
+kaspa-notify = { version = "0.17.2", path = "notify" }
+kaspa-p2p-flows = { version = "0.17.2", path = "protocol/flows" }
+kaspa-p2p-lib = { version = "0.17.2", path = "protocol/p2p" }
+kaspa-p2p-mining = { version = "0.17.2", path = "protocol/mining" }
+kaspa-perf-monitor = { version = "0.17.2", path = "metrics/perf_monitor" }
+kaspa-pow = { version = "0.17.2", path = "consensus/pow" }
+kaspa-rpc-core = { version = "0.17.2", path = "rpc/core" }
+kaspa-rpc-macros = { version = "0.17.2", path = "rpc/macros" }
+kaspa-rpc-service = { version = "0.17.2", path = "rpc/service" }
+kaspa-txscript = { version = "0.17.2", path = "crypto/txscript" }
+kaspa-txscript-errors = { version = "0.17.2", path = "crypto/txscript/errors" }
+kaspa-utils = { version = "0.17.2", path = "utils" }
+kaspa-utils-tower = { version = "0.17.2", path = "utils/tower" }
+kaspa-utxoindex = { version = "0.17.2", path = "indexes/utxoindex" }
+kaspa-wallet = { version = "0.17.2", path = "wallet/native" }
+kaspa-wallet-cli-wasm = { version = "0.17.2", path = "wallet/wasm" }
+kaspa-wallet-keys = { version = "0.17.2", path = "wallet/keys" }
+kaspa-wallet-pskt = { version = "0.17.2", path = "wallet/pskt" }
+kaspa-wallet-core = { version = "0.17.2", path = "wallet/core" }
+kaspa-wallet-macros = { version = "0.17.2", path = "wallet/macros" }
+kaspa-wasm = { version = "0.17.2", path = "wasm" }
+kaspa-wasm-core = { version = "0.17.2", path = "wasm/core" }
+kaspa-wrpc-client = { version = "0.17.2", path = "rpc/wrpc/client" }
+kaspa-wrpc-proxy = { version = "0.17.2", path = "rpc/wrpc/proxy" }
+kaspa-wrpc-server = { version = "0.17.2", path = "rpc/wrpc/server" }
+kaspa-wrpc-wasm = { version = "0.17.2", path = "rpc/wrpc/wasm" }
+kaspa-wrpc-example-subscriber = { version = "0.17.2", path = "rpc/wrpc/examples/subscriber" }
+kaspad = { version = "0.17.2", path = "kaspad" }
+kaspa-alloc = { version = "0.17.2", path = "utils/alloc" }
 
 # external
 aes = "0.8.3"

Cargo.toml

@@ -539,7 +539,9 @@ pub const MAINNET_PARAMS: Params = Params {
     pruning_proof_m: 1000,
 
     crescendo: CRESCENDO,
-    crescendo_activation: ForkActivation::never(),
+    // Temp: use a value which will trigger upper_bound/after calculations but is not actually scheduled.
+    // We want the pre-release to test the influence of this change on mainnet nodes as well
+    crescendo_activation: ForkActivation::new(u64::MAX - 1),
 };
 
 pub const TESTNET_PARAMS: Params = Params {

consensus/core/src/config/params.rs

@@ -24,7 +24,7 @@ pub trait SelectedChainStoreReader {
 /// since chain index is not append-only and thus needs to be guarded.
 pub trait SelectedChainStore: SelectedChainStoreReader {
     fn apply_changes(&mut self, batch: &mut WriteBatch, changes: &ChainPath) -> StoreResult<()>;
-    fn prune_below_pruning_point(&mut self, writer: impl DbWriter, pruning_point: Hash) -> StoreResult<()>;
+    fn prune_below_point(&mut self, writer: impl DbWriter, block: Hash) -> StoreResult<()>;
     fn init_with_pruning_point(&mut self, batch: &mut WriteBatch, block: Hash) -> StoreResult<()>;
 }
 
@@ -99,8 +99,8 @@ impl SelectedChainStore for DbSelectedChainStore {
         Ok(())
     }
 
-    fn prune_below_pruning_point(&mut self, mut writer: impl DbWriter, pruning_point: Hash) -> StoreResult<()> {
-        let mut index = self.access_index_by_hash.read(pruning_point)?;
+    fn prune_below_point(&mut self, mut writer: impl DbWriter, block: Hash) -> StoreResult<()> {
+        let mut index = self.access_index_by_hash.read(block)?;
         while index > 0 {
             index -= 1;
             match self.access_hash_by_index.read(index.into()) {

consensus/src/model/stores/selected_chain.rs

@@ -15,7 +15,7 @@ use crate::{
             pruning_samples::PruningSamplesStoreReader,
             reachability::{DbReachabilityStore, ReachabilityStoreReader, StagingReachabilityStore},
             relations::StagingRelationsStore,
-            selected_chain::SelectedChainStore,
+            selected_chain::{SelectedChainStore, SelectedChainStoreReader},
             statuses::StatusesStoreReader,
             tips::{TipsStore, TipsStoreReader},
             utxo_diffs::UtxoDiffsStoreReader,
@@ -383,7 +383,14 @@ impl PruningProcessor {
 
             // Prune the selected chain index below the pruning point
             let mut selected_chain_write = self.selected_chain_store.write();
-            selected_chain_write.prune_below_pruning_point(BatchDbWriter::new(&mut batch), retention_period_root).unwrap();
+            // Temp — bug fix upgrade logic: the prev wrong logic might have pruned the new retention period root from the selected chain store,
+            //                               hence we verify its existence first and only then proceed.
+            // TODO (in upcoming versions): remove this temp condition
+            if retention_period_root == new_pruning_point
+                || selected_chain_write.get_by_hash(retention_period_root).unwrap_option().is_some()
+            {
+                selected_chain_write.prune_below_point(BatchDbWriter::new(&mut batch), retention_period_root).unwrap();
+            }
 
             // Flush the batch to the DB
             self.db.write(batch).unwrap();
@@ -563,8 +570,7 @@ impl PruningProcessor {
                 let retention_period_ms = (retention_period_days * 86400.0 * 1000.0).ceil() as u64;
 
                 // The target timestamp we would like to find a point below
-                let sink_timestamp_as_current_time =
-                    self.headers_store.get_timestamp(self.lkg_virtual_state.load().ghostdag_data.selected_parent).unwrap();
+                let sink_timestamp_as_current_time = self.get_sink_timestamp();
                 let retention_period_root_ts_target = sink_timestamp_as_current_time.saturating_sub(retention_period_ms);
 
                 // Iterate from the new pruning point to the prev retention root and search for the first point with enough days above it.
@@ -595,6 +601,14 @@ impl PruningProcessor {
         }
     }
 
+    fn get_sink_timestamp(&self) -> u64 {
+        self.headers_store.get_timestamp(self.get_sink()).unwrap()
+    }
+
+    fn get_sink(&self) -> Hash {
+        self.lkg_virtual_state.load().ghostdag_data.selected_parent
+    }
+
     fn past_pruning_points(&self) -> BlockHashSet {
         (0..self.pruning_point_store.read().get().unwrap().index)
             .map(|index| self.past_pruning_points_store.get(index).unwrap())

consensus/src/pipeline/pruning_processor/processor.rs

@@ -25,6 +25,7 @@ faster-hex.workspace = true
 itertools.workspace = true
 log.workspace = true
 parking_lot.workspace = true
+rand.workspace = true
 rayon.workspace = true
 secp256k1 = { workspace = true, features = ["global-context", "rand-std"] }
 tokio = { workspace = true, features = ["rt", "macros", "rt-multi-thread"] }

rothschild/Cargo.toml

@@ -16,6 +16,7 @@ use kaspa_notify::subscription::context::SubscriptionContext;
 use kaspa_rpc_core::{api::rpc::RpcApi, notify::mode::NotificationMode, RpcUtxoEntry};
 use kaspa_txscript::pay_to_address_script;
 use parking_lot::Mutex;
+use rand::RngCore;
 use rayon::prelude::*;
 use secp256k1::{
     rand::{thread_rng, Rng},
@@ -46,6 +47,7 @@ pub struct Args {
     pub addr: Option<String>,
     pub priority_fee: u64,
     pub randomize_fee: bool,
+    pub payload_size: usize,
 }
 
 impl Args {
@@ -60,6 +62,7 @@ impl Args {
             addr: m.get_one::<String>("addr").cloned(),
             priority_fee: m.get_one::<u64>("priority-fee").cloned().unwrap_or(0),
             randomize_fee: m.get_one::<bool>("randomize-fee").cloned().unwrap_or(false),
+            payload_size: m.get_one::<usize>("payload-size").cloned().unwrap_or(0),
         }
     }
 }
@@ -113,6 +116,16 @@ pub fn cli() -> Command {
                 .default_value("false")
                 .help("Randomize transaction priority fee"),
         )
+        .arg(
+            Arg::new("payload-size")
+                .long("payload-size")
+                .short('p')
+                .value_name("payload-size")
+                .hide(true)
+                .default_value("0")
+                .value_parser(clap::value_parser!(usize))
+                .help("Randomized payload size"),
+        )
 }
 
 async fn new_rpc_client(subscription_context: &SubscriptionContext, address: &str) -> GrpcClient {
@@ -139,9 +152,10 @@ struct ClientPoolArg {
     utxos_len: usize,
 }
 
-struct TxsFeeConfig {
+struct TxConfig {
     priority_fee: u64,
     randomize_fee: bool,
+    payload_size: usize,
 }
 
 #[tokio::main]
@@ -187,7 +201,9 @@ async fn main() {
 
     let kaspa_to_addr = args.addr.as_ref().map_or_else(|| kaspa_addr.clone(), |addr_str| Address::try_from(addr_str.clone()).unwrap());
 
-    let fee_config = TxsFeeConfig { priority_fee: args.priority_fee, randomize_fee: args.randomize_fee };
+    (args.payload_size <= 20000).then_some(()).expect("payload-size can be max 20000");
+
+    let tx_config = TxConfig { priority_fee: args.priority_fee, randomize_fee: args.randomize_fee, payload_size: args.payload_size };
 
     rayon::ThreadPoolBuilder::new().num_threads(args.threads as usize).build_global().unwrap();
 
@@ -204,10 +220,13 @@ async fn main() {
     if args.priority_fee != 0 {
         log_message.push_str(&format!(
             "\n\tpriority fee: {} SOMPS {}",
-            fee_config.priority_fee,
-            if fee_config.randomize_fee { "[randomize]" } else { "" }
+            tx_config.priority_fee,
+            if tx_config.randomize_fee { "[randomize]" } else { "" }
         ));
     }
+    if args.payload_size != 0 {
+        log_message.push_str(&format!("\n\tpayload size: {} random bytes", tx_config.payload_size,));
+    }
     info!("{}", log_message);
 
     let info = rpc_client.get_block_dag_info().await.expect("Failed to get block dag info.");
@@ -314,7 +333,7 @@ async fn main() {
             stats.clone(),
             maximize_inputs,
             &mut next_available_utxo_index,
-            &fee_config,
+            &tx_config,
         )
         .await;
         if !has_funds {
@@ -429,7 +448,7 @@ async fn maybe_send_tx(
     stats: Arc<Mutex<Stats>>,
     maximize_inputs: bool,
     next_available_utxo_index: &mut usize,
-    fee_config: &TxsFeeConfig,
+    tx_config: &TxConfig,
 ) -> bool {
     let num_outs = if maximize_inputs { 1 } else { 2 };
 
@@ -438,7 +457,7 @@ async fn maybe_send_tx(
     let selected_utxos_groups = (0..txs_to_send)
         .map(|_| {
             let (selected_utxos, selected_amount) =
-                select_utxos(utxos, DEFAULT_SEND_AMOUNT, num_outs, maximize_inputs, next_available_utxo_index, fee_config);
+                select_utxos(utxos, DEFAULT_SEND_AMOUNT, num_outs, maximize_inputs, next_available_utxo_index, tx_config);
             if selected_amount == 0 {
                 return None;
             }
@@ -464,7 +483,7 @@ async fn maybe_send_tx(
         .into_par_iter()
         .map(|utxo_option| {
             if let Some((selected_utxos, selected_amount)) = utxo_option {
-                let tx = generate_tx(schnorr_key, &selected_utxos, selected_amount, num_outs, &kaspa_addr);
+                let tx = generate_tx(schnorr_key, &selected_utxos, selected_amount, num_outs, &kaspa_addr, tx_config.payload_size);
 
                 return Some((tx, selected_utxos.len(), selected_utxos.into_iter().map(|(_, entry)| entry.amount).sum::<u64>()));
             }
@@ -509,6 +528,7 @@ fn generate_tx(
     send_amount: u64,
     num_outs: u64,
     kaspa_addr: &Address,
+    payload_size: usize,
 ) -> Transaction {
     let script_public_key = pay_to_address_script(kaspa_addr);
     let inputs = utxos
@@ -519,7 +539,9 @@ fn generate_tx(
     let outputs = (0..num_outs)
         .map(|_| TransactionOutput { value: send_amount / num_outs, script_public_key: script_public_key.clone() })
         .collect_vec();
-    let unsigned_tx = Transaction::new_non_finalized(TX_VERSION, inputs, outputs, 0, SUBNETWORK_ID_NATIVE, 0, vec![]);
+    let mut data = vec![0u8; payload_size];
+    rand::thread_rng().fill_bytes(&mut data);
+    let unsigned_tx = Transaction::new_non_finalized(TX_VERSION, inputs, outputs, 0, SUBNETWORK_ID_NATIVE, 0, data);
     let signed_tx =
         sign(MutableTransaction::with_entries(unsigned_tx, utxos.iter().map(|(_, entry)| entry.clone()).collect_vec()), schnorr_key);
     signed_tx.tx
@@ -531,9 +553,9 @@ fn select_utxos(
     num_outs: u64,
     maximize_utxos: bool,
     next_available_utxo_index: &mut usize,
-    fee_config: &TxsFeeConfig,
+    tx_config: &TxConfig,
 ) -> (Vec<(TransactionOutpoint, UtxoEntry)>, u64) {
-    const MAX_UTXOS: usize = 84;
+    const MAX_UTXOS: usize = 8;
     let mut selected_amount: u64 = 0;
     let mut selected = Vec::new();
     let mut rng = thread_rng();
@@ -544,10 +566,10 @@ fn select_utxos(
         selected.push((outpoint, entry));
 
         let fee = required_fee(selected.len(), num_outs);
-        let priority_fee = if fee_config.randomize_fee && fee_config.priority_fee > 0 {
-            rng.gen_range(0..fee_config.priority_fee)
+        let priority_fee = if tx_config.randomize_fee && tx_config.priority_fee > 0 {
+            rng.gen_range(0..tx_config.priority_fee)
         } else {
-            fee_config.priority_fee
+            tx_config.priority_fee
         };
 
         *next_available_utxo_index += 1;

rothschild/src/main.rs

@@ -406,7 +406,7 @@ async fn block_window_test() {
 #[tokio::test]
 async fn header_in_isolation_validation_test() {
     init_allocator_with_default_settings();
-    let config = Config::new(MAINNET_PARAMS);
+    let config = ConfigBuilder::new(MAINNET_PARAMS).edit_consensus_params(|p| p.skip_proof_of_work = true).build();
     let consensus = TestConsensus::new(&config);
     let wait_handles = consensus.init();
     let block = consensus.build_block_with_parents(1.into(), vec![config.genesis.hash]);
@@ -457,7 +457,8 @@ async fn header_in_isolation_validation_test() {
     {
         let mut block = block.clone();
         block.header.hash = 4.into();
-        block.header.parents_by_level[0] = (5..(config.prior_max_block_parents + 6)).map(|x| (x as u64).into()).collect();
+        block.header.parents_by_level[0] =
+            std::iter::repeat(config.genesis.hash).take(config.prior_max_block_parents as usize + 1).collect();
         match consensus.validate_and_insert_block(block.to_immutable()).virtual_state_task.await {
             Err(RuleError::TooManyParents(num_parents, limit)) => {
                 assert_eq!((config.prior_max_block_parents + 1) as usize, num_parents);