From a4c7b3359d1475708eeea3fc57b6816d505227a7 Mon Sep 17 00:00:00 2001
From: hatim boufnichel <boufni95@gmail.com>
Date: Sat, 12 Jun 2021 18:27:39 +0200
Subject: [PATCH 1/6] relay up

---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 449dd7c2..06384b80 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "graphviz": "0.0.8",
     "grpc": "1.24.4",
     "gun": "git://github.com/amark/gun#97aa976c97e6219a9f93095d32c220dcd371ca62",
-    "hybrid-relay-client": "git://github.com/shocknet/hybridRelayClient#43478046e160f2b85a18cea4400c3076389dda64",
+    "hybrid-relay-client": "git://github.com/shocknet/hybridRelayClient#6e82181068ece29f839adab23bc755484e2db6dd",
     "husky": "^4.2.5",
     "jsonfile": "^4.0.0",
     "jsonwebtoken": "^8.3.0",
diff --git a/yarn.lock b/yarn.lock
index 3340ca2e..fbabef87 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3606,9 +3606,9 @@ husky@^4.2.5:
     slash "^3.0.0"
     which-pm-runs "^1.0.0"
 
-"hybrid-relay-client@git://github.com/shocknet/hybridRelayClient#43478046e160f2b85a18cea4400c3076389dda64":
+"hybrid-relay-client@git://github.com/shocknet/hybridRelayClient#6e82181068ece29f839adab23bc755484e2db6dd":
   version "1.0.0"
-  resolved "git://github.com/shocknet/hybridRelayClient#43478046e160f2b85a18cea4400c3076389dda64"
+  resolved "git://github.com/shocknet/hybridRelayClient#6e82181068ece29f839adab23bc755484e2db6dd"
   dependencies:
     node-fetch "^2.6.1"
     socket.io-client "^4.1.2"

From 93e2647e01ae886a5549b7d73488aeba7c7a473c Mon Sep 17 00:00:00 2001
From: CapDog <34176400+capitalistdog@users.noreply.github.com>
Date: Sat, 12 Jun 2021 13:43:12 -0400
Subject: [PATCH 2/6] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f2ca2b81..15388634 100644
--- a/README.md
+++ b/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

From ae194754d76a8d11ff18652d839c479c0e5c1880 Mon Sep 17 00:00:00 2001
From: hatim boufnichel <boufni95@gmail.com>
Date: Sat, 12 Jun 2021 20:06:09 +0200
Subject: [PATCH 3/6] return new uri

---
 src/routes.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/routes.js b/src/routes.js
index 95a14930..71bea40c 100644
--- a/src/routes.js
+++ b/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}` })
   })
 
   /**

From ca600b8a40dfdee7efef375ffcd965a16674f9db Mon Sep 17 00:00:00 2001
From: Version Update Action <actions@shock.network>
Date: Sat, 12 Jun 2021 19:55:04 +0000
Subject: [PATCH 4/6] version upgraded to 2021.6.12

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 06384b80..80fecf0b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shockapi",
-  "version": "2021.5.20",
+  "version": "2021.6.12",
   "description": "",
   "main": "src/server.js",
   "scripts": {

From da73b86717eda741baea3bbfa97c596374b5395d Mon Sep 17 00:00:00 2001
From: hatim boufnichel <boufni95@gmail.com>
Date: Mon, 14 Jun 2021 21:08:10 +0200
Subject: [PATCH 5/6] add port

---
 utils/lightningServices/channelRequests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/lightningServices/channelRequests.js b/utils/lightningServices/channelRequests.js
index d8a969eb..4598193f 100644
--- a/utils/lightningServices/channelRequests.js
+++ b/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"
 
 /**
  * 

From bf3d6feddcb5e63accb5540beefb0387c5c11d98 Mon Sep 17 00:00:00 2001
From: Version Update Action <actions@shock.network>
Date: Mon, 14 Jun 2021 19:31:31 +0000
Subject: [PATCH 6/6] version upgraded to 2021.6.14

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 80fecf0b..8b25d4cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shockapi",
-  "version": "2021.6.12",
+  "version": "2021.6.14",
   "description": "",
   "main": "src/server.js",
   "scripts": {