forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-09 06:24:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

case m2 down affect to m1.

Browse source
This commit is contained in:
parmarrushabh 2019-03-25 12:19:25 +05:30
parent ef94c38a68
commit 4af57cc070
3 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/constants.go
View file

@ -24,6 +24,7 @@ const (
var TIP2019Block = big.NewInt(1050000) var TIP2019Block = big.NewInt(1050000)
var TIPSigning = big.NewInt(3000000) var TIPSigning = big.NewInt(3000000)
var TIPRandomize = big.NewInt(901)
var IsTestnet bool = false var IsTestnet bool = false
var StoreRewardFolder string var StoreRewardFolder string
var RollbackHash Hash var RollbackHash Hash

27
consensus/XDPoS/XDPoS.go
View file

@ -226,7 +226,7 @@ type XDPoS struct {
lock sync.RWMutex // Protects the signer fields lock sync.RWMutex // Protects the signer fields
BlockSigners *lru.Cache BlockSigners *lru.Cache
HookReward func(chain consensus.ChainReader, state *state.StateDB, header *types.Header) (error, map[string]interface{}) HookReward func(chain consensus.ChainReader, state *state.StateDB, header *types.Header) (error, map[string]interface{})
HookPenalty func(chain consensus.ChainReader, blockNumberEpoc uint64) ([]common.Address, error) HookPenalty func(chain consensus.ChainReader, blockNumberEpoc uint64) ([]common.Address, error)
HookPenaltyTIPSigning func(chain consensus.ChainReader, header *types.Header, candidate []common.Address) ([]common.Address, error) HookPenaltyTIPSigning func(chain consensus.ChainReader, header *types.Header, candidate []common.Address) ([]common.Address, error)
HookValidator func(header *types.Header, signers []common.Address) ([]byte, error) HookValidator func(header *types.Header, signers []common.Address) ([]byte, error)
@ -739,7 +739,7 @@ func (c *XDPoS) GetValidator(creator common.Address, chain consensus.ChainReader
return common.Address{}, fmt.Errorf("couldn't find checkpoint header") return common.Address{}, fmt.Errorf("couldn't find checkpoint header")
} }
} }
m, err := GetM1M2FromCheckpointHeader(cpHeader) m, err := GetM1M2FromCheckpointHeader(cpHeader, header, chain.Config())
if err != nil { if err != nil {
return common.Address{}, err return common.Address{}, err
} }
@ -1125,7 +1125,7 @@ func GetMasternodesFromCheckpointHeader(checkpointHeader *types.Header) []common
} }
// Get m2 list from checkpoint block. // Get m2 list from checkpoint block.
func GetM1M2FromCheckpointHeader(checkpointHeader *types.Header) (map[common.Address]common.Address, error) { func GetM1M2FromCheckpointHeader(checkpointHeader *types.Header, currentHeader *types.Header, config *params.ChainConfig) (map[common.Address]common.Address, error) {
if checkpointHeader.Number.Uint64()%common.EpocBlockRandomize != 0 { if checkpointHeader.Number.Uint64()%common.EpocBlockRandomize != 0 {
return nil, errors.New("This block is not checkpoint block epoc.") return nil, errors.New("This block is not checkpoint block epoc.")
} }
@ -1134,13 +1134,24 @@ func GetM1M2FromCheckpointHeader(checkpointHeader *types.Header) (map[common.Add
masternodes := GetMasternodesFromCheckpointHeader(checkpointHeader) masternodes := GetMasternodesFromCheckpointHeader(checkpointHeader)
validators := ExtractValidatorsFromBytes(checkpointHeader.Validators) validators := ExtractValidatorsFromBytes(checkpointHeader.Validators)
if len(validators) < len(masternodes) { maxMNs := len(masternodes)
return nil, errors.New("len(m2) is less than len(m1)") if len(validators) < maxMNs {
return nil, errors.New("len(m2) is less than len(m1)")
} }
if len(masternodes) > 0 { if maxMNs > 0 {
for i, m1 := range masternodes { isForked := config.IsTIPRandomize(currentHeader.Number)
m1m2[m1] = masternodes[validators[i]%int64(len(masternodes))] moveM2 := uint64(0)
if isForked {
moveM2 = (currentHeader.Number.Uint64() % config.XDPoS.Epoch) / uint64(maxMNs)
} }
for i, m1 := range masternodes {
m2Index := uint64(validators[i] % int64(maxMNs))
m2Index = m2Index + moveM2
if m2Index >= common.MaxMasternodes {
m2Index = m2Index - common.MaxMasternodes
}
m1m2[m1] = masternodes[m2Index]
}
} }
return m1m2, nil return m1m2, nil
} }

2
eth/backend.go
View file

@ -322,7 +322,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
c.HookPenaltyTIPSigning = func(chain consensus.ChainReader, header *types.Header, candidates []common.Address) ([]common.Address, error) { c.HookPenaltyTIPSigning = func(chain consensus.ChainReader, header *types.Header, candidates []common.Address) ([]common.Address, error) {
prevEpoc := header.Number.Uint64() - chain.Config().XDPoS.Epoch prevEpoc := header.Number.Uint64() - chain.Config().XDPoS.Epoch
combackEpoch := uint64(0) combackEpoch := uint64(0)
comebackLength := uint64((common.LimitPenaltyEpoch + 1) * chain.Config().XDPoS.Epoch) comebackLength := (common.LimitPenaltyEpoch + 1) * chain.Config().XDPoS.Epoch
if header.Number.Uint64() > comebackLength { if header.Number.Uint64() > comebackLength {
combackEpoch = header.Number.Uint64() - comebackLength combackEpoch = header.Number.Uint64() - comebackLength
} }