Merge pull request Musicoin#1 from Musicoin/master

updates musicoin latest.

cmd/gmc/main.go

@@ -140,7 +140,21 @@ func init() {
 	// Initialize the CLI app and start GMC
 	app.Action = gmc
 	app.HideVersion = true // we have a command to print the version
-	app.Copyright = "Copyright 2013-2017 The go-ethereum Authors"
+	app.Copyright = `Copyright 2013-2017 The Go-Ethereum Authors
+   Copyright 2016-2017 The Go-Musicoin Authors
+
+   Go-Musicoin is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   Go-Musicoin is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Go-Musicoin. If not, see <http://www.gnu.org/licenses/>.`
 	app.Commands = []cli.Command{
 		// See chaincmd.go:
 		initCommand,

cmd/gmc/usage.go

@@ -31,7 +31,8 @@ import (
 var AppHelpTemplate = `NAME:
    {{.App.Name}} - {{.App.Usage}}
 
-   Copyright 2013-2017 The go-ethereum Authors
+   Copyright 2013-2017 The Go-Ethereum Authors
+   Copyright 2016-2017 The Go-Musicoin Authors
 
 USAGE:
    {{.App.HelpName}} [options]{{if .App.Commands}} command [command options]{{end}} {{if .App.ArgsUsage}}{{.App.ArgsUsage}}{{else}}[arguments...]{{end}}

consensus/ethash/consensus.go

@@ -1,5 +1,8 @@
-// Copyright 2017 The go-ethereum Authors
-// This file is part of the go-ethereum library.
+// Copyright 2017 The Go-Ethereum Authors
+// This file is part of the Go-Ethereum library.
+//
+// Copyright 2017 The Go-Musicoin Authors
+// This file is part of the Go-Musicoin library.
 //
 // The go-ethereum library is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Lesser General Public License as published by
@@ -550,6 +553,7 @@ func AccumulateRewards(config *params.ChainConfig, state *state.StateDB, header
 		reward.Add(reward, r)
 	}
 
+	// Activate MCIP3-UBI hardfork
 	if config.IsUBIFork(header.Number) {
 		state.AddBalance(header.Coinbase, mcip3Reward)
 		state.AddBalance(common.HexToAddress("0x00eFdd5883eC628983E9063c7d969fE268BBf310"), ubiReservoir)

core/fees.go

@@ -1,5 +1,8 @@
-// Copyright 2014 The go-ethereum Authors
-// This file is part of the go-ethereum library.
+// Copyright 2014 The Go-Ethereum Authors
+// This file is part of the Go-Ethereum library.
+//
+// Copyright 2017 The Go-Musicoin Authors
+// This file is part of the Go-Musicoin library.
 //
 // The go-ethereum library is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Lesser General Public License as published by

params/config.go

@@ -1,5 +1,8 @@
-// Copyright 2016 The go-ethereum Authors
-// This file is part of the go-ethereum library.
+// Copyright 2016 The Go-Ethereum Authors
+// This file is part of the Go-Ethereum library.
+//
+// Copyright 2017 The Go-Musicoin Authors
+// This file is part of the Go-Musicoin library.
 //
 // The go-ethereum library is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Lesser General Public License as published by
@@ -151,7 +154,7 @@ func (c *ChainConfig) String() string {
 	default:
 		engine = "unknown"
 	}
-	return fmt.Sprintf("{ChainID: %v Homestead: %v MCIP-3 UBI: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Engine: %v}",
+	return fmt.Sprintf("{ChainID: %v Homestead: %v MCIP3-UBI: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Engine: %v}",
 		c.ChainId,
 		c.HomesteadBlock,
 		c.UBIForkBlock,
@@ -170,7 +173,7 @@ func (c *ChainConfig) IsHomestead(num *big.Int) bool {
 	return isForked(c.HomesteadBlock, num)
 }
 
-// IsUBIFork returns whether num is either equal to the MCIP-3 block or greater.
+// IsUBIFork returns whether num is either equal to the MCIP3-UBI block or greater.
 func (c *ChainConfig) IsUBIFork(num *big.Int) bool {
 	return isForked(c.UBIForkBlock, num)
 }
@@ -236,7 +239,7 @@ func (c *ChainConfig) checkCompatible(newcfg *ChainConfig, head *big.Int) *Confi
 		return newCompatError("Homestead fork block", c.HomesteadBlock, newcfg.HomesteadBlock)
 	}
 	if isForkIncompatible(c.UBIForkBlock, newcfg.UBIForkBlock, head) {
-		return newCompatError("MCIP-3 UBI fork block", c.UBIForkBlock, newcfg.UBIForkBlock)
+		return newCompatError("MCIP3-UBI fork block", c.UBIForkBlock, newcfg.UBIForkBlock)
 	}
 	if isForkIncompatible(c.DAOForkBlock, newcfg.DAOForkBlock, head) {
 		return newCompatError("DAO fork block", c.DAOForkBlock, newcfg.DAOForkBlock)

params/version.go

@@ -22,7 +22,7 @@ import (
 
 const (
 	VersionMajor = 2          // Major version component of the current release
-	VersionMinor = 1          // Minor version component of the current release
+	VersionMinor = 5          // Minor version component of the current release
 	VersionPatch = 0          // Patch version component of the current release
 	VersionMeta  = "unstable" // Version metadata to append to the version string
 )