Skip to content

Commit

Permalink
test heights, test address
Browse files Browse the repository at this point in the history
rebuild home
  • Loading branch information
TheTrunk committed Oct 27, 2021
1 parent 3e54473 commit f8b9590
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 24 deletions.
1 change: 0 additions & 1 deletion HomeUI/dist/css/chunk-48f58b21.css

This file was deleted.

1 change: 1 addition & 0 deletions HomeUI/dist/css/chunk-b8f6df0a.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion HomeUI/dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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-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-48f58b21.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="/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-48f58b21.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="/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-b8f6df0a.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="/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-b8f6df0a.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="/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')) {
Expand Down
2 changes: 1 addition & 1 deletion HomeUI/dist/js/chunk-24a28e3c.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion HomeUI/dist/js/chunk-48f58b21.js

This file was deleted.

8 changes: 4 additions & 4 deletions HomeUI/dist/js/chunk-7c050d1e.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion HomeUI/dist/js/chunk-8180ba76.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions HomeUI/dist/js/chunk-b8f6df0a.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion HomeUI/dist/js/chunk-e58920c6.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions HomeUI/dist/js/chunk-vendors.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion HomeUI/dist/js/index.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions HomeUI/src/libs/fluxApps.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ export default {
minPrice: 1,
},
{
height: 984000, // height from which price spec is valid. Counts from when app was registerd on blockchain!
height: 954000, // 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
address: 't1J1DwsDMWFKxbF4VNHWc1qgbXc5hZeRLRn', // 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,
Expand Down
6 changes: 3 additions & 3 deletions HomeUI/src/views/apps/Management.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1610,7 +1610,7 @@ export default {
total: '',
downloaded: '',
abortToken: {},
foundationAddress: 't1LUs6quf7TB2zVZmexqPQdnqmrFMGZGjV6',
foundationAddress: 't1J1DwsDMWFKxbF4VNHWc1qgbXc5hZeRLRn',
};
},
computed: {
Expand Down Expand Up @@ -1888,7 +1888,7 @@ export default {
this.appUpdateSpecification.cpubamf = specs.cpubamf;
this.appUpdateSpecification.rambamf = specs.rambamf;
this.appUpdateSpecification.hddbamf = specs.hddbamf;
if (this.currentHeight > 984000) { // fork height for spec v3
if (this.currentHeight > 954000) { // fork height for spec v3
this.appUpdateSpecification.version = 3; // enforce specs version 3
}
}
Expand Down Expand Up @@ -2374,7 +2374,7 @@ export default {
this.showToast('danger', daemonGetInfo.data.data.message || daemonGetInfo.data.data);
} else {
this.currentHeight = daemonGetInfo.data.data.blocks;
if (this.currentHeight < 984000) { // fork height for spec v3
if (this.currentHeight < 954000) { // fork height for spec v3
this.appUpdateSpecification.version = 2;
}
}
Expand Down
2 changes: 1 addition & 1 deletion HomeUI/src/views/apps/RegisterFluxApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ export default {
} else {
this.currentHeight = daemonGetInfo.data.data.blocks;
}
if (this.currentHeight < 984000) { // fork height for spec v3
if (this.currentHeight < 954000) { // fork height for spec v3
this.appRegistrationSpecification.version = 2;
}
},
Expand Down
6 changes: 3 additions & 3 deletions ZelBack/config/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ module.exports = {
minPrice: 1, // minimum price that has to be paid for registration or update. Flux listens only to message above or equal this price
},
{
height: 984000, // height from which price spec is valid. Counts from when app was registerd on blockchain!
height: 954000, // 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,
Expand All @@ -82,9 +82,9 @@ module.exports = {
appSpecsEnforcementHeights: {
1: 0, // blockheight
2: 0, // blockheight
3: 984000, // blockheight. Since this blockheight specification of type 3 is active. User can still submit v1 or v2. UI allows only v2, v3
3: 954000, // blockheight. Since this blockheight specification of type 3 is active. User can still submit v1 or v2. UI allows only v2, v3
},
address: 't1LUs6quf7TB2zVZmexqPQdnqmrFMGZGjV6',
address: 't1J1DwsDMWFKxbF4VNHWc1qgbXc5hZeRLRn',
epochstart: 694000,
publicepochstart: 705000,
portMin: 31000, // ports 30000 - 30999 are reserved for local applications
Expand Down

0 comments on commit f8b9590

Please sign in to comment.