Skip to content

4.0.2 release preparation #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SurfingNerd merged 3 commits into from
Dec 12, 2025
Merged

4.0.2 release preparation #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
236d549
cleanup of comments
SurfingNerd Dec 12, 2025
58dfe2b
fixed typos in comments
SurfingNerd Dec 12, 2025
b1eecb9
version Update: 4.0.2-rc3 -> 4.0.2
SurfingNerd Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions crates/concensus/miner/src/pool/queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<F: Fn(&VerifiedTransaction) -> bool>(
&self,
Expand Down
11 changes: 3 additions & 8 deletions crates/ethcore/src/client/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ pub struct Client {

shutdown: Arc<ShutdownManager>,

/// 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)>,

Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -1582,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,
Expand Down
2 changes: 1 addition & 1 deletion crates/ethcore/src/miner/miner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<F: Fn(&VerifiedTransaction) -> bool>(
&self,
Expand Down
2 changes: 1 addition & 1 deletion crates/util/version/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Loading