forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

eth: improve getting chainID with existence check and hexutil

Browse source
This commit is contained in:
ia 2017-09-06 11:08:06 -05:00 committed by hackyminer
parent 51dd117a34
commit df4f7c867e
No known key found for this signature in database
GPG key ID: 46D453DDCA4B766F
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
eth/api.go
View file

@ -68,8 +68,12 @@ func (api *PublicEthereumAPI) Hashrate() hexutil.Uint64 {
} }
// ChainId is the EIP-155 replay-protection chain id for the current ethereum chain config. // ChainId is the EIP-155 replay-protection chain id for the current ethereum chain config.
func (api *PublicEthereumAPI) ChainId() *big.Int { func (api *PublicEthereumAPI) ChainId() hexutil.Uint {
return api.e.chainConfig.ChainId chainID := new(big.Int)
if config := api.e.chainConfig; config.IsEIP155(api.e.blockchain.CurrentBlock().Number()) {
chainID = config.ChainId
}
return hexutil.Uint(chainID)
} }
// PublicMinerAPI provides an API to control the miner. // PublicMinerAPI provides an API to control the miner.