[WIP] Feature - rework comms utils / add fluxd zmq

ZelBack/config/default.js

@@ -74,6 +74,7 @@ module.exports = {
     rpcport: 16124,
     porttestnet: 26125,
     rpcporttestnet: 26124,
+    zmqport: 28332,
   },
   minimumFluxBenchAllowedVersion: '4.0.0',
   minimumFluxOSAllowedVersion: '5.4.0',

ZelBack/src/services/appsService.js

@@ -11817,8 +11817,7 @@ async function checkMyAppsAvailability() {
       throw err.message;
     });
     await serviceHelper.delay(10 * 1000);
-    // eslint-disable-next-line no-await-in-loop
-    let askingIP = await fluxNetworkHelper.getRandomConnection();
+    let askingIP = fluxNetworkHelper.getRandomConnection();
     if (!askingIP) {
       checkMyAppsAvailability();
       return;
@@ -11993,11 +11992,9 @@ async function checkInstallingAppPortAvailable(portsToTest = []) {
       });
     }
     await serviceHelper.delay(10 * 1000);
-    // eslint-disable-next-line no-await-in-loop
-    let askingIP = await fluxNetworkHelper.getRandomConnection();
+    let askingIP = fluxNetworkHelper.getRandomConnection();
     while (!askingIP || askingIP.split(':')[0] === myIP) {
-      // eslint-disable-next-line no-await-in-loop
-      askingIP = await fluxNetworkHelper.getRandomConnection();
+      askingIP = fluxNetworkHelper.getRandomConnection();
     }
     let askingIpPort = config.server.apiport;
     if (askingIP.includes(':')) { // has port specification

ZelBack/src/services/daemonService/daemonServiceFluxnodeRpcs.js

@@ -207,13 +207,15 @@ async function startFluxNode(req, res) {
 async function viewDeterministicFluxNodeList(req, res) {
   let { filter } = req.params;
   filter = filter || req.query.filter;
+  const useCache = req.params.useCache ?? true;
+
   const rpccall = 'viewdeterministiczelnodelist'; // viewdeterministicfluxnodelist
   const rpcparameters = [];
   if (filter) {
     rpcparameters.push(filter);
   }
 
-  response = await daemonServiceUtils.executeCall(rpccall, rpcparameters);
+  response = await daemonServiceUtils.executeCall(rpccall, rpcparameters, { useCache });
 
   return res ? res.json(response) : response;
 }

ZelBack/src/services/daemonService/daemonServiceUtils.js

@@ -39,7 +39,9 @@ let daemonCallRunning = false;
  * @param {string[]} params RPC parameters.
  * @returns {object} Message.
  */
-async function executeCall(rpc, params) {
+async function executeCall(rpc, params, options = {}) {
+  const useCache = options.useCache ?? true;
+
   const rpcparameters = params || [];
   try {
     let data;
@@ -71,11 +73,11 @@ async function executeCall(rpc, params) {
       const randomDelay = Math.floor((Math.random() * 25)) + 10;
       await serviceHelper.delay(randomDelay);
     }
-    if (rpc === 'getBlock') {
+    if (useCache && rpc === 'getBlock') {
       data = blockCache.get(rpc + serviceHelper.ensureString(rpcparameters));
-    } else if (rpc === 'getRawTransaction') {
+    } else if (useCache && rpc === 'getRawTransaction') {
       data = rawTxCache.get(rpc + serviceHelper.ensureString(rpcparameters));
-    } else {
+    } else if (useCache) {
       data = cache.get(rpc + serviceHelper.ensureString(rpcparameters));
     }
     if (!data) {

ZelBack/src/services/enterpriseNodesService.js

@@ -1,5 +1,5 @@
 const config = require('config');
-const fluxCommunicationUtils = require('./fluxCommunicationUtils');
+const networkStateService = require('./networkStateService');
 const messageHelper = require('./messageHelper');
 const dbHelper = require('./dbHelper');
 const log = require('../lib/log');
@@ -12,7 +12,7 @@ const globalAppsInformation = config.database.appsglobal.collections.appsInforma
  */
 async function getEnterpriseList() {
   try {
-    const nodeList = await fluxCommunicationUtils.deterministicFluxList();
+    const nodeList = networkStateService.networkState();
     const enterpriseList = []; // txhash, outidx, pubkey, score, ip, payment_address?, tier,
     // user collateralization, 200k in flux nodes is most trusted, get 500 points
     // 200k flux in nodes, is most trusted, 5 * 40, 200 * 1, get 500 points