From 2f5c6133416e0ed9e2d48b9d4f23484675301e42 Mon Sep 17 00:00:00 2001 From: Tuna Date: Wed, 30 Jan 2019 22:41:44 +0700 Subject: [PATCH 1/3] correct peer on stats --- eth/backend.go | 6 +++++- ethstats/ethstats.go | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/eth/backend.go b/eth/backend.go index a49e034494..2b19db2fbf 100644 --- a/eth/backend.go +++ b/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) +} diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index 7587afb4f7..29e7c52a98 100644 --- a/ethstats/ethstats.go +++ b/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, From f8d62782818ff7443347c93edd386ba502b051c7 Mon Sep 17 00:00:00 2001 From: Tuna Date: Thu, 31 Jan 2019 09:30:04 +0700 Subject: [PATCH 2/3] v1.2.2 --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index ee2f8a5be9..3e33197a61 100644 --- a/params/version.go +++ b/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 ) From f772c0f8b9c19854fb97b3bcc5250417a5665203 Mon Sep 17 00:00:00 2001 From: Nguyen Sy Thanh Son Date: Thu, 31 Jan 2019 09:59:29 +0700 Subject: [PATCH 3/3] Change default gasPrice to 0.25 Gwei --- docker/tomochain/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/tomochain/entrypoint.sh b/docker/tomochain/entrypoint.sh index 9b41a752a5..254eab0dee 100755 --- a/docker/tomochain/entrypoint.sh +++ b/docker/tomochain/entrypoint.sh @@ -175,6 +175,6 @@ exec tomo $params \ --wsport 8546 \ --wsorigins "*" \ --mine \ - --gasprice "2500" \ + --gasprice "250000000" \ --targetgaslimit "84000000" \ "$@"