Skip to content

Commit 8fa20ce

Browse files
committed
ethapi: add timestamp to logs in eth_simulate
1 parent 1e4b39e commit 8fa20ce

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

internal/ethapi/logtracer.go

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,17 @@ type tracer struct {
5353
count int
5454
traceTransfers bool
5555
blockNumber uint64
56+
blockTimestamp uint64
5657
blockHash common.Hash
5758
txHash common.Hash
5859
txIdx uint
5960
}
6061

61-
func newTracer(traceTransfers bool, blockNumber uint64, blockHash, txHash common.Hash, txIndex uint) *tracer {
62+
func newTracer(traceTransfers bool, blockNumber uint64, blockTimestamp uint64, blockHash, txHash common.Hash, txIndex uint) *tracer {
6263
return &tracer{
6364
traceTransfers: traceTransfers,
6465
blockNumber: blockNumber,
66+
blockTimestamp: blockTimestamp,
6567
blockHash: blockHash,
6668
txHash: txHash,
6769
txIdx: txIndex,
@@ -115,14 +117,15 @@ func (t *tracer) onLog(log *types.Log) {
115117

116118
func (t *tracer) captureLog(address common.Address, topics []common.Hash, data []byte) {
117119
t.logs[len(t.logs)-1] = append(t.logs[len(t.logs)-1], &types.Log{
118-
Address: address,
119-
Topics: topics,
120-
Data: data,
121-
BlockNumber: t.blockNumber,
122-
BlockHash: t.blockHash,
123-
TxHash: t.txHash,
124-
TxIndex: t.txIdx,
125-
Index: uint(t.count),
120+
Address: address,
121+
Topics: topics,
122+
Data: data,
123+
BlockNumber: t.blockNumber,
124+
BlockTimestamp: t.blockTimestamp,
125+
BlockHash: t.blockHash,
126+
TxHash: t.txHash,
127+
TxIndex: t.txIdx,
128+
Index: uint(t.count),
126129
})
127130
t.count++
128131
}

internal/ethapi/simulate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header,
244244
callResults = make([]simCallResult, len(block.Calls))
245245
receipts = make([]*types.Receipt, len(block.Calls))
246246
// Block hash will be repaired after execution.
247-
tracer = newTracer(sim.traceTransfers, blockContext.BlockNumber.Uint64(), common.Hash{}, common.Hash{}, 0)
247+
tracer = newTracer(sim.traceTransfers, blockContext.BlockNumber.Uint64(), blockContext.Time, common.Hash{}, common.Hash{}, 0)
248248
vmConfig = &vm.Config{
249249
NoBaseFee: !sim.validate,
250250
Tracer: tracer.Hooks(),

0 commit comments

Comments
 (0)