Merge pull request #347 from RunOnFlux/development

v2.2.0
RunOnFlux · Oct 27, 2021 · 69d765f · 69d765f
2 parents 49a38c5 + cba354b
commit 69d765f
Show file tree

Hide file tree

Showing 27 changed files with 427 additions and 172 deletions.
diff --git a/HomeUI/dist/css/chunk-cb06fb70.css → HomeUI/dist/css/chunk-05e5e5c2.css b/HomeUI/dist/css/chunk-cb06fb70.css → HomeUI/dist/css/chunk-05e5e5c2.css
diff --git a/HomeUI/dist/css/chunk-0d18e412.css → HomeUI/dist/css/chunk-3064f74b.css b/HomeUI/dist/css/chunk-0d18e412.css → HomeUI/dist/css/chunk-3064f74b.css
diff --git a/HomeUI/dist/css/chunk-6d0bc202.css b/HomeUI/dist/css/chunk-6d0bc202.css
diff --git a/HomeUI/dist/css/chunk-730b225d.css → HomeUI/dist/css/chunk-8180ba76.css b/HomeUI/dist/css/chunk-730b225d.css → HomeUI/dist/css/chunk-8180ba76.css
diff --git a/HomeUI/dist/css/chunk-5c691692.css → HomeUI/dist/css/chunk-e58920c6.css b/HomeUI/dist/css/chunk-5c691692.css → HomeUI/dist/css/chunk-e58920c6.css
diff --git a/HomeUI/dist/css/chunk-fc31bef4.css b/HomeUI/dist/css/chunk-fc31bef4.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-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';
+}</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-05e5e5c2.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-3064f74b.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-65bf740a.css" rel="prefetch"><link href="/css/chunk-66546a30.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-8180ba76.css" rel="prefetch"><link href="/css/chunk-84a82956.css" rel="prefetch"><link href="/css/chunk-b2383f76.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-e58920c6.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="/css/chunk-fc31bef4.css" rel="prefetch"><link href="/js/chunk-002dafad.js" rel="prefetch"><link href="/js/chunk-05e5e5c2.js" rel="prefetch"><link href="/js/chunk-08f30e46.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-3064f74b.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-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-6fff6798.js" rel="prefetch"><link href="/js/chunk-72cac487.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-8180ba76.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-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-e58920c6.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="/js/chunk-fc31bef4.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-cb06fb70.js → HomeUI/dist/js/chunk-05e5e5c2.js b/HomeUI/dist/js/chunk-cb06fb70.js → HomeUI/dist/js/chunk-05e5e5c2.js
diff --git a/HomeUI/dist/js/chunk-24a28e3c.js b/HomeUI/dist/js/chunk-24a28e3c.js
diff --git a/HomeUI/dist/js/chunk-0d18e412.js → HomeUI/dist/js/chunk-3064f74b.js b/HomeUI/dist/js/chunk-0d18e412.js → HomeUI/dist/js/chunk-3064f74b.js
diff --git a/HomeUI/dist/js/chunk-5c691692.js b/HomeUI/dist/js/chunk-5c691692.js
diff --git a/HomeUI/dist/js/chunk-6d0bc202.js b/HomeUI/dist/js/chunk-6d0bc202.js
diff --git a/HomeUI/dist/js/chunk-730b225d.js b/HomeUI/dist/js/chunk-730b225d.js
diff --git a/HomeUI/dist/js/chunk-8180ba76.js b/HomeUI/dist/js/chunk-8180ba76.js
diff --git a/HomeUI/dist/js/chunk-e58920c6.js b/HomeUI/dist/js/chunk-e58920c6.js
diff --git a/HomeUI/dist/js/chunk-fc31bef4.js b/HomeUI/dist/js/chunk-fc31bef4.js
diff --git a/HomeUI/dist/js/index.js b/HomeUI/dist/js/index.js
diff --git a/HomeUI/src/libs/fluxApps.js b/HomeUI/src/libs/fluxApps.js
@@ -32,42 +32,67 @@ export default {
   lockedSystemResources,
   apps: {
     // in flux per month
-    price: {
+    price: [{
+      height: 0, // height from which price spec is valid
       cpu: 3, // per 0.1 cpu core,
       ram: 1, // per 100mb,
       hdd: 0.5, // per 1gb,
+      minPrice: 1,
     },
+    {
+      height: 983000, // height from which price spec is valid. Counts from when app was registerd on blockchain!
+      cpu: 0.3, // per 0.1 cpu core,
+      ram: 0.1, // per 100mb,
+      hdd: 0.05, // per 1gb,
+      minPrice: 0.1,
+    }],
     address: 't1LUs6quf7TB2zVZmexqPQdnqmrFMGZGjV6', // apps registration address
     epochstart: 694000, // apps epoch blockheight start
     portMin: 31000, // originally should have been from 30000 but we got temporary folding there
     portMax: 39999,
   },
-  appPricePerMonthMethod(specifications) {
+  appPricePerMonthMethod(specifications, height) {
     let price;
+    const intervals = this.apps.price.filter((i) => i.height <= height);
+    const priceSpecifications = intervals[intervals.length - 1]; // filter does not change order
+    let instancesAdditional = 0;
+    if (specifications.instances) {
+      // spec of version >= 3
+      // specification version 3 is saying. 3 instances are standard, every 3 additional is double the price.
+      instancesAdditional = specifications.instances - 3; // has to always be >=0 as of checks before.
+    }
     if (specifications.tiered) {
       const cpuTotalCount = specifications.cpubasic + specifications.cpusuper + specifications.cpubamf;
-      const cpuPrice = cpuTotalCount * this.apps.price.cpu * 10; // 0.1 core cost cpu price
+      const cpuPrice = cpuTotalCount * priceSpecifications.cpu * 10; // 0.1 core cost cpu price
       const cpuTotal = cpuPrice / 3;
       const ramTotalCount = specifications.rambasic + specifications.ramsuper + specifications.rambamf;
-      const ramPrice = (ramTotalCount * this.apps.price.ram) / 100;
+      const ramPrice = (ramTotalCount * priceSpecifications.ram) / 100;
       const ramTotal = ramPrice / 3;
       const hddTotalCount = specifications.hddbasic + specifications.hddsuper + specifications.hddbamf;
-      const hddPrice = hddTotalCount * this.apps.price.hdd;
+      const hddPrice = hddTotalCount * priceSpecifications.hdd;
       const hddTotal = hddPrice / 3;
       const totalPrice = cpuTotal + ramTotal + hddTotal;
       price = Number(Math.ceil(totalPrice * 100) / 100);
-      if (price < 1) {
-        price = 1;
+      if (instancesAdditional > 0) {
+        const additionalPrice = (price * instancesAdditional) / 3;
+        price = (Math.ceil(additionalPrice * 100) + Math.ceil(price * 100)) / 100;
+      }
+      if (price < priceSpecifications.minPrice) {
+        price = priceSpecifications.minPrice;
       }
       return price;
     }
-    const cpuTotal = specifications.cpu * this.apps.price.cpu * 10;
-    const ramTotal = (specifications.ram * this.apps.price.ram) / 100;
-    const hddTotal = specifications.hdd * this.apps.price.hdd;
+    const cpuTotal = specifications.cpu * priceSpecifications.cpu * 10;
+    const ramTotal = (specifications.ram * priceSpecifications.ram) / 100;
+    const hddTotal = specifications.hdd * priceSpecifications.hdd;
     const totalPrice = cpuTotal + ramTotal + hddTotal;
     price = Number(Math.ceil(totalPrice * 100) / 100);
-    if (price < 1) {
-      price = 1;
+    if (instancesAdditional > 0) {
+      const additionalPrice = (price * instancesAdditional) / 3;
+      price = (Math.ceil(additionalPrice * 100) + Math.ceil(price * 100)) / 100;
+    }
+    if (price < priceSpecifications.minPrice) {
+      price = priceSpecifications.minPrice;
     }
     return price;
   },