Merge branch 'master' into feature/reconnect-existing

README.md

@@ -45,7 +45,7 @@ yarn install
 3) Run with `yarn start`
 4) Connect with Shockwallet *(Provide your nodes IP manually or scan QR from ShockWizard)*
 
-*Optionally, add the `--tunnel` flag to create an ssh connection through a tunnel.rip webserver for zero-configuration networking. All communication between the api and wallet is end-to-end encrypted and your privacy is protected.*
+*Optionally, add the `-t` flag to route through a tunnel.rip webserver for zero-configuration networking. All communication between the api and wallet is end-to-end encrypted and your privacy is protected.*
 
 
 ### Docker for Raspberry Pi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "shockapi",
-  "version": "2021.5.20",
+  "version": "2021.6.14",
   "description": "",
   "main": "src/server.js",
   "scripts": {

src/routes.js

@@ -486,7 +486,11 @@ module.exports = async (
   })
 
   app.get('/tunnel/status', async (req, res) => {
-    res.json({ uri: await Storage.getItem('tunnel/url') })
+    const [relayId, relayUrl] = await Promise.all([
+      Storage.getItem('relay/id'),
+      Storage.getItem('relay/url')
+    ])
+    res.json({ uri: `${relayId}@${relayUrl}` })
   })
 
   /**

utils/lightningServices/channelRequests.js

@@ -3,7 +3,7 @@ const fetch = require('node-fetch')
 const Storage = require('node-persist')
 const { listPeers, connectPeer,getInfo } = require('./v2')
 
-const handlerBaseUrl = "https://channels.shock.network"
+const handlerBaseUrl = "https://channels.shock.network:4444"
 
 /**
  *