aboutsummaryrefslogtreecommitdiffstats
path: root/mobile
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2017-03-02 21:03:33 +0800
committerFelix Lange <fjl@twurst.com>2017-03-23 22:58:43 +0800
commit37dd9086ec491900311fc39837f4a62ef5fd3a4a (patch)
tree0d2c7bb99ad1cd2ffa6d014e44288452a537aba5 /mobile
parent67c47459f283842bbf0063d9a1dc078251d6f433 (diff)
downloadgo-tangerine-37dd9086ec491900311fc39837f4a62ef5fd3a4a.tar
go-tangerine-37dd9086ec491900311fc39837f4a62ef5fd3a4a.tar.gz
go-tangerine-37dd9086ec491900311fc39837f4a62ef5fd3a4a.tar.bz2
go-tangerine-37dd9086ec491900311fc39837f4a62ef5fd3a4a.tar.lz
go-tangerine-37dd9086ec491900311fc39837f4a62ef5fd3a4a.tar.xz
go-tangerine-37dd9086ec491900311fc39837f4a62ef5fd3a4a.tar.zst
go-tangerine-37dd9086ec491900311fc39837f4a62ef5fd3a4a.zip
core: refactor genesis handling
This commit solves several issues concerning the genesis block: * Genesis/ChainConfig loading was handled by cmd/geth code. This left library users in the cold. They could specify a JSON-encoded string and overwrite the config, but didn't get any of the additional checks performed by geth. * Decoding and writing of genesis JSON was conflated in WriteGenesisBlock. This made it a lot harder to embed the genesis block into the forthcoming config file loader. This commit changes things so there is a single Genesis type that represents genesis blocks. All uses of Write*Genesis* are changed to use the new type instead. * If the chain config supplied by the user was incompatible with the current chain (i.e. the chain had already advanced beyond a scheduled fork), it got overwritten. This is not an issue in practice because previous forks have always had the highest total difficulty. It might matter in the future though. The new code reverts the local chain to the point of the fork when upgrading configuration. The change to genesis block data removes compression library dependencies from package core.
Diffstat (limited to 'mobile')
-rw-r--r--mobile/geth.go50
-rw-r--r--mobile/params.go8
2 files changed, 46 insertions, 12 deletions
diff --git a/mobile/geth.go b/mobile/geth.go
index 62791652d..e070cec56 100644
--- a/mobile/geth.go
+++ b/mobile/geth.go
@@ -20,10 +20,12 @@
package geth
import (
+ "encoding/json"
"fmt"
"math/big"
"path/filepath"
+ "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/ethstats"
@@ -92,6 +94,18 @@ func NewNodeConfig() *NodeConfig {
return &config
}
+// SetMainnet sets up the node for use on the Ethereum mainnet.
+func (cfg *NodeConfig) SetMainnet() {
+ cfg.EthereumGenesis = ""
+ cfg.EthereumChainConfig = MainnetChainConfig()
+}
+
+// SetTestnet sets up the node for use on the Ethereum testnet.
+func (cfg *NodeConfig) SetTestnet() {
+ cfg.EthereumGenesis = TestnetGenesis()
+ cfg.EthereumChainConfig = TestnetChainConfig()
+}
+
// Node represents a Geth Ethereum node instance.
type Node struct {
node *node.Node
@@ -127,20 +141,34 @@ func NewNode(datadir string, config *NodeConfig) (stack *Node, _ error) {
if err != nil {
return nil, err
}
+
+ var genesis *core.Genesis
+ if config.EthereumGenesis != "" {
+ genesis = new(core.Genesis)
+ if err := json.Unmarshal([]byte(config.EthereumGenesis), genesis); err != nil {
+ return nil, fmt.Errorf("invalid EthereumGenesis: %v", err)
+ }
+ }
+ if config.EthereumChainConfig != nil {
+ if genesis == nil {
+ genesis = core.DefaultGenesisBlock()
+ }
+ genesis.Config = &params.ChainConfig{
+ ChainId: big.NewInt(config.EthereumChainConfig.ChainID),
+ 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),
+ }
+ }
+
// Register the Ethereum protocol if requested
if config.EthereumEnabled {
ethConf := &eth.Config{
- ChainConfig: &params.ChainConfig{
- ChainId: big.NewInt(config.EthereumChainConfig.ChainID),
- 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,
+ Genesis: genesis,
LightMode: true,
DatabaseCache: config.EthereumDatabaseCache,
NetworkId: config.EthereumNetworkID,
diff --git a/mobile/params.go b/mobile/params.go
index 87747c7b0..6ca0c1b3a 100644
--- a/mobile/params.go
+++ b/mobile/params.go
@@ -19,6 +19,8 @@
package geth
import (
+ "encoding/json"
+
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/p2p/discv5"
"github.com/ethereum/go-ethereum/params"
@@ -60,7 +62,11 @@ func TestnetChainConfig() *ChainConfig {
// TestnetGenesis returns the JSON spec to use for the Ethereum test network.
func TestnetGenesis() string {
- return core.DefaultTestnetGenesisBlock()
+ enc, err := json.Marshal(core.DefaultTestnetGenesisBlock())
+ if err != nil {
+ panic(err)
+ }
+ return string(enc)
}
// ChainConfig is the core config which determines the blockchain settings.