aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-10-24 16:40:58 +0800
committerPéter Szilágyi <peterke@gmail.com>2016-10-29 17:10:00 +0800
commit8639b0fae975a5e65dea16fe5321168ac0aef128 (patch)
tree17cc166f2728551ed8999b95c690a423114e25ed
parent00665a0b72ed93692daec21bbd79931828653228 (diff)
downloaddexon-8639b0fae975a5e65dea16fe5321168ac0aef128.tar.gz
dexon-8639b0fae975a5e65dea16fe5321168ac0aef128.tar.zst
dexon-8639b0fae975a5e65dea16fe5321168ac0aef128.zip
cmd/utils, core, params: explicitly pick reprice fork for fast sync
-rw-r--r--cmd/utils/flags.go7
-rw-r--r--core/block_validator.go10
-rw-r--r--core/config.go4
-rw-r--r--params/util.go18
4 files changed, 32 insertions, 7 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 5e2dcf8c9..71777ce60 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -804,6 +804,13 @@ func MakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *core.ChainConfi
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
switch {
case ctx.GlobalBool(SupportDAOFork.Name):
diff --git a/core/block_validator.go b/core/block_validator.go
index e5bc6178b..3f5aa10ff 100644
--- a/core/block_validator.go
+++ b/core/block_validator.go
@@ -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
- 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.HomesteadGasRepriceBlock)
+ }
+ }
+ return nil
}
// CalcDifficulty is the difficulty adjustment algorithm. It returns
diff --git a/core/config.go b/core/config.go
index 3ab04e520..96e39ea3c 100644
--- a/core/config.go
+++ b/core/config.go
@@ -20,6 +20,7 @@ import (
"errors"
"math/big"
+ "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/vm"
"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)
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:"-"`
}
diff --git a/params/util.go b/params/util.go
index 583cf03bb..bd0cff7e8 100644
--- a/params/util.go
+++ b/params/util.go
@@ -16,11 +16,19 @@
package params
-import "math/big"
+import (
+ "math/big"
+
+ "github.com/ethereum/go-ethereum/common"
+)
var (
- TestNetHomesteadBlock = big.NewInt(494000) // Testnet homestead block
- MainNetHomesteadBlock = big.NewInt(1150000) // Mainnet homestead block
- 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)
)