From 1c872ddf4b1db51847a5d9d020e13d432e847f52 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 8 Apr 2015 17:14:58 +0200 Subject: Changed how logs are being recorded Logs are now recorded per transactions instead of tossing them out after each transaction. This should also fix an issue with `eth_getFilterLogs` (#629) Also now implemented are the `transactionHash, blockHash, transactionIndex, logIndex` on logs. Closes #654. --- rpc/responses.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'rpc') diff --git a/rpc/responses.go b/rpc/responses.go index 52a2f714c..3620f643e 100644 --- a/rpc/responses.go +++ b/rpc/responses.go @@ -284,15 +284,19 @@ type LogRes struct { TransactionIndex *hexnum `json:"transactionIndex"` } -func NewLogRes(log state.Log) LogRes { +func NewLogRes(log *state.Log) LogRes { var l LogRes - l.Topics = make([]*hexdata, len(log.Topics())) - for j, topic := range log.Topics() { + l.Topics = make([]*hexdata, len(log.Topics)) + for j, topic := range log.Topics { l.Topics[j] = newHexData(topic) } - l.Address = newHexData(log.Address()) - l.Data = newHexData(log.Data()) - l.BlockNumber = newHexNum(log.Number()) + l.Address = newHexData(log.Address) + l.Data = newHexData(log.Data) + l.BlockNumber = newHexNum(log.Number) + l.LogIndex = newHexNum(log.Index) + l.TransactionHash = newHexData(log.TxHash) + l.TransactionIndex = newHexNum(log.TxIndex) + l.BlockHash = newHexData(log.BlockHash) return l } -- cgit