feat: DEVOPS-2042 add pending and queued transactions (#13)

Author: frankmeds

docker-compose.yaml

@@ -25,7 +25,7 @@ services:
     build:
       context: ../ethstats-server
       dockerfile: Dockerfile
-    image: zilstats-server:latest
+    # image: zilstats-server:latest
     platform: linux/amd64
     ports:
       - "3000:3000"
@@ -40,19 +40,20 @@ services:
       - dashboard
       #- node0
     environment:
-      RPC_HOST: zq2-prototestnet-validator-ase1-0-80f5.zq2.dev #"198.51.100.103"
+      RPC_HOST: zq2-devnet-api-ase1-0-b549.zq2.dev #"198.51.100.103"
       RPC_PORT: "4202"
       LISTENING_PORT: "3333"
-      INSTANCE_NAME: "zq2-prototestnet-validator-ase1-0-80f5"
+      INSTANCE_NAME: "zq2-devnet-api-ase1-0-b549"
       CONTACT_DETAILS: "[email protected]"
+      WS_PORT: "4202"
       WS_SERVER: "ws://198.51.100.10:3000"
       WS_SECRET: "mysecret"
       VERBOSITY: "2"
     container_name: client0
     build:
       context: .
       dockerfile: Dockerfile.zilliqa
-    image: zilstats-client:latest
+    # image: zilstats-client:latest
     networks:
       testnet:
         ipv4_address: 198.51.100.50

lib/node.js

@@ -27,7 +27,7 @@ var WS_SECRET = process.env.WS_SECRET || "eth-net-stats-has-a-secret";
 
 var PENDING_WORKS = true;
 var MAX_BLOCKS_HISTORY = 40;
-var UPDATE_INTERVAL = 1000;
+var UPDATE_INTERVAL = process.env.UPDATE_INTERVAL || 1000;
 var PING_INTERVAL = 3000;
 var MINERS_LIMIT = 5;
 var MAX_HISTORY_UPDATE = 50;
@@ -37,7 +37,7 @@ var CONNECTION_ATTEMPTS_TIMEOUT = 1000;
 // RPC call protection
 var RPC_LOCKED = false;
 var RPC_LOCK_TIMEOUT = 10000; // 10 seconds lock
-var RPC_SLOW_THRESHOLD = 2000; // 2 seconds threshold
+var RPC_SLOW_THRESHOLD = process.env.RPC_SLOW_THRESHOLD || 2000; // 2 seconds threshold
 var lastRpcLockTime = 0;
 
 // Soft start protection
@@ -96,10 +96,11 @@ function Node ()
 		active: false,
 		mining: false,
 		peers: 0,
-        currentView: 0,
-        nextViewChange: 0,
-        highQcView: 0,
+		currentView: 0,
+		nextViewChange: 0,
+		highQcView: 0,
 		pending: 0,
+		queued: 0,
 		gasPrice: 0,
 		block: {
 			number: 0,
@@ -117,6 +118,7 @@ function Node ()
 	this._lastStats = JSON.stringify(this.stats);
 	this._lastFetch = 0;
 	this._lastPending = 0;
+	this._lastQueued = 0;
 
 	this._tries = 0;
 	this._down = 0;
@@ -457,9 +459,9 @@ Node.prototype.setInactive = function()
 {
 	this.stats.active = false;
 	this.stats.peers = 0;
-    this.currentView = 0;
-    this.nextViewChange = 0;
-    this.highQcView = 0;
+	this.stats.currentView = 0;
+	this.stats.nextViewChange = 0;
+	this.stats.highQcView = 0;
 	this.stats.mining = false;
 	this._down++;
 
@@ -686,10 +688,16 @@ Node.prototype.getPending = function()
 
 	if (this._web3)
 	{
-		console.stats('==>', 'Getting Pending')
+		console.stats('==>', 'Getting Pending and Queued')
 
-		web3.eth.getBlockTransactionCount('pending', function (err, pending)
-		{
+		const payload = {
+			jsonrpc: "2.0",
+			method: "txpool_status",
+			params: [],
+			id: 1
+		};
+
+		web3.currentProvider.sendAsync(payload, function (err, response) {
 			if (err) {
 				console.error('xx>', 'getPending error: ', err);
 				return false;
@@ -699,14 +707,25 @@ Node.prototype.getPending = function()
 			results.end = _.now();
 			results.diff = results.end - now;
 
-			console.sstats('==>', 'Got', chalk.reset.red(pending) , chalk.reset.bold.green('pending tx'+ (pending === 1 ? '' : 's') + ' in'), chalk.reset.cyan(results.diff, 'ms'));
+			try {
+				// Values are already in decimal format
+				const pending = parseInt(response.result.pending);
+				const queued = parseInt(response.result.queued);
 
-			self.stats.pending = pending;
+				console.sstats('==>', 'Got', chalk.reset.red(pending), chalk.reset.bold.green('pending tx' + (pending === 1 ? '' : 's')), 'and', chalk.reset.red(queued), chalk.reset.bold.green('queued tx' + (queued === 1 ? '' : 's')), 'in', chalk.reset.cyan(results.diff, 'ms'));
 
-			if(self._lastPending !== pending)
-				self.sendPendingUpdate();
+				self.stats.pending = pending;
+				self.stats.queued = queued;
 
-			self._lastPending = pending;
+				if(self._lastPending !== pending || self._lastQueued !== queued)
+					self.sendPendingUpdate();
+
+				self._lastPending = pending;
+				self._lastQueued = queued;
+			} catch (e) {
+				console.error('xx>', 'Error parsing txpool_status response:', e);
+				console.error('xx>', 'Response was:', response);
+			}
 		});
 	}
 }
@@ -776,7 +795,8 @@ Node.prototype.preparePending = function ()
 	return {
 		id: this.id,
 		stats: {
-			pending: this.stats.pending
+			pending: this.stats.pending,
+			queued: this.stats.queued
 		}
 	};
 }