From 236d549043941c5b4eda983ee2f9e80d4a4deadc Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 12 Dec 2025 17:54:34 +0100 Subject: [PATCH 1/3] cleanup of comments --- crates/ethcore/src/client/client.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/crates/ethcore/src/client/client.rs b/crates/ethcore/src/client/client.rs index 43e52b75e..8643abb5a 100644 --- a/crates/ethcore/src/client/client.rs +++ b/crates/ethcore/src/client/client.rs @@ -848,11 +848,6 @@ impl Importer { client.schedule_garbage_collect_in_queue(); - //self.on_block_commit_finalized(); - - //client.miner().g - //client.check_garbage();.garbage_collect(Duration::from_secs(1)); - route } From 58dfe2b6900d90d6068dad8997bbb0a72bfddccd Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 12 Dec 2025 17:58:49 +0100 Subject: [PATCH 2/3] fixed typos in comments --- crates/concensus/miner/src/pool/queue.rs | 4 ++-- crates/ethcore/src/client/client.rs | 6 +++--- crates/ethcore/src/miner/miner.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/concensus/miner/src/pool/queue.rs b/crates/concensus/miner/src/pool/queue.rs index fcf9659cb..dc9fd9e6f 100644 --- a/crates/concensus/miner/src/pool/queue.rs +++ b/crates/concensus/miner/src/pool/queue.rs @@ -415,8 +415,8 @@ impl TransactionQueue { .collect() } - /// Performs garbage collection of the pool of this transactionqueue for free service transactions. - /// Removes transaction that are not valid anymore. + /// Performs garbage collection on the pool of this `TransactionQueue` for free service transactions. + /// Removes transactions that are not valid anymore. /// The process executes listener calls. pub fn garbage_collect bool>( &self, diff --git a/crates/ethcore/src/client/client.rs b/crates/ethcore/src/client/client.rs index 8643abb5a..48291d278 100644 --- a/crates/ethcore/src/client/client.rs +++ b/crates/ethcore/src/client/client.rs @@ -306,7 +306,7 @@ pub struct Client { shutdown: Arc, - /// block number and block has of latest gc. + /// block number and block hash of latest gc. /// this information is used to avoid double garbage collection. garbage_collect_latest_block: Mutex<(u64, H256)>, @@ -1577,9 +1577,9 @@ impl Client { } // here hides an accepted race condition. - // latest block could change during loing ongoing GCs. + // latest block could change during long ongoing GCs. // this could be avoided developing a more complex GC logic. - // but the GC blocks the tx queue, so it has to be placing fast. + // but the GC blocks the tx queue, so it has to be blazing fast. self.importer.miner.collect_garbage(|tx| match machine.verify_transaction(tx.signed(), block_header, self) { Ok(_) => true, diff --git a/crates/ethcore/src/miner/miner.rs b/crates/ethcore/src/miner/miner.rs index bc2a08bb8..5df562f2c 100644 --- a/crates/ethcore/src/miner/miner.rs +++ b/crates/ethcore/src/miner/miner.rs @@ -421,7 +421,7 @@ impl Miner { } /// Performs garbage collection of the pool for free service transactions. - /// Removes transaction that are not valid anymore. + /// Removes transactions that are not valid anymore. /// The process executes listener calls. pub fn collect_garbage bool>( &self, From b1eecb93da8351fe128f459e5b5cbfd0aa80d583 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 12 Dec 2025 17:59:47 +0100 Subject: [PATCH 3/3] version Update: 4.0.2-rc3 -> 4.0.2 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- crates/util/version/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3fa0b15ac..8cc7e6cb1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -850,7 +850,7 @@ dependencies = [ [[package]] name = "diamond-node" -version = "4.0.2-rc3" +version = "4.0.2" dependencies = [ "ansi_term 0.10.2", "atty", @@ -3579,7 +3579,7 @@ dependencies = [ [[package]] name = "parity-version" -version = "4.0.2-rc3" +version = "4.0.2" dependencies = [ "parity-bytes", "rlp", diff --git a/Cargo.toml b/Cargo.toml index c283c8c90..1e225d0df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ description = "Diamond Node" name = "diamond-node" # NOTE Make sure to update util/version/Cargo.toml as well -version = "4.0.2-rc3" +version = "4.0.2" license = "GPL-3.0" authors = [ "bit.diamonds developers", diff --git a/crates/util/version/Cargo.toml b/crates/util/version/Cargo.toml index 12b6250c6..8737eca0a 100644 --- a/crates/util/version/Cargo.toml +++ b/crates/util/version/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "parity-version" # NOTE: this value is used for OpenEthereum version string (via env CARGO_PKG_VERSION) -version = "4.0.2-rc3" +version = "4.0.2" authors = [ "bit.diamonds developers", "OpenEthereum developers",