aboutsummaryrefslogtreecommitdiffstats
path: root/core
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 /core
parent00665a0b72ed93692daec21bbd79931828653228 (diff)
downloaddexon-8639b0fae975a5e65dea16fe5321168ac0aef128.tar
dexon-8639b0fae975a5e65dea16fe5321168ac0aef128.tar.gz
dexon-8639b0fae975a5e65dea16fe5321168ac0aef128.tar.bz2
dexon-8639b0fae975a5e65dea16fe5321168ac0aef128.tar.lz
dexon-8639b0fae975a5e65dea16fe5321168ac0aef128.tar.xz
dexon-8639b0fae975a5e65dea16fe5321168ac0aef128.tar.zst
dexon-8639b0fae975a5e65dea16fe5321168ac0aef128.zip
cmd/utils, core, params: explicitly pick reprice fork for fast sync
Diffstat (limited to 'core')
-rw-r--r--core/block_validator.go10
-rw-r--r--core/config.go4
2 files changed, 12 insertions, 2 deletions
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:"-"`
}