forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-17 18:30:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

replace consensus int config with string const

Browse source
This commit is contained in:
Jianrong 2021-10-17 11:31:49 +11:00
parent 0eb2504db3
commit e5a9a5ddbc
2 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
consensus/XDPoS/XDPoS.go
View file

@ -121,9 +121,9 @@ func (c *XDPoS) APIs(chain consensus.ChainReader) []rpc.API {
// from the signature in the header's extra-data section. // from the signature in the header's extra-data section.
func (c *XDPoS) Author(header *types.Header) (common.Address, error) { func (c *XDPoS) Author(header *types.Header) (common.Address, error) {
switch c.config.BlockConsensusVersion(header.Number) { switch c.config.BlockConsensusVersion(header.Number) {
case 2: case params.ConsensusEngineVersion2:
return c.EngineV2.Author(header) return c.EngineV2.Author(header)
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.Author(header) return c.EngineV1.Author(header)
} }
} }
@ -131,7 +131,7 @@ func (c *XDPoS) Author(header *types.Header) (common.Address, error) {
// VerifyHeader checks whether a header conforms to the consensus rules. // VerifyHeader checks whether a header conforms to the consensus rules.
func (c *XDPoS) VerifyHeader(chain consensus.ChainReader, header *types.Header, fullVerify bool) error { func (c *XDPoS) VerifyHeader(chain consensus.ChainReader, header *types.Header, fullVerify bool) error {
switch c.config.BlockConsensusVersion(header.Number) { switch c.config.BlockConsensusVersion(header.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.VerifyHeader(chain, header, fullVerify) return c.EngineV1.VerifyHeader(chain, header, fullVerify)
} }
} }
@ -148,7 +148,7 @@ func (c *XDPoS) VerifyHeaders(chain consensus.ChainReader, headers []*types.Head
// uncles as this consensus mechanism doesn't permit uncles. // uncles as this consensus mechanism doesn't permit uncles.
func (c *XDPoS) VerifyUncles(chain consensus.ChainReader, block *types.Block) error { func (c *XDPoS) VerifyUncles(chain consensus.ChainReader, block *types.Block) error {
switch c.config.BlockConsensusVersion(block.Number()) { switch c.config.BlockConsensusVersion(block.Number()) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.VerifyUncles(chain, block) return c.EngineV1.VerifyUncles(chain, block)
} }
} }
@ -157,7 +157,7 @@ func (c *XDPoS) VerifyUncles(chain consensus.ChainReader, block *types.Block) er
// in the header satisfies the consensus protocol requirements. // in the header satisfies the consensus protocol requirements.
func (c *XDPoS) VerifySeal(chain consensus.ChainReader, header *types.Header) error { func (c *XDPoS) VerifySeal(chain consensus.ChainReader, header *types.Header) error {
switch c.config.BlockConsensusVersion(header.Number) { switch c.config.BlockConsensusVersion(header.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.VerifySeal(chain, header) return c.EngineV1.VerifySeal(chain, header)
} }
} }
@ -166,7 +166,7 @@ func (c *XDPoS) VerifySeal(chain consensus.ChainReader, header *types.Header) er
// header for running the transactions on top. // header for running the transactions on top.
func (c *XDPoS) Prepare(chain consensus.ChainReader, header *types.Header) error { func (c *XDPoS) Prepare(chain consensus.ChainReader, header *types.Header) error {
switch c.config.BlockConsensusVersion(header.Number) { switch c.config.BlockConsensusVersion(header.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.Prepare(chain, header) return c.EngineV1.Prepare(chain, header)
} }
} }
@ -175,7 +175,7 @@ func (c *XDPoS) Prepare(chain consensus.ChainReader, header *types.Header) error
// rewards given, and returns the final block. // rewards given, and returns the final block.
func (c *XDPoS) Finalize(chain consensus.ChainReader, header *types.Header, state *state.StateDB, parentState *state.StateDB, txs []*types.Transaction, uncles []*types.Header, receipts []*types.Receipt) (*types.Block, error) { func (c *XDPoS) Finalize(chain consensus.ChainReader, header *types.Header, state *state.StateDB, parentState *state.StateDB, txs []*types.Transaction, uncles []*types.Header, receipts []*types.Receipt) (*types.Block, error) {
switch c.config.BlockConsensusVersion(header.Number) { switch c.config.BlockConsensusVersion(header.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.Finalize(chain, header, state, parentState, txs, uncles, receipts) return c.EngineV1.Finalize(chain, header, state, parentState, txs, uncles, receipts)
} }
} }
@ -184,7 +184,7 @@ func (c *XDPoS) Finalize(chain consensus.ChainReader, header *types.Header, stat
// the local signing credentials. // the local signing credentials.
func (c *XDPoS) Seal(chain consensus.ChainReader, block *types.Block, stop <-chan struct{}) (*types.Block, error) { func (c *XDPoS) Seal(chain consensus.ChainReader, block *types.Block, stop <-chan struct{}) (*types.Block, error) {
switch c.config.BlockConsensusVersion(block.Number()) { switch c.config.BlockConsensusVersion(block.Number()) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.Seal(chain, block, stop) return c.EngineV1.Seal(chain, block, stop)
} }
} }
@ -194,7 +194,7 @@ func (c *XDPoS) Seal(chain consensus.ChainReader, block *types.Block, stop <-cha
// current signer. // current signer.
func (c *XDPoS) CalcDifficulty(chain consensus.ChainReader, time uint64, parent *types.Header) *big.Int { func (c *XDPoS) CalcDifficulty(chain consensus.ChainReader, time uint64, parent *types.Header) *big.Int {
switch c.config.BlockConsensusVersion(parent.Number) { switch c.config.BlockConsensusVersion(parent.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.CalcDifficulty(chain, time, parent) return c.EngineV1.CalcDifficulty(chain, time, parent)
} }
} }
@ -216,49 +216,49 @@ func (c *XDPoS) GetPeriod() uint64 {
func (c *XDPoS) IsAuthorisedAddress(header *types.Header, chain consensus.ChainReader, address common.Address) bool { func (c *XDPoS) IsAuthorisedAddress(header *types.Header, chain consensus.ChainReader, address common.Address) bool {
switch c.config.BlockConsensusVersion(header.Number) { switch c.config.BlockConsensusVersion(header.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.IsAuthorisedAddress(header, chain, address) return c.EngineV1.IsAuthorisedAddress(header, chain, address)
} }
} }
func (c *XDPoS) GetMasternodes(chain consensus.ChainReader, header *types.Header) []common.Address { func (c *XDPoS) GetMasternodes(chain consensus.ChainReader, header *types.Header) []common.Address {
switch c.config.BlockConsensusVersion(header.Number) { switch c.config.BlockConsensusVersion(header.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.GetMasternodes(chain, header) return c.EngineV1.GetMasternodes(chain, header)
} }
} }
func (c *XDPoS) YourTurn(chain consensus.ChainReader, parent *types.Header, signer common.Address) (int, int, int, bool, error) { func (c *XDPoS) YourTurn(chain consensus.ChainReader, parent *types.Header, signer common.Address) (int, int, int, bool, error) {
switch c.config.BlockConsensusVersion(parent.Number) { switch c.config.BlockConsensusVersion(parent.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.YourTurn(chain, parent, signer) return c.EngineV1.YourTurn(chain, parent, signer)
} }
} }
func (c *XDPoS) GetValidator(creator common.Address, chain consensus.ChainReader, header *types.Header) (common.Address, error) { func (c *XDPoS) GetValidator(creator common.Address, chain consensus.ChainReader, header *types.Header) (common.Address, error) {
switch c.config.BlockConsensusVersion(header.Number) { switch c.config.BlockConsensusVersion(header.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.GetValidator(creator, chain, header) return c.EngineV1.GetValidator(creator, chain, header)
} }
} }
func (c *XDPoS) UpdateMasternodes(chain consensus.ChainReader, header *types.Header, ms []utils.Masternode) error { func (c *XDPoS) UpdateMasternodes(chain consensus.ChainReader, header *types.Header, ms []utils.Masternode) error {
switch c.config.BlockConsensusVersion(header.Number) { switch c.config.BlockConsensusVersion(header.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.UpdateMasternodes(chain, header, ms) return c.EngineV1.UpdateMasternodes(chain, header, ms)
} }
} }
func (c *XDPoS) RecoverSigner(header *types.Header) (common.Address, error) { func (c *XDPoS) RecoverSigner(header *types.Header) (common.Address, error) {
switch c.config.BlockConsensusVersion(header.Number) { switch c.config.BlockConsensusVersion(header.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.RecoverSigner(header) return c.EngineV1.RecoverSigner(header)
} }
} }
func (c *XDPoS) RecoverValidator(header *types.Header) (common.Address, error) { func (c *XDPoS) RecoverValidator(header *types.Header) (common.Address, error) {
switch c.config.BlockConsensusVersion(header.Number) { switch c.config.BlockConsensusVersion(header.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.RecoverValidator(header) return c.EngineV1.RecoverValidator(header)
} }
} }
@ -266,7 +266,7 @@ func (c *XDPoS) RecoverValidator(header *types.Header) (common.Address, error) {
// Get master nodes over extra data of previous checkpoint block. // Get master nodes over extra data of previous checkpoint block.
func (c *XDPoS) GetMasternodesFromCheckpointHeader(preCheckpointHeader *types.Header, n, e uint64) []common.Address { func (c *XDPoS) GetMasternodesFromCheckpointHeader(preCheckpointHeader *types.Header, n, e uint64) []common.Address {
switch c.config.BlockConsensusVersion(preCheckpointHeader.Number) { switch c.config.BlockConsensusVersion(preCheckpointHeader.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.GetMasternodesFromCheckpointHeader(preCheckpointHeader, n, e) return c.EngineV1.GetMasternodesFromCheckpointHeader(preCheckpointHeader, n, e)
} }
} }
@ -278,7 +278,7 @@ func (c *XDPoS) GetDb() ethdb.Database {
func (c *XDPoS) GetSnapshot(chain consensus.ChainReader, header *types.Header) (*utils.PublicApiSnapshot, error) { func (c *XDPoS) GetSnapshot(chain consensus.ChainReader, header *types.Header) (*utils.PublicApiSnapshot, error) {
switch c.config.BlockConsensusVersion(header.Number) { switch c.config.BlockConsensusVersion(header.Number) {
default: // Default "1.0" default: // Default "v1"
sp, err := c.EngineV1.GetSnapshot(chain, header) sp, err := c.EngineV1.GetSnapshot(chain, header)
// Convert to a standard PublicApiSnapshot type, otherwise it's a breaking change to API // Convert to a standard PublicApiSnapshot type, otherwise it's a breaking change to API
return &utils.PublicApiSnapshot{ return &utils.PublicApiSnapshot{
@ -294,7 +294,7 @@ func (c *XDPoS) GetSnapshot(chain consensus.ChainReader, header *types.Header) (
func (c *XDPoS) GetAuthorisedSignersFromSnapshot(chain consensus.ChainReader, header *types.Header) ([]common.Address, error) { func (c *XDPoS) GetAuthorisedSignersFromSnapshot(chain consensus.ChainReader, header *types.Header) ([]common.Address, error) {
switch c.config.BlockConsensusVersion(header.Number) { switch c.config.BlockConsensusVersion(header.Number) {
default: // Default "1.0" default: // Default "v1"
return c.EngineV1.GetAuthorisedSignersFromSnapshot(chain, header) return c.EngineV1.GetAuthorisedSignersFromSnapshot(chain, header)
} }
} }

11
params/config.go
View file

@ -23,6 +23,11 @@ import (
"github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/common"
) )
const (
ConsensusEngineVersion1 = "v1"
ConsensusEngineVersion2 = "v2"
)
var ( var (
XDCMainnetGenesisHash = common.HexToHash("9326145f8a2c8c00bbe13afc7d7f3d9c868b5ef39d89f2f4e9390e9720298624") // XDC Mainnet genesis hash to enforce below configs on XDCMainnetGenesisHash = common.HexToHash("9326145f8a2c8c00bbe13afc7d7f3d9c868b5ef39d89f2f4e9390e9720298624") // XDC Mainnet genesis hash to enforce below configs on
MainnetGenesisHash = common.HexToHash("8d13370621558f4ed0da587934473c0404729f28b0ff1d50e5fdd840457a2f17") // Mainnet genesis hash to enforce below configs on MainnetGenesisHash = common.HexToHash("8d13370621558f4ed0da587934473c0404729f28b0ff1d50e5fdd840457a2f17") // Mainnet genesis hash to enforce below configs on
@ -191,11 +196,11 @@ func (c *XDPoSConfig) String() string {
ConsensusVersion will return the consensus version to use for the provided block number. The returned int represent its version ConsensusVersion will return the consensus version to use for the provided block number. The returned int represent its version
TODO: It's a dummy value for now until the 2.0 consensus engine is fully implemented. TODO: It's a dummy value for now until the 2.0 consensus engine is fully implemented.
*/ */
func (c *XDPoSConfig) BlockConsensusVersion(num *big.Int) int { func (c *XDPoSConfig) BlockConsensusVersion(num *big.Int) string {
if c.V2ConsensusBlockNumber != nil && num.Cmp(c.V2ConsensusBlockNumber) > 0 { if c.V2ConsensusBlockNumber != nil && num.Cmp(c.V2ConsensusBlockNumber) > 0 {
return 2 return ConsensusEngineVersion2
} }
return 1 return ConsensusEngineVersion1
} }
// String implements the fmt.Stringer interface. // String implements the fmt.Stringer interface.