Merge pull request #340 from RunOnFlux/development

v2.1.4
RunOnFlux · Sep 18, 2021 · dcf1ffd · dcf1ffd
2 parents b2b3da3 + f4a9b56
commit dcf1ffd
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 22 deletions.
diff --git a/HomeUI/dist/css/chunk-0a54105e.css → HomeUI/dist/css/chunk-0d18e412.css b/HomeUI/dist/css/chunk-0a54105e.css → HomeUI/dist/css/chunk-0d18e412.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-002dafad.css" rel="prefetch"><link href="/css/chunk-0a54105e.css" rel="prefetch"><link href="/css/chunk-1c76f7fe.css" rel="prefetch"><link href="/css/chunk-1df8ad36.css" rel="prefetch"><link href="/css/chunk-24a28e3c.css" rel="prefetch"><link href="/css/chunk-2e4305fd.css" rel="prefetch"><link href="/css/chunk-2f037878.css" rel="prefetch"><link href="/css/chunk-377903a4.css" rel="prefetch"><link href="/css/chunk-3bddc606.css" rel="prefetch"><link href="/css/chunk-448594c3.css" rel="prefetch"><link href="/css/chunk-4ba4f37c.css" rel="prefetch"><link href="/css/chunk-4d0d7446.css" rel="prefetch"><link href="/css/chunk-56bfc1e1.css" rel="prefetch"><link href="/css/chunk-586caf0d.css" rel="prefetch"><link href="/css/chunk-5c691692.css" rel="prefetch"><link href="/css/chunk-65bf740a.css" rel="prefetch"><link href="/css/chunk-66546a30.css" rel="prefetch"><link href="/css/chunk-6d0bc202.css" rel="prefetch"><link href="/css/chunk-730b225d.css" rel="prefetch"><link href="/css/chunk-7c77c1e2.css" rel="prefetch"><link href="/css/chunk-7eb6d8ec.css" rel="prefetch"><link href="/css/chunk-7f00bc12.css" rel="prefetch"><link href="/css/chunk-84a82956.css" rel="prefetch"><link href="/css/chunk-b2383f76.css" rel="prefetch"><link href="/css/chunk-cb06fb70.css" rel="prefetch"><link href="/css/chunk-cd18eef6.css" rel="prefetch"><link href="/css/chunk-cf86b400.css" rel="prefetch"><link href="/css/chunk-d9881758.css" rel="prefetch"><link href="/css/chunk-f4e44914.css" rel="prefetch"><link href="/css/chunk-f742bcf2.css" rel="prefetch"><link href="/css/chunk-f8d17ac2.css" rel="prefetch"><link href="/js/chunk-002dafad.js" rel="prefetch"><link href="/js/chunk-08f30e46.js" rel="prefetch"><link href="/js/chunk-0a54105e.js" rel="prefetch"><link href="/js/chunk-0c9d4aae.js" rel="prefetch"><link href="/js/chunk-0fdab1f5.js" rel="prefetch"><link href="/js/chunk-18c81973.js" rel="prefetch"><link href="/js/chunk-1c76f7fe.js" rel="prefetch"><link href="/js/chunk-1d267246.js" rel="prefetch"><link href="/js/chunk-1df8ad36.js" rel="prefetch"><link href="/js/chunk-207cf88f.js" rel="prefetch"><link href="/js/chunk-24a28e3c.js" rel="prefetch"><link href="/js/chunk-276a226b.js" rel="prefetch"><link href="/js/chunk-2928c9ba.js" rel="prefetch"><link href="/js/chunk-2a15b404.js" rel="prefetch"><link href="/js/chunk-2d2082cb.js" rel="prefetch"><link href="/js/chunk-2d81a400.js" rel="prefetch"><link href="/js/chunk-2dcd0dfb.js" rel="prefetch"><link href="/js/chunk-2e4305fd.js" rel="prefetch"><link href="/js/chunk-2f037878.js" rel="prefetch"><link href="/js/chunk-3775d85b.js" rel="prefetch"><link href="/js/chunk-377903a4.js" rel="prefetch"><link href="/js/chunk-3bddc606.js" rel="prefetch"><link href="/js/chunk-3f1b13c2.js" rel="prefetch"><link href="/js/chunk-41b45156.js" rel="prefetch"><link href="/js/chunk-448594c3.js" rel="prefetch"><link href="/js/chunk-45eb91e0.js" rel="prefetch"><link href="/js/chunk-49419389.js" rel="prefetch"><link href="/js/chunk-4ba4f37c.js" rel="prefetch"><link href="/js/chunk-4d0d7446.js" rel="prefetch"><link href="/js/chunk-52d08741.js" rel="prefetch"><link href="/js/chunk-56bfc1e1.js" rel="prefetch"><link href="/js/chunk-586caf0d.js" rel="prefetch"><link href="/js/chunk-5aa78c20.js" rel="prefetch"><link href="/js/chunk-5b67c44c.js" rel="prefetch"><link href="/js/chunk-5c691692.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-65bf740a.js" rel="prefetch"><link href="/js/chunk-66546a30.js" rel="prefetch"><link href="/js/chunk-69bcc4fe.js" rel="prefetch"><link href="/js/chunk-6d0bc202.js" rel="prefetch"><link href="/js/chunk-6fff6798.js" rel="prefetch"><link href="/js/chunk-72cac487.js" rel="prefetch"><link href="/js/chunk-730b225d.js" rel="prefetch"><link href="/js/chunk-7a1a851d.js" rel="prefetch"><link href="/js/chunk-7bf0b7cc.js" rel="prefetch"><link href="/js/chunk-7c050d1e.js" rel="prefetch"><link href="/js/chunk-7c77c1e2.js" rel="prefetch"><link href="/js/chunk-7eb6d8ec.js" rel="prefetch"><link href="/js/chunk-7f00bc12.js" rel="prefetch"><link href="/js/chunk-7fc4780e.js" rel="prefetch"><link href="/js/chunk-82e5c6ba.js" rel="prefetch"><link href="/js/chunk-84a82956.js" rel="prefetch"><link href="/js/chunk-ac0ae80e.js" rel="prefetch"><link href="/js/chunk-b2383f76.js" rel="prefetch"><link href="/js/chunk-b650ba02.js" rel="prefetch"><link href="/js/chunk-cb06fb70.js" rel="prefetch"><link href="/js/chunk-cb4887ac.js" rel="prefetch"><link href="/js/chunk-cd18eef6.js" rel="prefetch"><link href="/js/chunk-ceeb5c8c.js" rel="prefetch"><link href="/js/chunk-cf86b400.js" rel="prefetch"><link href="/js/chunk-d4fcbd38.js" rel="prefetch"><link href="/js/chunk-d9881758.js" rel="prefetch"><link href="/js/chunk-e696eef4.js" rel="prefetch"><link href="/js/chunk-f4e44914.js" rel="prefetch"><link href="/js/chunk-f742bcf2.js" rel="prefetch"><link href="/js/chunk-f8b79a3e.js" rel="prefetch"><link href="/js/chunk-f8d17ac2.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-002dafad.css" rel="prefetch"><link href="/css/chunk-0d18e412.css" rel="prefetch"><link href="/css/chunk-1c76f7fe.css" rel="prefetch"><link href="/css/chunk-1df8ad36.css" rel="prefetch"><link href="/css/chunk-24a28e3c.css" rel="prefetch"><link href="/css/chunk-2e4305fd.css" rel="prefetch"><link href="/css/chunk-2f037878.css" rel="prefetch"><link href="/css/chunk-377903a4.css" rel="prefetch"><link href="/css/chunk-3bddc606.css" rel="prefetch"><link href="/css/chunk-448594c3.css" rel="prefetch"><link href="/css/chunk-4ba4f37c.css" rel="prefetch"><link href="/css/chunk-4d0d7446.css" rel="prefetch"><link href="/css/chunk-56bfc1e1.css" rel="prefetch"><link href="/css/chunk-586caf0d.css" rel="prefetch"><link href="/css/chunk-5c691692.css" rel="prefetch"><link href="/css/chunk-65bf740a.css" rel="prefetch"><link href="/css/chunk-66546a30.css" rel="prefetch"><link href="/css/chunk-6d0bc202.css" rel="prefetch"><link href="/css/chunk-730b225d.css" rel="prefetch"><link href="/css/chunk-7c77c1e2.css" rel="prefetch"><link href="/css/chunk-7eb6d8ec.css" rel="prefetch"><link href="/css/chunk-7f00bc12.css" rel="prefetch"><link href="/css/chunk-84a82956.css" rel="prefetch"><link href="/css/chunk-b2383f76.css" rel="prefetch"><link href="/css/chunk-cb06fb70.css" rel="prefetch"><link href="/css/chunk-cd18eef6.css" rel="prefetch"><link href="/css/chunk-cf86b400.css" rel="prefetch"><link href="/css/chunk-d9881758.css" rel="prefetch"><link href="/css/chunk-f4e44914.css" rel="prefetch"><link href="/css/chunk-f742bcf2.css" rel="prefetch"><link href="/css/chunk-f8d17ac2.css" rel="prefetch"><link href="/js/chunk-002dafad.js" rel="prefetch"><link href="/js/chunk-08f30e46.js" rel="prefetch"><link href="/js/chunk-0c9d4aae.js" rel="prefetch"><link href="/js/chunk-0d18e412.js" rel="prefetch"><link href="/js/chunk-0fdab1f5.js" rel="prefetch"><link href="/js/chunk-18c81973.js" rel="prefetch"><link href="/js/chunk-1c76f7fe.js" rel="prefetch"><link href="/js/chunk-1d267246.js" rel="prefetch"><link href="/js/chunk-1df8ad36.js" rel="prefetch"><link href="/js/chunk-207cf88f.js" rel="prefetch"><link href="/js/chunk-24a28e3c.js" rel="prefetch"><link href="/js/chunk-276a226b.js" rel="prefetch"><link href="/js/chunk-2928c9ba.js" rel="prefetch"><link href="/js/chunk-2a15b404.js" rel="prefetch"><link href="/js/chunk-2d2082cb.js" rel="prefetch"><link href="/js/chunk-2d81a400.js" rel="prefetch"><link href="/js/chunk-2dcd0dfb.js" rel="prefetch"><link href="/js/chunk-2e4305fd.js" rel="prefetch"><link href="/js/chunk-2f037878.js" rel="prefetch"><link href="/js/chunk-3775d85b.js" rel="prefetch"><link href="/js/chunk-377903a4.js" rel="prefetch"><link href="/js/chunk-3bddc606.js" rel="prefetch"><link href="/js/chunk-3f1b13c2.js" rel="prefetch"><link href="/js/chunk-41b45156.js" rel="prefetch"><link href="/js/chunk-448594c3.js" rel="prefetch"><link href="/js/chunk-45eb91e0.js" rel="prefetch"><link href="/js/chunk-49419389.js" rel="prefetch"><link href="/js/chunk-4ba4f37c.js" rel="prefetch"><link href="/js/chunk-4d0d7446.js" rel="prefetch"><link href="/js/chunk-52d08741.js" rel="prefetch"><link href="/js/chunk-56bfc1e1.js" rel="prefetch"><link href="/js/chunk-586caf0d.js" rel="prefetch"><link href="/js/chunk-5aa78c20.js" rel="prefetch"><link href="/js/chunk-5b67c44c.js" rel="prefetch"><link href="/js/chunk-5c691692.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-65bf740a.js" rel="prefetch"><link href="/js/chunk-66546a30.js" rel="prefetch"><link href="/js/chunk-69bcc4fe.js" rel="prefetch"><link href="/js/chunk-6d0bc202.js" rel="prefetch"><link href="/js/chunk-6fff6798.js" rel="prefetch"><link href="/js/chunk-72cac487.js" rel="prefetch"><link href="/js/chunk-730b225d.js" rel="prefetch"><link href="/js/chunk-7a1a851d.js" rel="prefetch"><link href="/js/chunk-7bf0b7cc.js" rel="prefetch"><link href="/js/chunk-7c050d1e.js" rel="prefetch"><link href="/js/chunk-7c77c1e2.js" rel="prefetch"><link href="/js/chunk-7eb6d8ec.js" rel="prefetch"><link href="/js/chunk-7f00bc12.js" rel="prefetch"><link href="/js/chunk-7fc4780e.js" rel="prefetch"><link href="/js/chunk-82e5c6ba.js" rel="prefetch"><link href="/js/chunk-84a82956.js" rel="prefetch"><link href="/js/chunk-ac0ae80e.js" rel="prefetch"><link href="/js/chunk-b2383f76.js" rel="prefetch"><link href="/js/chunk-b650ba02.js" rel="prefetch"><link href="/js/chunk-cb06fb70.js" rel="prefetch"><link href="/js/chunk-cb4887ac.js" rel="prefetch"><link href="/js/chunk-cd18eef6.js" rel="prefetch"><link href="/js/chunk-ceeb5c8c.js" rel="prefetch"><link href="/js/chunk-cf86b400.js" rel="prefetch"><link href="/js/chunk-d4fcbd38.js" rel="prefetch"><link href="/js/chunk-d9881758.js" rel="prefetch"><link href="/js/chunk-e696eef4.js" rel="prefetch"><link href="/js/chunk-f4e44914.js" rel="prefetch"><link href="/js/chunk-f742bcf2.js" rel="prefetch"><link href="/js/chunk-f8b79a3e.js" rel="prefetch"><link href="/js/chunk-f8d17ac2.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-0a54105e.js b/HomeUI/dist/js/chunk-0a54105e.js
diff --git a/HomeUI/dist/js/chunk-0d18e412.js b/HomeUI/dist/js/chunk-0d18e412.js
diff --git a/HomeUI/dist/js/chunk-7c050d1e.js b/HomeUI/dist/js/chunk-7c050d1e.js
diff --git a/HomeUI/dist/js/chunk-vendors.js b/HomeUI/dist/js/chunk-vendors.js
diff --git a/HomeUI/dist/js/index.js b/HomeUI/dist/js/index.js
diff --git a/HomeUI/src/views/xdao/ProposalView.vue b/HomeUI/src/views/xdao/ProposalView.vue
@@ -536,7 +536,7 @@ export default {
         mybackend += names.join('.');
       } else {
         if (typeof hostname === 'string') {
-          this.$store.commit('flux/setUserIp', hostname);
+          ctx.root.$store.commit('flux/setUserIp', hostname);
         }
         mybackend += hostname;
         mybackend += ':';
@@ -578,7 +578,7 @@ export default {
         mybackend += names.join('.');
       } else {
         if (typeof hostname === 'string') {
-          this.$store.commit('flux/setUserIp', hostname);
+          ctx.root.$store.commit('flux/setUserIp', hostname);
         }
         mybackend += hostname;
         mybackend += ':';

diff --git a/ZelBack/src/services/appsService.js b/ZelBack/src/services/appsService.js
@@ -4123,11 +4123,11 @@ async function checkAndRequestApp(hash, txid, height, valueSat, i = 0) {
               }
             }
           });
-          const messageInfo = latestPermanentRegistrationMessage; // we only care about height
+          const messageInfo = latestPermanentRegistrationMessage;
           // here comparison of height differences and specifications
           // price shall be price for standard registration plus minus already paid price according to old specifics. height remains height valid for 22000 blocks
           const appPrice = appPricePerMonth(specifications);
-          const previousSpecsPrice = appPricePerMonth(messageInfo);
+          const previousSpecsPrice = appPricePerMonth(messageInfo.appSpecifications || messageInfo.zelAppSpecifications);
           // what is the height difference
           const heightDifference = permanentAppMessage.height - messageInfo.height; // has to be lower than 22000
           const perc = (config.fluxapps.blocksLasting - heightDifference) / config.fluxapps.blocksLasting;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flux",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Flux, Your Gateway to a Decentralized World",
   "repository": {
     "type": "git",