cerc-io/go-ethereum
13
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Bloom validation

Browse Source
This commit is contained in:
obscuren 2014-11-04 11:04:02 +01:00
parent f59a3b67f6
commit f4b717cb9d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
chain/block_manager.go
View File

@ -3,6 +3,7 @@ package chain
import ( import (
"bytes" "bytes"
"container/list" "container/list"
"errors"
"fmt" "fmt"
"math/big" "math/big"
"os" "os"
@ -168,7 +169,6 @@ done:
erroneous = append(erroneous, tx) erroneous = append(erroneous, tx)
err = nil err = nil
continue continue
//return nil, nil, nil, err
} }
} }
@ -177,7 +177,6 @@ done:
txGas.Sub(txGas, st.gas) txGas.Sub(txGas, st.gas)
cumulative := new(big.Int).Set(totalUsedGas.Add(totalUsedGas, txGas)) cumulative := new(big.Int).Set(totalUsedGas.Add(totalUsedGas, txGas))
//receipt := &Receipt{tx, ethutil.CopyBytes(state.Root().([]byte)), accumelative}
receipt := &Receipt{ethutil.CopyBytes(state.Root().([]byte)), cumulative, LogsBloom(state.Logs()).Bytes(), state.Logs()} receipt := &Receipt{ethutil.CopyBytes(state.Root().([]byte)), cumulative, LogsBloom(state.Logs()).Bytes(), state.Logs()}
if i < len(block.Receipts()) { if i < len(block.Receipts()) {
@ -254,8 +253,6 @@ func (sm *BlockManager) Process(block *Block) (err error) {
return fmt.Errorf("Error validating receipt sha. Received %x, got %x", block.ReceiptSha, receiptSha) return fmt.Errorf("Error validating receipt sha. Received %x, got %x", block.ReceiptSha, receiptSha)
} }
// TODO validate bloom
// Block validation // Block validation
if err = sm.ValidateBlock(block); err != nil { if err = sm.ValidateBlock(block); err != nil {
statelogger.Errorln("Error validating block:", err) statelogger.Errorln("Error validating block:", err)
@ -267,6 +264,10 @@ func (sm *BlockManager) Process(block *Block) (err error) {
return err return err
} }
if bytes.Compare(CreateBloom(block), block.LogsBloom) != 0 {
return errors.New("Unable to replicate block's bloom")
}
state.Update() state.Update()
if !block.State().Cmp(state) { if !block.State().Cmp(state) {