Skip to content

Commit

Permalink
Merge pull request #343 from RunOnFlux/development
Browse files Browse the repository at this point in the history
v2.1.5
  • Loading branch information
TheTrunk authored Oct 10, 2021
2 parents 20ade9d + 3a3f38e commit f660db5
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 16 deletions.
2 changes: 1 addition & 1 deletion HomeUI/dist/js/chunk-1df8ad36.js

Large diffs are not rendered by default.

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-7eb6d8ec.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/src/@core/layouts/components/AppFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
>Flux, Your Gateway to a Decentralized World</b-link>
</span>

<span class="float-md-right d-none d-md-block">Flux {{ 'v' + fluxVersion }}
<span class="float-md-right d-none d-md-block">FluxOS {{ 'v' + fluxVersion }}
</span>
</p>
</template>
Expand Down
4 changes: 2 additions & 2 deletions ZelBack/src/services/appsService.js
Original file line number Diff line number Diff line change
Expand Up @@ -2722,7 +2722,7 @@ async function availableApps(req, res) {
+ 'Chainweb is a braided, parallelized Proof Of Work consensus mechanism that improves throughput and scalability in executing transactions on the blockchain while maintaining the security and integrity found in Bitcoin. '
+ 'The healthy information tells you if your node is running and synced. If you just installed the docker it can say unhealthy for long time because on first run a bootstrap is downloaded and extracted to make your node sync faster before the node is started. '
+ 'Do not stop or restart the docker in the first hour after installation. You can also check if your kadena node is synced, by going to running apps and press visit button on kadena and compare your node height with Kadena explorer. Thank you.',
repotag: 'runonflux/kadena-chainweb-node:2.9.2',
repotag: 'runonflux/kadena-chainweb-node:2.10.0',
owner: '1hjy4bCYBJr4mny4zCE85J94RXa8W6q37',
ports: [30004, 30005],
containerPorts: [30004, 30005],
Expand All @@ -2734,7 +2734,7 @@ async function availableApps(req, res) {
enviromentParameters: ['CHAINWEB_P2P_PORT=30004', 'CHAINWEB_SERVICE_PORT=30005', 'LOGLEVEL=warn'],
commands: ['/bin/bash', '-c', '(test -d /data/chainweb-db/0 && ./run-chainweb-node.sh) || (/chainweb/initialize-db.sh && ./run-chainweb-node.sh)'],
containerData: '/data', // cannot be root todo in verification
hash: 'localSpecificationsVersion12', // hash of app message
hash: 'localSpecificationsVersion13', // hash of app message
height: 680000, // height of tx on which it was
},
{
Expand Down
10 changes: 8 additions & 2 deletions ZelBack/src/services/fluxCommunication.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ const incomingPeers = []; // array of objects containing ip
let dosState = 0; // we can start at bigger number later
let dosMessage = null;

const minimumFluxBenchAllowedVersion = 223;
const minimumFluxBenchAllowedVersion = 231;
const minimumFluxOSAllowedVersion = 214;
let storedFluxBenchAllowed = null;

// my external Flux IP from benchmark
Expand Down Expand Up @@ -52,7 +53,12 @@ async function isFluxAvailable(ip) {
try {
const fluxResponse = await serviceHelper.axiosGet(`http://${ip}:${config.server.apiport}/flux/version`, axiosConfig);
if (fluxResponse.data.status === 'success') {
return true;
let fluxVersion = fluxResponse.data.data;
fluxVersion = fluxVersion.replace(/\./g, '');
if (fluxVersion >= minimumFluxOSAllowedVersion) {
return true;
}
return false;
}
return false;
} catch (e) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flux",
"version": "2.1.4",
"version": "2.1.5",
"description": "Flux, Your Gateway to a Decentralized World",
"repository": {
"type": "git",
Expand Down

0 comments on commit f660db5

Please sign in to comment.