forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #293 from nguyenbatam/ignore_faster_with_block_no_validator_m2

Browse source 
ignore faster with block no M2 Validator
This commit is contained in:
Tam Nguyen 2018-11-21 10:00:47 +07:00 committed by GitHub
commit 2a7e0dd009
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/types_test.go
View file

@ -151,7 +151,7 @@ func BenchmarkAddressHex(b *testing.B) {
} }
func TestRemoveItemInArray(t *testing.T) { func TestRemoveItemInArray(t *testing.T) {
array := []Address{HexToAddress("0x0000003"),HexToAddress("0x0000001"), HexToAddress("0x0000002"),HexToAddress("0x0000003")} array := []Address{HexToAddress("0x0000003"), HexToAddress("0x0000001"), HexToAddress("0x0000002"), HexToAddress("0x0000003")}
remove := []Address{HexToAddress("0x0000002"), HexToAddress("0x0000004"), HexToAddress("0x0000003")} remove := []Address{HexToAddress("0x0000002"), HexToAddress("0x0000004"), HexToAddress("0x0000003")}
array = RemoveItemFromArray(array, remove) array = RemoveItemFromArray(array, remove)
if len(array) != 1 { if len(array) != 1 {

4
consensus/errors.go
View file

@ -35,5 +35,7 @@ var (
// plus one. // plus one.
ErrInvalidNumber = errors.New("invalid block number") ErrInvalidNumber = errors.New("invalid block number")
ErrMissingValidatorSignature = errors.New("missing validator in header") ErrFailValidatorSignature = errors.New("missing validator in header")
ErrNoValidatorSignature = errors.New("no validator in header")
) )

5
consensus/posv/posv.go
View file

@ -370,6 +370,9 @@ func (c *Posv) verifyCascadingFields(chain consensus.ChainReader, header *types.
if parent.Time.Uint64()+c.config.Period > header.Time.Uint64() { if parent.Time.Uint64()+c.config.Period > header.Time.Uint64() {
return ErrInvalidTimestamp return ErrInvalidTimestamp
} }
if header.Number.Uint64() > c.config.Epoch && len(header.Validator) == 0 {
return consensus.ErrNoValidatorSignature
}
// Retrieve the snapshot needed to verify this header and cache it // Retrieve the snapshot needed to verify this header and cache it
snap, err := c.snapshot(chain, number-1, header.ParentHash, parents) snap, err := c.snapshot(chain, number-1, header.ParentHash, parents)
if err != nil { if err != nil {
@ -959,7 +962,7 @@ func (c *Posv) RecoverValidator(header *types.Header) (common.Address, error) {
// Retrieve the signature from the header.Validator // Retrieve the signature from the header.Validator
// len equals 65 bytes // len equals 65 bytes
if len(header.Validator) != extraSeal { if len(header.Validator) != extraSeal {
return common.Address{}, consensus.ErrMissingValidatorSignature return common.Address{}, consensus.ErrFailValidatorSignature
} }
// Recover the public key and the Ethereum address // Recover the public key and the Ethereum address
pubkey, err := crypto.Ecrecover(sigHash(header).Bytes(), header.Validator) pubkey, err := crypto.Ecrecover(sigHash(header).Bytes(), header.Validator)

2
eth/fetcher/fetcher.go
View file

@ -669,7 +669,7 @@ func (f *Fetcher) insert(peer string, block *types.Block) {
time.Sleep(delay) time.Sleep(delay)
log.Info("Receive future block", "number", block.NumberU64(), "hash", block.Hash().Hex(), "delay", delay) log.Info("Receive future block", "number", block.NumberU64(), "hash", block.Hash().Hex(), "delay", delay)
goto again goto again
case consensus.ErrMissingValidatorSignature: case consensus.ErrNoValidatorSignature:
newBlock := block newBlock := block
if f.appendM2HeaderHook != nil { if f.appendM2HeaderHook != nil {
if newBlock, err = f.appendM2HeaderHook(block); err != nil { if newBlock, err = f.appendM2HeaderHook(block); err != nil {