cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
pull from: v1.11.6-statediff-v5
merge into: cerc-io:master
Conversation 0 Commits 1565 Files Changed 1471 +2 -6
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 647c6f2db6 - Show all commits

8
internal/ethapi/api.go
View File

@ -609,12 +609,8 @@ func NewBlockChainAPI(b Backend) *BlockChainAPI {
} }
// 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 *BlockChainAPI) ChainId() (*hexutil.Big, error) { func (api *BlockChainAPI) ChainId() *hexutil.Big {
// if current block is at or past the EIP-155 replay-protection fork block, return chainID from config return (*hexutil.Big)(api.b.ChainConfig().ChainID)
if config := api.b.ChainConfig(); config.IsEIP155(api.b.CurrentBlock().Number()) {
return (*hexutil.Big)(config.ChainID), nil
}
return nil, fmt.Errorf("chain not synced beyond EIP-155 replay-protection fork block")
} }
// BlockNumber returns the block number of the chain head. // BlockNumber returns the block number of the chain head.