Merge pull request #2889 from zzzckck/release_v1.5.6

release: prepare for release v1.5.6
bnb-chain · Feb 13, 2025 · f078a48 · f078a48
2 parents d1ead90 + 0908a19
commit f078a48
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Changelog
+## v1.5.6
+v1.5.6 performed another small code sync with Geth upstream, mainly sync the 7702 tx type txpool update, refer: https://github.com/bnb-chain/bsc/pull/2888/
+
+And it also setup the Testnet Pascal hard fork date.
+
 ## v1.5.5
 v1.5.5 mainly did a upstream code sync, it catches up to Geth of date around 5th-Feb-2025 to sync the latest Praque hard fork changes, see: https://github.com/bnb-chain/bsc/pull/2856
 

diff --git a/cmd/jsutils/getchainstatus.js b/cmd/jsutils/getchainstatus.js
@@ -302,7 +302,7 @@ async function getSlashCount()  {
                 let isMaintaining = validatorExtra[1]
                 // let voteAddress = validatorExtra[2]
                 if (isMaintaining) {
-                    let jailHeight = (felonyThreshold - slashCount) * slashScale * maxElected + BigInt(enterMaintenanceHeight)
+                    let jailHeight = (felonyThreshold - BigInt(slashCount)) * slashScale * maxElected + BigInt(enterMaintenanceHeight)
                     console.log("          in maintenance mode since", enterMaintenanceHeight, "will jail after", ethers.toNumber(jailHeight))    
                 } else {
                     console.log("          exited maintenance mode")

diff --git a/params/config.go b/params/config.go
@@ -235,9 +235,8 @@ var (
 		HaberTime:           newUint64(1716962820), // 2024-05-29 06:07:00 AM UTC
 		HaberFixTime:        newUint64(1719986788), // 2024-07-03 06:06:28 AM UTC
 		BohrTime:            newUint64(1724116996), // 2024-08-20 01:23:16 AM UTC
-		// TODO
-		PascalTime: nil,
-		PragueTime: nil,
+		PascalTime:          newUint64(1740021480), // 2025-02-20 03:18:00 AM UTC
+		PragueTime:          newUint64(1740021480), // 2025-02-20 03:18:00 AM UTC
 
 		Parlia: &ParliaConfig{
 			Period: 3,

diff --git a/version/version.go b/version/version.go
@@ -19,6 +19,6 @@ package version
 const (
 	Major = 1  // Major version component of the current release
 	Minor = 5  // Minor version component of the current release
-	Patch = 5  // Patch version component of the current release
+	Patch = 6  // Patch version component of the current release
 	Meta  = "" // Version metadata to append to the version string
 )