Merge pull request #1086 from RunOnFlux/development

v4.8.0

HomeUI/dist/index.html

@@ -83,7 +83,7 @@
           transform: rotate(1turn);
           opacity: 1;
         }
-      }</style><link rel="icon" href="/logo.png" type="image/x-icon"><link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,300;0,400;0,500;0,600;1,400&display=swap" rel="stylesheet"><title>FluxOS Dashboard</title><link href="/css/chunk-07114f10.css" rel="prefetch"><link href="/css/chunk-08f7be80.css" rel="prefetch"><link href="/css/chunk-0b5387ea.css" rel="prefetch"><link href="/css/chunk-0c015dcd.css" rel="prefetch"><link href="/css/chunk-138ffd6c.css" rel="prefetch"><link href="/css/chunk-18ed890a.css" rel="prefetch"><link href="/css/chunk-1fe6e0c0.css" rel="prefetch"><link href="/css/chunk-29173282.css" rel="prefetch"><link href="/css/chunk-2aa43537.css" rel="prefetch"><link href="/css/chunk-41fad500.css" rel="prefetch"><link href="/css/chunk-455bdd98.css" rel="prefetch"><link href="/css/chunk-45bfc8b0.css" rel="prefetch"><link href="/css/chunk-46f77fb8.css" rel="prefetch"><link href="/css/chunk-4b97e0a0.css" rel="prefetch"><link href="/css/chunk-5551db4a.css" rel="prefetch"><link href="/css/chunk-5e501b82.css" rel="prefetch"><link href="/css/chunk-62c6dc85.css" rel="prefetch"><link href="/css/chunk-68457c75.css" rel="prefetch"><link href="/css/chunk-6dbaaeb9.css" rel="prefetch"><link href="/css/chunk-738cdf7a.css" rel="prefetch"><link href="/css/chunk-785363c7.css" rel="prefetch"><link href="/css/chunk-7dc032a2.css" rel="prefetch"><link href="/css/chunk-7f24f869.css" rel="prefetch"><link href="/css/chunk-7f5b4a93.css" rel="prefetch"><link href="/css/chunk-90a42266.css" rel="prefetch"><link href="/css/chunk-934d8af2.css" rel="prefetch"><link href="/css/chunk-977bdf12.css" rel="prefetch"><link href="/css/chunk-bc127992.css" rel="prefetch"><link href="/css/chunk-caeadf52.css" rel="prefetch"><link href="/css/chunk-d563a22e.css" rel="prefetch"><link href="/css/chunk-d5dfb516.css" rel="prefetch"><link href="/css/chunk-e785f854.css" rel="prefetch"><link href="/js/chunk-07114f10.js" rel="prefetch"><link href="/js/chunk-08f30e46.js" rel="prefetch"><link href="/js/chunk-08f7be80.js" rel="prefetch"><link href="/js/chunk-0b5387ea.js" rel="prefetch"><link href="/js/chunk-0c015dcd.js" rel="prefetch"><link href="/js/chunk-0c3491f3.js" rel="prefetch"><link href="/js/chunk-138ffd6c.js" rel="prefetch"><link href="/js/chunk-18c81973.js" rel="prefetch"><link href="/js/chunk-18ed890a.js" rel="prefetch"><link href="/js/chunk-1c099427.js" rel="prefetch"><link href="/js/chunk-1d267246.js" rel="prefetch"><link href="/js/chunk-1fe6e0c0.js" rel="prefetch"><link href="/js/chunk-207cf88f.js" rel="prefetch"><link href="/js/chunk-276a226b.js" rel="prefetch"><link href="/js/chunk-29173282.js" rel="prefetch"><link href="/js/chunk-2aa43537.js" rel="prefetch"><link href="/js/chunk-2ae447ee.js" rel="prefetch"><link href="/js/chunk-2ca6d314.js" rel="prefetch"><link href="/js/chunk-2d2082cb.js" rel="prefetch"><link href="/js/chunk-2d7ce103.js" rel="prefetch"><link href="/js/chunk-2dcd0dfb.js" rel="prefetch"><link href="/js/chunk-3775d85b.js" rel="prefetch"><link href="/js/chunk-3f1b13c2.js" rel="prefetch"><link href="/js/chunk-3fa61e41.js" rel="prefetch"><link href="/js/chunk-41fad500.js" rel="prefetch"><link href="/js/chunk-4385be76.js" rel="prefetch"><link href="/js/chunk-454fbe66.js" rel="prefetch"><link href="/js/chunk-455bdd98.js" rel="prefetch"><link href="/js/chunk-45bfc8b0.js" rel="prefetch"><link href="/js/chunk-46f77fb8.js" rel="prefetch"><link href="/js/chunk-4b97e0a0.js" rel="prefetch"><link href="/js/chunk-4d5520dc.js" rel="prefetch"><link href="/js/chunk-52d08741.js" rel="prefetch"><link href="/js/chunk-5551db4a.js" rel="prefetch"><link href="/js/chunk-5afdd5c4.js" rel="prefetch"><link href="/js/chunk-5b67c44c.js" rel="prefetch"><link href="/js/chunk-5e501b82.js" rel="prefetch"><link href="/js/chunk-623dc2e1.js" rel="prefetch"><link href="/js/chunk-62c6dc85.js" rel="prefetch"><link href="/js/chunk-64f322df.js" rel="prefetch"><link href="/js/chunk-650d0bfc.js" rel="prefetch"><link href="/js/chunk-68457c75.js" rel="prefetch"><link href="/js/chunk-6dbaaeb9.js" rel="prefetch"><link href="/js/chunk-6fff6798.js" rel="prefetch"><link href="/js/chunk-72cac487.js" rel="prefetch"><link href="/js/chunk-738cdf7a.js" rel="prefetch"><link href="/js/chunk-785363c7.js" rel="prefetch"><link href="/js/chunk-7a1a851d.js" rel="prefetch"><link href="/js/chunk-7bf0b7cc.js" rel="prefetch"><link href="/js/chunk-7db479ac.js" rel="prefetch"><link href="/js/chunk-7dc032a2.js" rel="prefetch"><link href="/js/chunk-7f24f869.js" rel="prefetch"><link href="/js/chunk-7f5b4a93.js" rel="prefetch"><link href="/js/chunk-90a42266.js" rel="prefetch"><link href="/js/chunk-934d8af2.js" rel="prefetch"><link href="/js/chunk-977bdf12.js" rel="prefetch"><link href="/js/chunk-b650ba02.js" rel="prefetch"><link href="/js/chunk-bc127992.js" rel="prefetch"><link href="/js/chunk-c2910f42.js" rel="prefetch"><link href="/js/chunk-c94617ac.js" rel="prefetch"><link href="/js/chunk-caeadf52.js" rel="prefetch"><link href="/js/chunk-d05c52fa.js" rel="prefetch"><link href="/js/chunk-d4fcbd38.js" rel="prefetch"><link href="/js/chunk-d563a22e.js" rel="prefetch"><link href="/js/chunk-d5dfb516.js" rel="prefetch"><link href="/js/chunk-e696eef4.js" rel="prefetch"><link href="/js/chunk-e785f854.js" rel="prefetch"><link href="/js/chunk-f8b79a3e.js" rel="prefetch"><link href="/css/index.css" rel="preload" as="style"><link href="/js/chunk-vendors.js" rel="preload" as="script"><link href="/js/index.js" rel="preload" as="script"><link href="/css/index.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but the FluxOS Dashboard doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="loading-bg"><div class="loading-logo"><img src="/logo.png" alt="Logo"></div><div class="loading"><div class="effect-1 effects"></div><div class="effect-2 effects"></div><div class="effect-3 effects"></div></div></div><div id="app"></div><script src="/js/chunk-vendors.js"></script><script src="/js/index.js"></script></body><script>var skin = localStorage.getItem("vuexy-skin") || "dark";
+      }</style><link rel="icon" href="/logo.png" type="image/x-icon"><link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,300;0,400;0,500;0,600;1,400&display=swap" rel="stylesheet"><title>FluxOS Dashboard</title><link href="/css/chunk-07114f10.css" rel="prefetch"><link href="/css/chunk-0b5387ea.css" rel="prefetch"><link href="/css/chunk-0c015dcd.css" rel="prefetch"><link href="/css/chunk-138ffd6c.css" rel="prefetch"><link href="/css/chunk-18ed890a.css" rel="prefetch"><link href="/css/chunk-1fe6e0c0.css" rel="prefetch"><link href="/css/chunk-29173282.css" rel="prefetch"><link href="/css/chunk-2aa43537.css" rel="prefetch"><link href="/css/chunk-46f77fb8.css" rel="prefetch"><link href="/css/chunk-4b97e0a0.css" rel="prefetch"><link href="/css/chunk-5551db4a.css" rel="prefetch"><link href="/css/chunk-555e1e48.css" rel="prefetch"><link href="/css/chunk-5e501b82.css" rel="prefetch"><link href="/css/chunk-62c6dc85.css" rel="prefetch"><link href="/css/chunk-66270117.css" rel="prefetch"><link href="/css/chunk-677e2054.css" rel="prefetch"><link href="/css/chunk-68457c75.css" rel="prefetch"><link href="/css/chunk-6dbaaeb9.css" rel="prefetch"><link href="/css/chunk-738cdf7a.css" rel="prefetch"><link href="/css/chunk-785363c7.css" rel="prefetch"><link href="/css/chunk-7a3a3ef2.css" rel="prefetch"><link href="/css/chunk-7dac3e23.css" rel="prefetch"><link href="/css/chunk-7dc032a2.css" rel="prefetch"><link href="/css/chunk-7f24f869.css" rel="prefetch"><link href="/css/chunk-90a42266.css" rel="prefetch"><link href="/css/chunk-934d8af2.css" rel="prefetch"><link href="/css/chunk-977bdf12.css" rel="prefetch"><link href="/css/chunk-bc127992.css" rel="prefetch"><link href="/css/chunk-caeadf52.css" rel="prefetch"><link href="/css/chunk-d563a22e.css" rel="prefetch"><link href="/css/chunk-d5dfb516.css" rel="prefetch"><link href="/css/chunk-e785f854.css" rel="prefetch"><link href="/js/chunk-07114f10.js" rel="prefetch"><link href="/js/chunk-08f30e46.js" rel="prefetch"><link href="/js/chunk-0b5387ea.js" rel="prefetch"><link href="/js/chunk-0c015dcd.js" rel="prefetch"><link href="/js/chunk-0c3491f3.js" rel="prefetch"><link href="/js/chunk-138ffd6c.js" rel="prefetch"><link href="/js/chunk-18c81973.js" rel="prefetch"><link href="/js/chunk-18ed890a.js" rel="prefetch"><link href="/js/chunk-1c099427.js" rel="prefetch"><link href="/js/chunk-1d267246.js" rel="prefetch"><link href="/js/chunk-1fe6e0c0.js" rel="prefetch"><link href="/js/chunk-207cf88f.js" rel="prefetch"><link href="/js/chunk-276a226b.js" rel="prefetch"><link href="/js/chunk-29173282.js" rel="prefetch"><link href="/js/chunk-2aa43537.js" rel="prefetch"><link href="/js/chunk-2ae447ee.js" rel="prefetch"><link href="/js/chunk-2ca6d314.js" rel="prefetch"><link href="/js/chunk-2d2082cb.js" rel="prefetch"><link href="/js/chunk-2d7ce103.js" rel="prefetch"><link href="/js/chunk-2dcd0dfb.js" rel="prefetch"><link href="/js/chunk-3775d85b.js" rel="prefetch"><link href="/js/chunk-3f1b13c2.js" rel="prefetch"><link href="/js/chunk-3fa61e41.js" rel="prefetch"><link href="/js/chunk-4385be76.js" rel="prefetch"><link href="/js/chunk-454fbe66.js" rel="prefetch"><link href="/js/chunk-46f77fb8.js" rel="prefetch"><link href="/js/chunk-4b97e0a0.js" rel="prefetch"><link href="/js/chunk-4d5520dc.js" rel="prefetch"><link href="/js/chunk-52d08741.js" rel="prefetch"><link href="/js/chunk-5551db4a.js" rel="prefetch"><link href="/js/chunk-555e1e48.js" rel="prefetch"><link href="/js/chunk-5afdd5c4.js" rel="prefetch"><link href="/js/chunk-5b67c44c.js" rel="prefetch"><link href="/js/chunk-5e501b82.js" rel="prefetch"><link href="/js/chunk-623dc2e1.js" rel="prefetch"><link href="/js/chunk-62c6dc85.js" rel="prefetch"><link href="/js/chunk-64f322df.js" rel="prefetch"><link href="/js/chunk-650d0bfc.js" rel="prefetch"><link href="/js/chunk-66270117.js" rel="prefetch"><link href="/js/chunk-677e2054.js" rel="prefetch"><link href="/js/chunk-68457c75.js" rel="prefetch"><link href="/js/chunk-6dbaaeb9.js" rel="prefetch"><link href="/js/chunk-6fff6798.js" rel="prefetch"><link href="/js/chunk-72cac487.js" rel="prefetch"><link href="/js/chunk-738cdf7a.js" rel="prefetch"><link href="/js/chunk-785363c7.js" rel="prefetch"><link href="/js/chunk-7a1a851d.js" rel="prefetch"><link href="/js/chunk-7a3a3ef2.js" rel="prefetch"><link href="/js/chunk-7bf0b7cc.js" rel="prefetch"><link href="/js/chunk-7dac3e23.js" rel="prefetch"><link href="/js/chunk-7db479ac.js" rel="prefetch"><link href="/js/chunk-7dc032a2.js" rel="prefetch"><link href="/js/chunk-7f24f869.js" rel="prefetch"><link href="/js/chunk-90a42266.js" rel="prefetch"><link href="/js/chunk-934d8af2.js" rel="prefetch"><link href="/js/chunk-977bdf12.js" rel="prefetch"><link href="/js/chunk-b650ba02.js" rel="prefetch"><link href="/js/chunk-bc127992.js" rel="prefetch"><link href="/js/chunk-c2910f42.js" rel="prefetch"><link href="/js/chunk-c94617ac.js" rel="prefetch"><link href="/js/chunk-caeadf52.js" rel="prefetch"><link href="/js/chunk-d05c52fa.js" rel="prefetch"><link href="/js/chunk-d4fcbd38.js" rel="prefetch"><link href="/js/chunk-d563a22e.js" rel="prefetch"><link href="/js/chunk-d5dfb516.js" rel="prefetch"><link href="/js/chunk-e696eef4.js" rel="prefetch"><link href="/js/chunk-e785f854.js" rel="prefetch"><link href="/js/chunk-f8b79a3e.js" rel="prefetch"><link href="/css/index.css" rel="preload" as="style"><link href="/js/chunk-vendors.js" rel="preload" as="script"><link href="/js/index.js" rel="preload" as="script"><link href="/css/index.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but the FluxOS Dashboard doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="loading-bg"><div class="loading-logo"><img src="/logo.png" alt="Logo"></div><div class="loading"><div class="effect-1 effects"></div><div class="effect-2 effects"></div><div class="effect-3 effects"></div></div></div><div id="app"></div><script src="/js/chunk-vendors.js"></script><script src="/js/index.js"></script></body><script>var skin = localStorage.getItem("vuexy-skin") || "dark";
     if (skin === "dark") {
       document.body.classList.add("dark-layout");
     } else if (document.body.className.match("dark-layout")) {

HomeUI/src/router/routes/apps/apps.js

@@ -77,7 +77,7 @@ export default [
     },
   },
   {
-    path: '/apps/shared-nodes',
+    path: 'https://titan.runonflux.io',
     name: 'apps-marketplace-sharednodes',
     component: () => import('@/views/apps/marketplace/Marketplace.vue'),
     meta: {

HomeUI/src/views/apps/Management.vue

@@ -3828,6 +3828,7 @@ const axios = require('axios');
 const qs = require('qs');
 const store = require('store');
 const openpgp = require('openpgp');
+// const https = require('https');
 const timeoptions = require('@/libs/dateFormat');
 
 const geolocations = require('../../libs/geolocation');
@@ -5980,7 +5981,10 @@ export default {
     async fetchEnterpriseKey(nodeip) { // we must have at least +5 nodes or up to 10% of spare keys
       try {
         const node = nodeip.split(':')[0];
-        const port = nodeip.split(':')[1] || 16127;
+        const port = Number(nodeip.split(':')[1] || 16127) + 1;
+        // const agent = new https.Agent({
+        //   rejectUnauthorized: false,
+        // });
         const response = await axios.get(`http://${node}:${port}/flux/pgp`); // ip with port
         if (response.data.status === 'error') {
           this.showToast('danger', response.data.data.message || response.data.data);

HomeUI/src/views/apps/RegisterFluxApp.vue

@@ -131,7 +131,7 @@
                           :value="undefined"
                           disabled
                         >
-                          -- Select to restrict Continent  --
+                          -- Select to restrict Continent --
                         </b-form-select-option>
                       </template>
                     </b-form-select>
@@ -231,7 +231,7 @@
                           :value="undefined"
                           disabled
                         >
-                          -- Select to ban Continent  --
+                          -- Select to ban Continent --
                         </b-form-select-option>
                       </template>
                     </b-form-select>
@@ -1548,9 +1548,7 @@
                 width="100%"
               >
             </a>
-            <a
-              @click="initWalletConnect"
-            >
+            <a @click="initWalletConnect">
               <img
                 class="walletconnectLogin"
                 src="@/assets/images/walletconnect.svg"
@@ -1559,9 +1557,7 @@
                 width="100%"
               >
             </a>
-            <a
-              @click="initMetamask"
-            >
+            <a @click="initMetamask">
               <img
                 class="metamaskLogin"
                 src="@/assets/images/metamask.svg"
@@ -1926,6 +1922,7 @@ const qs = require('qs');
 const axios = require('axios');
 const store = require('store');
 const openpgp = require('openpgp');
+// const https = require('https');
 const timeoptions = require('@/libs/dateFormat');
 
 const geolocations = require('../../libs/geolocation');
@@ -3189,7 +3186,10 @@ export default {
     async fetchEnterpriseKey(nodeip) { // we must have at least +5 nodes or up to 10% of spare keys
       try {
         const node = nodeip.split(':')[0];
-        const port = nodeip.split(':')[1] || 16127;
+        const port = Number(nodeip.split(':')[1] || 16127) + 1;
+        // const agent = new https.Agent({
+        //   rejectUnauthorized: false,
+        // });
         const response = await axios.get(`http://${node}:${port}/flux/pgp`); // ip with port
         if (response.data.status === 'error') {
           this.showToast('danger', response.data.data.message || response.data.data);

HomeUI/src/views/apps/marketplace/CategorySidebar.vue

@@ -33,6 +33,7 @@
                 :key="action.title + $route.path"
                 :to="action.route"
                 :active="isDynamicRouteActive(action.route)"
+                target="_blank"
                 @click="$emit('close-app-view'); $emit('close-left-sidebar'); $emit(action.event)"
               >
                 <v-icon

HomeUI/src/views/apps/marketplace/Marketplace.vue

@@ -175,7 +175,6 @@
         :zelid="zelid"
         @close-left-sidebar="showDetailSidebar = false"
         @close-app-view="isAppViewActive = false; isSharedNodesViewActive = false;"
-        @open-shared-nodes="isSharedNodesViewActive = true"
       />
     </portal>
   </div>

ZelBack/config/default.js

@@ -75,7 +75,7 @@ module.exports = {
     rpcporttestnet: 26124,
   },
   minimumFluxBenchAllowedVersion: '3.8.0',
-  minimumFluxOSAllowedVersion: '3.40.1',
+  minimumFluxOSAllowedVersion: '4.5.0',
   fluxTeamZelId: '1hjy4bCYBJr4mny4zCE85J94RXa8W6q37',
   deterministicNodesStart: 558000,
   fluxapps: {

ZelBack/src/services/appsService.js

@@ -7795,6 +7795,7 @@ async function continuousFluxAppHashesCheck(force = false) {
     const numberOfPeers = fluxCommunication.getNumberOfPeers();
     if (numberOfPeers < 20) {
       log.info('Not enough connected peers to request missing Flux App messages');
+      continuousFluxAppHashesCheckRunning = false;
       return;
     }
     const dbopen = dbHelper.databaseConnection();

ZelBack/src/services/fluxNetworkHelper.js

@@ -875,6 +875,7 @@ async function adjustExternalIP(ip) {
     testnet: ${userconfig.initial.testnet || false},
     development: ${userconfig.initial.development || false},
     apiport: ${Number(userconfig.initial.apiport || config.server.apiport)},
+    routerIP: '${userconfig.initial.routerIP || ''}',
     pgpPrivateKey: \`${userconfig.initial.pgpPrivateKey || ''}\`,
     pgpPublicKey: \`${userconfig.initial.pgpPublicKey || ''}\`,
     blockedPorts: [${userconfig.initial.blockedPorts || ''}],