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

refactor: use EthHash for event topics

Browse Source 
This ensures they're always 32 bytes and padded, as required.
This commit is contained in:
Steven Allen
2023-02-10 07:41:29 -08:00
parent 1588dd3dbe
commit f1381ad535
5 changed files with 200 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node/impl/full/eth.go
+12 -2
View File
@@ -1376,7 +1376,12 @@ func ethFilterResultFromEvents(evs []*filter.CollectedEvent, sa StateAPI) (*etht
continue
}
if entry.Key == ethtypes.EthTopic1 || entry.Key == ethtypes.EthTopic2 || entry.Key == ethtypes.EthTopic3 || entry.Key == ethtypes.EthTopic4 {
log.Topics = append(log.Topics, entry.Value)
if len(entry.Value) != 32 {
continue
}
var value ethtypes.EthHash
copy(value[:], entry.Value)
log.Topics = append(log.Topics, value)
} else {
log.Data = entry.Value
}
@@ -1913,8 +1918,13 @@ func newEthTxReceipt(ctx context.Context, tx ethtypes.EthTx, lookup *api.MsgLook
continue
}
if entry.Key == ethtypes.EthTopic1 || entry.Key == ethtypes.EthTopic2 || entry.Key == ethtypes.EthTopic3 || entry.Key == ethtypes.EthTopic4 {
if len(entry.Value) != 32 {
continue
}
var value ethtypes.EthHash
copy(value[:], entry.Value)
l.Topics = append(l.Topics, value)
ethtypes.EthBloomSet(receipt.LogsBloom, entry.Value)
l.Topics = append(l.Topics, entry.Value)
} else {
l.Data = entry.Value
}