From d1750f382fffbb5c261792481aa10f697f26da23 Mon Sep 17 00:00:00 2001 From: Chris Pinnock Date: Thu, 4 Jan 2024 18:31:10 +0000 Subject: [PATCH 1/2] All: Change references to teztnets service and mondaynet --- docs/global/test_networks.rst | 4 ++-- docs/shell/smart_rollup_node.rst | 6 +++--- src/bin_testnet_scenarios/README.md | 16 ++++++++-------- src/bin_testnet_scenarios/dal.ml | 2 +- src/bin_testnet_scenarios/dal_helpers.ml | 4 ++-- src/bin_testnet_scenarios/helpers.ml | 2 +- src/lib_node_config/config_file.ml | 2 +- src/lib_octogram/tezos.ml | 2 +- tezt/lib_tezos/client.ml | 2 +- tezt/lib_tezos/sc_rollup_node.mli | 2 +- tezt/manual_tests/dal.ml | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/global/test_networks.rst b/docs/global/test_networks.rst index 4b0f29967aff..07559dd47986 100644 --- a/docs/global/test_networks.rst +++ b/docs/global/test_networks.rst @@ -28,7 +28,7 @@ faster than with a long-lived network. Faucets ======= -Faucets can be accessed from https://teztnets.xyz/. Each of the test +Faucets can be accessed from https://teztnets.com/. Each of the test 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. @@ -56,7 +56,7 @@ Ghostnet was previously known as :ref:`ithacanet`, the testchain for the Ithaca See also ======== -An external description of the various test networks available can be found on https://teztnets.xyz/. +An external description of the various test networks available can be found on https://teztnets.com/. Old Networks ============ diff --git a/docs/shell/smart_rollup_node.rst b/docs/shell/smart_rollup_node.rst index 90518539fe2e..e61cbf311efb 100644 --- a/docs/shell/smart_rollup_node.rst +++ b/docs/shell/smart_rollup_node.rst @@ -21,14 +21,14 @@ Prerequisites ------------- To experiment with the commands described in this section, we use -the `Dailynet `_. +the `Dailynet `_. In this section, we assume that ``${OPERATOR_ADDR}`` is a valid implicit account on Dailynet owned by the reader. Notice that you need a specific development version of Octez to participate to Dailynet. This version is either available from docker images or can be compiled from sources. Please refer to the -`Dailynet `_ website +`Dailynet `_ website for installation details. An Octez rollup node needs an Octez node to run. We assume that @@ -40,7 +40,7 @@ an Octez node has been launched locally, typically by issuing: octez-node run --data-dir "${ONODE_DIR}" --network "${NETWORK}" --rpc-addr 127.0.0.1 in a terminal where ``${NETWORK}`` is of the -form ``https://teztnets.xyz/dailynet-YYYY-MM-DD`` +form ``https://teztnets.com/dailynet-YYYY-MM-DD`` and ``${ONODE_DIR}`` is a path for the Octez node store, by default ``~/.tezos-node``. The commands will only work when the node is completely bootstrapped, and therefore the current protocol on the target network is activated. diff --git a/src/bin_testnet_scenarios/README.md b/src/bin_testnet_scenarios/README.md index ba496fb899e7..25930a88a61c 100644 --- a/src/bin_testnet_scenarios/README.md +++ b/src/bin_testnet_scenarios/README.md @@ -1,7 +1,7 @@ # Testnet Scenarios This directory contains scenarios that can be run against a testnet, -(by default, Mondaynet). +(by default, Weeklynet). ``` dune exec -- src/bin_testnet_scenarios/main.exe --info @@ -11,15 +11,15 @@ Configuration is fetched from a file called `scenarios.json` in the current working directory. Alternatively, a path to such a file can be provided with `-a "configuration=PATH"`. -For instance, running the scenarios against Mondaynet can be done with +For instance, running the scenarios against Weeklynet can be done with the following configuration file (where `MM` and `DD` are customized -to match the current Mondaynet). +to match the current Weeklynet). ``` { "protocol": "alpha", - "network": "https://teztnets.xyz/mondaynet-2023-MM-DD", - "snapshot": "http://mondaynet.snapshots.s3-website.eu-central-1.amazonaws.com/mondaynet-rolling-snapshot" + "network": "https://teztnets.com/weeklynet-2023-MM-DD", + "snapshot": "https://snapshots.eu.tzinit.org/weeklynet/rolling" } ``` @@ -33,8 +33,8 @@ data-dir you can provide the path: ``` { "protocol": "alpha", - "network": "https://teztnets.xyz/mondaynet-2023-MM-DD", - "data-dir": /home/.octez-node-mondaynet" + "network": "https://teztnets.com/weeklynet-2023-MM-DD", + "data-dir": /home/.octez-node-weeklynet" } ``` This also mean that you cannot run scenarios in parallel and need to stop @@ -46,7 +46,7 @@ can provide the path with: ``` { "protocol": "alpha", - "network": "https://teztnets.xyz/mondaynet-2023-MM-DD", + "network": "https://teztnets.com/weeklynet-2023-MM-DD", "client-dir": /home/.tezos-client-testnet" } ``` diff --git a/src/bin_testnet_scenarios/dal.ml b/src/bin_testnet_scenarios/dal.ml index d1005a96b97f..535aa08e2fb3 100644 --- a/src/bin_testnet_scenarios/dal.ml +++ b/src/bin_testnet_scenarios/dal.ml @@ -554,7 +554,7 @@ let run_scenario network kind scenario = let key_indices = range 0 (num_accounts - 1) in let network_name = Network.name network in - let network_url = Format.sprintf "https://teztnets.xyz/%s" network_name in + let network_url = Format.sprintf "https://teztnets.com/%s" network_name in let network_arg = Node.Network network_url in let network_baker = (* a bootstrap delegate for both Dailynet and Weeklynet *) diff --git a/src/bin_testnet_scenarios/dal_helpers.ml b/src/bin_testnet_scenarios/dal_helpers.ml index 0b86ce5ca4a2..4d6ff21fa62a 100644 --- a/src/bin_testnet_scenarios/dal_helpers.ml +++ b/src/bin_testnet_scenarios/dal_helpers.ml @@ -177,8 +177,8 @@ module Wallet = struct let giver_account = { - (* That's dal_rich_account at - https://github.com/oxheadalpha/teztnets/blob/c6d40e06a2565610813cbc1c059ee70793e2809e/dailynet/values.yaml#L206 *) + (* That's dal_rich_account cf. + https://github.com/tacoinfra/teztnets/blob/main/networks/dailynet/values.yaml *) Account.alias = giver_alias; public_key_hash = "tz1PEhbjTyVvjQ2Zz8g4bYU2XPTbhvG8JMFh"; public_key = "edpkuwL7MVYArfQN9jyR8pZTqmFGYFWTYhhF4F8KWjr2vB18ozTqbd"; diff --git a/src/bin_testnet_scenarios/helpers.ml b/src/bin_testnet_scenarios/helpers.ml index 935184a33452..a39bb435a733 100644 --- a/src/bin_testnet_scenarios/helpers.ml +++ b/src/bin_testnet_scenarios/helpers.ml @@ -52,7 +52,7 @@ let setup_octez_node ~(testnet : Testnet.t) ?runner ?metrics_port () = in (* By default, Tezt sets the difficulty to generate the identity file of the Octez node to 0 (`--expected-pow 0`). The default - value used in networks like mainnet, Mondaynet etc. is 26 (see + value used in networks like mainnet, Weeklynet etc. is 26 (see `lib_node_config/config_file.ml`). *) let node = Node.create ?runner ?data_dir:testnet.data_dir ?metrics_port l1_node_args diff --git a/src/lib_node_config/config_file.ml b/src/lib_node_config/config_file.ml index 711cbe39282c..f9c9c3c77aa8 100644 --- a/src/lib_node_config/config_file.ml +++ b/src/lib_node_config/config_file.ml @@ -164,7 +164,7 @@ let blockchain_network_ghostnet = ] ~default_bootstrap_peers: [ - "ghostnet.teztnets.xyz"; + "ghostnet.teztnets.com"; "ghostnet.tzinit.org"; "ghostnet.tzboot.net"; "ghostnet.boot.ecadinfra.com"; diff --git a/src/lib_octogram/tezos.ml b/src/lib_octogram/tezos.ml index d42147ec7f50..c00b78f2f913 100644 --- a/src/lib_octogram/tezos.ml +++ b/src/lib_octogram/tezos.ml @@ -501,7 +501,7 @@ module Start_octez_node = struct [ (* By default, Tezt set the difficulty to generate the identity file of the Octez node to 0 (`--expected-pow 0`). The default value - used in network like mainnet, Mondaynet etc. is 26 (see + used in network like mainnet, Weeklynet etc. is 26 (see `lib_node_config/config_file.ml`). *) Expected_pow 0; (* TODO: https://gitlab.com/tezos/tezos/-/issues/6283 diff --git a/tezt/lib_tezos/client.ml b/tezt/lib_tezos/client.ml index 697487998d5c..31271bae5806 100644 --- a/tezt/lib_tezos/client.ml +++ b/tezt/lib_tezos/client.ml @@ -121,7 +121,7 @@ let address ?(hostname = false) ?from peer = endpoints. Because the API contract of the [Runner] module is to provide a way to connect to a remote host using SSH, we cannot return a runner for a foreign endpoint, because the module does not provide such - invariants (for instance, the public RPC endpoint of Mondaynet is a good + invariants (for instance, the public RPC endpoint of Weeklynet is a good candidate for a foreign endpoint to which we likely cannot connect to using SSH). diff --git a/tezt/lib_tezos/sc_rollup_node.mli b/tezt/lib_tezos/sc_rollup_node.mli index 9856ac1f11d3..67bd38eea7e1 100644 --- a/tezt/lib_tezos/sc_rollup_node.mli +++ b/tezt/lib_tezos/sc_rollup_node.mli @@ -287,7 +287,7 @@ val wait_for_level : ?timeout:float -> t -> int -> int Lwt.t This variant of {!wait_for_sync} should not be used in sandboxes, as it has been witnessed time and time again that these tests are more subject to race conditions when setting up rollup infrastructure. On open testnets - like mondaynet and dailynet, this does not happen because of the large + like weeklynet and dailynet, this does not happen because of the large block time. *) val unsafe_wait_sync : ?path_client:string -> ?timeout:float -> t -> int Lwt.t diff --git a/tezt/manual_tests/dal.ml b/tezt/manual_tests/dal.ml index 798a95b71032..857e3c7cbb58 100644 --- a/tezt/manual_tests/dal.ml +++ b/tezt/manual_tests/dal.ml @@ -227,7 +227,7 @@ let scenario_on_teztnet = (* Start L1 node and wait until it's bootstrapped *) let* l1_node = let network = - sf "https://teztnets.xyz/%s-%s" network teztnet_network_day + sf "https://teztnets.com/%s-%s" network teztnet_network_day in start_layer_1_node ~network @@ -250,7 +250,7 @@ let scenario_on_teztnet = let* () = Client.bootstrapped client in (* Start DAL node *) - let peer = sf "dal.%s-%s.teztnets.xyz:11732" network teztnet_network_day in + let peer = sf "dal.%s-%s.teztnets.com:11732" network teztnet_network_day in let* dal_node = start_dal_node ~peers:(peer :: dal_bootstrap_peers) -- GitLab From 7c4b901705fddaf1bbdd0edaab54271754c9599c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Thir=C3=A9?= Date: Mon, 8 Jan 2024 11:53:36 +0100 Subject: [PATCH 2/2] All: Fix formatting issue --- src/bin_testnet_scenarios/dal_helpers.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin_testnet_scenarios/dal_helpers.ml b/src/bin_testnet_scenarios/dal_helpers.ml index 4d6ff21fa62a..f84661abb40c 100644 --- a/src/bin_testnet_scenarios/dal_helpers.ml +++ b/src/bin_testnet_scenarios/dal_helpers.ml @@ -178,7 +178,7 @@ module Wallet = struct let giver_account = { (* That's dal_rich_account cf. - https://github.com/tacoinfra/teztnets/blob/main/networks/dailynet/values.yaml *) + https://github.com/tacoinfra/teztnets/blob/main/networks/dailynet/values.yaml *) Account.alias = giver_alias; public_key_hash = "tz1PEhbjTyVvjQ2Zz8g4bYU2XPTbhvG8JMFh"; public_key = "edpkuwL7MVYArfQN9jyR8pZTqmFGYFWTYhhF4F8KWjr2vB18ozTqbd"; -- GitLab