diff --git a/.gitlab/ci/jobs/build/common.yml b/.gitlab/ci/jobs/build/common.yml index bf4e5145ada39c0ec6388ed4206c93d1973fa0ca..e66247fcc0eb2bc03adfcca703f7411bd38c0781 100644 --- a/.gitlab/ci/jobs/build/common.yml +++ b/.gitlab/ci/jobs/build/common.yml @@ -33,6 +33,7 @@ variables: ARCH: "" script: + - eval $(opam env) - ./scripts/ci/take_ownership.sh - ./scripts/ci/build_static_binaries.sh artifacts: diff --git a/.gitlab/ci/jobs/doc/build_all.yml b/.gitlab/ci/jobs/doc/build_all.yml index 4fe3f926f22615aa3a104cff8314096f0d706a69..88fa909df9e37d3c5cc25515ba7340897965fef5 100644 --- a/.gitlab/ci/jobs/doc/build_all.yml +++ b/.gitlab/ci/jobs/doc/build_all.yml @@ -11,6 +11,7 @@ documentation:build_all: needs: [trigger] before_script: - . $HOME/.venv/bin/activate + - eval $(opam env) script: - ./.gitlab/ci/jobs/doc/documentation:build_all.sh artifacts: diff --git a/.gitlab/ci/jobs/doc/linkcheck.yml b/.gitlab/ci/jobs/doc/linkcheck.yml index 141518920871de50307995d91a4e48d83b875ad1..37f081f08cca8770e8de2de24b3675bc4ed0100f 100644 --- a/.gitlab/ci/jobs/doc/linkcheck.yml +++ b/.gitlab/ci/jobs/doc/linkcheck.yml @@ -14,6 +14,7 @@ documentation:linkcheck: before_script: - . ./scripts/version.sh - . $HOME/.venv/bin/activate + - eval $(opam env) script: - make all - make -C docs redirectcheck diff --git a/.gitlab/ci/jobs/doc/publish.yml b/.gitlab/ci/jobs/doc/publish.yml index 6397888c059afc4921e35e7f5a7ee3bd2e8772d0..73e65b1300b4eb320b2cf485f69df59c7e014b77 100644 --- a/.gitlab/ci/jobs/doc/publish.yml +++ b/.gitlab/ci/jobs/doc/publish.yml @@ -22,6 +22,7 @@ publish:documentation: # Load the environment poetry previously created in the docker image. # Give access to the Python dependencies/executables - . $HOME/.venv/bin/activate + - eval $(opam env) script: - ./scripts/ci/doc_publish.sh # Publish jobs are uninterruptible to avoid publishing partial results. diff --git a/.gitlab/ci/jobs/packaging/opam_prepare.yml b/.gitlab/ci/jobs/packaging/opam_prepare.yml index 0d31fb226b16d16e276297841687f241170eed77..b5f21adafb67885227edf26625865622def3a73b 100644 --- a/.gitlab/ci/jobs/packaging/opam_prepare.yml +++ b/.gitlab/ci/jobs/packaging/opam_prepare.yml @@ -46,6 +46,7 @@ opam:prepare: stage: packaging needs: [trigger] script: + - eval $(opam env) - git init _opam-repo-for-release - ./scripts/opam-prepare-repo.sh dev ./ ./_opam-repo-for-release - git -C _opam-repo-for-release add packages diff --git a/.gitlab/ci/jobs/sanity/sanity_ci.yml b/.gitlab/ci/jobs/sanity/sanity_ci.yml index c64bc7965d72c320206b410cecea13c9988bc72b..fa01ebcb602a24e0f0f7ed1a502b8a8b752147bc 100644 --- a/.gitlab/ci/jobs/sanity/sanity_ci.yml +++ b/.gitlab/ci/jobs/sanity/sanity_ci.yml @@ -4,6 +4,7 @@ sanity_ci: - .image_template__runtime_prebuild_dependencies stage: sanity script: + - eval $(opam env) - ./scripts/ci/take_ownership.sh - make -C manifest check - ./scripts/lint.sh --check-gitlab-ci-yml diff --git a/.gitlab/ci/jobs/shared/templates.yml b/.gitlab/ci/jobs/shared/templates.yml index b4f4add0bbd3807834d5b16a49d0edec40babe6c..2cebac21a945243313be900f71a67172446b8f6f 100644 --- a/.gitlab/ci/jobs/shared/templates.yml +++ b/.gitlab/ci/jobs/shared/templates.yml @@ -42,6 +42,7 @@ # FIXME: https://gitlab.com/tezos/tezos/-/issues/2865 - sudo chown -R $(id -u):$(id -g) $CI_PROJECT_DIR - . ./scripts/version.sh + - eval $(opam env) .kernels_template: extends: diff --git a/.gitlab/ci/jobs/test/check_scripts.yml b/.gitlab/ci/jobs/test/check_scripts.yml index 232b587737e3dd50e139bb7b63b1696a83e40ae5..3b5381adf48c85f8bb172edbcd1f8987ebb329fe 100644 --- a/.gitlab/ci/jobs/test/check_scripts.yml +++ b/.gitlab/ci/jobs/test/check_scripts.yml @@ -11,6 +11,7 @@ script:snapshot_alpha_and_link: stage: test before_script: - . ./scripts/version.sh + - eval $(opam env) needs: - "build_x86_64-released" - "build_x86_64-exp-dev-extra" @@ -37,6 +38,7 @@ script:test-gen-genesis: needs: [trigger] before_script: - cd scripts/gen-genesis + - eval $(opam env) script: - dune build gen_genesis.exe diff --git a/.gitlab/ci/jobs/test/common.yml b/.gitlab/ci/jobs/test/common.yml index b81440171643a325d77fed05c934ffde761f2f84..a26071785d5f980769dc7bc694522a8b195dfb8f 100644 --- a/.gitlab/ci/jobs/test/common.yml +++ b/.gitlab/ci/jobs/test/common.yml @@ -9,6 +9,7 @@ stage: test before_script: - . ./scripts/version.sh + - eval $(opam env) retry: 2 # Merge coverage files after the execution diff --git a/.gitlab/ci/jobs/test/misc_checks.yml b/.gitlab/ci/jobs/test/misc_checks.yml index 48cc76191036919f740f62076d7a55904f72d697..d805a129e41edfa24a066500c257ee8dd65d4a6d 100644 --- a/.gitlab/ci/jobs/test/misc_checks.yml +++ b/.gitlab/ci/jobs/test/misc_checks.yml @@ -9,6 +9,7 @@ misc_checks: # Load the environment poetry previously created in the docker image. # Give access to the Python dependencies/executables - . $HOME/.venv/bin/activate + - eval $(opam env) script: - ./scripts/ci/take_ownership.sh - ./scripts/ci/lint_misc_check.sh @@ -22,8 +23,6 @@ kaitai_checks: needs: [trigger] needs: - "build_x86_64-released" - before_script: - - . ./scripts/version.sh script: - make -C ${CI_PROJECT_DIR} check-kaitai-struct-files || (echo 'Octez encodings and Kaitai files seem to be out of sync. You might need to run `make check-kaitai-struct-files` and commit the resulting diff.' ; false) diff --git a/docs/introduction/test_networks.rst b/docs/introduction/test_networks.rst index 4b0f29967aff3c86a46b3694645b17dfa0d32650..07559dd479869e4f67c4546e4cec82b9bf3608f7 100644 --- a/docs/introduction/test_networks.rst +++ b/docs/introduction/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 db9a28b7a5194e05d769cccd31bf6b81e94f5c6f..8790250b1bd439fa05ac6ad7b915f7ee320401d0 100644 --- a/docs/shell/smart_rollup_node.rst +++ b/docs/shell/smart_rollup_node.rst @@ -23,14 +23,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 @@ -42,7 +42,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 boostrapped, and therefore the current protocol on the target network is activated. diff --git a/scripts/ci/build_full_unreleased.sh b/scripts/ci/build_full_unreleased.sh index 6934eba2dc51b8e106a791bb4e46ea3b8c0f0e9b..03a552a0bb77fe893cef2198c9a70cc92d760884 100755 --- a/scripts/ci/build_full_unreleased.sh +++ b/scripts/ci/build_full_unreleased.sh @@ -2,6 +2,8 @@ set -eu +eval "$(opam env)" + if [ -z "${build_deps_image_name}" ]; then echo "build_deps_image_name is unset" && exit 3; fi if [ -z "${build_deps_image_version}" ]; then echo "build_deps_image_version is unset" && exit 3; fi diff --git a/src/bin_testnet_scenarios/README.md b/src/bin_testnet_scenarios/README.md index ba496fb899e7e6d359417705c8894259c506400a..25930a88a61c36652b693ab3fb9ea812470e9d52 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 a8df34866ab376ea742f98daf1a169280f421d1b..afe45e297205d70308f98a80981ba83d707f7022 100644 --- a/src/bin_testnet_scenarios/dal.ml +++ b/src/bin_testnet_scenarios/dal.ml @@ -561,7 +561,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 0b86ce5ca4a27adc1799eacac7f0946e2b96b3e9..f84661abb40ceaa934ae9c859dae90be20592821 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 9490326b595787ff1a9a841e036d8973c19919ab..e67a92d52a336ba8b148bdb4f04415f429b58495 100644 --- a/src/bin_testnet_scenarios/helpers.ml +++ b/src/bin_testnet_scenarios/helpers.ml @@ -58,7 +58,7 @@ let setup_octez_node ~(testnet : Testnet.t) ?runner () = | None -> (* 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`). *) let node = Node.create ?runner l1_node_args in let* () = Node.config_init node [] in diff --git a/src/lib_node_config/config_file.ml b/src/lib_node_config/config_file.ml index 0498b888fef7774ec5cb6c6f6f9a9235227530c6..d6146d275975d5473d48d09031ddb1f58bf8015b 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 021ced1acc867f43a803a2a0f716c525a02add4e..8393a90833f957037ab24048d1633c15a60ad98d 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 8f4954ed35b4bd07778cbf1aa2c98f1f162bfddb..5a8b7623821a3baa6a2d755f15ca7c3335f6e38f 100644 --- a/tezt/lib_tezos/client.ml +++ b/tezt/lib_tezos/client.ml @@ -117,7 +117,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 cdb5c66a5bec14461da7d370c35411f7323178f0..5feed30fe3c601b43bc03f8e8d004c55a489dd76 100644 --- a/tezt/lib_tezos/sc_rollup_node.mli +++ b/tezt/lib_tezos/sc_rollup_node.mli @@ -284,7 +284,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 d875cf3d73e819a182fe1261391fda9e4b6e1d8f..6c302931c41917f5ba33d65cfb94f02bfc76f3dd 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)