From 8fa20cea0baecbcc59612bdf9296beef9bd9af48 Mon Sep 17 00:00:00 2001
From: Nikita Meshcheriakov <root@nikitam.io>
Date: Thu, 2 Oct 2025 22:53:02 +0300
Subject: [PATCH] ethapi: add timestamp to logs in eth_simulate

---
 internal/ethapi/logtracer.go | 21 ++++++++++++---------
 internal/ethapi/simulate.go  |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/internal/ethapi/logtracer.go b/internal/ethapi/logtracer.go
index 456aa93736..379a73bd89 100644
--- a/internal/ethapi/logtracer.go
+++ b/internal/ethapi/logtracer.go
@@ -53,15 +53,17 @@ type tracer struct {
 	count          int
 	traceTransfers bool
 	blockNumber    uint64
+    blockTimestamp uint64
 	blockHash      common.Hash
 	txHash         common.Hash
 	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{
 		traceTransfers: traceTransfers,
 		blockNumber:    blockNumber,
+        blockTimestamp: blockTimestamp,
 		blockHash:      blockHash,
 		txHash:         txHash,
 		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) {
 	t.logs[len(t.logs)-1] = append(t.logs[len(t.logs)-1], &types.Log{
-		Address:     address,
-		Topics:      topics,
-		Data:        data,
-		BlockNumber: t.blockNumber,
-		BlockHash:   t.blockHash,
-		TxHash:      t.txHash,
-		TxIndex:     t.txIdx,
-		Index:       uint(t.count),
+		Address:        address,
+		Topics:         topics,
+		Data:           data,
+		BlockNumber:    t.blockNumber,
+        BlockTimestamp: t.blockTimestamp,
+		BlockHash:      t.blockHash,
+		TxHash:         t.txHash,
+		TxIndex:        t.txIdx,
+		Index:          uint(t.count),
 	})
 	t.count++
 }
diff --git a/internal/ethapi/simulate.go b/internal/ethapi/simulate.go
index 2bda69b315..0d1a59b371 100644
--- a/internal/ethapi/simulate.go
+++ b/internal/ethapi/simulate.go
@@ -244,7 +244,7 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header,
 		callResults          = make([]simCallResult, len(block.Calls))
 		receipts             = make([]*types.Receipt, len(block.Calls))
 		// 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{
 			NoBaseFee: !sim.validate,
 			Tracer:    tracer.Hooks(),