From fd277a4d4e8a1a0bda2951b9f3362d80ba0ec44b Mon Sep 17 00:00:00 2001 From: Jerry Date: Thu, 2 May 2024 12:08:53 -0700 Subject: [PATCH 1/2] Cancel pending downloader tasks before rewinding --- eth/bor_checkpoint_verifier.go | 1 + 1 file changed, 1 insertion(+) diff --git a/eth/bor_checkpoint_verifier.go b/eth/bor_checkpoint_verifier.go index a0bdfeac8e..b2fd2c2d21 100644 --- a/eth/bor_checkpoint_verifier.go +++ b/eth/bor_checkpoint_verifier.go @@ -162,6 +162,7 @@ func rewindBack(eth *Ethereum, head uint64, rewindTo uint64) { } func rewind(eth *Ethereum, head uint64, rewindTo uint64) { + eth.handler.downloader.Cancel() err := eth.blockchain.SetHead(rewindTo) if err != nil { From 8fdc7aa11619c41bd0f260f1055274f79cd41eef Mon Sep 17 00:00:00 2001 From: Jerry Date: Thu, 2 May 2024 12:22:13 -0700 Subject: [PATCH 2/2] Bump up version to v1.3.2-beta --- packaging/templates/package_scripts/control | 2 +- packaging/templates/package_scripts/control.arm64 | 2 +- packaging/templates/package_scripts/control.profile.amd64 | 2 +- packaging/templates/package_scripts/control.profile.arm64 | 2 +- packaging/templates/package_scripts/control.validator | 2 +- .../templates/package_scripts/control.validator.arm64 | 2 +- params/version.go | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index 328b755aa8..f5614043e4 100644 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: bor -Version: 1.3.1-beta-1 +Version: 1.3.2-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index 95a7e88e30..d54083434a 100644 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: bor -Version: 1.3.1-beta-1 +Version: 1.3.2-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index c56d98b26d..8ea2c1e6ac 100644 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.1-beta-1 +Version: 1.3.2-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index 56a813805c..7c7dab057c 100644 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.1-beta-1 +Version: 1.3.2-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index ff39b60819..6e294542b9 100644 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.1-beta-1 +Version: 1.3.2-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index 38c101aaa8..29c27dc577 100644 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.1-beta-1 +Version: 1.3.2-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/params/version.go b/params/version.go index 9e414399fb..9f653da20d 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 = 3 // Minor version component of the current release - VersionPatch = 1 // Patch version component of the current release - VersionMeta = "beta-1" // Version metadata to append to the version string + VersionMajor = 1 // Major version component of the current release + VersionMinor = 3 // Minor version component of the current release + VersionPatch = 2 // Patch version component of the current release + VersionMeta = "beta" // Version metadata to append to the version string ) var GitCommit string