forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

remove fork point, check signHash != nil

Browse source
This commit is contained in:
Tuna 2019-03-12 10:19:46 +07:00
parent 3f2f8bdeb8
commit 7714a18330
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/blockchain.go
View file

@ -1257,11 +1257,7 @@ func (bc *BlockChain) PrepareBlock(block *types.Block) (err error) {
log.Debug("Stop prepare a block because inserting", "number", block.NumberU64(), "hash", block.Hash(), "validator", block.Header().Validator) log.Debug("Stop prepare a block because inserting", "number", block.NumberU64(), "hash", block.Hash(), "validator", block.Header().Validator)
return nil return nil
} }
var fullVerify bool = false err = bc.engine.VerifyHeader(bc, block.Header(), false)
if bc.chainConfig.IsTIPSigning(block.Number()) {
fullVerify = true
}
err = bc.engine.VerifyHeader(bc, block.Header(), fullVerify)
if err != nil { if err != nil {
return err return err
} }

4
eth/backend.go
View file

@ -247,8 +247,8 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
} }
header := block.Header() header := block.Header()
sighash, err := wallet.SignHash(accounts.Account{Address: eb}, posv.SigHash(header).Bytes()) sighash, err := wallet.SignHash(accounts.Account{Address: eb}, posv.SigHash(header).Bytes())
if err != nil { if err != nil || sighash == nil {
log.Error("Can't get signature hash of m2", "err", err) log.Error("Can't get signature hash of m2", "sighash", sighash, "err", err)
return block, false, err return block, false, err
} }
header.Validator = sighash header.Validator = sighash