Merge pull request #92 from NoteGio/standardize-block-rpc

Align block_helper.toJSON with hashed values
trufflesuite · Apr 12, 2018 · cd630dd · cd630dd
2 parents 8d97cee + d951cae
commit cd630dd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/lib/utils/block_helper.js b/lib/utils/block_helper.js
@@ -7,21 +7,21 @@ module.exports = {
       number: to.rpcQuantityHexString(block.header.number),
       hash: to.hex(block.hash()),
       parentHash: to.hex(block.header.parentHash), //common.hash
-      mixHash: "0x" + (new Array(32).fill("10").join("")), // TODO: Figure out what to do here.
+      mixHash: to.hex(block.header.mixHash),
       nonce: to.rpcDataHexString(to.hex(block.header.nonce), 16),
       sha3Uncles: to.hex(block.header.uncleHash),
       logsBloom: to.hex(block.header.bloom),
       transactionsRoot: to.hex(block.header.transactionsTrie),
       stateRoot: to.hex(block.header.stateRoot),
       receiptsRoot: to.hex(block.header.receiptTrie),
       miner: to.hex(block.header.coinbase),
-      difficulty: to.hex(block.header.difficulty),
-      totalDifficulty: to.hex(block.header.difficulty), // TODO: Figure out what to do here.
-      extraData: to.rpcDataHexString(to.hex(block.header.extraData)),
+      difficulty: to.rpcQuantityHexString(block.header.difficulty),
+      totalDifficulty: to.rpcQuantityHexString(block.header.difficulty), // TODO: Figure out what to do here.
+      extraData: to.rpcDataHexString(block.header.extraData),
       size: to.hex(1000), // TODO: Do something better here
-      gasLimit: to.hex(block.header.gasLimit),
-      gasUsed: to.hex(block.header.gasUsed),
-      timestamp: to.hex(block.header.timestamp),
+      gasLimit: to.rpcQuantityHexString(block.header.gasLimit),
+      gasUsed: to.rpcQuantityHexString(block.header.gasUsed),
+      timestamp: to.rpcQuantityHexString(block.header.timestamp),
       transactions: block.transactions.map(function(tx) {
         if (include_full_transactions) {
           return txhelper.toJSON(tx, block);

diff --git a/lib/utils/to.js b/lib/utils/to.js
@@ -47,6 +47,9 @@ module.exports = {
 
       val = new Array(length-val.length).fill("0").join("") + val;
     } else {
+      if(val.length == 0) {
+        return "0x";
+      }
       val = this.hex(val).replace("0x", "");
 
       if(val.length % 2 != 0) {

diff --git a/test/hex.js b/test/hex.js
@@ -30,6 +30,13 @@ describe("to.rpcQuantityHexString", function() {
   });
 });
 
+describe("to.rpcDataHexString", function() {
+  it("should differentiate between a list of 0 items and a list of one 0", function(done) {
+    assert.notEqual(to.rpcDataHexString(new Buffer("", "hex")), to.rpcDataHexString(new Buffer("00", "hex")));
+    done();
+  })
+})
+
 function noLeadingZeros(method, result, path) {
   if (!path) {
     path = 'result'

diff --git a/test/requests.js b/test/requests.js
@@ -162,7 +162,7 @@ var tests = function(web3) {
         var expectedFirstBlock = {
           number: 0,
           hash: block.hash, // Don't test this one
-          mixHash: "0x1010101010101010101010101010101010101010101010101010101010101010",
+          mixHash: "0x0000000000000000000000000000000000000000000000000000000000000000",
           parentHash: '0x0000000000000000000000000000000000000000000000000000000000000000',
           nonce: '0x0000000000000000',
           sha3Uncles: '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347',
@@ -173,7 +173,7 @@ var tests = function(web3) {
           miner: '0x0000000000000000000000000000000000000000',
           difficulty: "0",
           totalDifficulty: "0",
-          extraData: '0x00',
+          extraData: '0x',
           size: 1000,
           gasLimit: 6721975,
           gasUsed: 0,