Merge pull request #917 from CortexFoundation/dev

ucwong · web-flow · commit 4023010bc6c7 · 2021-03-18T10:43:04.000+08:00
ckp &amp; version
diff --git a/params/config.go b/params/config.go
@@ -62,8 +62,8 @@ var (
 var (
 	MainnetTrustedCheckpoint = &TrustedCheckpoint{
 		Name:         "mainnet",
-		SectionIndex: 102,
-		SectionHead:  common.HexToHash("0xd9e03e7b4f089001d7a5c22beb2f00ab8a95f42da6a04ed1feb1e6837eb04141"),
+		SectionIndex: 104,
+		SectionHead:  common.HexToHash("0xf669959171cd41583c2c3ecf19b9e3b38ebb224e1421e763c4fb59698accb90a"),
 	}
 
 	DoloresTrustedCheckpoint = &TrustedCheckpoint{
diff --git a/params/version.go b/params/version.go
@@ -21,10 +21,10 @@ import (
 )
 
 const (
-	VersionMajor = 1          // Major version component of the current release
-	VersionMinor = 10         // Minor version component of the current release
-	VersionPatch = 20         // Patch version component of the current release
-	VersionMeta  = "unstable" // Version metadata to append to the version string
+	VersionMajor = 1        // Major version component of the current release
+	VersionMinor = 10       // Minor version component of the current release
+	VersionPatch = 20       // Patch version component of the current release
+	VersionMeta  = "stable" // Version metadata to append to the version string
 )
 
 // Version holds the textual version string.

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ import (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`const (`
`24`		`- VersionMajor = 1 // Major version component of the current release`
`25`		`- VersionMinor = 10 // Minor version component of the current release`
`26`		`- VersionPatch = 20 // Patch version component of the current release`
`27`		`- VersionMeta = "unstable" // Version metadata to append to the version string`
	`24`	`+ VersionMajor = 1 // Major version component of the current release`
	`25`	`+ VersionMinor = 10 // Minor version component of the current release`
	`26`	`+ VersionPatch = 20 // Patch version component of the current release`
	`27`	`+ VersionMeta = "stable" // Version metadata to append to the version string`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`// Version holds the textual version string.`