gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GasLimit check updated

Browse Source
This commit is contained in:
obscuren
2015-03-03 17:05:51 +01:00
parent c74c07eed1
commit ee0a1bec6c
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/block_processor.go
View File

@@ -204,9 +204,6 @@ func (sm *BlockProcessor) processWithParent(block, parent *types.Block) (td *big
// Tre receipt Trie's root (R = (Tr [[H1, R1], ... [Hn, R1]]))
receiptSha := types.DeriveSha(receipts)
if bytes.Compare(receiptSha, header.ReceiptHash) != 0 {
fmt.Println("receipts", receipts)
state.Sync()
chainlogger.Infof("%s\n", state.Dump())
err = fmt.Errorf("validating receipt root. received=%x got=%x", header.ReceiptHash, receiptSha)
return
}
@@ -249,9 +246,14 @@ func (sm *BlockProcessor) ValidateBlock(block, parent *types.Block) error {
return fmt.Errorf("Difficulty check failed for block %v, %v", block.Header().Difficulty, expd)
}
expl := CalcGasLimit(parent, block)
if expl.Cmp(block.Header().GasLimit) != 0 {
return fmt.Errorf("GasLimit check failed for block %v, %v", block.Header().GasLimit, expl)
//expl := CalcGasLimit(parent, block)
//if expl.Cmp(block.Header().GasLimit) != 0 {
// block.gasLimit - parent.gasLimit <= parent.gasLimit / 1024
a := new(big.Int).Sub(block.Header().GasLimit, parent.Header().GasLimit)
b := new(big.Int).Div(parent.Header().GasLimit, big.NewInt(1024))
if a.Cmp(b) > 0 {
return fmt.Errorf("GasLimit check failed for block %v", block.Header().GasLimit)
}
if block.Time() < parent.Time() {