Merge tag 'v1.3.13' into release/bsc-1.x-fh2.2

streamingfast · Apr 12, 2024 · 095fe71 · 095fe71
2 parents b14331d + bae7e6b
commit 095fe71
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,12 @@
 # Changelog
+## v1.3.13
+* [\#2358](https://github.com/bnb-chain/bsc/pull/2358) doc: add Feynman upgrade for mainnet
+* [\#2335](https://github.com/bnb-chain/bsc/pull/2335) upgrade: update system contracts bytes code and hardfork time of Feynman upgrade
+
+## v1.3.12
+BUGFIX
+* [\#2305](https://github.com/bnb-chain/bsc/pull/2305) fix: fix the wrong version number
+
 ## v1.3.11
 BUGFIX
 * [\#2288](https://github.com/bnb-chain/bsc/pull/2288) fix: add FeynmanFix upgrade for a testnet issue

diff --git a/core/systemcontracts/upgrade.go b/core/systemcontracts/upgrade.go
diff --git a/params/config.go b/params/config.go
@@ -145,11 +145,10 @@ var (
 		HertzBlock:          big.NewInt(31302048),
 		HertzfixBlock:       big.NewInt(34140700),
 		// UnixTime: 1705996800 is January 23, 2024 8:00:00 AM UTC
-		ShanghaiTime: newUint64(1705996800),
-		KeplerTime:   newUint64(1705996800),
-
-		// TODO
-		FeynmanTime: nil,
+		ShanghaiTime:   newUint64(1705996800),
+		KeplerTime:     newUint64(1705996800),
+		FeynmanTime:    newUint64(1713419340),
+		FeynmanFixTime: newUint64(1713419340),
 
 		Parlia: &ParliaConfig{
 			Period: 3,

diff --git a/params/version.go b/params/version.go
@@ -23,7 +23,7 @@ import (
 const (
 	VersionMajor = 1       // Major version component of the current release
 	VersionMinor = 3       // Minor version component of the current release
-	VersionPatch = 11      // Patch version component of the current release
+	VersionPatch = 13      // Patch version component of the current release
 	VersionMeta  = "fh2.2" // Version metadata to append to the version string
 
 	FirehoseVersionMajor = 2