Merge branch 'master' of github.com:tomochain/tomochain

docker/tomochain/entrypoint.sh

@@ -175,6 +175,6 @@ exec tomo $params \
   --wsport 8546 \
   --wsorigins "*" \
   --mine \
-  --gasprice "2500" \
+  --gasprice "250000000" \
   --targetgaslimit "84000000" \
   "$@"

eth/backend.go

@@ -387,7 +387,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 			header := currentHeader
 			// Sometimes, the latest block hasn't been inserted to chain yet
 			// getSnapshot from parent block if it exists
-			parentHeader := eth.blockchain.GetHeader(currentHeader.ParentHash, currentHeader.Number.Uint64() - 1)
+			parentHeader := eth.blockchain.GetHeader(currentHeader.ParentHash, currentHeader.Number.Uint64()-1)
 			if parentHeader != nil {
 				// not genesis block
 				header = parentHeader
@@ -723,3 +723,7 @@ func rewardInflation(chainReward *big.Int, number uint64, blockPerYear uint64) *
 
 	return chainReward
 }
+
+func (s *Ethereum) GetPeer() int {
+	return len(s.protocolManager.peers.peers)
+}

ethstats/ethstats.go

@@ -704,7 +704,7 @@ func (s *Service) reportStats(conn *websocket.Conn) error {
 			Active:   true,
 			Mining:   mining,
 			Hashrate: hashrate,
-			Peers:    s.server.PeerCount(),
+			Peers:    s.eth.GetPeer(),
 			GasPrice: gasprice,
 			Syncing:  syncing,
 			Uptime:   100,

params/version.go

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