Skip to content

eth: change chainID method to return chainID from config or error if before EIP-155 #21686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 12, 2021
Merged

eth: change chainID method to return chainID from config or error if before EIP-155 #21686

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b306f01
add a method to eth, unsafe? chainID
renaynay Oct 11, 2020
871a47b
chainID returns config chainID, extra method EIP155 to check if block…
renaynay Oct 12, 2020
0af9293
simplify
renaynay Nov 25, 2020
4310f63
return err if chain not synced beyond EIP155 fork block
renaynay Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions eth/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@ func (api *PublicEthereumAPI) Hashrate() hexutil.Uint64 {
return hexutil.Uint64(api.e.Miner().HashRate())
}

// ChainId is the EIP-155 replay-protection chain id for the current ethereum chain config.
// ChainId is the chain id for the current ethereum chain config.
func (api *PublicEthereumAPI) ChainId() hexutil.Uint64 {
chainID := new(big.Int)
if config := api.e.blockchain.Config(); config.IsEIP155(api.e.blockchain.CurrentBlock().Number()) {
chainID = config.ChainID
}
return (hexutil.Uint64)(chainID.Uint64())
return (hexutil.Uint64)(api.e.blockchain.Config().ChainID.Uint64())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's return an error when the current block does not have EIP-155 yet.

}

// IsEIP155 returns whether the current chain is on or past the
// EIP-155 replay-protection fork block.
func (api *PublicEthereumAPI) IsEIP155() bool {
return api.e.blockchain.Config().IsEIP155(api.e.blockchain.CurrentBlock().Number())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this method

}

// PublicMinerAPI provides an API to control the miner.
Expand Down
5 changes: 5 additions & 0 deletions internal/web3ext/web3ext.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,11 @@ web3._extend({
call: 'eth_chainId',
params: 0
}),
new web3._extend.Method({
name: 'isEIP155',
call: 'eth_isEIP155',
params: 0
}),
new web3._extend.Method({
name: 'sign',
call: 'eth_sign',
Expand Down