From 5246dcf5db4510342bf2e7805419be96037ee5ea Mon Sep 17 00:00:00 2001
From: Rome Reginelli <rome@ripple.com>
Date: Thu, 22 Oct 2020 14:27:15 -0700
Subject: [PATCH 1/4] Add xrpl.ws as a server option

---
 tool/template-websocket-api-tool.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tool/template-websocket-api-tool.html b/tool/template-websocket-api-tool.html
index db6181ee16..09a5b001d7 100644
--- a/tool/template-websocket-api-tool.html
+++ b/tool/template-websocket-api-tool.html
@@ -95,6 +95,12 @@
               s1.ripple.com (Mainnet Public Server)
             </label>
           </div>
+          <div class="form-check">
+            <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-xrplws" value="wss://xrpl.ws/" data-jsonrpcurl="https://s1.ripple.com:51234/" data-shortname="Mainnet" checked>
+            <label class="form-check-label" for="wstool-1-connection-xrplws">
+              xrpl.ws (Mainnet Public Server)
+            </label>
+          </div>
           <div class="form-check">
             <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-s2" value="wss://s2.ripple.com/" data-jsonrpcurl="https://s2.ripple.com:51234/" data-shortname="Full History">
             <label class="form-check-label" for="wstool-1-connection-s2">

From 63d2c8d66b1f5e2dcec3a49eaf206dec1e797dbc Mon Sep 17 00:00:00 2001
From: Rome Reginelli <rome@ripple.com>
Date: Thu, 22 Oct 2020 14:28:40 -0700
Subject: [PATCH 2/4] xrpl.ws supports JSON-RPC now

in limited capacity (WSS preferred, but curl is a thing)
---
 tool/template-websocket-api-tool.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tool/template-websocket-api-tool.html b/tool/template-websocket-api-tool.html
index 09a5b001d7..75cec92d04 100644
--- a/tool/template-websocket-api-tool.html
+++ b/tool/template-websocket-api-tool.html
@@ -96,7 +96,7 @@
             </label>
           </div>
           <div class="form-check">
-            <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-xrplws" value="wss://xrpl.ws/" data-jsonrpcurl="https://s1.ripple.com:51234/" data-shortname="Mainnet" checked>
+            <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-xrplws" value="wss://xrpl.ws/" data-jsonrpcurl="https://xrpl.ws/" data-shortname="Mainnet" checked>
             <label class="form-check-label" for="wstool-1-connection-xrplws">
               xrpl.ws (Mainnet Public Server)
             </label>

From 603a875ca002db963dcba4a68559cded4841f944 Mon Sep 17 00:00:00 2001
From: Rome Reginelli <rome@ripple.com>
Date: Fri, 23 Oct 2020 00:58:08 -0700
Subject: [PATCH 3/4] =?UTF-8?q?WS=20Tool:=20Server=20=E2=86=92=20Cluster?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tool/template-websocket-api-tool.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tool/template-websocket-api-tool.html b/tool/template-websocket-api-tool.html
index 75cec92d04..5204ccfe31 100644
--- a/tool/template-websocket-api-tool.html
+++ b/tool/template-websocket-api-tool.html
@@ -92,31 +92,31 @@
           <div class="form-check">
             <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-s1" value="wss://s1.ripple.com/" data-jsonrpcurl="https://s1.ripple.com:51234/" data-shortname="Mainnet" checked>
             <label class="form-check-label" for="wstool-1-connection-s1">
-              s1.ripple.com (Mainnet Public Server)
+              s1.ripple.com (Mainnet Public Cluster)
             </label>
           </div>
           <div class="form-check">
             <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-xrplws" value="wss://xrpl.ws/" data-jsonrpcurl="https://xrpl.ws/" data-shortname="Mainnet" checked>
             <label class="form-check-label" for="wstool-1-connection-xrplws">
-              xrpl.ws (Mainnet Public Server)
+              xrpl.ws (Mainnet Full History Cluster)
             </label>
           </div>
           <div class="form-check">
             <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-s2" value="wss://s2.ripple.com/" data-jsonrpcurl="https://s2.ripple.com:51234/" data-shortname="Full History">
             <label class="form-check-label" for="wstool-1-connection-s2">
-              s2.ripple.com (Full History Public Server)
+              s2.ripple.com (Mainnet Full History Cluster)
             </label>
           </div>
           <div class="form-check">
             <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-testnet" value="wss://s.altnet.rippletest.net:51233/" data-jsonrpcurl="https://s.altnet.rippletest.net:51234/" data-shortname="Testnet">
             <label class="form-check-label" for="wstool-1-connection-testnet">
-              s.altnet.rippletest.net (Testnet Public Server)
+              s.altnet.rippletest.net (Testnet Public Cluster)
             </label>
           </div>
           <div class="form-check">
             <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-devnet" value="wss://s.devnet.rippletest.net:51233/" data-jsonrpcurl="https://s.devnet.rippletest.net:51234/" data-shortname="Devnet">
             <label class="form-check-label" for="wstool-1-connection-devnet">
-              s.devnet.rippletest.net (Devnet Public Server)
+              s.devnet.rippletest.net (Devnet Public Cluster)
             </label>
           </div>
           <div class="form-check">

From 86f2daa1994331437d58acb753014ce85427d974 Mon Sep 17 00:00:00 2001
From: mDuo13 <mduo13@gmail.com>
Date: Fri, 23 Oct 2020 02:33:13 -0700
Subject: [PATCH 4/4] WS tool: fix typo w/ 2 defaults

---
 tool/template-websocket-api-tool.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tool/template-websocket-api-tool.html b/tool/template-websocket-api-tool.html
index 5204ccfe31..25b14e7f2a 100644
--- a/tool/template-websocket-api-tool.html
+++ b/tool/template-websocket-api-tool.html
@@ -96,7 +96,7 @@
             </label>
           </div>
           <div class="form-check">
-            <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-xrplws" value="wss://xrpl.ws/" data-jsonrpcurl="https://xrpl.ws/" data-shortname="Mainnet" checked>
+            <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-xrplws" value="wss://xrpl.ws/" data-jsonrpcurl="https://xrpl.ws/" data-shortname="Mainnet">
             <label class="form-check-label" for="wstool-1-connection-xrplws">
               xrpl.ws (Mainnet Full History Cluster)
             </label>