Merge pull request #471 from RunOnFlux/development

v3.9.0
RunOnFlux · Feb 27, 2022 · 896ae6a · 896ae6a
2 parents 8e73a6b + 845563f
commit 896ae6a
Show file tree

Hide file tree

Showing 34 changed files with 2,644 additions and 912 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -2,5 +2,5 @@
 /config/userconfig.js
 /lib/zelcashrpc/
 /lib/daemonrpc/
-/tests/
+/tests/e2e/
 /ZelApps/
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -5,11 +5,11 @@ on: [push]
 jobs:
   build:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [14.x]
 
     services:
       mongodb:
@@ -29,5 +29,6 @@ jobs:
         npm run ciconfig
         npm run homebuild
         npm run test:zelback
+        npm run test:zelback:unit
       env:
         CI: true
diff --git a/HomeUI/src/views/apps/MyFluxShare.vue b/HomeUI/src/views/apps/MyFluxShare.vue
@@ -342,6 +342,8 @@ export default {
   },
   computed: {
     ...mapState('flux', [
+      'userconfig',
+      'config',
     ]),
     percentage() {
       const perc = (this.storage.used / this.storage.total) * 100;
@@ -367,11 +369,12 @@ export default {
       return filteredFolder.filter((data) => data.name !== '.gitkeep');
     },
     getUploadFolder() {
+      const port = this.userconfig.apiPort || this.config.apiPort;
       if (this.currentFolder) {
         const folder = encodeURIComponent(this.currentFolder);
-        return `${this.ipAddress}:16127/apps/fluxshare/uploadfile/${folder}`;
+        return `${this.ipAddress}:${port}/apps/fluxshare/uploadfile/${folder}`;
       }
-      return `${this.ipAddress}:16127/apps/fluxshare/uploadfile`;
+      return `${this.ipAddress}:${port}/apps/fluxshare/uploadfile`;
     },
   },
   mounted() {
@@ -638,7 +641,8 @@ export default {
       return true;
     },
     createfluxshareLink(name, token) {
-      return `${this.ipAddress}:16127/apps/fluxshare/getfile/${name}?token=${token}`;
+      const port = this.userconfig.apiPort || this.config.apiPort;
+      return `${this.ipAddress}:${port}/apps/fluxshare/getfile/${name}?token=${token}`;
     },
     copyLinkToClipboard(link) {
       const el = document.createElement('textarea');

diff --git a/README.md b/README.md
@@ -188,7 +188,7 @@ sudo yum install git
 git clone https://github.com/runonflux/flux
 ```
 
-Allow Inbound Connections on UFW firewall (ONLY if ufw enabled):
+Allow Inbound Connections on UFW firewall - default ports (ONLY if ufw enabled):
 
 ```bash
 sudo ufw allow 16126/tcp

diff --git a/ZelBack/config/default.js b/ZelBack/config/default.js
@@ -56,13 +56,14 @@ module.exports = {
     rpcporttestnet: 26224,
   },
   daemon: {
-    chainValidHeight: 770000,
+    chainValidHeight: 1062000,
     port: 16125,
     rpcport: 16124,
     porttestnet: 26125,
     rpcporttestnet: 26124,
   },
   fluxTeamZelId: '1hjy4bCYBJr4mny4zCE85J94RXa8W6q37',
+  deterministicNodesStart: 558000,
   fluxapps: {
     // in flux main chain per month (blocksLasting)
     price: [{ // any price fork can be done by adjusting object similarily.
@@ -126,7 +127,7 @@ module.exports = {
     ram: 2000, // 2000mb
     hdd: 30, // 30gb // this value is likely to rise
   },
-  fluxSpecifics: {
+  fluxSpecifics: { // tbd during forks
     cpu: {
       basic: 20, // 10 available for apps
       super: 40, // 30 available for apps
@@ -142,7 +143,7 @@ module.exports = {
       super: 150, // 120 for apps
       bamf: 600, // 570 for apps
     },
-    collateral: {
+    collateral: { // tbd during forks
       basic: 10000,
       super: 25000,
       bamf: 100000,

diff --git a/ZelBack/src/routes.js b/ZelBack/src/routes.js
@@ -256,7 +256,7 @@ module.exports = (app, expressWs) => {
   app.get('/flux/incomingconnectionsinfo', cache('30 seconds'), (req, res) => {
     fluxCommunication.getIncomingConnectionsInfo(req, res, expressWs.getWss('/ws/flux'));
   });
-  app.get('/flux/checkfluxavailability/:ip?', cache('30 seconds'), (req, res) => {
+  app.get('/flux/checkfluxavailability/:ip?/:port?', cache('30 seconds'), (req, res) => {
     fluxCommunication.checkFluxAvailability(req, res);
   });
 
@@ -340,7 +340,7 @@ module.exports = (app, expressWs) => {
   //   explorerService.getAllFluxTransactions(req, res);
   // });
   // filter can be IP, address, collateralHash.
-  app.get('/explorer/fluxtxs/:filter?', cache('30 seconds'), (req, res) => { // deprecated
+  app.get('/explorer/fluxtxs/:filter?', cache('30 seconds'), (req, res) => {
     explorerService.getFilteredFluxTxs(req, res);
   });
   app.get('/explorer/utxo/:address?', cache('30 seconds'), (req, res) => {
@@ -595,6 +595,21 @@ module.exports = (app, expressWs) => {
   app.get('/daemon/zcsamplejoinsplit', (req, res) => {
     daemonService.zcSampleJoinSplit(req, res);
   });
+  app.get('/daemon/getaddresstxids/:address?/:start?/:end?', (req, res) => {
+    daemonService.getSingleAddresssTxids(req, res);
+  });
+  app.get('/daemon/getaddressbalance/:address?', (req, res) => {
+    daemonService.getSingleAddressBalance(req, res);
+  });
+  app.get('/daemon/getaddressdeltas/:address?/:start?/:end?/:chaininfo?', (req, res) => {
+    daemonService.getSingleAddressDeltas(req, res);
+  });
+  app.get('/daemon/getaddressutxos/:address?/:chaininfo?', (req, res) => {
+    daemonService.getSingleAddressUtxos(req, res);
+  });
+  app.get('/daemon/getaddressmempool/:address?', (req, res) => {
+    daemonService.getSingleAddressMempool(req, res);
+  });
 
   app.get('/id/loggedusers', (req, res) => {
     idService.loggedUsers(req, res);