diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-11-14 19:03:29 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-11-15 00:00:14 +0800 |
| commit | 4a439c2359991bdc49463ae66da11da895cc6eb7 (patch) | |
| tree | bb5ef79628597c67af9f13c2aa7ddcf59452d482 /mobile/geth.go | |
| parent | 4c16c82500645de83907743555e7256af86a9423 (diff) | |
| download | go-tangerine-4a439c2359991bdc49463ae66da11da895cc6eb7.tar go-tangerine-4a439c2359991bdc49463ae66da11da895cc6eb7.tar.gz go-tangerine-4a439c2359991bdc49463ae66da11da895cc6eb7.tar.bz2 go-tangerine-4a439c2359991bdc49463ae66da11da895cc6eb7.tar.lz go-tangerine-4a439c2359991bdc49463ae66da11da895cc6eb7.tar.xz go-tangerine-4a439c2359991bdc49463ae66da11da895cc6eb7.tar.zst go-tangerine-4a439c2359991bdc49463ae66da11da895cc6eb7.zip | |
mobile: port wrappers to EIP155 and EIP158 fork
Diffstat (limited to 'mobile/geth.go')
| -rw-r--r-- | mobile/geth.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mobile/geth.go b/mobile/geth.go index 4d1f48ec3..d7f0800e0 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -25,7 +25,6 @@ import ( "path/filepath" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/ethclient" @@ -33,6 +32,7 @@ import ( "github.com/ethereum/go-ethereum/light" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/whisper/whisperv2" ) @@ -129,12 +129,14 @@ func NewNode(datadir string, config *NodeConfig) (*Node, error) { // Register the Ethereum protocol if requested if config.EthereumEnabled { ethConf := ð.Config{ - ChainConfig: &core.ChainConfig{ - HomesteadBlock: big.NewInt(config.EthereumChainConfig.HomesteadBlock), - DAOForkBlock: big.NewInt(config.EthereumChainConfig.DAOForkBlock), - DAOForkSupport: config.EthereumChainConfig.DAOForkSupport, - HomesteadGasRepriceBlock: big.NewInt(config.EthereumChainConfig.HomesteadGasRepriceBlock), - HomesteadGasRepriceHash: config.EthereumChainConfig.HomesteadGasRepriceHash.hash, + ChainConfig: ¶ms.ChainConfig{ + HomesteadBlock: big.NewInt(config.EthereumChainConfig.HomesteadBlock), + DAOForkBlock: big.NewInt(config.EthereumChainConfig.DAOForkBlock), + DAOForkSupport: config.EthereumChainConfig.DAOForkSupport, + EIP150Block: big.NewInt(config.EthereumChainConfig.EIP150Block), + EIP150Hash: config.EthereumChainConfig.EIP150Hash.hash, + EIP155Block: big.NewInt(config.EthereumChainConfig.EIP155Block), + EIP158Block: big.NewInt(config.EthereumChainConfig.EIP158Block), }, Genesis: config.EthereumGenesis, LightMode: true, |