30d706c35e
* p2p/discover, p2p/discv5: add marshaling methods to Node * p2p/netutil: make Netlist decodable from TOML * common/math: encode nil HexOrDecimal256 as 0x0 * cmd/geth: add --config file flag * cmd/geth: add missing license header * eth: prettify Config again, fix tests * eth: use gasprice.Config instead of duplicating its fields * eth/gasprice: hide nil default from dumpconfig output * cmd/geth: hide genesis block in dumpconfig output * node: make tests compile * console: fix tests * cmd/geth: make TOML keys look exactly like Go struct fields * p2p: use discovery by default This makes the zero Config slightly more useful. It also fixes package node tests because Node detects reuse of the datadir through the NodeDatabase. * cmd/geth: make ethstats URL settable through config file * cmd/faucet: fix configuration * cmd/geth: dedup attach tests * eth: add comment for DefaultConfig * eth: pass downloader.SyncMode in Config This removes the FastSync, LightSync flags in favour of a more general SyncMode flag. * cmd/utils: remove jitvm flags * cmd/utils: make mutually exclusive flag error prettier It now reads: Fatal: flags --dev, --testnet can't be used at the same time * p2p: fix typo * node: add DefaultConfig, use it for geth * mobile: add missing NoDiscovery option * cmd/utils: drop MakeNode This exposed a couple of places that needed to be updated to use node.DefaultConfig. * node: fix typo * eth: make fast sync the default mode * cmd/utils: remove IPCApiFlag (unused) * node: remove default IPC path Set it in the frontends instead. * cmd/geth: add --syncmode * cmd/utils: make --ipcdisable and --ipcpath mutually exclusive * cmd/utils: don't enable WS, HTTP when setting addr * cmd/utils: fix --identity
153 lines
5.5 KiB
Go
153 lines
5.5 KiB
Go
// Copyright 2016 The go-ethereum Authors
|
|
// This file is part of go-ethereum.
|
|
//
|
|
// go-ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// go-ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package main
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"math/big"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/core"
|
|
"github.com/ethereum/go-ethereum/ethdb"
|
|
"github.com/ethereum/go-ethereum/params"
|
|
)
|
|
|
|
// Genesis block for nodes which don't care about the DAO fork (i.e. not configured)
|
|
var daoOldGenesis = `{
|
|
"alloc" : {},
|
|
"coinbase" : "0x0000000000000000000000000000000000000000",
|
|
"difficulty" : "0x20000",
|
|
"extraData" : "",
|
|
"gasLimit" : "0x2fefd8",
|
|
"nonce" : "0x0000000000000042",
|
|
"mixhash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"timestamp" : "0x00",
|
|
"config" : {}
|
|
}`
|
|
|
|
// Genesis block for nodes which actively oppose the DAO fork
|
|
var daoNoForkGenesis = `{
|
|
"alloc" : {},
|
|
"coinbase" : "0x0000000000000000000000000000000000000000",
|
|
"difficulty" : "0x20000",
|
|
"extraData" : "",
|
|
"gasLimit" : "0x2fefd8",
|
|
"nonce" : "0x0000000000000042",
|
|
"mixhash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"timestamp" : "0x00",
|
|
"config" : {
|
|
"daoForkBlock" : 314,
|
|
"daoForkSupport" : false
|
|
}
|
|
}`
|
|
|
|
// Genesis block for nodes which actively support the DAO fork
|
|
var daoProForkGenesis = `{
|
|
"alloc" : {},
|
|
"coinbase" : "0x0000000000000000000000000000000000000000",
|
|
"difficulty" : "0x20000",
|
|
"extraData" : "",
|
|
"gasLimit" : "0x2fefd8",
|
|
"nonce" : "0x0000000000000042",
|
|
"mixhash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
|
|
"timestamp" : "0x00",
|
|
"config" : {
|
|
"daoForkBlock" : 314,
|
|
"daoForkSupport" : true
|
|
}
|
|
}`
|
|
|
|
var daoGenesisHash = common.HexToHash("5e1fc79cb4ffa4739177b5408045cd5d51c6cf766133f23f7cd72ee1f8d790e0")
|
|
var daoGenesisForkBlock = big.NewInt(314)
|
|
|
|
// TestDAOForkBlockNewChain tests that the DAO hard-fork number and the nodes support/opposition is correctly
|
|
// set in the database after various initialization procedures and invocations.
|
|
func TestDAOForkBlockNewChain(t *testing.T) {
|
|
for i, arg := range []struct {
|
|
genesis string
|
|
expectBlock *big.Int
|
|
expectVote bool
|
|
}{
|
|
// Test DAO Default Mainnet
|
|
{"", params.MainNetDAOForkBlock, true},
|
|
// test DAO Init Old Privnet
|
|
{daoOldGenesis, nil, false},
|
|
// test DAO Default No Fork Privnet
|
|
{daoNoForkGenesis, daoGenesisForkBlock, false},
|
|
// test DAO Default Pro Fork Privnet
|
|
{daoProForkGenesis, daoGenesisForkBlock, true},
|
|
} {
|
|
testDAOForkBlockNewChain(t, i, arg.genesis, arg.expectBlock, arg.expectVote)
|
|
}
|
|
}
|
|
|
|
func testDAOForkBlockNewChain(t *testing.T, test int, genesis string, expectBlock *big.Int, expectVote bool) {
|
|
// Create a temporary data directory to use and inspect later
|
|
datadir := tmpdir(t)
|
|
defer os.RemoveAll(datadir)
|
|
|
|
// Start a Geth instance with the requested flags set and immediately terminate
|
|
if genesis != "" {
|
|
json := filepath.Join(datadir, "genesis.json")
|
|
if err := ioutil.WriteFile(json, []byte(genesis), 0600); err != nil {
|
|
t.Fatalf("test %d: failed to write genesis file: %v", test, err)
|
|
}
|
|
runGeth(t, "--datadir", datadir, "init", json).cmd.Wait()
|
|
} else {
|
|
// Force chain initialization
|
|
args := []string{"--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--ipcdisable", "--datadir", datadir}
|
|
geth := runGeth(t, append(args, []string{"--exec", "2+2", "console"}...)...)
|
|
geth.cmd.Wait()
|
|
}
|
|
// Retrieve the DAO config flag from the database
|
|
path := filepath.Join(datadir, "geth", "chaindata")
|
|
db, err := ethdb.NewLDBDatabase(path, 0, 0)
|
|
if err != nil {
|
|
t.Fatalf("test %d: failed to open test database: %v", test, err)
|
|
}
|
|
defer db.Close()
|
|
|
|
genesisHash := common.HexToHash("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3")
|
|
if genesis != "" {
|
|
genesisHash = daoGenesisHash
|
|
}
|
|
config, err := core.GetChainConfig(db, genesisHash)
|
|
if err != nil {
|
|
t.Errorf("test %d: failed to retrieve chain config: %v", test, err)
|
|
return // we want to return here, the other checks can't make it past this point (nil panic).
|
|
}
|
|
// Validate the DAO hard-fork block number against the expected value
|
|
if config.DAOForkBlock == nil {
|
|
if expectBlock != nil {
|
|
t.Errorf("test %d: dao hard-fork block mismatch: have nil, want %v", test, expectBlock)
|
|
}
|
|
} else if expectBlock == nil {
|
|
t.Errorf("test %d: dao hard-fork block mismatch: have %v, want nil", test, config.DAOForkBlock)
|
|
} else if config.DAOForkBlock.Cmp(expectBlock) != 0 {
|
|
t.Errorf("test %d: dao hard-fork block mismatch: have %v, want %v", test, config.DAOForkBlock, expectBlock)
|
|
}
|
|
if config.DAOForkSupport != expectVote {
|
|
t.Errorf("test %d: dao hard-fork support mismatch: have %v, want %v", test, config.DAOForkSupport, expectVote)
|
|
}
|
|
}
|