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

Merge pull request #1545 from obscuren/log-index

Browse Source 
core/state: Set log index. Closes #1226
This commit is contained in:
Jeffrey Wilcke
2015-07-31 10:36:42 -07:00
parent c1c06fffcb f715547fc7
commit ab85a3593a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/state/statedb.go
View File

@@ -44,6 +44,7 @@ type StateDB struct {
thash, bhash common.Hash thash, bhash common.Hash
txIndex int txIndex int
logs map[common.Hash]Logs logs map[common.Hash]Logs
logSize uint
} }
// Create a new state from a given trie // Create a new state from a given trie
@@ -66,7 +67,9 @@ func (self *StateDB) AddLog(log *Log) {
log.TxHash = self.thash log.TxHash = self.thash
log.BlockHash = self.bhash log.BlockHash = self.bhash
log.TxIndex = uint(self.txIndex) log.TxIndex = uint(self.txIndex)
log.Index = self.logSize
self.logs[self.thash] = append(self.logs[self.thash], log) self.logs[self.thash] = append(self.logs[self.thash], log)
self.logSize++
} }
func (self *StateDB) GetLogs(hash common.Hash) Logs { func (self *StateDB) GetLogs(hash common.Hash) Logs {
@@ -288,6 +291,7 @@ func (self *StateDB) Copy() *StateDB {
state.logs[hash] = make(Logs, len(logs)) state.logs[hash] = make(Logs, len(logs))
copy(state.logs[hash], logs) copy(state.logs[hash], logs)
} }
state.logSize = self.logSize
return state return state
} }
@@ -298,6 +302,7 @@ func (self *StateDB) Set(state *StateDB) {
self.refund = state.refund self.refund = state.refund
self.logs = state.logs self.logs = state.logs
self.logSize = state.logSize
} }
func (s *StateDB) Root() common.Hash { func (s *StateDB) Root() common.Hash {