Merge pull request #748 from RunOnFlux/development

v3.26.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-01abd53e.css" rel="prefetch"><link href="/css/chunk-0dd9ca4d.css" rel="prefetch"><link href="/css/chunk-10d8afd2.css" rel="prefetch"><link href="/css/chunk-14dd8282.css" rel="prefetch"><link href="/css/chunk-1cf4b413.css" rel="prefetch"><link href="/css/chunk-1ec3f795.css" rel="prefetch"><link href="/css/chunk-2aa43537.css" rel="prefetch"><link href="/css/chunk-2ebb2369.css" rel="prefetch"><link href="/css/chunk-2f85d536.css" rel="prefetch"><link href="/css/chunk-2f8dba98.css" rel="prefetch"><link href="/css/chunk-2fe6c1ee.css" rel="prefetch"><link href="/css/chunk-308ea032.css" rel="prefetch"><link href="/css/chunk-347db6f6.css" rel="prefetch"><link href="/css/chunk-3c177b15.css" rel="prefetch"><link href="/css/chunk-3d619c94.css" rel="prefetch"><link href="/css/chunk-422d2dba.css" rel="prefetch"><link href="/css/chunk-4b97e0a0.css" rel="prefetch"><link href="/css/chunk-59f77a29.css" rel="prefetch"><link href="/css/chunk-5ae43c90.css" rel="prefetch"><link href="/css/chunk-6dbaaeb9.css" rel="prefetch"><link href="/css/chunk-745b50eb.css" rel="prefetch"><link href="/css/chunk-7bc41632.css" rel="prefetch"><link href="/css/chunk-8353f2f6.css" rel="prefetch"><link href="/css/chunk-8b57f506.css" rel="prefetch"><link href="/css/chunk-8b9585a0.css" rel="prefetch"><link href="/css/chunk-9bfd6254.css" rel="prefetch"><link href="/css/chunk-b78956a0.css" rel="prefetch"><link href="/css/chunk-bbd2a2e0.css" rel="prefetch"><link href="/css/chunk-dea3bc5c.css" rel="prefetch"><link href="/css/chunk-e4864f2c.css" rel="prefetch"><link href="/css/chunk-f4322616.css" rel="prefetch"><link href="/css/chunk-f904ffcc.css" rel="prefetch"><link href="/js/chunk-01abd53e.js" rel="prefetch"><link href="/js/chunk-08f30e46.js" rel="prefetch"><link href="/js/chunk-0dd9ca4d.js" rel="prefetch"><link href="/js/chunk-0e9311fe.js" rel="prefetch"><link href="/js/chunk-10d8afd2.js" rel="prefetch"><link href="/js/chunk-14dd8282.js" rel="prefetch"><link href="/js/chunk-154aa63e.js" rel="prefetch"><link href="/js/chunk-1cf4b413.js" rel="prefetch"><link href="/js/chunk-1d267246.js" rel="prefetch"><link href="/js/chunk-1ec3f795.js" rel="prefetch"><link href="/js/chunk-207cf88f.js" rel="prefetch"><link href="/js/chunk-276a226b.js" rel="prefetch"><link href="/js/chunk-2928c9ba.js" rel="prefetch"><link href="/js/chunk-2aa43537.js" rel="prefetch"><link href="/js/chunk-2d2082cb.js" rel="prefetch"><link href="/js/chunk-2dcd0dfb.js" rel="prefetch"><link href="/js/chunk-2e343d6b.js" rel="prefetch"><link href="/js/chunk-2ebb2369.js" rel="prefetch"><link href="/js/chunk-2f85d536.js" rel="prefetch"><link href="/js/chunk-2f8dba98.js" rel="prefetch"><link href="/js/chunk-2fe6c1ee.js" rel="prefetch"><link href="/js/chunk-308ea032.js" rel="prefetch"><link href="/js/chunk-30dd6b1b.js" rel="prefetch"><link href="/js/chunk-347db6f6.js" rel="prefetch"><link href="/js/chunk-3680ca8f.js" rel="prefetch"><link href="/js/chunk-3775d85b.js" rel="prefetch"><link href="/js/chunk-39edc0c0.js" rel="prefetch"><link href="/js/chunk-3b682446.js" rel="prefetch"><link href="/js/chunk-3c177b15.js" rel="prefetch"><link href="/js/chunk-3d619c94.js" rel="prefetch"><link href="/js/chunk-3f1b13c2.js" rel="prefetch"><link href="/js/chunk-422d2dba.js" rel="prefetch"><link href="/js/chunk-45eb91e0.js" rel="prefetch"><link href="/js/chunk-4b97e0a0.js" rel="prefetch"><link href="/js/chunk-4c31b2b8.js" rel="prefetch"><link href="/js/chunk-506ee572.js" rel="prefetch"><link href="/js/chunk-52d08741.js" rel="prefetch"><link href="/js/chunk-54bd7062.js" rel="prefetch"><link href="/js/chunk-59f77a29.js" rel="prefetch"><link href="/js/chunk-5ae43c90.js" rel="prefetch"><link href="/js/chunk-623dc2e1.js" rel="prefetch"><link href="/js/chunk-64f322df.js" rel="prefetch"><link href="/js/chunk-650d0bfc.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-745b50eb.js" rel="prefetch"><link href="/js/chunk-7a1a851d.js" rel="prefetch"><link href="/js/chunk-7bc41632.js" rel="prefetch"><link href="/js/chunk-7bf0b7cc.js" rel="prefetch"><link href="/js/chunk-7db479ac.js" rel="prefetch"><link href="/js/chunk-7f840ba6.js" rel="prefetch"><link href="/js/chunk-7f855614.js" rel="prefetch"><link href="/js/chunk-8353f2f6.js" rel="prefetch"><link href="/js/chunk-8b57f506.js" rel="prefetch"><link href="/js/chunk-8b9585a0.js" rel="prefetch"><link href="/js/chunk-9bfd6254.js" rel="prefetch"><link href="/js/chunk-b650ba02.js" rel="prefetch"><link href="/js/chunk-b78956a0.js" rel="prefetch"><link href="/js/chunk-bbd2a2e0.js" rel="prefetch"><link href="/js/chunk-c02a7a16.js" rel="prefetch"><link href="/js/chunk-ceeb5c8c.js" rel="prefetch"><link href="/js/chunk-d4df5830.js" rel="prefetch"><link href="/js/chunk-d4fcbd38.js" rel="prefetch"><link href="/js/chunk-dea3bc5c.js" rel="prefetch"><link href="/js/chunk-e4864f2c.js" rel="prefetch"><link href="/js/chunk-e98c830e.js" rel="prefetch"><link href="/js/chunk-f4322616.js" rel="prefetch"><link href="/js/chunk-f904ffcc.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-01abd53e.css" rel="prefetch"><link href="/css/chunk-10d8afd2.css" rel="prefetch"><link href="/css/chunk-14dd8282.css" rel="prefetch"><link href="/css/chunk-1cf4b413.css" rel="prefetch"><link href="/css/chunk-1ec3f795.css" rel="prefetch"><link href="/css/chunk-2a3c118a.css" rel="prefetch"><link href="/css/chunk-2aa43537.css" rel="prefetch"><link href="/css/chunk-2ebb2369.css" rel="prefetch"><link href="/css/chunk-2f85d536.css" rel="prefetch"><link href="/css/chunk-2f8dba98.css" rel="prefetch"><link href="/css/chunk-2fe6c1ee.css" rel="prefetch"><link href="/css/chunk-308ea032.css" rel="prefetch"><link href="/css/chunk-347db6f6.css" rel="prefetch"><link href="/css/chunk-3c177b15.css" rel="prefetch"><link href="/css/chunk-3d619c94.css" rel="prefetch"><link href="/css/chunk-422d2dba.css" rel="prefetch"><link href="/css/chunk-4476a94c.css" rel="prefetch"><link href="/css/chunk-4b97e0a0.css" rel="prefetch"><link href="/css/chunk-59f77a29.css" rel="prefetch"><link href="/css/chunk-5ae43c90.css" rel="prefetch"><link href="/css/chunk-6dbaaeb9.css" rel="prefetch"><link href="/css/chunk-7bc41632.css" rel="prefetch"><link href="/css/chunk-8353f2f6.css" rel="prefetch"><link href="/css/chunk-8b57f506.css" rel="prefetch"><link href="/css/chunk-8b9585a0.css" rel="prefetch"><link href="/css/chunk-9bfd6254.css" rel="prefetch"><link href="/css/chunk-a196473e.css" rel="prefetch"><link href="/css/chunk-b78956a0.css" rel="prefetch"><link href="/css/chunk-bbd2a2e0.css" rel="prefetch"><link href="/css/chunk-dea3bc5c.css" rel="prefetch"><link href="/css/chunk-e4864f2c.css" rel="prefetch"><link href="/css/chunk-f4322616.css" rel="prefetch"><link href="/js/chunk-01abd53e.js" rel="prefetch"><link href="/js/chunk-08f30e46.js" rel="prefetch"><link href="/js/chunk-0e9311fe.js" rel="prefetch"><link href="/js/chunk-10d8afd2.js" rel="prefetch"><link href="/js/chunk-14dd8282.js" rel="prefetch"><link href="/js/chunk-154aa63e.js" rel="prefetch"><link href="/js/chunk-1cf4b413.js" rel="prefetch"><link href="/js/chunk-1d267246.js" rel="prefetch"><link href="/js/chunk-1ec3f795.js" rel="prefetch"><link href="/js/chunk-207cf88f.js" rel="prefetch"><link href="/js/chunk-276a226b.js" rel="prefetch"><link href="/js/chunk-2928c9ba.js" rel="prefetch"><link href="/js/chunk-2a3c118a.js" rel="prefetch"><link href="/js/chunk-2aa43537.js" rel="prefetch"><link href="/js/chunk-2d2082cb.js" rel="prefetch"><link href="/js/chunk-2dcd0dfb.js" rel="prefetch"><link href="/js/chunk-2e343d6b.js" rel="prefetch"><link href="/js/chunk-2ebb2369.js" rel="prefetch"><link href="/js/chunk-2f85d536.js" rel="prefetch"><link href="/js/chunk-2f8dba98.js" rel="prefetch"><link href="/js/chunk-2fe6c1ee.js" rel="prefetch"><link href="/js/chunk-308ea032.js" rel="prefetch"><link href="/js/chunk-30dd6b1b.js" rel="prefetch"><link href="/js/chunk-347db6f6.js" rel="prefetch"><link href="/js/chunk-3680ca8f.js" rel="prefetch"><link href="/js/chunk-3775d85b.js" rel="prefetch"><link href="/js/chunk-39edc0c0.js" rel="prefetch"><link href="/js/chunk-3b682446.js" rel="prefetch"><link href="/js/chunk-3c177b15.js" rel="prefetch"><link href="/js/chunk-3d619c94.js" rel="prefetch"><link href="/js/chunk-3f1b13c2.js" rel="prefetch"><link href="/js/chunk-422d2dba.js" rel="prefetch"><link href="/js/chunk-4476a94c.js" rel="prefetch"><link href="/js/chunk-45eb91e0.js" rel="prefetch"><link href="/js/chunk-4b97e0a0.js" rel="prefetch"><link href="/js/chunk-4c31b2b8.js" rel="prefetch"><link href="/js/chunk-506ee572.js" rel="prefetch"><link href="/js/chunk-52d08741.js" rel="prefetch"><link href="/js/chunk-54bd7062.js" rel="prefetch"><link href="/js/chunk-59f77a29.js" rel="prefetch"><link href="/js/chunk-5ae43c90.js" rel="prefetch"><link href="/js/chunk-623dc2e1.js" rel="prefetch"><link href="/js/chunk-64f322df.js" rel="prefetch"><link href="/js/chunk-650d0bfc.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-7a1a851d.js" rel="prefetch"><link href="/js/chunk-7bc41632.js" rel="prefetch"><link href="/js/chunk-7bf0b7cc.js" rel="prefetch"><link href="/js/chunk-7db479ac.js" rel="prefetch"><link href="/js/chunk-7f840ba6.js" rel="prefetch"><link href="/js/chunk-7f855614.js" rel="prefetch"><link href="/js/chunk-8353f2f6.js" rel="prefetch"><link href="/js/chunk-8b57f506.js" rel="prefetch"><link href="/js/chunk-8b9585a0.js" rel="prefetch"><link href="/js/chunk-9bfd6254.js" rel="prefetch"><link href="/js/chunk-a196473e.js" rel="prefetch"><link href="/js/chunk-b650ba02.js" rel="prefetch"><link href="/js/chunk-b78956a0.js" rel="prefetch"><link href="/js/chunk-bbd2a2e0.js" rel="prefetch"><link href="/js/chunk-c02a7a16.js" rel="prefetch"><link href="/js/chunk-ceeb5c8c.js" rel="prefetch"><link href="/js/chunk-d4df5830.js" rel="prefetch"><link href="/js/chunk-d4fcbd38.js" rel="prefetch"><link href="/js/chunk-dea3bc5c.js" rel="prefetch"><link href="/js/chunk-e4864f2c.js" rel="prefetch"><link href="/js/chunk-e98c830e.js" rel="prefetch"><link href="/js/chunk-f4322616.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/views/apps/Management.vue

@@ -3266,7 +3266,6 @@ export default {
       forbiddenGeolocations: {},
       numberOfGeolocations: 1,
       numberOfNegativeGeolocations: 1,
-      geoWasUpdate: false,
     };
   },
   computed: {
@@ -3495,16 +3494,16 @@ export default {
         case 7:
           this.getApplicationLogs();
           break;
-        case 10:
+        case 12:
           this.getGlobalApplicationSpecifics();
           break;
-        case 11:
+        case 13:
           this.getZelidAuthority();
           break;
-        case 12:
+        case 14:
           this.getApplicationLocations();
           break;
-        case 13:
+        case 15:
           this.getGlobalApplicationSpecifics();
           break;
         default:
@@ -3666,10 +3665,7 @@ export default {
       try {
         const appSpecification = this.appUpdateSpecification;
         if (appSpecification.version >= 5) {
-          // TODO because we will have a grace period, check if geolocation was updated
-          if (this.geoWasUpdate) {
-            appSpecification.geolocation = this.generateGeolocations();
-          }
+          appSpecification.geolocation = this.generateGeolocations();
         }
         // call api for verification of app registration specifications that returns formatted specs
         const responseAppSpecs = await AppsService.appUpdateVerification(appSpecification);
@@ -4623,9 +4619,6 @@ export default {
     },
     countriesOptions(continentCode, isNegative) {
       const countries = [{ value: isNegative ? 'NONE' : 'ALL', text: isNegative ? 'NONE' : 'ALL' }];
-      if (this.callBResponse.data.height < 1230000) { // not yet enabled from start
-        return countries;
-      }
       this.possibleLocations.filter((options) => options.instances > (isNegative ? -1 : 3)).forEach((location) => {
         if (!location.value.split('_')[2] && location.value.startsWith(`${continentCode}_`)) {
           const existingCountry = geolocations.countries.find((country) => country.code === location.value.split('_')[1]);
@@ -4636,9 +4629,6 @@ export default {
     },
     regionsOptions(continentCode, countryCode, isNegative) {
       const regions = [{ value: isNegative ? 'NONE' : 'ALL', text: isNegative ? 'NONE' : 'ALL' }];
-      if (this.callBResponse.data.height < 1230000) { // not yet enabled from start
-        return regions;
-      }
       this.possibleLocations.filter((options) => options.instances > (isNegative ? -1 : 3)).forEach((location) => {
         if (location.value.startsWith(`${continentCode}_${countryCode}_`)) {
           regions.push({ value: location.value.split('_')[2], text: location.value.split('_')[2] });
@@ -4743,7 +4733,6 @@ export default {
       instances = instances > 3 ? instances : 3;
       const maxInstances = instances > 100 ? 100 : instances;
       this.maxInstances = maxInstances;
-      this.geoWasUpdate = true; // TODO later remove after fork
     },
   },
 };

HomeUI/src/views/apps/RegisterFluxApp.vue

@@ -1762,9 +1762,6 @@ export default {
     },
     countriesOptions(continentCode, isNegative) {
       const countries = [{ value: isNegative ? 'NONE' : 'ALL', text: isNegative ? 'NONE' : 'ALL' }];
-      if (this.currentHeight < 1230000) { // not yet enabled from start
-        return countries;
-      }
       this.possibleLocations.filter((options) => options.instances > (isNegative ? -1 : 3)).forEach((location) => {
         if (!location.value.split('_')[2] && location.value.startsWith(`${continentCode}_`)) {
           const existingCountry = geolocations.countries.find((country) => country.code === location.value.split('_')[1]);
@@ -1775,9 +1772,6 @@ export default {
     },
     regionsOptions(continentCode, countryCode, isNegative) {
       const regions = [{ value: isNegative ? 'NONE' : 'ALL', text: isNegative ? 'NONE' : 'ALL' }];
-      if (this.currentHeight < 1230000) { // not yet enabled from start
-        return regions;
-      }
       this.possibleLocations.filter((options) => options.instances > (isNegative ? -1 : 3)).forEach((location) => {
         if (location.value.startsWith(`${continentCode}_${countryCode}_`)) {
           regions.push({ value: location.value.split('_')[2], text: location.value.split('_')[2] });

ZelBack/config/default.js

@@ -61,7 +61,7 @@ module.exports = {
     porttestnet: 26125,
     rpcporttestnet: 26124,
   },
-  minimumFluxBenchAllowedVersion: '3.3.1',
+  minimumFluxBenchAllowedVersion: '3.5.0',
   minimumFluxOSAllowedVersion: '3.23.0',
   fluxTeamZelId: '1hjy4bCYBJr4mny4zCE85J94RXa8W6q37',
   deterministicNodesStart: 558000,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flux",
-  "version": "3.25.0",
+  "version": "3.26.0",
   "description": "Flux, Your Gateway to a Decentralized World",
   "repository": {
     "type": "git",