Merge branch 'master' into dev

VerusCoin · May 20, 2018 · 3e2edf8 · 3e2edf8
2 parents 5ebdf6b + 1a27cc0
commit 3e2edf8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,5 @@
 # Agama Desktop App
-Desktop App for SuperNET DAPPs
-
-## Alpha 1
-Fixed receive panel, still depends on external service at port 3000.
+Desktop Wallet App
 
 #### For Developers
 You must have `node.js` and `npm` installed on your machine.
@@ -11,7 +8,7 @@ Check versions:
 nodejs --version
 v8.9.4
 
-Note that Easy-DEX-GUI is quite sensitive to the node version. 9.x fails for me, and older versions do as well. Make sure you're on 8.9.x. Installing nvm is probably a good idea, especially if you already have node installed but it is not a compatible version.
+Easy-DEX-GUI is quite sensitive to the node version. 9.x fails for me, and older versions do as well. Make sure you're on 8.9.x. Installing nvm is probably a good idea, especially if you already have node installed but it is not a compatible version.
 
 Other essential dependencies:
 sudo apt-get install -y build-essential
@@ -125,4 +122,3 @@ electron-installer-debian
 electron-installer-redhat
 
 refer to ./make-deb.js and ./make-rpm.js
-
diff --git a/routes/nativeCoind.js b/routes/nativeCoind.js
@@ -1,4 +1,5 @@
 const nativeCoind = {
+  // TODO Our coin goes into this list, along with the binary module and port
   'btc': {
     name: 'Bitcoin',
     bin: 'bitcoin',
@@ -95,4 +96,4 @@ const nativeCoind = {
   }
 };
 
-module.exports = nativeCoind;
+module.exports = nativeCoind;
diff --git a/routes/shepherd/addCoinShortcuts.js b/routes/shepherd/addCoinShortcuts.js
@@ -53,6 +53,7 @@ module.exports = (shepherd) => {
           //resolve(body);
         }
       });
+// TODO Add our coin selection here, along with NODE address etc.
     } else if (selection === 'REVS') {
       const herdData = {
         'ac_name': 'REVS',

diff --git a/routes/shepherd/dex/electrumServersList.js b/routes/shepherd/dex/electrumServersList.js
@@ -1,5 +1,5 @@
 // TODO: merge with spv mode
-
+// TODO Add us to this list?
 const electrumServersList = {
   "ARG": [{"173.212.225.176": 50081},{"136.243.45.140": 50081}],
   "BET": [{"electrum2.cipig.net":10012},{"electrum1.cipig.net":10012}],
@@ -36,4 +36,4 @@ const electrumServersList = {
 module.exports = (shepherd) => {
   shepherd.electrumServersList = electrumServersList;
   return shepherd;
-};
+};
diff --git a/routes/shepherd/dex/mmControl.js b/routes/shepherd/dex/mmControl.js
@@ -64,7 +64,7 @@ module.exports = (shepherd) => {
     const defaultCoinsListFile = path.join(__dirname, '../dex/coins.json');
     const _coins = fs.readJsonSync(defaultCoinsListFile, { throws: false });
     let coins = {};
-
+    // TODO Mostly from coins.json with a few hard wired, I assume we add to coins.json
     for (let i = 0; i < _coins.length; i++) {
       coins[_coins[i].coin] = _coins[i];
     }
@@ -250,4 +250,4 @@ module.exports = (shepherd) => {
   }
 
   return shepherd;
-};
+};
diff --git a/routes/shepherd/explorer/remoteExplorers.js b/routes/shepherd/explorer/remoteExplorers.js
@@ -17,5 +17,5 @@ const remoteExplorers = {
   COQUI: 'https://explorer.coqui.cash',
   MNZ: 'https://www.mnzexplorer.com',
 };
-
-module.exports = remoteExplorers;
+// TODO Our landing page gets added to this list
+module.exports = remoteExplorers;
diff --git a/routes/shepherd/paths.js b/routes/shepherd/paths.js
@@ -1,7 +1,7 @@
 const path = require('path');
 const fixPath = require('fix-path');
 const os = require('os');
-
+// TODO add the path to our bin here
 module.exports = (shepherd) => {
   shepherd.pathsAgama = () => {
     switch (os.platform()) {
@@ -79,4 +79,4 @@ module.exports = (shepherd) => {
   }
 
   return shepherd;
-};
+};