Merge pull request #110 from zelcash/development

v0.64
RunOnFlux · Jul 10, 2020 · 4e9ccf1 · 4e9ccf1
2 parents 0e44f71 + e539ba1
commit 4e9ccf1
Show file tree

Hide file tree

Showing 14 changed files with 869 additions and 794 deletions.
diff --git a/ZelBack/config/default.js b/ZelBack/config/default.js
@@ -29,7 +29,6 @@ module.exports = {
     zelappslocal: {
       database: 'localzelapps',
       collections: {
-        resourcesLocked: 'zelappslocalresources', // TODO DELETE
         zelappsInformation: 'zelappsinformation',
       },
     },

diff --git a/ZelBack/src/routes.js b/ZelBack/src/routes.js
@@ -245,6 +245,12 @@ module.exports = (app, expressWs) => {
   app.get('/zelapps/temporarymessages', (req, res) => {
     zelappsService.getZelAppsTemporaryMessages(req, res);
   });
+  app.get('/zelapps/permanentmessages', (req, res) => {
+    zelappsService.getZelAppsPermanentMessages(req, res);
+  });
+  app.get('/zelapps/globalspecifications', (req, res) => {
+    zelappsService.getGlobalZelAppsSpecifications(req, res);
+  });
 
   // app.get('/explorer/allutxos', (req, res) => {
   //   explorerService.getAllUtxos(req, res);
@@ -601,7 +607,7 @@ module.exports = (app, expressWs) => {
     zelbenchService.restartNodeBenchmarks(req, res);
   });
 
-  app.get('/explorer/reindex', (req, res) => {
+  app.get('/explorer/reindex/:reindexapps?', (req, res) => {
     explorerService.reindexExplorer(req, res);
   });
   app.get('/explorer/restart', (req, res) => {
@@ -610,7 +616,7 @@ module.exports = (app, expressWs) => {
   app.get('/explorer/stop', (req, res) => {
     explorerService.stopBlockProcessing(req, res);
   });
-  app.get('/explorer/rescan/:blockheight?', (req, res) => {
+  app.get('/explorer/rescan/:blockheight?/:rescanapps?', (req, res) => {
     explorerService.rescanExplorer(req, res);
   });