From 958fe8b5b12634ffcf7ba3ff20f3a560d1d2317f Mon Sep 17 00:00:00 2001 From: Jerry Date: Thu, 30 Jan 2025 11:40:03 -0800 Subject: [PATCH 1/4] Bump version to v2.0.0-beta --- params/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/params/version.go b/params/version.go index c139179f0f..82039d039b 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 1 // Major version component of the current release - VersionMinor = 5 // Minor version component of the current release - VersionPatch = 5 // Patch version component of the current release - VersionMeta = "" // Version metadata to append to the version string + VersionMajor = 2 // Major version component of the current release + VersionMinor = 0 // Minor version component of the current release + VersionPatch = 0 // Patch version component of the current release + VersionMeta = "beta" // Version metadata to append to the version string ) var GitCommit string From 9be1add40096d24b0b715ed9947b0587b70db4f4 Mon Sep 17 00:00:00 2001 From: Jerry Date: Mon, 10 Feb 2025 08:14:51 -0800 Subject: [PATCH 2/4] Bump version to v2.0.0-beta2 --- params/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/params/version.go b/params/version.go index 82039d039b..3905f5d9d9 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 2 // Major version component of the current release - VersionMinor = 0 // Minor version component of the current release - VersionPatch = 0 // Patch version component of the current release - VersionMeta = "beta" // Version metadata to append to the version string + VersionMajor = 2 // Major version component of the current release + VersionMinor = 0 // Minor version component of the current release + VersionPatch = 0 // Patch version component of the current release + VersionMeta = "beta2" // Version metadata to append to the version string ) var GitCommit string From 4a1c4151fae543ae85a36b981fb326e339860b04 Mon Sep 17 00:00:00 2001 From: Manav Darji Date: Mon, 17 Feb 2025 17:53:35 +0530 Subject: [PATCH 3/4] params: bump version to v2.0.0 --- params/version.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/params/version.go b/params/version.go index 3905f5d9d9..43c57b5365 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 2 // Major version component of the current release - VersionMinor = 0 // Minor version component of the current release - VersionPatch = 0 // Patch version component of the current release - VersionMeta = "beta2" // Version metadata to append to the version string + VersionMajor = 2 // Major version component of the current release + VersionMinor = 0 // Minor version component of the current release + VersionPatch = 0 // Patch version component of the current release + VersionMeta = "" // Version metadata to append to the version string ) var GitCommit string From baea4afdbd1eb619f70f57eeb57d92b0e2ab5e50 Mon Sep 17 00:00:00 2001 From: Manav Darji Date: Mon, 17 Feb 2025 21:38:15 +0530 Subject: [PATCH 4/4] miner: wait for next block before running commit interrupt tests --- miner/worker_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/miner/worker_test.go b/miner/worker_test.go index 296b2dbca6..fff63b61b5 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -876,6 +876,9 @@ func TestCommitInterruptExperimentBor_NewTxFlow(t *testing.T) { head := <-chainHeadCh // We skip the initial 2 blocks as the mining timings are a bit skewed up if head.Block.NumberU64() == 2 { + // Wait until `w.current` is updated for next block (3) + time.Sleep(100 * time.Millisecond) + // Stop the miner so that worker assumes it's a sentry and not a validator w.stop()