Merge pull request #3135 from rsksmart/vovchyk/rc710/nonce-fix

fix(rpc): extend BlockResultDTO with nonce field

Author: Vovchyk

rskj-core/src/main/java/org/ethereum/rpc/dto/BlockResultDTO.java

@@ -39,6 +39,7 @@ public class BlockResultDTO {
     private final String hash; // DATA, 32 Bytes - hash of the block. null when its pending block.
     private final String parentHash; // DATA, 32 Bytes - hash of the parent block.
     private final String mixHash; // DATA, 32 Bytes - mix hash field used for compatibility reasons.
+    private final String nonce; // QUANTITY - nonce field used for compatibility reasons.
     private final String sha3Uncles; // DATA, 32 Bytes - SHA3 of the uncles data in the block.
     private final String logsBloom; // DATA, 256 Bytes - the bloom filter for the logs of the block. null when its pending block.
     private final String transactionsRoot; // DATA, 32 Bytes - the root of the transaction trie of the block.
@@ -95,6 +96,7 @@ private BlockResultDTO(
         this.hash = hash != null ? hash.toJsonString() : null;
         this.parentHash = parentHash.toJsonString();
         this.mixHash = mixHash != null ? mixHash.toJsonString() : null;
+        this.nonce = "0x0000000000000000"; // hardcoded for compatibility with Ethereum
         this.sha3Uncles = HexUtils.toUnformattedJsonHex(sha3Uncles);
         this.logsBloom = logsBloom != null ? HexUtils.toUnformattedJsonHex(logsBloom) : null;
         this.transactionsRoot = HexUtils.toUnformattedJsonHex(transactionsRoot);
@@ -216,6 +218,10 @@ public String getMixHash() {
         return mixHash;
     }
 
+    public String getNonce() {
+        return nonce;
+    }
+
     public String getSha3Uncles() {
         return sha3Uncles;
     }

rskj-core/src/test/java/org/ethereum/rpc/dto/BlockResultDTOTest.java

@@ -35,6 +35,7 @@
 import java.math.BigInteger;
 import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -98,6 +99,14 @@ void getBlockResultDTOWithoutRemasc_emptyTransactions() {
         Assertions.assertTrue(blockResultDTO.getTransactions().isEmpty());
     }
 
+    @Test
+    void getBlockResultDTO_containsObsoleteFields() {
+        Block block = buildBlockWithTransactions(Collections.emptyList());
+        BlockResultDTO blockResultDTO = BlockResultDTO.fromBlock(block, false, blockStore, true, false, new BlockTxSignatureCache(new ReceivedTxSignatureCache()));
+
+        Assertions.assertEquals("0x0000000000000000000000000000000000000000000000000000000000000000", blockResultDTO.getMixHash());
+        Assertions.assertEquals("0x0000000000000000", blockResultDTO.getNonce());
+    }
 
     @Test
     void getBlockResultDTOWithNullSignatureRemascAndFullTransactions() {