feat(jsonrpc): add blockTimestamp to logs and receipts

Author: 0xbigapple

framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogMatch.java

@@ -66,7 +66,8 @@ public static List<LogFilterElement> matchBlock(LogFilter logFilter, long blockN
               topicList,
               ByteArray.toHexString(log.getData().toByteArray()),
               logIndexInBlock,
-              removed
+              removed,
+              transactionInfo.getBlockTimeStamp()
           );
           matchedLog.add(logFilterElement);
         }

framework/src/main/java/org/tron/core/services/jsonrpc/types/TransactionReceipt.java

@@ -35,6 +35,7 @@ public static class TransactionLog {
     private String data;
     private String[] topics;
     private boolean removed = false;
+    private String blockTimestamp;
 
     public TransactionLog() {}
   }
@@ -116,6 +117,7 @@ public TransactionReceipt(
       transactionLog.setTransactionIndex(this.transactionIndex);
       transactionLog.setBlockHash(this.blockHash);
       transactionLog.setBlockNumber(this.blockNumber);
+      transactionLog.setBlockTimestamp(ByteArray.toJsonHex(txInfo.getBlockTimeStamp() / 1000));
 
       byte[] addressByte = convertToTronAddress(log.getAddress().toByteArray());
       transactionLog.setAddress(ByteArray.toJsonHexAddress(addressByte));

framework/src/test/java/org/tron/core/jsonrpc/LogMatchExactlyTest.java

@@ -37,6 +37,7 @@ private TransactionInfo createTransactionInfo(byte[] address, byte[][] topicArra
     LogInfo logInfo = new LogInfo(address, topics, data);
     logList.add(LogInfo.buildLog(logInfo));
     builder.addAllLog(logList);
+    builder.setBlockTimeStamp(1000000L);
 
     return builder.build();
   }
@@ -230,6 +231,7 @@ public void testMatchBlock() {
       LogFilterElement logFilterElement1 = elementList.get(0);
       LogFilterElement logFilterElement2 = elementList2.get(0);
 
+      Assert.assertEquals("0x3e8", logFilterElement1.getBlockTimestamp());
       Assert.assertEquals(logFilterElement1.hashCode(), logFilterElement2.hashCode());
       Assert.assertEquals(logFilterElement1, logFilterElement2);
 

framework/src/test/java/org/tron/core/services/jsonrpc/TransactionReceiptTest.java

@@ -32,6 +32,7 @@ public void testTransactionReceipt() throws JsonRpcInternalException {
     Protocol.TransactionInfo transactionInfo = Protocol.TransactionInfo.newBuilder()
         .setId(ByteString.copyFrom("1".getBytes()))
         .setContractAddress(ByteString.copyFrom("address1".getBytes()))
+        .setBlockTimeStamp(1000000L)
         .setReceipt(Protocol.ResourceReceipt.newBuilder()
             .setEnergyUsageTotal(100L)
             .setResult(Protocol.Transaction.Result.contractResult.DEFAULT)
@@ -90,6 +91,7 @@ public void testTransactionReceipt() throws JsonRpcInternalException {
     Assert.assertEquals(transactionReceipt.getLogs()[0].getBlockNumber(), "0x1");
     Assert.assertEquals(transactionReceipt.getLogs()[0].getTransactionHash(), "0x31");
     Assert.assertEquals(transactionReceipt.getLogs()[0].getTransactionIndex(), "0x0");
+    Assert.assertEquals(transactionReceipt.getLogs()[0].getBlockTimestamp(), "0x3e8");
 
     // assert default fields
     Assert.assertNull(transactionReceipt.getRoot());