cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Eth JSON-RPC API: make EthLog#Data a string.

Browse Source
This commit is contained in:
Raúl Kripalani 2022-11-16 20:51:28 +00:00
parent 5b4ec7dbea
commit a536f533d8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/eth_types.go
View File

@ -545,8 +545,8 @@ type EthLog struct {
// Address is the address of the actor that produced the event log. // Address is the address of the actor that produced the event log.
Address EthAddress `json:"address"` Address EthAddress `json:"address"`
// Data is the values of the event log, excluding topics // Data is the value of the event log, excluding topics
Data []EthHash `json:"data"` Data EthHash `json:"data"`
// List of topics associated with the event log. // List of topics associated with the event log.
Topics []EthHash `json:"topics"` Topics []EthHash `json:"topics"`

2
api/eth_types_test.go
View File

@ -176,7 +176,7 @@ func TestEthFilterResultMarshalJSON(t *testing.T) {
BlockHash: hash2, BlockHash: hash2,
BlockNumber: 53, BlockNumber: 53,
Topics: []EthHash{hash1}, Topics: []EthHash{hash1},
Data: []EthHash{hash1}, Data: hash1,
Address: addr, Address: addr,
} }
logjson, err := json.Marshal(log) logjson, err := json.Marshal(log)

4
node/impl/full/eth.go
View File

@ -1062,7 +1062,7 @@ func ethFilterResultFromEvents(evs []*filter.CollectedEvent) (*api.EthFilterResu
if entry.Key == api.EthTopic1 || entry.Key == api.EthTopic2 || entry.Key == api.EthTopic3 || entry.Key == api.EthTopic4 { if entry.Key == api.EthTopic1 || entry.Key == api.EthTopic2 || entry.Key == api.EthTopic3 || entry.Key == api.EthTopic4 {
log.Topics = append(log.Topics, hash) log.Topics = append(log.Topics, hash)
} else { } else {
log.Data = append(log.Data, hash) log.Data = hash
} }
} }
@ -1497,7 +1497,7 @@ func newEthTxReceipt(ctx context.Context, tx api.EthTx, lookup *api.MsgLookup, r
if entry.Key == api.EthTopic1 || entry.Key == api.EthTopic2 || entry.Key == api.EthTopic3 || entry.Key == api.EthTopic4 { if entry.Key == api.EthTopic1 || entry.Key == api.EthTopic2 || entry.Key == api.EthTopic3 || entry.Key == api.EthTopic4 {
l.Topics = append(l.Topics, hash) l.Topics = append(l.Topics, hash)
} else { } else {
l.Data = append(l.Data, hash) l.Data = hash
} }
} }