roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Validations reordering & added nonce validation

Browse Source
This commit is contained in:
obscuren 2014-01-12 02:36:41 +01:00
parent bee05d52bf
commit 54bce64e3a
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
block_manager.go
View File

@ -114,15 +114,18 @@ func (bm *BlockManager) CalculateTD(block *ethutil.Block) bool {
} }
// Validates the current block. Returns an error if the block was invalid, // Validates the current block. Returns an error if the block was invalid,
// an uncle or anything that isn't on the current block chain // an uncle or anything that isn't on the current block chain.
// Validation validates easy over difficult (dagger takes longer time = difficult)
func (bm *BlockManager) ValidateBlock(block *ethutil.Block) error { func (bm *BlockManager) ValidateBlock(block *ethutil.Block) error {
// TODO // TODO
// 1. Check if the nonce of the block is valid
// 2. Check if the difficulty is correct // 2. Check if the difficulty is correct
// Check if we have the parent hash, if it isn't known we discard it // Check if we have the parent hash, if it isn't known we discard it
// Reasons might be catching up or simply an invalid block // Reasons might be catching up or simply an invalid block
if bm.bc.HasBlock(block.PrevHash) { if !bm.bc.HasBlock(block.PrevHash) {
return errors.New("Block's parent unknown")
}
// Check each uncle's previous hash. In order for it to be valid // Check each uncle's previous hash. In order for it to be valid
// is if it has the same block hash as the current // is if it has the same block hash as the current
for _, uncle := range block.Uncles { for _, uncle := range block.Uncles {
@ -134,10 +137,11 @@ func (bm *BlockManager) ValidateBlock(block *ethutil.Block) error {
return errors.New("Mismatching Prvhash from uncle") return errors.New("Mismatching Prvhash from uncle")
} }
} }
} else {
return errors.New("Block's parent unknown")
}
// Verify the nonce of the block. Return an error if it's not valid
if !DaggerVerify(block.Hash(), block.Nonce) {
return errors.New("Block's nonce is invalid")
}
return nil return nil
} }