From 1c8bd10a23ad12ac5a897cdd6507ecbb297c3ebf Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 19 Oct 2022 18:37:19 +0200 Subject: [PATCH 1/3] Docs: add Limanet --- docs/introduction/test_networks.rst | 15 +++++++++++++++ docs/user/multinetwork.rst | 22 ++++++++++++---------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/docs/introduction/test_networks.rst b/docs/introduction/test_networks.rst index 0625e304fa99..07c7af8cd97a 100644 --- a/docs/introduction/test_networks.rst +++ b/docs/introduction/test_networks.rst @@ -33,6 +33,21 @@ network listed there, including the active test networks described below, have independent faucets. Enter the public key hash of any test account on the website to receive test tokens. +Limanet +======= + +- Built-in network alias: ``limanet`` (see :ref:`builtin_networks`) + + * Available from version 15.0. + +Limanet is a test network which runs the Lima protocol. +Limanet will run until Lima is refused through the amendment process +or (accepted and then) replaced by another protocol on Mainnet. + +On Limanet, some constants differ from Mainnet. +This results in a faster chain than Mainnet. +See :ref:`protocol constants ` to learn how to find out their values. + Kathmandunet ============ diff --git a/docs/user/multinetwork.rst b/docs/user/multinetwork.rst index e7c0805a6d6c..2cbeaf779923 100644 --- a/docs/user/multinetwork.rst +++ b/docs/user/multinetwork.rst @@ -32,11 +32,11 @@ Built-In Networks ----------------- The simplest way to select the network to connect to is to use the ``--network`` -option when you initialize your :doc:`node configuration <./node-configuration>`. For instance, to run on Kathmandunet:: +option when you initialize your :doc:`node configuration <./node-configuration>`. For instance, to run on Limanet:: - tezos-node config init --data-dir ~/tezos-kathmandunet --network kathmandunet - tezos-node identity generate --data-dir ~/tezos-kathmandunet - tezos-node run --data-dir ~/tezos-kathmandunet + tezos-node config init --data-dir ~/tezos-limanet --network limanet + tezos-node identity generate --data-dir ~/tezos-limanet + tezos-node run --data-dir ~/tezos-limanet .. note:: Once initialized, the node remembers its network settings on subsequent runs @@ -56,15 +56,17 @@ the following built-in networks: - ``kathmandunet`` (available from version 14.0) +- ``limanet`` (available from version 15.0) + If you did not initialize your node configuration, or if your configuration file contains no ``network`` field, the node assumes you want to run Mainnet. You can use the ``--network`` option with ``tezos-node run`` to make sure your node runs on the expected network. For instance, to make sure that -it runs on Kathmandunet:: +it runs on Limanet:: - tezos-node run --data-dir ~/tezos-kathmandunet --network kathmandunet + tezos-node run --data-dir ~/tezos-limanet --network limanet -This command will fail with an error if the configured network is not Kathmandunet. +This command will fail with an error if the configured network is not Limanet. The node also displays the chain name (such as ``TEZOS_MAINNET``) when it starts. Also mind opening the :doc:`RPC interface <../developer/rpc>` as appropriate. @@ -197,11 +199,11 @@ Alias Versus Explicit Configuration If you use one of the `Built-In Networks`_, the configuration file stores the name of the network to connect to. For instance, if you configured it -to connect to Kathmandunet, it will contain something like:: +to connect to Limanet, it will contain something like:: { "p2p": {}, - "network": "kathmandunet" + "network": "limanet" } For Mainnet, it would contain ``mainnet``, or nothing as this is actually the default. @@ -213,7 +215,7 @@ overrides may be added. Because the configuration file only contains the name of the network and not its parameters, it will automatically use the updated values. However, if you configure `Custom Networks`_, the configuration file will -no longer contain an alias such as ``mainnet`` or ``kathmandunet``. Instead, +no longer contain an alias such as ``mainnet`` or ``limanet``. Instead, it will explicitly contain the list of bootstrap peers, user-activated upgrades and user-activated protocol overrides that you specify. This means that when you update your node, updates to built-in network parameters will have no effect. -- GitLab From 04685ac2a4060d56f538f38e8a1a65311598f893 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 19 Oct 2022 18:50:13 +0200 Subject: [PATCH 2/3] Node: add --network limanet argument --- src/bin_node/node_config_file.ml | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/bin_node/node_config_file.ml b/src/bin_node/node_config_file.ml index 9751e1042bd3..2666084a1ecb 100644 --- a/src/bin_node/node_config_file.ml +++ b/src/bin_node/node_config_file.ml @@ -166,6 +166,41 @@ let blockchain_network_ghostnet = "ghostnet.visualtez.com"; ] +let blockchain_network_limanet = + make_blockchain_network + ~alias:"limanet" + { + time = Time.Protocol.of_notation_exn "2022-10-13T15:00:00Z"; + block = + Block_hash.of_b58check_exn + "BL3LAGwnWoNFM2H5ZA3Mbd622CVWMe8Kzfkksws4roKDD9WwBmf"; + protocol = + Protocol_hash.of_b58check_exn + "Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P"; + } + ~genesis_parameters: + { + context_key = "sandbox_parameter"; + values = + `O + [ + ( "genesis_pubkey", + `String "edpkuYLienS3Xdt5c1vfRX1ibMxQuvfM67ByhJ9nmRYYKGAAoTq1UC" + ); + ]; + } + ~chain_name:"TEZOS_LIMANET_2022-10-13T15:00:00Z" + ~sandboxed_chain_name:"SANDBOXED_TEZOS" + ~user_activated_upgrades: + [(8192l, "PtLimaPtLMwfNinJi9rCfDPWea8dFgTZ1MeJ9f1m2SRic6ayiwW")] + ~default_bootstrap_peers: + [ + "limanet.teztnets.xyz"; + "limanet.boot.ecadinfra.com"; + "limaboot.tzbeta.net"; + "limanet.stakenow.de:9733"; + ] + let blockchain_network_kathmandunet = make_blockchain_network ~alias:"kathmandunet" @@ -300,6 +335,7 @@ let builtin_blockchain_networks_with_tags = (4, blockchain_network_mainnet); (19, blockchain_network_ghostnet); (20, blockchain_network_kathmandunet); + (21, blockchain_network_limanet); ] |> List.map (fun (tag, network) -> match network.alias with -- GitLab From 91932d62300e8b02aaede86749ae13d8bfbcae29 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 19 Oct 2022 18:52:31 +0200 Subject: [PATCH 3/3] Changelog: Add --network Limanet --- CHANGES.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 58a5ff10fdff..c347ef0ba3b5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -98,6 +98,8 @@ Node - Add third user-activated upgrade to the ``--network ghostnet`` built-in network alias (at level 1191936 for Kathmandu). +- Added the built-in network alias for Limanet (``--network limanet``). + Client ------ -- GitLab