Merge pull request #1375 from RunOnFlux/development

v5.18.0

HomeUI/src/services/FluxService.js

@@ -102,13 +102,6 @@ export default {
       },
     });
   },
-  adjustCruxID(zelidauthHeader, cruxid) {
-    return Api().get(`/flux/adjustcruxid/${cruxid}`, {
-      headers: {
-        zelidauth: zelidauthHeader,
-      },
-    });
-  },
   adjustKadena(zelidauthHeader, account, chainid) {
     return Api().get(`/flux/adjustkadena/${account}/${chainid}`, {
       headers: {
@@ -148,14 +141,6 @@ export default {
     };
     return Api().post('/flux/adjustblockedrepositories', data, axiosConfig);
   },
-  getCruxID() {
-    const axiosConfig = {
-      headers: {
-        'x-apicache-bypass': true,
-      },
-    };
-    return Api().get('/flux/cruxid', axiosConfig);
-  },
   getKadenaAccount() {
     const axiosConfig = {
       headers: {

HomeUI/src/views/fluxadmin/ManageFlux.vue

@@ -807,11 +807,11 @@ export default {
       const chainid = this.kadenaChainIDInput;
       const zelidauth = localStorage.getItem('zelidauth');
       try {
-        const cruxIDResponse = await FluxService.adjustKadena(zelidauth, account, chainid);
-        if (cruxIDResponse.data.status === 'error') {
-          this.showToast('danger', cruxIDResponse.data.data.message || cruxIDResponse.data.data);
+        const response = await FluxService.adjustKadena(zelidauth, account, chainid);
+        if (response.data.status === 'error') {
+          this.showToast('danger', response.data.data.message || response.data.data);
         } else {
-          this.showToast('success', cruxIDResponse.data.data.message || cruxIDResponse.data.data);
+          this.showToast('success', response.data.data.message || response.data.data);
         }
       } catch (error) {
         this.showToast('danger', error.message || error);

ZelBack/config/default.js

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

ZelBack/src/routes.js

@@ -255,9 +255,6 @@ module.exports = (app) => {
   app.get('/flux/pgp', cache('30 seconds'), (req, res) => {
     fluxService.getFluxPGPidentity(req, res);
   });
-  app.get('/flux/cruxid', cache('30 seconds'), (req, res) => {
-    fluxService.getFluxCruxID(req, res);
-  });
   app.get('/flux/kadena', cache('30 seconds'), (req, res) => {
     fluxService.getFluxKadena(req, res);
   });
@@ -880,9 +877,6 @@ module.exports = (app) => {
     idService.logoutAllUsers(req, res);
   });
 
-  app.get('/flux/adjustcruxid/:cruxid?', (req, res) => { // note this essentially rebuilds flux use with caution!
-    fluxService.adjustCruxID(req, res);
-  });
   app.get('/flux/adjustkadena/:account?/:chainid?', (req, res) => { // note this essentially rebuilds flux use with caution!
     fluxService.adjustKadenaAccount(req, res);
   });

ZelBack/src/services/benchmarkService.js

@@ -1,22 +1,43 @@
-const benchmarkrpc = require('daemonrpc');
+const path = require('node:path');
+const fs = require('node:fs/promises');
+
 const config = require('config');
-const path = require('path');
-const fs = require('fs');
+const userconfig = require('../../../config/userconfig');
+const log = require('../lib/log');
+
 const serviceHelper = require('./serviceHelper');
 const messageHelper = require('./messageHelper');
 const verificationHelper = require('./verificationHelper');
 const generalService = require('./generalService');
 const upnpService = require('./upnpService');
-const log = require('../lib/log');
+const fluxRpc = require('./utils/fluxRpc');
 
-const isTestnet = userconfig.initial.testnet;
+let response = messageHelper.createErrorMessage();
 
-const rpcport = isTestnet === true ? config.benchmark.rpcporttestnet : config.benchmark.rpcport;
+let benchdClient = null;
 
-const homeDirPath = path.join(__dirname, '../../../../');
-const newBenchmarkPath = path.join(homeDirPath, '.fluxbenchmark');
+async function buildBenchdClient() {
+  const homeDirPath = path.join(__dirname, '../../../../');
+  const fluxbenchdPath = path.join(homeDirPath, '.fluxbenchmark');
 
-let response = messageHelper.createErrorMessage();
+  const exists = await fs.stat(fluxbenchdPath).catch(() => false);
+
+  const prefix = exists ? 'flux' : 'zel';
+
+  const username = `${prefix}benchuser`;
+  const password = `${prefix}benchpassword`;
+
+  const { initial: { testnet: isTestnet } } = userconfig;
+  const portId = isTestnet ? 'rpcporttestnet' : 'rpcport';
+  const rpcPort = config.benchmark[portId];
+
+  const client = new fluxRpc.FluxRpc(`http://127.0.0.1:${rpcPort}`, {
+    auth: { username, password }, timeout: 10_000, mode: 'fluxbenchd',
+  });
+
+  benchdClient = client;
+  return client;
+}
 
 /**
  * To execute a remote procedure call (RPC).
@@ -26,23 +47,14 @@ let response = messageHelper.createErrorMessage();
  * @returns {object} Message.
  */
 async function executeCall(rpc, params) {
-  let callResponse;
   const rpcparameters = params || [];
-  try {
-    let rpcuser = 'zelbenchuser';
-    let rpcpassword = 'zelbenchpassword';
-    if (fs.existsSync(newBenchmarkPath)) {
-      rpcuser = 'fluxbenchuser';
-      rpcpassword = 'fluxbenchpassword';
-    }
 
-    const client = new benchmarkrpc.Client({
-      port: rpcport,
-      user: rpcuser,
-      pass: rpcpassword,
-      timeout: 60000,
-    });
-    const data = await client[rpc](...rpcparameters);
+  if (!benchdClient) await buildBenchdClient();
+
+  let callResponse;
+
+  try {
+    const data = await benchdClient.run(rpc, { params: rpcparameters });
     const successResponse = messageHelper.createDataMessage(data);
     callResponse = successResponse;
   } catch (error) {
@@ -252,6 +264,10 @@ async function executeUpnpBench() {
   }
 }
 
+if (require.main === module) {
+  getInfo().then((res) => console.log(res));
+}
+
 module.exports = {
   // == Export for testing purposes ==
   executeCall,

ZelBack/src/services/daemonService/daemonServiceMiscRpcs.js

@@ -3,7 +3,9 @@ const daemonServiceUtils = require('./daemonServiceUtils');
 const daemonServiceBlockchainRpcs = require('./daemonServiceBlockchainRpcs');
 const log = require('../../lib/log');
 
-const isTestnet = userconfig.initial.testnet;
+const userconfig = require('../../../../config/userconfig');
+
+const { initial: { isTestnet } } = userconfig;
 
 let currentDaemonHeight = 0;
 let currentDaemonHeader = isTestnet === true ? 377006 : 1136836;

ZelBack/src/services/daemonService/daemonServiceTransactionRpcs.js

@@ -2,7 +2,6 @@ const serviceHelper = require('../serviceHelper');
 const messageHelper = require('../messageHelper');
 const daemonServiceUtils = require('./daemonServiceUtils');
 const verificationHelper = require('../verificationHelper');
-const client = require('../utils/daemonrpcClient').default;
 
 let response = messageHelper.createErrorMessage();
 
@@ -21,7 +20,7 @@ async function createRawTransaction(req, res) {
   addresses = addresses || req.query.addresses;
   let { locktime } = req.params;
   locktime = locktime || req.query.locktime || 0;
-  const blockcount = await client.getBlockCount().catch((error) => {
+  const blockcount = await daemonServiceUtils.getFluxdClient().getBlockCount().catch((error) => {
     response = messageHelper.createErrorMessage(error.message, error.name, error.code);
   });
   if (!blockcount) {
@@ -64,7 +63,7 @@ async function createRawTransactionPost(req, res) {
     let { addresses } = processedBody;
     let { locktime } = processedBody;
     locktime = locktime || 0;
-    const blockcount = await client.getBlockCount().catch((error) => {
+    const blockcount = await daemonServiceUtils.getFluxdClient().getBlockCount().catch((error) => {
       response = messageHelper.createErrorMessage(error.message, error.name, error.code);
     });
     if (!blockcount) {