AMM-Devnet connection info

2025-11-04 20:05:50 +00:00 · 2022-12-16 16:18:49 -08:00
parent daeabe6c9d
commit 116ce417d7
5 changed files with 127 additions and 88 deletions
--- a/assets/js/test-net.js
+++ b/assets/js/test-net.js
@@ -27,7 +27,7 @@ async function wait_for_seq(network_url, address) {
 }


-function rippleTestNetCredentials(url, altnet_name) {
+function TestNetCredentials(url, altnet_name, ws_url) {

  const credentials = $('#your-credentials')
  const address = $('#address')
@@ -72,13 +72,7 @@ function rippleTestNetCredentials(url, altnet_name) {
      balance.hide().html('<h3>Balance</h3> ' +
        Number(data.amount).toLocaleString('en') + ' XRP').fadeIn('fast')
      sequence.html('<h3>Sequence</h3> <img class="throbber" src="assets/img/xrp-loader-96.png"> Waiting...').fadeIn('fast')
-      if (altnet_name=="Testnet") {
-        wait_for_seq("wss://s.altnet.rippletest.net:51233", test_wallet.address)
-      } else if (altnet_name=="NFT-Devnet") {
-        wait_for_seq("wss://xls20-sandbox.rippletest.net:51233", test_wallet.address)
-      } else {
-        wait_for_seq("wss://s.devnet.rippletest.net:51233", test_wallet.address)
-      }
+      wait_for_seq(ws_url, test_wallet.address)

    },
    error: function() {
@@ -89,20 +83,11 @@ function rippleTestNetCredentials(url, altnet_name) {
 }

 $(document).ready(function() {
-  function testnet_click(evt) {
-    rippleTestNetCredentials("https://faucet.altnet.rippletest.net/accounts",
-      "Testnet")
-  }
-  function devnet_click(evt) {
-    rippleTestNetCredentials("https://faucet.devnet.rippletest.net/accounts",
-      "Devnet")
-  }
-  function nftnet_click(evt) {
-    rippleTestNetCredentials("https://faucet-nft.ripple.com/accounts",
-      "NFT-Devnet")
-  }
-
-  $('#testnet-creds-button').click(testnet_click)
-  $('#devnet-creds-button').click(devnet_click)
-  $('#nftnet-creds-button').click(nftnet_click)
+  $('#generate-creds-button').click( (evt) => {
+    const checked_network = $("input[name='faucet-selector']:checked")
+    const url = checked_network.val()
+    const net_name = checked_network.data("shortname")
+    const ws_url = checked_network.data("wsurl")
+    TestNetCredentials(url, net_name, ws_url)
+  });
 })
--- a/content/concepts/consensus-network/parallel-networks.md
+++ b/content/concepts/consensus-network/parallel-networks.md
@@ -18,6 +18,7 @@ To help members of the XRP Ledger community interact with XRP Ledger technology
 | Devnet  | Beta releases   | A preview of coming attractions, where unstable changes to the core XRP Ledger software may be tested out. Developers can use this altnet to interact with and learn about planned new XRP Ledger features and amendments that are not yet enabled on the Mainnet. |
 | NFT-Devnet | [XLS-20 pre-release](https://github.com/ripple/rippled/tree/xls20) | A preview of the [XLS-20d](https://github.com/XRPLF/XRPL-Standards/discussions/46) standard for non-fungible tokens on the XRP Ledger. <!-- SPELLING_IGNORE: 20d --> |
 | [Hooks Testnet V2](https://hooks-testnet-v2.xrpl-labs.com/) | [Hooks server](https://github.com/XRPL-Labs/xrpld-hooks) | A preview of on-chain smart contract functionality using [hooks](https://write.as/xumm/xrpl-labs-is-working-on-the-transaction-hooks-amendment-for-the-xrp-ledger). |
+| AMM-Devnet | [XLS-30d pre-release](https://github.com/gregtatcam/rippled/tree/amm-core-functionality/) | A preview of the [XLS-30d](https://github.com/XRPLF/XRPL-Standards/discussions/78) standard for Automated Market Makers on the XRP Ledger. <!-- SPELLING_IGNORE: 30d --> [Binary builds for testing](https://github.com/legleux/scheduled/releases) are also available. Library support: [xrpl.js 2.6.0-beta.0](https://www.npmjs.com/package/xrpl/v/2.6.0-beta.0), [xrpl-py 1.8.0b0](https://pypi.org/project/xrpl-py/1.8.0b0/) |

 Each altnet has its own separate supply of test XRP, which is [given away for free](xrp-testnet-faucet.html) to parties interested in experimenting with the XRP Ledger and developing applications and integrations. Test XRP does not have real-world value and is lost when the network is reset.

--- a/content/tutorials/manage-the-rippled-server/configuration/connect-your-rippled-to-the-xrp-test-net.ja.md
+++ b/content/tutorials/manage-the-rippled-server/configuration/connect-your-rippled-to-the-xrp-test-net.ja.md
@@ -84,17 +84,11 @@ Rippleは[代替となるテスト用および開発用ネットワーク](paral

 4. `rippled`がXRP TestnetまたはDevnetに接続していることを確認するため、サーバーで[server_infoメソッド][]を使用して、その結果をTestnetまたはDevnetの公開サーバーの結果と比較します。両方のサーバーで`validated_ledger`オブジェクトの`seq`フィールドが同一である必要があります（確認中にこの数が変化した場合は、1～2の差が生じる可能性があります）。

-   以下のコマンドは、Testnetサーバーの最新の検証済みレジャーをチェックします。
+    以下のコマンドは、ローカルの`rippled`の最新検証済みレジャーインデックスをチェックします。

-        $ ./rippled --rpc_ip s.altnet.rippletest.net:51234 server_info | grep seq
+         $ ./rippled server_info | grep seq

-   以下のコマンドは、Devnetサーバーの最新の検証済みレジャーをチェックします。
-
-        $ ./rippled --rpc_ip s.devnet.rippletest.net:51234 server_info | grep seq
-
-   以下のコマンドは、ローカルの`rippled`の最新検証済みレジャーインデックスをチェックします。
-
-        $ ./rippled server_info | grep seq
+    [WebSocket Toolのserver_info](websocket-api-tool.html#server_info)でネットワークのレジャーインデックスをチェックします。


 ## 関連項目
--- a/content/tutorials/manage-the-rippled-server/configuration/connect-your-rippled-to-the-xrp-test-net.md
+++ b/content/tutorials/manage-the-rippled-server/configuration/connect-your-rippled-to-the-xrp-test-net.md
@@ -47,6 +47,11 @@ Edit your `rippled.cfg` file.
        [ips]
        xls20-sandbox.rippletest.net 51235

+    *AMM-Devnet*
+
+        [ips]
+        amm.devnet.rippletest.net 51235
+
    <!-- MULTICODE_BLOCK_END -->

 2. Comment out the previous `[ips]` stanza, if there is one:
@@ -80,6 +85,11 @@ Edit your `rippled.cfg` file.
        [network_id]
        20

+    *AMM-Devnet*
+
+        [network_id]
+        25
+
    <!-- MULTICODE_BLOCK_END -->

    For sidechains and custom networks, everyone who connects to the network should use a value unique to that network. When creating a new network, choose a network ID at random from the integers 11 to 4,294,967,295.
@@ -127,9 +137,17 @@ Edit your `validators.txt` file. This file is located in the same folder as your
        [validator_list_keys]
        ED8E43A943A174190BA2FAE91F44AC6E2D1D8202EFDCC2EA3DBB39814576D690F7

+    *AMM-Devnet*
+
+        [validator_list_sites]
+        http://vlamm.devnet.rippletest.net/
+
+        [validator_list_keys]
+        03553F67DC5A6FE0EBFE1B3B4742833D14AF7C65E79E5760EC76EC56EAFD254CE9
+
    <!-- MULTICODE_BLOCK_END -->

-    **Tip:** The packages for the NFT preview should already contain the necessary stanzas, but check them just in case.
+    **Tip:** Preview packages might come with the necessary stanzas pre-configured, but check them just in case.

 1. Comment out any previous `[validator_list_sites]`, `[validator_list_keys]`, or `[validators]` stanzas.

@@ -151,15 +169,51 @@ Edit your `validators.txt` file. This file is located in the same folder as your
            # n9LiE1gpUGws1kFGKCM9rVFNYPVS4QziwkQn281EFXX7TViCp2RC
            # n9Jq9w1R8UrvV1u2SQqGhSXLroeWNmPNc3AVszRXhpUr1fmbLyhS

-## 3. (NFT-Devnet Only) Enable Features
+## 3. Enable (or Disable) Features

-To connect to the NFT-Devnet, you must also forcefully enable the NFT feature, `XLS20`. Add or modify the `[features]` stanza of your config file as follows:
+For some test networks using experimental features, you must also forcefully enable the appropriate feature in the config file. For other networks, you should not use the `[features]` stanza. Add or modify the `[features]` stanza of your config file as follows:
+
+<!-- MULTICODE_BLOCK_START -->
+
+_Testnet_
+
+```
+# [features]
+# Delete or comment out. Don't force-enable features on Testnet.
+```
+
+_Devnet_
+
+```
+# [features]
+# Delete or comment out. Don't force-enable features on Devnet.
+```
+
+_Mainnet_
+
+```
+# [features]
+# Delete or comment out. Don't force-enable features on Mainnet.
+```
+
+_NFT-Devnet_

 ```
 [features]
 NonFungibleTokensV1
 ```

+_AMM-Devnet_
+
+```
+[features]
+AMM
+```
+
+<!-- MULTICODE_BLOCK_END -->
+
+(On Mainnet, Testnet, and Devnet, no you)
+
 **Warning:** Do not use the `[features]` stanza when connecting to Mainnet or Testnet. Forcefully enabling different features than the rest of the network could cause your server to diverge from the network.

 ## 4. Restart the server.
@@ -172,40 +226,15 @@ $ sudo systemctl restart rippled

 It takes about 5 to 15 minutes to sync to the network after a restart. After your server is synced, the [server_info method][] shows the a `validated_ledger` object based on the network you are connected to.

-To verify that your `rippled` is connected to the XRP Testnet or Devnet, compare the results from your server to [a public server][public servers] on the Testnet or Devnet. The `seq` field of the `validated_ledger` object should be the same on both servers (possibly off by one or two, if it changed as you were checking).
+To verify that your `rippled` is connected to the right network, compare the results from your server to [a public server][public servers] on the Testnet or Devnet. The `seq` field of the `validated_ledger` object should be the same on both servers (possibly off by one or two, if it changed as you were checking).

-The following example shows how to check the latest validated ledger from the commandline:
-
-<!-- MULTICODE_BLOCK_START -->
-
-*Local Server*
+The following example shows how to check your server's latest validated ledger from the commandline:

 ```sh
 rippled server_info | grep seq
 ```

-*Testnet*
-
-```sh
-rippled --rpc_ip s.altnet.rippletest.net:51234 server_info | grep seq
-```
-
-*Devnet*
-
-```sh
-rippled --rpc_ip s.devnet.rippletest.net:51234 server_info | grep seq
-```
-
-
-*Mainnet*
-
-```sh
-rippled --rpc_ip s1.ripple.com:51234 server_info | grep seq
-```
-
-
-<!-- MULTICODE_BLOCK_END -->
-
+You can use [server_info in the WebSocket Tool](websocket-api-tool.html#server_info) to look up the latest ledger index on the intended network.



--- a/template/page-xrp-faucets.html.jinja
+++ b/template/page-xrp-faucets.html.jinja
@@ -1,28 +1,52 @@
 {% extends "base.html.jinja" %}

+{% set faucets = [
+  {
+    "id": "faucet-select-testnet",
+    "ws_url": "wss://s.altnet.rippletest.net:51233/",
+    "jsonrpc_url": "https://s.altnet.rippletest.net:51234/",
+    "shortname": "Testnet",
+    "faucet": "https://faucet.altnet.rippletest.net/accounts",
+    "desc": "Mainnet-like network for testing applications."
+  },
+  {
+    "id": "faucet-select-devnet",
+    "ws_url": "wss://s.devnet.rippletest.net:51233/",
+    "jsonrpc_url": "https://s.devnet.rippletest.net:51234/",
+    "shortname": "Devnet",
+    "faucet": "https://faucet.devnet.rippletest.net/accounts",
+    "desc": "Preview of upcoming amendments."
+  },
+  {
+    "id": "faucet-select-nftdevnet",
+    "ws_url": "wss://xls20-sandbox.rippletest.net:51233/",
+    "jsonrpc_url": "https://xls20-sandbox.rippletest.net:51234/",
+    "shortname": "NFT-Devnet",
+    "faucet": "https://faucet-nft.ripple.com/accounts",
+    "desc": "XLS-20d Non-Fungible Tokens preview network. <strong>(Deprecated)</strong>"
+  },
+  {
+    "id": "faucet-select-ammdevnet",
+    "ws_url": "wss://amm.devnet.rippletest.net:51233/",
+    "jsonrpc_url": "https://amm.devnet.rippletest.net:51234/",
+    "shortname": "AMM-Devnet",
+    "faucet": "https://ammfaucet.devnet.rippletest.net/accounts",
+    "desc": "XLS-30d Automated Market Makers preview network."
+  }
+] %}
+
 {% block bodyclasses %}page-test-net{% endblock %}

 {% block right_sidebar %}
-    <h4>Testnet Servers</h4>
+{% for net in faucets %}
+
+    <h4>{{net.shortname}} Servers</h4>
    <pre><code>// WebSocket
-wss://s.altnet.rippletest.net:51233
+{{net.ws_url}}

 // JSON-RPC
-https://s.altnet.rippletest.net:51234</code></pre>
-
-    <h4>Devnet Servers</h4>
-    <pre><code>// WebSocket
-wss://s.devnet.rippletest.net:51233
-
-// JSON-RPC
-https://s.devnet.rippletest.net:51234</code></pre>
-
-    <h4>NFT-Devnet Servers</h4>
-    <pre><code>// WebSocket
-wss://xls20-sandbox.rippletest.net:51233
-
-// JSON-RPC
-http://xls20-sandbox.rippletest.net:51234</code></pre>
+{{net.jsonrpc_url}}</code></pre>
+{% endfor %}
 {% endblock %}

 {% block main %}
@@ -30,13 +54,19 @@ http://xls20-sandbox.rippletest.net:51234</code></pre>
  <h1>XRP Faucets</h1>

  <div class="content">
-    <p>Ripple runs these <a href="parallel-networks.html">parallel XRP Ledger test networks</a>, the Testnet and Devnet, to provide a testing platform for any software products built on the XRP Ledger without using real funds.</p>
-    <p>These funds are intended for <strong>testing</strong> only. The Testnet ledger and balances will be reset approximately every 90 days, or when otherwise necessary. Devnet funds may be reset without warning as needed.</p>
-    <p>Testnet and Devnet balances are separate. As a precaution, do not use the Testnet or Devnet credentials on the Mainnet.</p>
+    <p>These <a href="parallel-networks.html">parallel XRP Ledger test networks</a> provide platforms for testing changes to the XRP Ledger and software built on it, without using real funds.</p>
+    <p>These funds are intended for <strong>testing</strong> only. Test networks' ledger history and balances are reset as necessary. Devnets may be reset without warning.</p>
+    <p>All balances and XRP on these networks are separate from Mainnet. As a precaution, do not use the Testnet or Devnet credentials on the Mainnet.</p>
+    <h3>Choose Network:</h3>
+    {% for net in faucets %}
+    <div class="form-check">
+      <input class="form-check-input" type="radio" name="faucet-selector" id="{{net.id}}" value="{{net.faucet}}" data-jsonrpcurl="{{net.jsonrpc_url}}" data-wsurl="{{net.ws_url}}" data-shortname="{{net.shortname}}" {% if loop.index == 1 %} checked{% endif %} />
+      <label class="form-check-label" for="{{net.id}}"><strong>{{net.shortname}}</strong>: {{net.desc}}</label>
+    </div>
+    {% endfor %}
+    <p class="mb-3"><strong>Hooks Testnet</strong>: <a href="https://hooks-testnet-v2.xrpl-labs.com/" class="external-link">See the Hooks Faucet</a></p>
    <div class="btn-toolbar" role="toolbar" aria-label="Button">
-      <button id="testnet-creds-button" class="btn btn-primary mr-2 mb-2">Generate Testnet credentials</button>
-      <button id="devnet-creds-button" class="btn btn-primary mr-2 mb-2">Generate Devnet credentials</button>
-      <button id="nftnet-creds-button" class="btn btn-primary mb-2">Generate NFT-Devnet credentials</button>
+      <button id="generate-creds-button" class="btn btn-primary mr-2 mb-2">Generate credentials</button>
    </div><!--/.btn-toolbar-->
    <div id='your-credentials'></div>
    <div id='loader' style="display: none;"><img class="throbber" src="{{currentpage.prefix}}assets/img/xrp-loader-96.png"> Generating Keys...</div>
@@ -50,7 +80,7 @@ http://xls20-sandbox.rippletest.net:51234</code></pre>

 {% block endbody %}
  {{target.ripple_lib_tag}}
-  <script type='text/javascript' src='assets/js/test-net.js'></script>
+  <script type='text/javascript' src='assets/js/faucet.js'></script>
  <script src="{{currentpage.prefix}}assets/js/multicodetab.js"></script>
  <script type="application/javascript">
    $(document).ready(function() {