diff --git a/Formula/tezos-node-oxfordnet.rb b/Formula/tezos-node-oxfordnet.rb deleted file mode 100644 index 6ba519076..000000000 --- a/Formula/tezos-node-oxfordnet.rb +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env ruby - -# SPDX-FileCopyrightText: 2023 Oxhead Alpha -# SPDX-License-Identifier: LicenseRef-MIT-OA - -class TezosNodeOxfordnet < Formula - url "file:///dev/null" - version "v18.0-1" - - depends_on "tezos-node" - - desc "Meta formula that provides background tezos-node service that runs on oxfordnet" - - 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.xyz/oxfordnet\ - "$@" - else - echo "Updating the node configuration..." - "$node" config update \ - --rpc-addr "$NODE_RPC_ADDR" \ - --network=https://teztnets.xyz/oxfordnet\ - "$@" - 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-oxfordnet-start", startup_contents) - bin.install "tezos-node-oxfordnet-start" - print "Installing tezos-node-oxfordnet service" - end - - service do - run opt_bin/"tezos-node-oxfordnet-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-oxfordnet.log" - error_log_path var/"log/tezos-node-oxfordnet.log" - end - - def post_install - mkdir_p "#{var}/lib/tezos/node-oxfordnet" - system "octez-node", "config", "init", "--data-dir" "#{var}/lib/tezos/node-oxfordnet", "--network", "https://teztnets.xyz/oxfordnet" - end -end diff --git a/baking/pyproject.toml b/baking/pyproject.toml index 18c5c433d..404ca8fae 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 = "v18.0a" +version = "v18.0b" [tool.setuptools.packages.find] where= ["src"] diff --git a/baking/src/tezos_baking/steps.py b/baking/src/tezos_baking/steps.py index 34207fcd8..f991dfd14 100644 --- a/baking/src/tezos_baking/steps.py +++ b/baking/src/tezos_baking/steps.py @@ -107,7 +107,6 @@ def pprint_options(self): "mainnet": "Main Tezos network", "ghostnet": "Long running test network, currently using the Nairobi Tezos protocol", "nairobinet": "Test network using the Nairobi Tezos protocol", - "oxfordnet": "Test network using the Oxford Tezos protocol", } # Steps diff --git a/baking/src/tezos_baking/tezos_setup_wizard.py b/baking/src/tezos_baking/tezos_setup_wizard.py index bda303261..c646dd8ab 100644 --- a/baking/src/tezos_baking/tezos_setup_wizard.py +++ b/baking/src/tezos_baking/tezos_setup_wizard.py @@ -201,7 +201,7 @@ def get_node_version(): 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 `PtNairob` (used on `nairobinet`, `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 4c2b64de9..4e86754c7 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 = "a" + letter_version = "b" buildfile = "setup.py" diff --git a/docker/package/packages.py b/docker/package/packages.py index c7084b2ce..5e0df9f05 100644 --- a/docker/package/packages.py +++ b/docker/package/packages.py @@ -20,13 +20,11 @@ "mainnet": "mainnet", "ghostnet": "ghostnet", "nairobinet": "https://teztnets.xyz/nairobinet", - "oxfordnet": "https://teztnets.xyz/oxfordnet", } networks_protos = { "mainnet": ["PtNairob"], "ghostnet": ["PtNairob"], "nairobinet": ["PtNairob"], - "oxfordnet": ["Proxford"], } protocol_numbers = { diff --git a/docs/baking.md b/docs/baking.md index 9ffd85e60..df70f2f09 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 `PtNairob` (used on `nairobinet`, `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). diff --git a/docs/systemd.md b/docs/systemd.md index cf8f3d3ef..d2cf8432d 100644 --- a/docs/systemd.md +++ b/docs/systemd.md @@ -63,7 +63,6 @@ networks. `tezos-node` packages provide multiple services out of the box: - `tezos-node-nairobinet` -- `tezos-node-oxfordnet` - `tezos-node-ghostnet` - `tezos-node-mainnet` diff --git a/meta.json b/meta.json index 7e834dc5f..e6f5efd92 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { - "release": "2", + "release": "3", "maintainer": "Serokell ", "tezos_ref": "v18.0" }