diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index ef841d7a2..210abcd51 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -93,7 +93,7 @@ func New(config *Config, commit string, logdir string) *Dashboard { history: &Message{ General: &GeneralMessage{ Commit: commit, - Version: fmt.Sprintf("v%d.%d.%d%s", params.VersionMajor, params.VersionMinor, params.VersionPatch, versionMeta), + Version: fmt.Sprintf("v%d.%d.%d.%d%s", params.VersionMajor, params.VersionMinor, params.VersionPatch, params.VersionCross, versionMeta), }, System: &SystemMessage{ ActiveMemory: emptyChartEntries(now, activeMemorySampleLimit, config.Refresh), diff --git a/eth/backend.go b/eth/backend.go index ec4a7ec3a..2fae09d08 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -196,7 +196,7 @@ func makeExtraData(extra []byte) []byte { if len(extra) == 0 { // create default extradata extra, _ = rlp.EncodeToBytes([]interface{}{ - uint(params.VersionMajor<<16 | params.VersionMinor<<8 | params.VersionPatch), + uint(params.VersionMajor<<32 | params.VersionMinor<<16 | params.VersionPatch<<8 | params.VersionCross), "geth", runtime.Version(), runtime.GOOS, diff --git a/params/version.go b/params/version.go index d5348b68d..ef15b2a19 100644 --- a/params/version.go +++ b/params/version.go @@ -24,12 +24,13 @@ const ( VersionMajor = 1 // Major version component of the current release VersionMinor = 8 // Minor version component of the current release VersionPatch = 17 // Patch version component of the current release + VersionCross = 0 // Cross version component of the current release VersionMeta = "stable" // Version metadata to append to the version string ) // Version holds the textual version string. var Version = func() string { - return fmt.Sprintf("%d.%d.%d", VersionMajor, VersionMinor, VersionPatch) + return fmt.Sprintf("%d.%d.%d.%d", VersionMajor, VersionMinor, VersionPatch, VersionCross) }() // VersionWithMeta holds the textual version string including the metadata.