diff options
| author | Matthew Wampler-Doty <matthew.wampler.doty@gmail.com> | 2015-02-28 05:13:31 +0800 |
|---|---|---|
| committer | Matthew Wampler-Doty <matthew.wampler.doty@gmail.com> | 2015-02-28 05:13:31 +0800 |
| commit | 3820a65299831331f215e158d287fe3df3b69ea6 (patch) | |
| tree | cf7b435109c646aac576ed98eefefb57e1f27223 /rpc/util.go | |
| parent | 8653db6df0018d08212493e3a3df4677162bdd8f (diff) | |
| parent | 0efd6a881afac0b3082f3b1e8780e3438eea5b02 (diff) | |
| download | dexon-3820a65299831331f215e158d287fe3df3b69ea6.tar dexon-3820a65299831331f215e158d287fe3df3b69ea6.tar.gz dexon-3820a65299831331f215e158d287fe3df3b69ea6.tar.bz2 dexon-3820a65299831331f215e158d287fe3df3b69ea6.tar.lz dexon-3820a65299831331f215e158d287fe3df3b69ea6.tar.xz dexon-3820a65299831331f215e158d287fe3df3b69ea6.tar.zst dexon-3820a65299831331f215e158d287fe3df3b69ea6.zip | |
Merge branch 'publictests' of github.com:ebuchman/go-ethereum into ethash_pow
Diffstat (limited to 'rpc/util.go')
| -rw-r--r-- | rpc/util.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rpc/util.go b/rpc/util.go index 29824bcdb..3e8ca3fef 100644 --- a/rpc/util.go +++ b/rpc/util.go @@ -82,8 +82,9 @@ type RpcServer interface { type Log struct { Address string `json:"address"` - Topic []string `json:"topics"` + Topic []string `json:"topic"` Data string `json:"data"` + Number uint64 `json:"number"` } func toLogs(logs state.Logs) (ls []Log) { @@ -94,6 +95,7 @@ func toLogs(logs state.Logs) (ls []Log) { l.Topic = make([]string, len(log.Topics())) l.Address = toHex(log.Address()) l.Data = toHex(log.Data()) + l.Number = log.Number() for j, topic := range log.Topics() { l.Topic[j] = toHex(topic) } @@ -106,6 +108,7 @@ func toLogs(logs state.Logs) (ls []Log) { type whisperFilter struct { messages []xeth.WhisperMessage timeout time.Time + id int } func (w *whisperFilter) add(msgs ...xeth.WhisperMessage) { @@ -121,6 +124,7 @@ func (w *whisperFilter) get() []xeth.WhisperMessage { type logFilter struct { logs state.Logs timeout time.Time + id int } func (l *logFilter) add(logs ...state.Log) { |