forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Nguyen Sy Thanh Son 2019-01-31 04:21:01 +00:00
commit 8e97af7d95
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/tomochain/entrypoint.sh
View file

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

6
eth/backend.go
View file

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

2
ethstats/ethstats.go
View file

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

2
params/version.go
View file

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