forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 14:16:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

stuff

Browse source
This commit is contained in:
Jeffrey Wilcke 2016-10-04 13:12:26 +02:00
parent 145d88cbe4
commit ec9b582fe1
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/state/statedb.go
View file

@ -624,6 +624,10 @@ func Reduce(s *StateDB) *StateDB {
} else { } else {
state.SetStateObject(object) state.SetStateObject(object)
} }
if _, isDirty := s.stateObjectsDirty[address]; isDirty {
state.stateObjectsDirty[address] = struct{}{}
}
} }
state.logs = append(state.logs, s.logs...) state.logs = append(state.logs, s.logs...)

5
core/state_processor.go
View file

@ -84,8 +84,11 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
forkState = state.Fork(txPostState) forkState = state.Fork(txPostState)
} }
//fmt.Printf("before %x\n", state.IntermediateRoot(state.Reduce(forkState)))
//fmt.Println(string(forkState.Dump()))
AccumulateRewards(forkState, header, block.Uncles()) AccumulateRewards(forkState, header, block.Uncles())
//fmt.Println(string(forkState.Dump()))
//fmt.Printf("after %x\n", state.IntermediateRoot(state.Reduce(forkState)))
statedb.Set(state.Reduce(forkState)) statedb.Set(state.Reduce(forkState))
return receipts, allLogs, totalUsedGas, err return receipts, allLogs, totalUsedGas, err

2
tests/block_test_util.go
View file

@ -144,7 +144,7 @@ func runBlockTests(homesteadBlock, daoForkBlock *big.Int, bt map[string]*BlockTe
} }
for name, test := range bt { for name, test := range bt {
if skipTest[name] { if skipTest[name] || name != "OOGStateCopyContainingDeletedContract" {
glog.Infoln("Skipping block test", name) glog.Infoln("Skipping block test", name)
continue continue
} }