status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #290 from Gustav-Simonsson/correct_block_parent_timestamp_check 

Correct block parent timestamp check and typos
This commit is contained in:
Jeffrey Wilcke 2015-02-05 12:23:56 -08:00
parent 2f30a27b2b 697c2b5dc1
commit 47129428fe
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/block_processor.go
View File

@ -220,7 +220,7 @@ func (sm *BlockProcessor) ProcessWithParent(block, parent *types.Block) (td *big
return return
} }
if err = sm.AccumelateRewards(state, block, parent); err != nil { if err = sm.AccumulateRewards(state, block, parent); err != nil {
return return
} }
@ -261,8 +261,8 @@ func (sm *BlockProcessor) ValidateBlock(block, parent *types.Block) error {
} }
diff := block.Header().Time - parent.Header().Time diff := block.Header().Time - parent.Header().Time
if diff < 0 { if diff <= 0 {
return ValidationError("Block timestamp less then prev block %v (%v - %v)", diff, block.Header().Time, sm.bc.CurrentBlock().Header().Time) return ValidationError("Block timestamp not after prev block %v (%v - %v)", diff, block.Header().Time, sm.bc.CurrentBlock().Header().Time)
} }
if block.Time() > time.Now().Unix() { if block.Time() > time.Now().Unix() {
@ -277,7 +277,7 @@ func (sm *BlockProcessor) ValidateBlock(block, parent *types.Block) error {
return nil return nil
} }
func (sm *BlockProcessor) AccumelateRewards(statedb *state.StateDB, block, parent *types.Block) error { func (sm *BlockProcessor) AccumulateRewards(statedb *state.StateDB, block, parent *types.Block) error {
reward := new(big.Int).Set(BlockReward) reward := new(big.Int).Set(BlockReward)
ancestors := set.New() ancestors := set.New()
@ -335,7 +335,7 @@ func (sm *BlockProcessor) GetMessages(block *types.Block) (messages []*state.Mes
defer state.Reset() defer state.Reset()
sm.TransitionState(state, parent, block) sm.TransitionState(state, parent, block)
sm.AccumelateRewards(state, block, parent) sm.AccumulateRewards(state, block, parent)
return state.Manifest().Messages, nil return state.Manifest().Messages, nil
} }
@ -356,7 +356,7 @@ func (sm *BlockProcessor) GetLogs(block *types.Block) (logs state.Logs, err erro
defer state.Reset() defer state.Reset()
sm.TransitionState(state, parent, block) sm.TransitionState(state, parent, block)
sm.AccumelateRewards(state, block, parent) sm.AccumulateRewards(state, block, parent)
return state.Logs(), nil return state.Logs(), nil
} }

2
miner/miner.go
View File

@ -204,7 +204,7 @@ func (self *Miner) mine() {
block.SetReceipts(receipts) block.SetReceipts(receipts)
// Accumulate the rewards included for this block // Accumulate the rewards included for this block
blockProcessor.AccumelateRewards(state, block, parent) blockProcessor.AccumulateRewards(state, block, parent)
state.Update(ethutil.Big0) state.Update(ethutil.Big0)
block.SetRoot(state.Root()) block.SetRoot(state.Root())