forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 05:06:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ethapi: add timestamp to logs in eth_simulate

Browse source
This commit is contained in:
Nikita Meshcheriakov 2025-10-02 22:53:02 +03:00
parent 1e4b39ed12
commit 8fa20cea0b
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
internal/ethapi/logtracer.go
View file

@ -53,15 +53,17 @@ type tracer struct {
count int count int
traceTransfers bool traceTransfers bool
blockNumber uint64 blockNumber uint64
blockTimestamp uint64
blockHash common.Hash blockHash common.Hash
txHash common.Hash txHash common.Hash
txIdx uint txIdx uint
} }
func newTracer(traceTransfers bool, blockNumber uint64, blockHash, txHash common.Hash, txIndex uint) *tracer { func newTracer(traceTransfers bool, blockNumber uint64, blockTimestamp uint64, blockHash, txHash common.Hash, txIndex uint) *tracer {
return &tracer{ return &tracer{
traceTransfers: traceTransfers, traceTransfers: traceTransfers,
blockNumber: blockNumber, blockNumber: blockNumber,
blockTimestamp: blockTimestamp,
blockHash: blockHash, blockHash: blockHash,
txHash: txHash, txHash: txHash,
txIdx: txIndex, txIdx: txIndex,
@ -115,14 +117,15 @@ func (t *tracer) onLog(log *types.Log) {
func (t *tracer) captureLog(address common.Address, topics []common.Hash, data []byte) { func (t *tracer) captureLog(address common.Address, topics []common.Hash, data []byte) {
t.logs[len(t.logs)-1] = append(t.logs[len(t.logs)-1], &types.Log{ t.logs[len(t.logs)-1] = append(t.logs[len(t.logs)-1], &types.Log{
Address: address, Address: address,
Topics: topics, Topics: topics,
Data: data, Data: data,
BlockNumber: t.blockNumber, BlockNumber: t.blockNumber,
BlockHash: t.blockHash, BlockTimestamp: t.blockTimestamp,
TxHash: t.txHash, BlockHash: t.blockHash,
TxIndex: t.txIdx, TxHash: t.txHash,
Index: uint(t.count), TxIndex: t.txIdx,
Index: uint(t.count),
}) })
t.count++ t.count++
} }

2
internal/ethapi/simulate.go
View file

@ -244,7 +244,7 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header,
callResults = make([]simCallResult, len(block.Calls)) callResults = make([]simCallResult, len(block.Calls))
receipts = make([]*types.Receipt, len(block.Calls)) receipts = make([]*types.Receipt, len(block.Calls))
// Block hash will be repaired after execution. // Block hash will be repaired after execution.
tracer = newTracer(sim.traceTransfers, blockContext.BlockNumber.Uint64(), common.Hash{}, common.Hash{}, 0) tracer = newTracer(sim.traceTransfers, blockContext.BlockNumber.Uint64(), blockContext.Time, common.Hash{}, common.Hash{}, 0)
vmConfig = &vm.Config{ vmConfig = &vm.Config{
NoBaseFee: !sim.validate, NoBaseFee: !sim.validate,
Tracer: tracer.Hooks(), Tracer: tracer.Hooks(),