Merge pull request #140 from eosnetworkfoundation/yarkin/ws_batch_hash_check

Extra checks for block hash when batch requesting block and logs.

Author: arhag

peripherals/eos-evm-ws-proxy/block-monitor.js

@@ -78,6 +78,21 @@ class BlockMonitor extends EventEmitter {
     const block = results.data[0].result;
     const logs = results.data[1].result;
 
+    if (!block || !block["hash"]) {
+      throw new Error("missing hash in response for getBlock request of the [getBlock, GetPastLogs] batch request");
+    }
+    if (!Array.isArray(logs)) {
+        throw new Error("invalid logs in response for GetPastLogs request of the [getBlock, GetPastLogs] batch request");
+    }
+    for (const logEntry of logs) {
+      if (!logEntry["blockHash"]) {
+        throw new Error("missing blockHash in response for GetPastLogs request of the [getBlock, GetPastLogs] batch request");
+      }
+      else if (logEntry["blockHash"] !== block["hash"]) {
+        throw new Error("mismatched hashes in response of [getBlock, GetPastLogs] batch request");
+      }
+    }
+
     block.logs = logs;
     //console.log("RPC batch result:" + JSON.stringify(block));
     return block;