add blockTimestamp to logs within tx receipt (#9294)

* add block timestamp to logs within transaction receipt and block receipts

Signed-off-by: Sally MacFarlane <[email protected]>

---------

Signed-off-by: Sally MacFarlane <[email protected]>

Author: macfarla

CHANGELOG.md

@@ -16,6 +16,7 @@
 
 ### Additions and Improvements
 - Add blockTimestamp to `eth_getLogs` result [#9278](https://github.com/hyperledger/besu/pull/9278)
+- Add blockTimestamp to receipt logs for `eth_getBlockReceipts` and `eth_getTransactionReceipt` results [#9294](https://github.com/hyperledger/besu/pull/9294)
 - Add `--ethstats-report-interval` CLI option to control ethstats reporting frequency instead of using hardcoded 5-second interval [#9271](https://github.com/hyperledger/besu/pull/9271)
 - Add `isCancelled` method to `TransactionEvaluationContext`. That way selectors could check if the block creation has been cancelled or in timeout [#9285](https://github.com/hyperledger/besu/pull/9285)
 

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptLogResult.java

@@ -32,6 +32,7 @@
   "transactionHash",
   "transactionIndex",
   "blockHash",
+  "blockTimestamp",
   "logIndex",
   "removed"
 })
@@ -44,6 +45,7 @@ public class TransactionReceiptLogResult {
   private final String transactionHash;
   private final String transactionIndex;
   private final String blockHash;
+  private final String blockTimestamp;
   private final String logIndex;
   private final boolean removed;
 
@@ -52,6 +54,7 @@ public TransactionReceiptLogResult(
       final long blockNumber,
       final Hash transactionHash,
       final Hash blockHash,
+      final long blockTimestamp,
       final int transactionIndex,
       final int logIndex) {
     this.address = log.getLogger().toString();
@@ -66,6 +69,7 @@ public TransactionReceiptLogResult(
     this.transactionHash = transactionHash.toString();
     this.transactionIndex = Quantity.create(transactionIndex);
     this.blockHash = blockHash.toString();
+    this.blockTimestamp = Quantity.create(blockTimestamp);
     this.logIndex = Quantity.create(logIndex);
 
     // TODO: Handle chain reorgs, i.e. return `true` if log is removed
@@ -116,4 +120,9 @@ public String getLogIndex() {
   public boolean isRemoved() {
     return removed;
   }
+
+  @JsonGetter(value = "blockTimestamp")
+  public String getBlockTimestamp() {
+    return blockTimestamp;
+  }
 }

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java

@@ -92,6 +92,7 @@ protected TransactionReceiptResult(final TransactionReceiptWithMetadata receiptW
             receiptWithMetadata.getBlockNumber(),
             txn.getHash(),
             receiptWithMetadata.getBlockHash(),
+            receiptWithMetadata.getBlockTimestamp(),
             receiptWithMetadata.getTransactionIndex(),
             receiptWithMetadata.getLogIndexOffset());
     this.logsBloom = receipt.getBloomFilter().toString();
@@ -193,6 +194,7 @@ private List<TransactionReceiptLogResult> logReceipts(
       final long blockNumber,
       final Hash transactionHash,
       final Hash blockHash,
+      final long blockTimestamp,
       final int transactionIndex,
       final int logIndexOffset) {
     final List<TransactionReceiptLogResult> logResults = new ArrayList<>(logs.size());
@@ -201,7 +203,13 @@ private List<TransactionReceiptLogResult> logReceipts(
       final Log log = logs.get(i);
       logResults.add(
           new TransactionReceiptLogResult(
-              log, blockNumber, transactionHash, blockHash, transactionIndex, i + logIndexOffset));
+              log,
+              blockNumber,
+              transactionHash,
+              blockHash,
+              blockTimestamp,
+              transactionIndex,
+              i + logIndexOffset));
     }
 
     return logResults;

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueries.java

@@ -682,6 +682,7 @@ public Optional<List<TransactionReceiptWithMetadata>> transactionReceiptsByBlock
               gasUsed,
               header.getBaseFee(),
               blockHash,
+              header.getTimestamp(),
               header.getNumber(),
               maybeBlobGasUsed,
               maybeBlobGasPrice,
@@ -745,6 +746,7 @@ public Optional<TransactionReceiptWithMetadata> transactionReceiptByTransactionH
             gasUsed,
             header.getBaseFee(),
             blockhash,
+            header.getTimestamp(),
             header.getNumber(),
             maybeBlobGasUsed,
             maybeBlobGasPrice,

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionReceiptWithMetadata.java

@@ -29,6 +29,7 @@ public class TransactionReceiptWithMetadata {
   private final Optional<Wei> baseFee;
   private final long blockNumber;
   private final Hash blockHash;
+  private final long blockTimestamp;
   private final Transaction transaction;
   private final Optional<Long> blobGasUsed;
   private final Optional<Wei> blobGasPrice;
@@ -42,6 +43,7 @@ private TransactionReceiptWithMetadata(
       final long gasUsed,
       final Optional<Wei> baseFee,
       final Hash blockHash,
+      final long blockTimestamp,
       final long blockNumber,
       final Optional<Long> blobGasUsed,
       final Optional<Wei> blobGasPrice,
@@ -52,6 +54,7 @@ private TransactionReceiptWithMetadata(
     this.gasUsed = gasUsed;
     this.baseFee = baseFee;
     this.blockHash = blockHash;
+    this.blockTimestamp = blockTimestamp;
     this.blockNumber = blockNumber;
     this.transaction = transaction;
     this.blobGasUsed = blobGasUsed;
@@ -67,6 +70,7 @@ public static TransactionReceiptWithMetadata create(
       final long gasUsed,
       final Optional<Wei> baseFee,
       final Hash blockHash,
+      final long blockTimestamp,
       final long blockNumber,
       final Optional<Long> blobGasUsed,
       final Optional<Wei> blobGasPrice,
@@ -79,6 +83,7 @@ public static TransactionReceiptWithMetadata create(
         gasUsed,
         baseFee,
         blockHash,
+        blockTimestamp,
         blockNumber,
         blobGasUsed,
         blobGasPrice,
@@ -105,6 +110,10 @@ public Hash getBlockHash() {
     return blockHash;
   }
 
+  public long getBlockTimestamp() {
+    return blockTimestamp;
+  }
+
   public long getBlockNumber() {
     return blockNumber;
   }

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/TransactionDataFetcherTest.java

@@ -73,6 +73,7 @@ void emptyBlobs() throws Exception {
             21000,
             Optional.empty(),
             fakedHash,
+            1234,
             1,
             Optional.empty(),
             Optional.empty(),
@@ -108,6 +109,7 @@ void hasZeroBlobs() throws Exception {
             21000,
             Optional.empty(),
             fakedHash,
+            1234,
             1,
             Optional.of(0L),
             Optional.of(Wei.ZERO),
@@ -143,6 +145,7 @@ void hasOneBlob() throws Exception {
             21000,
             Optional.empty(),
             fakedHash,
+            1234,
             1,
             Optional.of(blobGasUsed),
             Optional.of(blobGasPrice),

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java

@@ -122,6 +122,7 @@ public String description() {
           2,
           Optional.empty(),
           blockHash,
+          1234,
           4,
           Optional.empty(),
           Optional.empty(),
@@ -135,6 +136,7 @@ public String description() {
           2,
           Optional.empty(),
           blockHash,
+          1234,
           4,
           Optional.empty(),
           Optional.empty(),
@@ -275,6 +277,7 @@ public void shouldWorkFor1559Txs() {
             2,
             Optional.of(baseFee),
             blockHash,
+            1234,
             4,
             Optional.empty(),
             Optional.empty(),

ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockReceiptsByNumber_32.json

@@ -26,6 +26,7 @@
         "transactionHash" : "0xcef53f2311d7c80e9086d661e69ac11a5f3d081e28e02a9ba9b66749407ac310",
         "transactionIndex" : "0x0",
         "blockHash" : "0x71d59849ddd98543bdfbe8548f5eed559b07b8aaf196369f39134500eab68e53",
+        "blockTimestamp" : "0x561bc33d",
         "logIndex" : "0x0",
         "removed" : false
       } ],

ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_logs.json

@@ -32,6 +32,7 @@
           "transactionHash": "0x185a9154a0acc4e0ffc84029aee0f3dbf57ff0b84ec7624cb80e7373a03e8aeb",
           "transactionIndex": "0x0",
           "blockHash": "0x0f765087745aa259d9e5ac39c367c57432a16ed98e3b0d81c5b51d10f301dc49",
+          "blockTimestamp" : "0x561bc33a",
           "logIndex": "0x0",
           "removed": false
         }