cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3195 from karalabe/fix-testnet-fastsync

Browse Source 
cmd/utils, core, params: explicitly pick reprice fork for fast sync
This commit is contained in:
Péter Szilágyi 2016-10-29 17:21:26 +03:00 committed by GitHub
commit 63d293cdbe
5 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/geth/dao_test.go
View File

@ -116,19 +116,19 @@ func TestDAOInitOldPrivnet(t *testing.T) {
testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{}, nil, false) testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{}, nil, false)
} }
func TestDAODefaultOldPrivnet(t *testing.T) { func TestDAODefaultOldPrivnet(t *testing.T) {
testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{false, false}}, params.MainNetDAOForkBlock, true) testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{false, false}}, nil, false)
} }
func TestDAOSupportOldPrivnet(t *testing.T) { func TestDAOSupportOldPrivnet(t *testing.T) {
testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{true, false}}, params.MainNetDAOForkBlock, true) testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{true, false}}, nil, true)
} }
func TestDAOOpposeOldPrivnet(t *testing.T) { func TestDAOOpposeOldPrivnet(t *testing.T) {
testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{false, true}}, params.MainNetDAOForkBlock, false) testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{false, true}}, nil, false)
} }
func TestDAOSwitchToSupportOldPrivnet(t *testing.T) { func TestDAOSwitchToSupportOldPrivnet(t *testing.T) {
testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{false, true}, {true, false}}, params.MainNetDAOForkBlock, true) testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{false, true}, {true, false}}, nil, true)
} }
func TestDAOSwitchToOpposeOldPrivnet(t *testing.T) { func TestDAOSwitchToOpposeOldPrivnet(t *testing.T) {
testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{true, false}, {false, true}}, params.MainNetDAOForkBlock, false) testDAOForkBlockNewChain(t, false, daoOldGenesis, [][2]bool{{true, false}, {false, true}}, nil, false)
} }
func TestDAOInitNoForkPrivnet(t *testing.T) { func TestDAOInitNoForkPrivnet(t *testing.T) {
testDAOForkBlockNewChain(t, false, daoNoForkGenesis, [][2]bool{}, daoGenesisForkBlock, false) testDAOForkBlockNewChain(t, false, daoNoForkGenesis, [][2]bool{}, daoGenesisForkBlock, false)

54
cmd/utils/flags.go
View File

@ -781,27 +781,43 @@ func MakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *core.ChainConfi
Fatalf("Could not make chain configuration: %v", err) Fatalf("Could not make chain configuration: %v", err)
} }
} }
// Set any missing fields due to them being unset or system upgrade // Check whether we are allowed to set default config params or not:
if config.HomesteadBlock == nil { // - If no genesis is set, we're running either mainnet or testnet (private nets use `geth init`)
if ctx.GlobalBool(TestNetFlag.Name) { // - If a genesis is already set, ensure we have a configuration for it (mainnet or testnet)
config.HomesteadBlock = params.TestNetHomesteadBlock defaults := genesis == nil ||
} else { (genesis.Hash() == params.MainNetGenesisHash && !ctx.GlobalBool(TestNetFlag.Name)) ||
config.HomesteadBlock = params.MainNetHomesteadBlock (genesis.Hash() == params.TestNetGenesisHash && ctx.GlobalBool(TestNetFlag.Name))
// Set any missing chainConfig fields due to them being unset or system upgrade
if defaults {
if config.HomesteadBlock == nil {
if ctx.GlobalBool(TestNetFlag.Name) {
config.HomesteadBlock = params.TestNetHomesteadBlock
} else {
config.HomesteadBlock = params.MainNetHomesteadBlock
}
} }
} if config.DAOForkBlock == nil {
if config.DAOForkBlock == nil { if ctx.GlobalBool(TestNetFlag.Name) {
if ctx.GlobalBool(TestNetFlag.Name) { config.DAOForkBlock = params.TestNetDAOForkBlock
config.DAOForkBlock = params.TestNetDAOForkBlock } else {
} else { config.DAOForkBlock = params.MainNetDAOForkBlock
config.DAOForkBlock = params.MainNetDAOForkBlock }
config.DAOForkSupport = true
} }
config.DAOForkSupport = true if config.HomesteadGasRepriceBlock == nil {
} if ctx.GlobalBool(TestNetFlag.Name) {
if config.HomesteadGasRepriceBlock == nil { config.HomesteadGasRepriceBlock = params.TestNetHomesteadGasRepriceBlock
if ctx.GlobalBool(TestNetFlag.Name) { } else {
config.HomesteadGasRepriceBlock = params.TestNetHomesteadGasRepriceBlock config.HomesteadGasRepriceBlock = params.MainNetHomesteadGasRepriceBlock
} else { }
config.HomesteadGasRepriceBlock = params.MainNetHomesteadGasRepriceBlock }
if config.HomesteadGasRepriceHash == (common.Hash{}) {
if ctx.GlobalBool(TestNetFlag.Name) {
config.HomesteadGasRepriceHash = params.TestNetHomesteadGasRepriceHash
} else {
config.HomesteadGasRepriceHash = params.MainNetHomesteadGasRepriceHash
}
} }
} }
// Force override any existing configs if explicitly requested // Force override any existing configs if explicitly requested

10
core/block_validator.go
View File

@ -248,7 +248,15 @@ func ValidateHeader(config *ChainConfig, pow pow.PoW, header *types.Header, pare
} }
} }
// If all checks passed, validate the extra-data field for hard forks // If all checks passed, validate the extra-data field for hard forks
return ValidateDAOHeaderExtraData(config, header) if err := ValidateDAOHeaderExtraData(config, header); err != nil {
return err
}
if config.HomesteadGasRepriceBlock != nil && config.HomesteadGasRepriceBlock.Cmp(header.Number) == 0 {
if config.HomesteadGasRepriceHash != (common.Hash{}) && config.HomesteadGasRepriceHash != header.Hash() {
return ValidationError("Homestead gas reprice fork hash mismatch: have 0x%x, want 0x%x", header.Hash(), config.HomesteadGasRepriceHash)
}
}
return nil
} }
// CalcDifficulty is the difficulty adjustment algorithm. It returns // CalcDifficulty is the difficulty adjustment algorithm. It returns

4
core/config.go
View File

@ -20,6 +20,7 @@ import (
"errors" "errors"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
) )
@ -36,7 +37,8 @@ type ChainConfig struct {
DAOForkBlock *big.Int `json:"daoForkBlock"` // TheDAO hard-fork switch block (nil = no fork) DAOForkBlock *big.Int `json:"daoForkBlock"` // TheDAO hard-fork switch block (nil = no fork)
DAOForkSupport bool `json:"daoForkSupport"` // Whether the nodes supports or opposes the DAO hard-fork DAOForkSupport bool `json:"daoForkSupport"` // Whether the nodes supports or opposes the DAO hard-fork
HomesteadGasRepriceBlock *big.Int `json:"homesteadGasRepriceBlock"` // Homestead gas reprice switch block (nil = no fork) HomesteadGasRepriceBlock *big.Int `json:"homesteadGasRepriceBlock"` // Homestead gas reprice switch block (nil = no fork)
HomesteadGasRepriceHash common.Hash `json:"homesteadGasRepriceHash"` // Homestead gas reprice switch block hash (fast sync aid)
VmConfig vm.Config `json:"-"` VmConfig vm.Config `json:"-"`
} }

21
params/util.go
View File

@ -16,11 +16,22 @@
package params package params
import "math/big" import (
"math/big"
"github.com/ethereum/go-ethereum/common"
)
var ( var (
TestNetHomesteadBlock = big.NewInt(494000) // Testnet homestead block TestNetGenesisHash = common.HexToHash("0x0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303") // Testnet genesis hash to enforce below configs on
MainNetHomesteadBlock = big.NewInt(1150000) // Mainnet homestead block MainNetGenesisHash = common.HexToHash("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3") // Mainnet genesis hash to enforce below configs on
TestNetHomesteadGasRepriceBlock = big.NewInt(1783000) // Test net gas reprice block
MainNetHomesteadGasRepriceBlock = big.NewInt(2463000) // Main net gas reprice block TestNetHomesteadBlock = big.NewInt(494000) // Testnet homestead block
MainNetHomesteadBlock = big.NewInt(1150000) // Mainnet homestead block
TestNetHomesteadGasRepriceBlock = big.NewInt(1783000) // Testnet gas reprice block
MainNetHomesteadGasRepriceBlock = big.NewInt(2463000) // Mainnet gas reprice block
TestNetHomesteadGasRepriceHash = common.HexToHash("0xf376243aeff1f256d970714c3de9fd78fa4e63cf63e32a51fe1169e375d98145") // Testnet gas reprice block hash (used by fast sync)
MainNetHomesteadGasRepriceHash = common.HexToHash("0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0") // Mainnet gas reprice block hash (used by fast sync)
) )