diff --git a/.buildkite/pipeline-raw.yml b/.buildkite/pipeline-raw.yml index 11a95a136..bb5b61132 100644 --- a/.buildkite/pipeline-raw.yml +++ b/.buildkite/pipeline-raw.yml @@ -116,7 +116,7 @@ steps: - eval "$SET_VERSION" # Building all binary packages will take significant amount of time, so we build only one # in order to ensure package generation sanity - - nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type binary -p tezos-baker-PtNairob + - nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type binary -p tezos-baker-Proxford - rm -rf out # It takes much time to build binary package, so we do it only on master branches: "master" @@ -144,7 +144,7 @@ steps: - eval "$SET_VERSION" # Building all binary packages will take significant amount of time, so we build only one # in order to ensure package generation sanity - - nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type binary -p tezos-baker-PtNairob + - nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type binary -p tezos-baker-Proxford - rm -rf out # It takes much time to build binary package, so we do it only on master branches: "master" diff --git a/Formula/tezos-node-nairobinet.rb b/Formula/tezos-node-nairobinet.rb deleted file mode 100644 index 8943d588c..000000000 --- a/Formula/tezos-node-nairobinet.rb +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env ruby - -# SPDX-FileCopyrightText: 2023 Oxhead Alpha -# SPDX-License-Identifier: LicenseRef-MIT-OA - -class TezosNodeNairobinet < Formula - url "file:///dev/null" - version "v19.1-1" - - depends_on "tezos-node" - - desc "Meta formula that provides background tezos-node service that runs on nairobinet" - - def install - startup_contents = - <<~EOS - #!/usr/bin/env bash - - set -euo pipefail - - node="/usr/local/bin/octez-node" - # default location of the config file - config_file="$TEZOS_CLIENT_DIR/config.json" - - mkdir -p "$TEZOS_CLIENT_DIR" - if [[ ! -f "$config_file" ]]; then - echo "Configuring the node..." - "$node" config init \ - --rpc-addr "$NODE_RPC_ADDR" \ - --network=https://teztnets.com/nairobinet\ - "$@" - else - echo "Updating the node configuration..." - "$node" config update \ - --rpc-addr "$NODE_RPC_ADDR" \ - --network=https://teztnets.com/nairobinet\ - "$@" - fi - - # Launching the node - if [[ -z "$CERT_PATH" || -z "$KEY_PATH" ]]; then - exec "$node" run --config-file="$config_file" - else - exec "$node" run --config-file="$config_file" \ - --rpc-tls="$CERT_PATH","$KEY_PATH" - fi - EOS - File.write("tezos-node-nairobinet-start", startup_contents) - bin.install "tezos-node-nairobinet-start" - print "Installing tezos-node-nairobinet service" - end - - service do - run opt_bin/"tezos-node-nairobinet-start" - require_root true - environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", NODE_RPC_ADDR: "127.0.0.1:8732", CERT_PATH: "", KEY_PATH: "" - keep_alive true - log_path var/"log/tezos-node-nairobinet.log" - error_log_path var/"log/tezos-node-nairobinet.log" - end - - def post_install - mkdir_p "#{var}/lib/tezos/node-nairobinet" - system "octez-node", "config", "init", "--data-dir" "#{var}/lib/tezos/node-nairobinet", "--network", "https://teztnets.com/nairobinet" - end -end diff --git a/baking/pyproject.toml b/baking/pyproject.toml index 485e8a23c..1325f4238 100644 --- a/baking/pyproject.toml +++ b/baking/pyproject.toml @@ -14,7 +14,7 @@ description = "Package that provides systemd services that orchestrate other ser license = { text = "LicenseRef-MIT-OA" } requires-python = ">=3.8" readme = "README.md" -version = "v19.1" +version = "v19.1a" [tool.setuptools.packages.find] where= ["src"] diff --git a/baking/src/tezos_baking/steps.py b/baking/src/tezos_baking/steps.py index 1d9af9cd3..06184a74b 100644 --- a/baking/src/tezos_baking/steps.py +++ b/baking/src/tezos_baking/steps.py @@ -105,8 +105,7 @@ def pprint_options(self): networks = { "mainnet": "Main Tezos network", - "ghostnet": "Long running test network, currently using the Nairobi Tezos protocol", - "nairobinet": "Test network using the Nairobi Tezos protocol", + "ghostnet": "Long running test network, currently using the Oxford Tezos protocol", "oxfordnet": "Test network using the Oxford2 Tezos protocol", } diff --git a/baking/src/tezos_baking/tezos_setup_wizard.py b/baking/src/tezos_baking/tezos_setup_wizard.py index 65816387d..5ee2b0ba9 100644 --- a/baking/src/tezos_baking/tezos_setup_wizard.py +++ b/baking/src/tezos_baking/tezos_setup_wizard.py @@ -220,7 +220,7 @@ def network_name_or_teztnets_url(network): id="network", prompt="Which Tezos network would you like to use?\nCurrently supported:", help="The selected network will be used to set up all required services.\n" - "The currently supported protocol is `PtNairob` (used on `nairobinet`, `ghostnet` and `mainnet`) and Proxford (used on `oxfordnet`).\n" + "The currently supported protocol is Proxford (used on `oxfordnet`, `ghostnet` and `mainnet`).\n" "Keep in mind that you must select the test network (e.g. ghostnet)\n" "if you plan on baking with a faucet JSON file.\n", options=networks, diff --git a/docker/package/model.py b/docker/package/model.py index 4fd7b8c59..4c2b64de9 100644 --- a/docker/package/model.py +++ b/docker/package/model.py @@ -585,7 +585,7 @@ class TezosBakingServicesPackage(AbstractPackage): # native releases, so we append an extra letter to the version of # the package. # This should be reset to "" whenever the native version is bumped. - letter_version = "" + letter_version = "a" buildfile = "setup.py" diff --git a/docker/package/packages.py b/docker/package/packages.py index d9db179d4..e169d5285 100644 --- a/docker/package/packages.py +++ b/docker/package/packages.py @@ -19,13 +19,11 @@ networks = { "mainnet": "mainnet", "ghostnet": "ghostnet", - "nairobinet": "https://teztnets.com/nairobinet", "oxfordnet": "https://teztnets.com/oxfordnet", } networks_protos = { - "mainnet": ["PtNairob"], - "ghostnet": ["PtNairob"], - "nairobinet": ["PtNairob"], + "mainnet": ["Proxford"], + "ghostnet": ["Proxford"], "oxfordnet": ["Proxford"], } diff --git a/docker/tests/binaries.json b/docker/tests/binaries.json index 578cf9167..7bcda3097 100644 --- a/docker/tests/binaries.json +++ b/docker/tests/binaries.json @@ -1,8 +1,7 @@ { "released": [ - "tezos-smart-rollup-client-Proxford", - "tezos-smart-rollup-client-PtNairob", "tezos-smart-rollup-node", + "tezos-smart-rollup-wasm-debugger" "tezos-baking", "tezos-sapling-params", "tezos-accuser-Proxford", @@ -15,8 +14,7 @@ "tezos-codec", "tezos-signer", "tezos-admin-client", - "tezos-client", - "tezos-smart-rollup-wasm-debugger" + "tezos-client" ], "candidates": [ "tezos-smart-rollup-node", diff --git a/docs/baking.md b/docs/baking.md index 0b28b738b..920836fe8 100644 --- a/docs/baking.md +++ b/docs/baking.md @@ -30,7 +30,7 @@ that you can use by following the [installation instructions](https://www.raspbe In order to run a baking instance, you'll need the following Tezos binaries: `tezos-client`, `tezos-node`, `tezos-baker-`. -The currently supported protocol is `PtNairob` (used on `nairobinet`, `ghostnet` and `mainnet`) and `Proxford` (used on `oxfordnet`). +The currently supported protocol is `Proxford` (used on `oxfordnet`, `ghostnet` and `mainnet`). Also, note that the corresponding packages have protocol suffix in lowercase, e.g. the list of available baker packages can be found [here](https://launchpad.net/~serokell/+archive/ubuntu/tezos/+packages?field.name_filter=tezos-baker&field.status_filter=published). @@ -115,8 +115,9 @@ which will take a significant amount of time. In order to avoid this, we suggest bootstrapping from a snapshot instead. Snapshots can be downloaded from the following websites: -* [XTZ-Shots](https://xtz-shots.io/) * [Lambs on acid](https://lambsonacid.nl/) +* [Marigold](https://snapshots.tezos.marigold.dev/) +* [Tzinit](https://snapshots.eu.tzinit.org/) Download the snapshot for the desired network. We recommend to use rolling snapshots. This is the smallest and the fastest mode that is sufficient for baking (you can read more about other diff --git a/docs/fedora.md b/docs/fedora.md index 581e64e59..ef8da20c5 100644 --- a/docs/fedora.md +++ b/docs/fedora.md @@ -12,11 +12,11 @@ following commands: # use dnf sudo dnf copr enable @Serokell/Tezos sudo dnf install tezos-client -sudo dnf install tezos-baker-PtNairob +sudo dnf install tezos-baker-Proxford # or use yum sudo yum copr enable @Serokell/Tezos -sudo yum install tezos-baker-PtNairob +sudo yum install tezos-baker-Proxford ``` Once you install these packages, the commands `tezos-*` and `octez-*` will be available. diff --git a/docs/systemd.md b/docs/systemd.md index cf8f3d3ef..d7eaa0e6f 100644 --- a/docs/systemd.md +++ b/docs/systemd.md @@ -44,7 +44,7 @@ Then you can use the script, specifying the binary name as an argument, e.g.: ``` ./gen_systemd_service_file.py tezos-node # or -./gen_systemd_service_file.py tezos-baker-PtNairob +./gen_systemd_service_file.py tezos-baker-Proxford ``` After that you'll have `.service` files in the current directory. @@ -62,7 +62,6 @@ It's possible to run multiple similar services, e.g. two `tezos-node`s that run networks. `tezos-node` packages provide multiple services out of the box: -- `tezos-node-nairobinet` - `tezos-node-oxfordnet` - `tezos-node-ghostnet` - `tezos-node-mainnet` @@ -78,7 +77,7 @@ Also, there are `tezos-node-` binary aliases that are equivalent to running `tezos-node` with [the service options](./configuration.md) given. In addition to node services where the config is predefined to a specific network -(e.g. `tezos-node-mainnet` or `tezos-node-nairobinet`), it's possible to run +(e.g. `tezos-node-mainnet` or `tezos-node-oxfordnet`), it's possible to run `tezos-node-custom` service. Another case for running multiple similar systemd services is when one wants to have diff --git a/docs/voting.md b/docs/voting.md index 4e48a65ea..c1b73b988 100644 --- a/docs/voting.md +++ b/docs/voting.md @@ -52,5 +52,5 @@ tezos-vote --network voting `tezos-vote` also supports voting on currently running testnets, for example: ```bash -tezos-vote --network nairobinet +tezos-vote --network oxfordnet ``` diff --git a/meta.json b/meta.json index 915c05dd2..dec1e41c4 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { - "release": "1", + "release": "2", "maintainer": "Serokell ", "tezos_ref": "v19.1" } diff --git a/tests/systemd/services_tests.py b/tests/systemd/services_tests.py index d124ffca3..4e3ca77d1 100644 --- a/tests/systemd/services_tests.py +++ b/tests/systemd/services_tests.py @@ -128,16 +128,16 @@ def test_node_mainnet_service(): node_service_test("mainnet") -def test_node_nairobinet_service(): - node_service_test("nairobinet") +def test_node_oxfordnet_service(): + node_service_test("oxfordnet") -def test_baking_nairobinet_service(): - baking_service_test("nairobinet", ["PtNairob"]) +def test_baking_oxfordnet_service(): + baking_service_test("oxfordnet", ["Proxford"]) def test_baking_mainnet_service(): - baking_service_test("mainnet", ["PtNairob"]) + baking_service_test("mainnet", ["Proxford"]) def test_http_signer_service(): @@ -149,9 +149,9 @@ def test_tcp_signer_service(): def test_standalone_accuser_service(): - with unit(f"tezos-node-nairobinet.service") as _: - with unit(f"tezos-accuser-ptnairob.service") as _: - assert check_running_process(f"octez-accuser-PtNairob") + with unit(f"tezos-node-oxfordnet.service") as _: + with unit(f"tezos-accuser-proxford.service") as _: + assert check_running_process(f"octez-accuser-Proxford") def test_unix_signer_service(): @@ -161,34 +161,34 @@ def test_unix_signer_service(): def test_standalone_baker_service(): replace_systemd_service_env( - "tezos-baker-ptnairob", + "tezos-baker-proxford", "TEZOS_NODE_DIR", - "/var/lib/tezos/node-nairobinet", + "/var/lib/tezos/node-oxfordnet", ) with account("baker") as _: - with unit(f"tezos-node-nairobinet.service") as _: - with unit(f"tezos-baker-ptnairob.service") as _: - assert check_active_service(f"tezos-baker-ptnairob.service") - assert check_running_process(f"octez-baker-PtNairob") + with unit(f"tezos-node-oxfordnet.service") as _: + with unit(f"tezos-baker-proxford.service") as _: + assert check_active_service(f"tezos-baker-proxford.service") + assert check_running_process(f"octez-baker-Proxford") def test_nondefault_node_rpc_endpoint(): rpc_addr = "127.0.0.1:8735" - replace_systemd_service_env("tezos-node-nairobinet", "NODE_RPC_ADDR", rpc_addr) - proc_call("cat /etc/default/tezos-node-nairobinet") + replace_systemd_service_env("tezos-node-oxfordnet", "NODE_RPC_ADDR", rpc_addr) + proc_call("cat /etc/default/tezos-node-oxfordnet") try: - node_service_test("nairobinet", f"http://{rpc_addr}") + node_service_test("oxfordnet", f"http://{rpc_addr}") finally: replace_systemd_service_env( - "tezos-node-nairobinet", "NODE_RPC_ADDR", "127.0.0.1:8732" + "tezos-node-oxfordnet", "NODE_RPC_ADDR", "127.0.0.1:8732" ) def test_nondefault_baking_config(): replace_systemd_service_env( - "tezos-baking-nairobinet", "BAKER_ADDRESS_ALIAS", "another_baker" + "tezos-baking-oxfordnet", "BAKER_ADDRESS_ALIAS", "another_baker" ) replace_systemd_service_env( - "tezos-baking-nairobinet", "LIQUIDITY_BAKING_TOGGLE_VOTE", "on" + "tezos-baking-oxfordnet", "LIQUIDITY_BAKING_TOGGLE_VOTE", "on" ) - baking_service_test("nairobinet", ["PtNairob"], "another_baker") + baking_service_test("oxfordnet", ["Proxford"], "another_baker") diff --git a/tests/tezos-binaries.nix b/tests/tezos-binaries.nix index f1b1295bd..a540bcdc7 100644 --- a/tests/tezos-binaries.nix +++ b/tests/tezos-binaries.nix @@ -15,9 +15,9 @@ in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: { testScript = '' path_to_binaries = "${path-to-binaries}" - octez_accuser = f"{path_to_binaries}/octez-accuser-PtNairob" + octez_accuser = f"{path_to_binaries}/octez-accuser-Proxford" octez_admin_client = f"{path_to_binaries}/octez-admin-client" - octez_baker = f"{path_to_binaries}/octez-baker-PtNairob" + octez_baker = f"{path_to_binaries}/octez-baker-Proxford" octez_client = f"{path_to_binaries}/octez-client" octez_node = f"{path_to_binaries}/octez-node" octez_signer = f"{path_to_binaries}/octez-signer" diff --git a/tests/tezos-modules.nix b/tests/tezos-modules.nix index 1ef99b800..c00d31056 100644 --- a/tests/tezos-modules.nix +++ b/tests/tezos-modules.nix @@ -19,12 +19,12 @@ let octez-accuser = { enable = true; - baseProtocols = ["PtNairob"]; + baseProtocols = ["Proxford"]; }; octez-baker = { enable = true; - baseProtocols = ["PtNairob"]; + baseProtocols = ["Proxford"]; bakerAccountAlias = "baker"; bakerSecretKey = "unencrypted:edsk3KaTNj1d8Xd3kMBrZkJrfkqsz4XwwiBXatuuVgTdPye2KpE98o"; };