Merge pull request #1153 from RunOnFlux/development

v4.18.0
RunOnFlux · Nov 14, 2023 · 3d63ffc · 3d63ffc
2 parents 973798e + cdc2c93
commit 3d63ffc
Show file tree

Hide file tree

Showing 24 changed files with 597 additions and 358 deletions.
diff --git a/HomeUI/dist/css/chunk-0c015dcd.css → HomeUI/dist/css/chunk-78d787a2.css b/HomeUI/dist/css/chunk-0c015dcd.css → HomeUI/dist/css/chunk-78d787a2.css
diff --git a/HomeUI/dist/css/chunk-c4c4dd3c.css → HomeUI/dist/css/chunk-ab354cbe.css b/HomeUI/dist/css/chunk-c4c4dd3c.css → HomeUI/dist/css/chunk-ab354cbe.css
diff --git a/HomeUI/dist/index.html b/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-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-3e901b32.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-a03b1696.css" rel="prefetch"><link href="/css/chunk-bc127992.css" rel="prefetch"><link href="/css/chunk-c4c4dd3c.css" rel="prefetch"><link href="/css/chunk-caeadf52.css" rel="prefetch"><link href="/css/chunk-ce8f5afa.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-3e901b32.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-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-a03b1696.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-c4c4dd3c.js" rel="prefetch"><link href="/js/chunk-c94617ac.js" rel="prefetch"><link href="/js/chunk-caeadf52.js" rel="prefetch"><link href="/js/chunk-ce8f5afa.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-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-3e901b32.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-78d787a2.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-a03b1696.css" rel="prefetch"><link href="/css/chunk-ab354cbe.css" rel="prefetch"><link href="/css/chunk-bc127992.css" rel="prefetch"><link href="/css/chunk-caeadf52.css" rel="prefetch"><link href="/css/chunk-ce8f5afa.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-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-3e901b32.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-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-78d787a2.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-a03b1696.js" rel="prefetch"><link href="/js/chunk-ab354cbe.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-ce8f5afa.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")) {

diff --git a/HomeUI/dist/js/chunk-0c015dcd.js b/HomeUI/dist/js/chunk-0c015dcd.js
diff --git a/HomeUI/dist/js/chunk-78d787a2.js b/HomeUI/dist/js/chunk-78d787a2.js
diff --git a/HomeUI/dist/js/chunk-c4c4dd3c.js → HomeUI/dist/js/chunk-ab354cbe.js b/HomeUI/dist/js/chunk-c4c4dd3c.js → HomeUI/dist/js/chunk-ab354cbe.js
diff --git a/HomeUI/dist/js/index.js b/HomeUI/dist/js/index.js
diff --git a/HomeUI/src/views/apps/marketplace/AppView.vue b/HomeUI/src/views/apps/marketplace/AppView.vue
@@ -792,7 +792,7 @@ export default {
           appSpecification.geolocation = [];
         }
         if (props.appData.version >= 6) {
-          appSpecification.expire = 22000;
+          appSpecification.expire = props.appData.expire || 22000;
         }
         if (props.appData.version >= 7) {
           appSpecification.staticip = props.appData.staticip;

diff --git a/HomeUI/src/views/apps/marketplace/Marketplace.vue b/HomeUI/src/views/apps/marketplace/Marketplace.vue
@@ -135,7 +135,7 @@
               <div class="app-title-area">
                 <div class="title-wrapper">
                   <h5 class="text-nowrap mr-1 app-description">
-                    Price: {{ singleApp.price }} Flux / month
+                    Price: {{ singleApp.price }} Flux / {{ adjustPeriod(singleApp) }}
                   </h5>
                 </div>
               </div>
@@ -266,6 +266,17 @@ export default {
 
     const resolveHdd = (app) => app.compose.reduce((total, component) => total + component.hdd, 0);
 
+    const adjustPeriod = (app) => {
+      if (app.expire === 264000) {
+        return '1 year';
+      } if (app.expire === 66000) {
+        return '3 months';
+      } if (app.expire === 132000) {
+        return '6 months';
+      }
+      return '1 month';
+    };
+
     const { showDetailSidebar } = useResponsiveAppLeftSidebarVisibility();
     const routeSortBy = computed(() => route.value.query.sort);
     const routeQuery = computed(() => route.value.query.q);
@@ -454,6 +465,7 @@ export default {
       resolveHdd,
       resolveCpu,
       resolveRam,
+      adjustPeriod,
     };
   },
 };

diff --git a/HomeUI/src/views/flux/FluxNetwork.vue b/HomeUI/src/views/flux/FluxNetwork.vue
@@ -117,13 +117,13 @@
       <b-card>
         <h4>Add Peer</h4>
         <div class="mt-1">
-          IP address:
+          IP address (with api port):
         </div>
         <b-form-input
           id="ip"
           v-model="addPeerIP"
           class="mb-2"
-          placeholder="Enter IP address"
+          placeholder="Enter IP address:API Port"
           type="text"
         />
         <div>
@@ -309,6 +309,7 @@ export default {
           filterOn: [],
           fields: [
             { key: 'ip', label: 'IP Address', sortable: true },
+            { key: 'port', label: 'Port', sortable: true },
             { key: 'latency', label: 'Latency', sortable: true },
             { key: 'lastPingTime', label: 'Last Ping', sortable: true },
             { key: 'disconnect', label: '' },
@@ -328,6 +329,7 @@ export default {
           filterOn: [],
           fields: [
             { key: 'ip', label: 'IP Address', sortable: true },
+            { key: 'port', label: 'Port', sortable: true },
             { key: 'disconnect', label: '' },
           ],
           totalRows: 1,
@@ -376,7 +378,7 @@ export default {
     async disconnectPeer(row) {
       const self = this;
       const zelidauth = localStorage.getItem('zelidauth');
-      const response = await FluxService.removePeer(zelidauth, row.item.ip).catch((error) => {
+      const response = await FluxService.removePeer(zelidauth, `${row.item.ip}:${row.item.port}`).catch((error) => {
         this.showToast('danger', error.message || error);
       });
       console.log(response);
@@ -393,7 +395,7 @@ export default {
     async disconnectIncoming(row) {
       const self = this;
       const zelidauth = localStorage.getItem('zelidauth');
-      const response = await FluxService.removeIncomingPeer(zelidauth, row.item.ip).catch((error) => {
+      const response = await FluxService.removeIncomingPeer(zelidauth, `${row.item.ip}:${row.item.port}`).catch((error) => {
         this.showToast('danger', error.message || error);
       });
       console.log(response);

diff --git a/ZelBack/config/default.js b/ZelBack/config/default.js
@@ -148,7 +148,9 @@ module.exports = {
     maximumInstances: 100,
     maximumAdditionalInstances: 1, // max instances above subscribed amount. In case of min instances, this is minimumInstances + maximumAdditionalInstances
     minOutgoing: 8,
+    minUniqueIpsOutgoing: 7,
     minIncoming: 4,
+    minUniqueIpsIncoming: 3,
     minUpTime: 1800, // 30 mins
     installation: {
       probability: 100, // 1%
@@ -175,6 +177,7 @@ module.exports = {
     reconstructAppMessagesHashPeriod: 3600, // every 5 days we ask for old messages
     benchUpnpPeriod: 6480, // every 9 days execute upnp bench
     apprunningv2: 1444444, // daemon block height when version 2 of fluxapprunning type messages start propagating on the network (around August 10th)
+    socketPortsInformation: 1527040, // daemon block height when we will start webservice socket request with origin port information (November 30 2023)
   },
   lockedSystemResources: {
     cpu: 10, // 1 cpu core

diff --git a/ZelBack/src/routes.js b/ZelBack/src/routes.js
@@ -1325,8 +1325,11 @@ module.exports = (app, expressWs) => {
   });
 
   // communication between multiple flux solution is on this:
+  app.ws('/ws/flux/:port', (ws, req) => {
+    fluxCommunication.handleIncomingConnection(ws, req, expressWs.getWss('/ws/flux/:port'));
+  });
   app.ws('/ws/flux', (ws, req) => {
-    fluxCommunication.handleIncomingConnection(ws, req, expressWs.getWss('/ws/flux'));
+    fluxCommunication.handleIncomingConnection(ws, req, expressWs.getWss('/ws/flux/'));
   });
 
   // FluxShare