diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-11-16 07:46:40 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2016-11-16 07:46:40 +0800 |
| commit | 64359c9417244c7a824ea90b39a20b06f702bc08 (patch) | |
| tree | eb0618e0afbbf7364884d1ce9ce23266fc56de94 /mobile | |
| parent | 5a3853f83f931b6a68353cb1f3611f1db345e340 (diff) | |
| download | dexon-64359c9417244c7a824ea90b39a20b06f702bc08.tar dexon-64359c9417244c7a824ea90b39a20b06f702bc08.tar.gz dexon-64359c9417244c7a824ea90b39a20b06f702bc08.tar.bz2 dexon-64359c9417244c7a824ea90b39a20b06f702bc08.tar.lz dexon-64359c9417244c7a824ea90b39a20b06f702bc08.tar.xz dexon-64359c9417244c7a824ea90b39a20b06f702bc08.tar.zst dexon-64359c9417244c7a824ea90b39a20b06f702bc08.zip | |
cmd/utils, mobile, params: set the correct field on testnet EIP 155 (#3272)
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/geth.go | 1 | ||||
| -rw-r--r-- | mobile/params.go | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mobile/geth.go b/mobile/geth.go index d7f0800e0..e209b667c 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -130,6 +130,7 @@ func NewNode(datadir string, config *NodeConfig) (*Node, error) { if config.EthereumEnabled { ethConf := ð.Config{ ChainConfig: ¶ms.ChainConfig{ + ChainId: big.NewInt(config.EthereumChainConfig.ChainID), HomesteadBlock: big.NewInt(config.EthereumChainConfig.HomesteadBlock), DAOForkBlock: big.NewInt(config.EthereumChainConfig.DAOForkBlock), DAOForkSupport: config.EthereumChainConfig.DAOForkSupport, diff --git a/mobile/params.go b/mobile/params.go index 48344a538..1b9f124b4 100644 --- a/mobile/params.go +++ b/mobile/params.go @@ -27,6 +27,7 @@ import ( // MainnetChainConfig returns the chain configurations for the main Ethereum network. func MainnetChainConfig() *ChainConfig { return &ChainConfig{ + ChainID: params.MainNetChainID.Int64(), HomesteadBlock: params.MainNetHomesteadBlock.Int64(), DAOForkBlock: params.MainNetDAOForkBlock.Int64(), DAOForkSupport: true, @@ -46,9 +47,10 @@ func MainnetGenesis() string { // TestnetChainConfig returns the chain configurations for the Ethereum test network. func TestnetChainConfig() *ChainConfig { return &ChainConfig{ + ChainID: params.TestNetChainID.Int64(), HomesteadBlock: params.TestNetHomesteadBlock.Int64(), DAOForkBlock: 0, - DAOForkSupport: false, + DAOForkSupport: true, EIP150Block: params.TestNetHomesteadGasRepriceBlock.Int64(), EIP150Hash: Hash{params.TestNetHomesteadGasRepriceHash}, EIP155Block: params.TestNetSpuriousDragon.Int64(), @@ -63,6 +65,7 @@ func TestnetGenesis() string { // ChainConfig is the core config which determines the blockchain settings. type ChainConfig struct { + ChainID int64 // Chain ID for replay protection HomesteadBlock int64 // Homestead switch block DAOForkBlock int64 // TheDAO hard-fork switch block DAOForkSupport bool // Whether the nodes supports or opposes the DAO hard-fork |