Merge branch 'master' of github.com:aspectron/rusty-kaspa

Author: aspect

README.md

@@ -1,4 +1,5 @@
-
+[![DeepWiki](https://img.shields.io/badge/DeepWiki-kaspanet%2Frusty--kaspa-blue.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAyCAYAAAAnWDnqAAAAAXNSR0IArs4c6QAAA05JREFUaEPtmUtyEzEQhtWTQyQLHNak2AB7ZnyXZMEjXMGeK/AIi+QuHrMnbChYY7MIh8g01fJoopFb0uhhEqqcbWTp06/uv1saEDv4O3n3dV60RfP947Mm9/SQc0ICFQgzfc4CYZoTPAswgSJCCUJUnAAoRHOAUOcATwbmVLWdGoH//PB8mnKqScAhsD0kYP3j/Yt5LPQe2KvcXmGvRHcDnpxfL2zOYJ1mFwrryWTz0advv1Ut4CJgf5uhDuDj5eUcAUoahrdY/56ebRWeraTjMt/00Sh3UDtjgHtQNHwcRGOC98BJEAEymycmYcWwOprTgcB6VZ5JK5TAJ+fXGLBm3FDAmn6oPPjR4rKCAoJCal2eAiQp2x0vxTPB3ALO2CRkwmDy5WohzBDwSEFKRwPbknEggCPB/imwrycgxX2NzoMCHhPkDwqYMr9tRcP5qNrMZHkVnOjRMWwLCcr8ohBVb1OMjxLwGCvjTikrsBOiA6fNyCrm8V1rP93iVPpwaE+gO0SsWmPiXB+jikdf6SizrT5qKasx5j8ABbHpFTx+vFXp9EnYQmLx02h1QTTrl6eDqxLnGjporxl3NL3agEvXdT0WmEost648sQOYAeJS9Q7bfUVoMGnjo4AZdUMQku50McDcMWcBPvr0SzbTAFDfvJqwLzgxwATnCgnp4wDl6Aa+Ax283gghmj+vj7feE2KBBRMW3FzOpLOADl0Isb5587h/U4gGvkt5v60Z1VLG8BhYjbzRwyQZemwAd6cCR5/XFWLYZRIMpX39AR0tjaGGiGzLVyhse5C9RKC6ai42ppWPKiBagOvaYk8lO7DajerabOZP46Lby5wKjw1HCRx7p9sVMOWGzb/vA1hwiWc6jm3MvQDTogQkiqIhJV0nBQBTU+3okKCFDy9WwferkHjtxib7t3xIUQtHxnIwtx4mpg26/HfwVNVDb4oI9RHmx5WGelRVlrtiw43zboCLaxv46AZeB3IlTkwouebTr1y2NjSpHz68WNFjHvupy3q8TFn3Hos2IAk4Ju5dCo8B3wP7VPr/FGaKiG+T+v+TQqIrOqMTL1VdWV1DdmcbO8KXBz6esmYWYKPwDL5b5FA1a0hwapHiom0r/cKaoqr+27/XcrS5UwSMbQAAAABJRU5ErkJggg==)](https://deepwiki.com/kaspanet/rusty-kaspa)
+<!-- DeepWiki badge generated by https://deepwiki.ryoppippi.com/ -->
 <h1>Kaspa On Rust</h1>
 
 Welcome to the Rust-based implementation of the Kaspa full-node and its ancillary libraries. The contained node release serves as a drop-in replacement to the established <a href="https://github.com/kaspanet/kaspad">Golang node</a> and to date is the recommended node software for the Kaspa network, introducing developers to the possibilities of Rust in the Kaspa network's context.
@@ -11,9 +12,7 @@ The default branch of this repository is `master` and new contributions are cons
 
 ## The Crescendo Hardfork  
 
-The Crescendo Hardfork, which will transition the network to 10 BPS, is scheduled to activate on mainnet at DAA Score **110,165,000**, projected to occur on **May 5, 2025, at approximately 15:00 UTC**. Note that 24 hours before activation, nodes will connect only to upgraded peers which are using the new P2P protocol version 7.  
-
-You are encouraged to verify your client software against this mainnet version ahead of or after the hardfork. For a more controlled environment, consider using **Testnet 10**, where the Crescendo changes are already active. Refer to the [Crescendo guide](docs/crescendo-guide.md) for detailed instructions.
+The [Crescendo Hardfork](docs/crescendo-guide.md) took place on May 5, 2025, at approximately 15:00 UTC. The fork has transitioned the network from a blockrate of 1 BPS to that of 10 BPS, and incorporated several major KIPs.
 
 
 
@@ -287,16 +286,16 @@ wRPC
 
   JSON protocol:
   ```bash
-  --rpclisten-json = <interface:port>
+  --rpclisten-json=<interface:port>
   # or use the defaults for current network
-  --rpclisten-json = default
+  --rpclisten-json=default
   ```
 
   Borsh protocol:
   ```bash
-  --rpclisten-borsh = <interface:port>
+  --rpclisten-borsh=<interface:port>
   # or use the defaults for current network
-  --rpclisten-borsh = default
+  --rpclisten-borsh=default
   ```
 
   **Sidenote:**
@@ -422,4 +421,4 @@ Logging in `kaspad` and `simpa` can be [filtered](https://docs.rs/env_logger/0.1
     ```
     In this command we set the `loglevel` to `INFO`.
 
-</details>
+</details>

cli/src/modules/rpc.rs

@@ -128,10 +128,16 @@ impl Rpc {
                 };
                 let start_hash = RpcHash::from_hex(argv.remove(0).as_str())?;
                 let include_accepted_transaction_ids = argv.first().and_then(|x| x.parse::<bool>().ok()).unwrap_or_default();
+                let min_confirmation_count = argv.get(1).and_then(|x| x.parse::<u64>().ok()).unwrap_or_default();
+
                 let result = rpc
                     .get_virtual_chain_from_block_call(
                         None,
-                        GetVirtualChainFromBlockRequest { start_hash, include_accepted_transaction_ids },
+                        GetVirtualChainFromBlockRequest {
+                            start_hash,
+                            include_accepted_transaction_ids,
+                            min_confirmation_count: Some(min_confirmation_count),
+                        },
                     )
                     .await?;
                 self.println(&ctx, result);

components/consensusmanager/src/session.rs

@@ -59,11 +59,11 @@ impl SessionLock {
         SessionOwnedReadGuard(Arc::new(self.0.clone().read_owned().await))
     }
 
-    pub async fn read(&self) -> SessionReadGuard {
+    pub async fn read(&self) -> SessionReadGuard<'_> {
         SessionReadGuard(self.0.read().await)
     }
 
-    pub fn blocking_read(&self) -> SessionReadGuard {
+    pub fn blocking_read(&self) -> SessionReadGuard<'_> {
         SessionReadGuard(self.0.blocking_read())
     }
 
@@ -86,7 +86,7 @@ impl ConsensusInstance {
     /// Returns a blocking session to be used in **non async** environments.
     /// Users would usually need to call something like `futures::executor::block_on` in order
     /// to acquire the session, but we prefer leaving this decision to the caller
-    pub async fn session_blocking(&self) -> ConsensusSessionBlocking {
+    pub async fn session_blocking(&self) -> ConsensusSessionBlocking<'_> {
         let g = self.session_lock.read().await;
         ConsensusSessionBlocking::new(g, self.consensus.clone())
     }
@@ -250,6 +250,10 @@ impl ConsensusSessionOwned {
         self.clone().spawn_blocking(|c| c.get_sink_timestamp()).await
     }
 
+    pub async fn async_get_sink_blue_score(&self) -> u64 {
+        self.clone().spawn_blocking(|c| c.get_sink_blue_score()).await
+    }
+
     pub async fn async_get_sink_daa_score_timestamp(&self) -> DaaScoreTimestamp {
         self.clone().spawn_blocking(|c| c.get_sink_daa_score_timestamp()).await
     }

consensus/client/src/utxo.rs

@@ -272,7 +272,7 @@ impl Ord for UtxoEntryReference {
 
 impl PartialOrd for UtxoEntryReference {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.id().cmp(&other.id()))
+        Some(self.cmp(other))
     }
 }
 

consensus/core/src/api/mod.rs

@@ -135,6 +135,10 @@ pub trait ConsensusApi: Send + Sync {
         unimplemented!()
     }
 
+    fn get_sink_blue_score(&self) -> u64 {
+        unimplemented!()
+    }
+
     fn get_sink_daa_score_timestamp(&self) -> DaaScoreTimestamp {
         unimplemented!()
     }

consensus/core/src/config/params.rs

@@ -487,8 +487,6 @@ pub const MAINNET_PARAMS: Params = Params {
         "n-mainnet.kaspa.ws",
         // This DNS seeder is run by -gerri-
         "dnsseeder-kaspa-mainnet.x-con.at",
-        // This DNS seeder is run by H@H
-        "ns-mainnet.kaspa-dnsseeder.net",
     ],
     net: NetworkId::new(NetworkType::Mainnet),
     genesis: GENESIS,
@@ -547,8 +545,6 @@ pub const TESTNET_PARAMS: Params = Params {
         "seeder1-testnet.kaspad.net",
         // This DNS seeder is run by -gerri-
         "dnsseeder-kaspa-testnet.x-con.at",
-        // This DNS seeder is run by H@H
-        "ns-testnet10.kaspa-dnsseeder.net",
         // This DNS seeder is run by supertypo
         "n-testnet-10.kaspa.ws",
     ],

consensus/src/consensus/mod.rs

@@ -408,7 +408,7 @@ impl Consensus {
     }
 
     /// Acquires a consensus session, blocking data-pruning from occurring until released
-    pub fn acquire_session(&self) -> SessionReadGuard {
+    pub fn acquire_session(&self) -> SessionReadGuard<'_> {
         self.pruning_lock.blocking_read()
     }
 
@@ -588,6 +588,10 @@ impl ConsensusApi for Consensus {
         self.headers_store.get_timestamp(self.get_sink()).unwrap()
     }
 
+    fn get_sink_blue_score(&self) -> u64 {
+        self.headers_store.get_blue_score(self.get_sink()).unwrap()
+    }
+
     fn get_sink_daa_score_timestamp(&self) -> DaaScoreTimestamp {
         let sink = self.get_sink();
         let compact = self.headers_store.get_compact_header_data(sink).unwrap();

consensus/src/model/stores/selected_chain.rs

@@ -58,7 +58,7 @@ pub trait SelectedChainStoreBatchExtensions {
         batch: &mut WriteBatch,
         hash: Hash,
         status: BlockStatus,
-    ) -> Result<RwLockWriteGuard<DbSelectedChainStore>, StoreError>;
+    ) -> Result<RwLockWriteGuard<'_, DbSelectedChainStore>, StoreError>;
 }
 
 impl SelectedChainStoreReader for DbSelectedChainStore {

consensus/src/model/stores/statuses.rs

@@ -54,7 +54,7 @@ pub trait StatusesStoreBatchExtensions {
         batch: &mut WriteBatch,
         hash: Hash,
         status: BlockStatus,
-    ) -> Result<RwLockWriteGuard<DbStatusesStore>, StoreError>;
+    ) -> Result<RwLockWriteGuard<'_, DbStatusesStore>, StoreError>;
 }
 
 impl StatusesStoreBatchExtensions for Arc<RwLock<DbStatusesStore>> {
@@ -63,7 +63,7 @@ impl StatusesStoreBatchExtensions for Arc<RwLock<DbStatusesStore>> {
         batch: &mut WriteBatch,
         hash: Hash,
         status: BlockStatus,
-    ) -> Result<RwLockWriteGuard<DbStatusesStore>, StoreError> {
+    ) -> Result<RwLockWriteGuard<'_, DbStatusesStore>, StoreError> {
         let write_guard = self.write();
         write_guard.access.write(BatchDbWriter::new(batch), hash, status)?;
         Ok(write_guard)

consensus/src/model/stores/utxo_set.rs

@@ -17,7 +17,7 @@ type UtxoCollectionIterator<'a> = Box<dyn Iterator<Item = Result<(TransactionOut
 
 pub trait UtxoSetStoreReader {
     fn get(&self, outpoint: &TransactionOutpoint) -> Result<Arc<UtxoEntry>, StoreError>;
-    fn seek_iterator(&self, from_outpoint: Option<TransactionOutpoint>, limit: usize, skip_first: bool) -> UtxoCollectionIterator;
+    fn seek_iterator(&self, from_outpoint: Option<TransactionOutpoint>, limit: usize, skip_first: bool) -> UtxoCollectionIterator<'_>;
 }
 
 pub trait UtxoSetStore: UtxoSetStoreReader {
@@ -151,7 +151,7 @@ impl UtxoSetStoreReader for DbUtxoSetStore {
         self.access.read((*outpoint).into())
     }
 
-    fn seek_iterator(&self, from_outpoint: Option<TransactionOutpoint>, limit: usize, skip_first: bool) -> UtxoCollectionIterator {
+    fn seek_iterator(&self, from_outpoint: Option<TransactionOutpoint>, limit: usize, skip_first: bool) -> UtxoCollectionIterator<'_> {
         let seek_key = from_outpoint.map(UtxoKey::from);
         Box::new(self.access.seek_iterator(None, seek_key, limit, skip_first).map(|res| {
             let (key, entry) = res?;