From 5f93d6478a5119592bd5e6d4cb7dbc9752310ffe Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Tue, 18 Jun 2024 13:28:20 +0000 Subject: [PATCH 1/7] [Chore] Bump Tezos sources to v20.1 --- docker/active-protocols | 1 + docker/octez-executables | 2 ++ flake.lock | 6 +++--- meta.json | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docker/active-protocols b/docker/active-protocols index 4233f30fc..474c463c3 100644 --- a/docker/active-protocols +++ b/docker/active-protocols @@ -1,3 +1,4 @@ Proxford PtParisB +PsParisC alpha diff --git a/docker/octez-executables b/docker/octez-executables index 462897b18..8616215cc 100644 --- a/docker/octez-executables +++ b/docker/octez-executables @@ -9,6 +9,8 @@ octez-codec octez-client octez-admin-client octez-node +octez-accuser-PsParisC +octez-baker-PsParisC octez-accuser-PtParisB octez-baker-PtParisB octez-accuser-Proxford diff --git a/flake.lock b/flake.lock index 7ec8b5757..009f7256b 100644 --- a/flake.lock +++ b/flake.lock @@ -1365,11 +1365,11 @@ "tezos": { "flake": false, "locked": { - "lastModified": 1716902791, - "narHash": "sha256-BcsxLOTt8LTq16FdExOw2FOM/YYfLFeWSOopslftXtY=", + "lastModified": 1718697806, + "narHash": "sha256-rF93yY0b0d53LUmYAoDjueqOBM5U/xA6riF/zXb7DXg=", "owner": "tezos", "repo": "tezos", - "rev": "0dcf32097f5144ddf8cc8dc9bf52e49501f40ed7", + "rev": "1a991a031e88249e187e6d39d979d2533233c17c", "type": "gitlab" }, "original": { diff --git a/meta.json b/meta.json index 66394287a..33a9333d8 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { "release": "3", "maintainer": "Serokell ", - "tezos_ref": "octez-v20.0" + "tezos_ref": "octez-v20.1" } From 817f6a7f172062b192ad19100ccedbee7255b1b3 Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Tue, 18 Jun 2024 13:28:21 +0000 Subject: [PATCH 2/7] [Chore] Update brew formulae for v20.1 --- Formula/tezos-accuser-Proxford.rb | 6 ++---- Formula/tezos-accuser-PtParisB.rb | 6 ++---- Formula/tezos-admin-client.rb | 6 ++---- Formula/tezos-baker-Proxford.rb | 6 ++---- Formula/tezos-baker-PtParisB.rb | 6 ++---- Formula/tezos-client.rb | 6 ++---- Formula/tezos-codec.rb | 6 ++---- Formula/tezos-dac-client.rb | 6 ++---- Formula/tezos-dac-node.rb | 6 ++---- Formula/tezos-dal-node.rb | 6 ++---- Formula/tezos-node-ghostnet.rb | 2 +- Formula/tezos-node-mainnet.rb | 2 +- Formula/tezos-node.rb | 6 ++---- Formula/tezos-signer-http.rb | 2 +- Formula/tezos-signer-https.rb | 2 +- Formula/tezos-signer-tcp.rb | 2 +- Formula/tezos-signer-unix.rb | 2 +- Formula/tezos-signer.rb | 6 ++---- Formula/tezos-smart-rollup-node.rb | 6 ++---- Formula/tezos-smart-rollup-wasm-debugger.rb | 6 ++---- 20 files changed, 34 insertions(+), 62 deletions(-) diff --git a/Formula/tezos-accuser-Proxford.rb b/Formula/tezos-accuser-Proxford.rb index 67237b3b0..7c223b24a 100644 --- a/Formula/tezos-accuser-Proxford.rb +++ b/Formula/tezos-accuser-Proxford.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,8 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserProxford.version}/" - sha256 cellar: :any, monterey: "6ff39c11fcee917ec4c348fc0f67a3dbbb287a2653d969778bf5facbb446173f" - sha256 cellar: :any, arm64_monterey: "afbb69d071745e4f53c2d23399d4a8e37958f92c777404fa4c0cd4e5bc01fa00" end def make_deps diff --git a/Formula/tezos-accuser-PtParisB.rb b/Formula/tezos-accuser-PtParisB.rb index c50a1876c..5cfb1e189 100644 --- a/Formula/tezos-accuser-PtParisB.rb +++ b/Formula/tezos-accuser-PtParisB.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,8 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPtparisb.version}/" - sha256 cellar: :any, monterey: "e43c960298b35bef54a692c6ca372fd02abd4655073709251653b3f302edcbc0" - sha256 cellar: :any, arm64_monterey: "0539e4c98d9dac4c51bbbff14a547d6d914a26e3c8bb6b87e31274d39da9b996" end def make_deps diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb index ba501f9e2..8afbd7caa 100644 --- a/Formula/tezos-admin-client.rb +++ b/Formula/tezos-admin-client.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,8 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/" - sha256 cellar: :any, monterey: "763571c2b94949472d30555cd87cdb3074e9fd07042dfe9001ea7329783a45d5" - sha256 cellar: :any, arm64_monterey: "346cda859428676b87657820d2e565add4cca9f4499183b4bbd34bef507cadbf" end def make_deps diff --git a/Formula/tezos-baker-Proxford.rb b/Formula/tezos-baker-Proxford.rb index a072d863a..84a5c1a3e 100644 --- a/Formula/tezos-baker-Proxford.rb +++ b/Formula/tezos-baker-Proxford.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,8 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerProxford.version}/" - sha256 cellar: :any, monterey: "9b9481e800d43f208f7a62c0a85ea1ff942832b9853d7db87bf8f7168918b981" - sha256 cellar: :any, arm64_monterey: "c0b9273ca12572e0abfd10b3ac48ec0d942be13dfe7fec23573d58ccb30e4376" end def make_deps diff --git a/Formula/tezos-baker-PtParisB.rb b/Formula/tezos-baker-PtParisB.rb index 42e66fd2e..faf96ab23 100644 --- a/Formula/tezos-baker-PtParisB.rb +++ b/Formula/tezos-baker-PtParisB.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,8 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPtparisb.version}/" - sha256 cellar: :any, monterey: "7ca1c8b2c23d700707735a955183f9286dbe27ae953690b3092a6f21703ca52f" - sha256 cellar: :any, arm64_monterey: "4465111801a14bdc89e6cad5b62788f150a8f44906b3838151a567e60b438ffd" end def make_deps diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb index 2376eb7a4..acc2248a9 100644 --- a/Formula/tezos-client.rb +++ b/Formula/tezos-client.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam opam] build_dependencies.each do |dependency| @@ -26,8 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/" - sha256 cellar: :any, monterey: "0745bff5f4e675c50e18555e73664f6de19068cd70804c191a702b6f5c7c6b88" - sha256 cellar: :any, arm64_monterey: "3d7fde1bbf98323886fcc059fc17a05ede1ea270037eaa21eae7706c950358e0" end def make_deps diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb index 4c0c38d84..4eaef32aa 100644 --- a/Formula/tezos-codec.rb +++ b/Formula/tezos-codec.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,8 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/" - sha256 cellar: :any, monterey: "98192e1bb9ea727870887d44b151d898cf6c160515a84094f789188e40bab8a5" - sha256 cellar: :any, arm64_monterey: "cbd1a414b02cb25a6036f553873010a39be7fa56508b42a9840a9bbf9cb47ccc" end def make_deps diff --git a/Formula/tezos-dac-client.rb b/Formula/tezos-dac-client.rb index 57de7838b..86362133f 100644 --- a/Formula/tezos-dac-client.rb +++ b/Formula/tezos-dac-client.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,8 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacClient.version}/" - sha256 cellar: :any, monterey: "9f91853e6c26ec1f405acc7cb2883d76f8e928d0911cbff96cffd7979b60d21d" - sha256 cellar: :any, arm64_monterey: "f3151c89911802a415b69a63d3d2cc9bdd530bd8ed235ccdf5920f09b2081de9" end def make_deps diff --git a/Formula/tezos-dac-node.rb b/Formula/tezos-dac-node.rb index ca5481c36..49f603ceb 100644 --- a/Formula/tezos-dac-node.rb +++ b/Formula/tezos-dac-node.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,8 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacNode.version}/" - sha256 cellar: :any, monterey: "b7bf391be6399858bdcd7aef591e07e57ad9373408367f2d1d10e10a4f538f1d" - sha256 cellar: :any, arm64_monterey: "cb4f3efc17cd6ad5ccca722d21e6a75a7a6b51ee3a53ee9e68ac3cdcd838561c" end def make_deps diff --git a/Formula/tezos-dal-node.rb b/Formula/tezos-dal-node.rb index 786c77192..d1501b54c 100644 --- a/Formula/tezos-dal-node.rb +++ b/Formula/tezos-dal-node.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,8 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDalNode.version}/" - sha256 cellar: :any, monterey: "228aa88775d3384c0266b7ca372fb5bdaf4fa3d0188553f33d4104d1f187027d" - sha256 cellar: :any, arm64_monterey: "c87c12c13516fe198f20e1315596ff3db759987599fac18150f3bb1d44dc362f" end def make_deps diff --git a/Formula/tezos-node-ghostnet.rb b/Formula/tezos-node-ghostnet.rb index fb1a3a721..764a1e60f 100644 --- a/Formula/tezos-node-ghostnet.rb +++ b/Formula/tezos-node-ghostnet.rb @@ -3,7 +3,7 @@ class TezosNodeGhostnet < Formula url "file:///dev/null" - version "v20.0-2" + version "v20.1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-mainnet.rb b/Formula/tezos-node-mainnet.rb index f97f3f5e7..b597b1c2f 100644 --- a/Formula/tezos-node-mainnet.rb +++ b/Formula/tezos-node-mainnet.rb @@ -3,7 +3,7 @@ class TezosNodeMainnet < Formula url "file:///dev/null" - version "v20.0-2" + version "v20.1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index 513396cb7..9a0e5d9d4 100644 --- a/Formula/tezos-node.rb +++ b/Formula/tezos-node.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,8 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/" - sha256 cellar: :any, monterey: "5fb634d7d5592b3a5b7b8f77f6f729e1b8fcba8218aa9626dd98a4867ebc92b1" - sha256 cellar: :any, arm64_monterey: "015a701f79ce4ef18c1a8883a2aead51b7064628c2b7e53c93a7f0aaa9d6117c" end def make_deps diff --git a/Formula/tezos-signer-http.rb b/Formula/tezos-signer-http.rb index 4de3bce92..c2566896d 100644 --- a/Formula/tezos-signer-http.rb +++ b/Formula/tezos-signer-http.rb @@ -3,7 +3,7 @@ class TezosSignerHttp < Formula url "file:///dev/null" - version "v20.0-2" + version "v20.1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-https.rb b/Formula/tezos-signer-https.rb index 881412895..8fd9457c7 100644 --- a/Formula/tezos-signer-https.rb +++ b/Formula/tezos-signer-https.rb @@ -3,7 +3,7 @@ class TezosSignerHttps < Formula url "file:///dev/null" - version "v20.0-2" + version "v20.1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-tcp.rb b/Formula/tezos-signer-tcp.rb index cac4946ef..478b0db5a 100644 --- a/Formula/tezos-signer-tcp.rb +++ b/Formula/tezos-signer-tcp.rb @@ -3,7 +3,7 @@ class TezosSignerTcp < Formula url "file:///dev/null" - version "v20.0-2" + version "v20.1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-unix.rb b/Formula/tezos-signer-unix.rb index 0eb96bc66..5dbe36d67 100644 --- a/Formula/tezos-signer-unix.rb +++ b/Formula/tezos-signer-unix.rb @@ -3,7 +3,7 @@ class TezosSignerUnix < Formula url "file:///dev/null" - version "v20.0-2" + version "v20.1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb index c37f87974..8f896761c 100644 --- a/Formula/tezos-signer.rb +++ b/Formula/tezos-signer.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -26,8 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/" - sha256 cellar: :any, monterey: "b0b29a23959bc1be0973fc4b02ab9d0991fdae43bbd16911c5bc54e7fb072049" - sha256 cellar: :any, arm64_monterey: "748b3f341006988992e6ca6285e5efbd0bc4d41ce78daae6025242402ba25aaa" end def make_deps diff --git a/Formula/tezos-smart-rollup-node.rb b/Formula/tezos-smart-rollup-node.rb index bbab67bd7..125897b42 100644 --- a/Formula/tezos-smart-rollup-node.rb +++ b/Formula/tezos-smart-rollup-node.rb @@ -11,9 +11,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -28,8 +28,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNode.version}/" - sha256 cellar: :any, monterey: "4de184f7c655c20ed5ede474c269185eb9552b0cdfd474107ec91ee0c466125c" - sha256 cellar: :any, arm64_monterey: "c9a5fc2126294154dcd188d2bd1373b73ff36fe1be7c9fc8d17a216b11064587" end def make_deps diff --git a/Formula/tezos-smart-rollup-wasm-debugger.rb b/Formula/tezos-smart-rollup-wasm-debugger.rb index 96f760f88..01ccb556e 100644 --- a/Formula/tezos-smart-rollup-wasm-debugger.rb +++ b/Formula/tezos-smart-rollup-wasm-debugger.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.0", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - version "v20.0-2" + version "v20.1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] build_dependencies.each do |dependency| @@ -27,8 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupWasmDebugger.version}/" - sha256 cellar: :any, monterey: "ec067bfeea9821bcd52ac842f8c2f29a5a96140755c60da99917f3d271ee9125" - sha256 cellar: :any, arm64_monterey: "1999b3f035cade8995b407ebe4ef1cee646816f92d512292854af114b616b15d" end def make_deps From 11ffc4b9219ba246b529cb5e1857a496c043c417 Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Tue, 18 Jun 2024 13:28:21 +0000 Subject: [PATCH 3/7] [Chore] Reset release number for v20.1 --- baking/pyproject.toml | 2 +- meta.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/baking/pyproject.toml b/baking/pyproject.toml index 9707eb3ab..bd847813d 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 = "v20.0a" +version = "v20.1" [tool.setuptools.packages.find] where= ["src"] diff --git a/meta.json b/meta.json index 33a9333d8..d90c7c259 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { - "release": "3", + "release": "1", "maintainer": "Serokell ", "tezos_ref": "octez-v20.1" } From f163acd48fe819d70e5fb55089ff4611b81e4362 Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Tue, 18 Jun 2024 13:28:21 +0000 Subject: [PATCH 4/7] [Chore] Reset letter_version for v20.1 --- docker/package/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/package/model.py b/docker/package/model.py index 5e16c8568..861040dc2 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 = "" buildfile = "setup.py" From 8a10b836caa52f57566cc661a2c140f29697eda7 Mon Sep 17 00:00:00 2001 From: serokell-bot Date: Tue, 18 Jun 2024 13:28:23 +0000 Subject: [PATCH 5/7] [Chore] Update release binaries for v20.1 --- .github/workflows/build-bottles.yml | 2 +- docker/tests/binaries.json | 2 ++ protocols.json | 3 ++- scripts/build-all-bottles.sh | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-bottles.yml b/.github/workflows/build-bottles.yml index 226f1a995..46d774227 100644 --- a/.github/workflows/build-bottles.yml +++ b/.github/workflows/build-bottles.yml @@ -17,7 +17,7 @@ jobs: matrix: os: [ { id: macos-12, name: "monterey" } ] # we don't bottle meta-formulas that contain only services - formula: [tezos-smart-rollup-wasm-debugger, tezos-smart-rollup-node, tezos-dac-client, tezos-dac-node, tezos-dal-node, tezos-signer, tezos-codec, tezos-client, tezos-admin-client, tezos-node, tezos-accuser-PtParisB, tezos-baker-PtParisB, tezos-accuser-Proxford, tezos-baker-Proxford] + formula: [tezos-smart-rollup-wasm-debugger, tezos-smart-rollup-node, tezos-dac-client, tezos-dac-node, tezos-dal-node, tezos-signer, tezos-codec, tezos-client, tezos-admin-client, tezos-node, tezos-accuser-PsParisC, tezos-baker-PsParisC, tezos-accuser-PtParisB, tezos-baker-PtParisB, tezos-accuser-Proxford, tezos-baker-Proxford] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/docker/tests/binaries.json b/docker/tests/binaries.json index 84c8dab8f..16194a549 100644 --- a/docker/tests/binaries.json +++ b/docker/tests/binaries.json @@ -11,6 +11,8 @@ "tezos-client", "tezos-admin-client", "tezos-node", + "tezos-accuser-PsParisC", + "tezos-baker-PsParisC", "tezos-accuser-PtParisB", "tezos-baker-PtParisB", "tezos-accuser-Proxford", diff --git a/protocols.json b/protocols.json index c36221758..fd3eb3d1f 100644 --- a/protocols.json +++ b/protocols.json @@ -29,6 +29,7 @@ ], "active": [ "Proxford", - "PtParisB" + "PtParisB", + "PsParisC" ] } diff --git a/scripts/build-all-bottles.sh b/scripts/build-all-bottles.sh index 3bd90325e..a173ab81d 100755 --- a/scripts/build-all-bottles.sh +++ b/scripts/build-all-bottles.sh @@ -19,7 +19,7 @@ set -euo pipefail retval="0" # we don't bottle meta-formulas that contain only services -formulae=("tezos-smart-rollup-wasm-debugger" "tezos-smart-rollup-node" "tezos-dac-client" "tezos-dac-node" "tezos-dal-node" "tezos-signer" "tezos-codec" "tezos-client" "tezos-admin-client" "tezos-node" "tezos-accuser-PtParisB" "tezos-baker-PtParisB" "tezos-accuser-Proxford" "tezos-baker-Proxford") +formulae=("tezos-smart-rollup-wasm-debugger" "tezos-smart-rollup-node" "tezos-dac-client" "tezos-dac-node" "tezos-dal-node" "tezos-signer" "tezos-codec" "tezos-client" "tezos-admin-client" "tezos-node" "tezos-accuser-PsParisC" "tezos-baker-PsParisC" "tezos-accuser-PtParisB" "tezos-baker-PtParisB" "tezos-accuser-Proxford" "tezos-baker-Proxford") # tezos-sapling-params is used as a dependency for some of the formulas # so we handle it separately. From d4ddc1719b3e0e8069f4dcd687a17326f8b4ed3a Mon Sep 17 00:00:00 2001 From: Roman Melnikov Date: Tue, 18 Jun 2024 16:08:21 +0200 Subject: [PATCH 6/7] [Chore] Deprecate 'Oxford' protocol Since it is now obsolete --- .buildkite/pipeline-raw.yml | 4 +- .github/workflows/build-bottles.yml | 2 +- Formula/tezos-accuser-Proxford.rb | 97 ---------------- Formula/tezos-baker-Proxford.rb | 107 ------------------ baking/src/tezos_baking/steps.py | 1 - baking/src/tezos_baking/tezos_setup_wizard.py | 2 +- docker/active-protocols | 1 - docker/octez-executables | 2 - docker/package/packages.py | 6 +- docker/tests/binaries.json | 4 - docs/baking.md | 2 +- docs/fedora.md | 4 +- docs/systemd.md | 5 +- docs/voting.md | 2 +- nix/modules/common.nix | 4 +- nix/modules/tezos-accuser.nix | 4 +- nix/modules/tezos-baker.nix | 4 +- protocols.json | 4 +- scripts/build-all-bottles.sh | 2 +- tests/systemd/services_tests.py | 42 +++---- tests/tezos-binaries.nix | 4 +- tests/tezos-modules.nix | 4 +- tests/tezos-nix-binaries.nix | 6 +- 23 files changed, 49 insertions(+), 264 deletions(-) delete mode 100644 Formula/tezos-accuser-Proxford.rb delete mode 100644 Formula/tezos-baker-Proxford.rb diff --git a/.buildkite/pipeline-raw.yml b/.buildkite/pipeline-raw.yml index bb5b61132..a4a6cb13b 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-Proxford + - nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type binary -p tezos-baker-PsParisC - 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-Proxford + - nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type binary -p tezos-baker-PsParisC - rm -rf out # It takes much time to build binary package, so we do it only on master branches: "master" diff --git a/.github/workflows/build-bottles.yml b/.github/workflows/build-bottles.yml index 46d774227..4d1cb99ef 100644 --- a/.github/workflows/build-bottles.yml +++ b/.github/workflows/build-bottles.yml @@ -17,7 +17,7 @@ jobs: matrix: os: [ { id: macos-12, name: "monterey" } ] # we don't bottle meta-formulas that contain only services - formula: [tezos-smart-rollup-wasm-debugger, tezos-smart-rollup-node, tezos-dac-client, tezos-dac-node, tezos-dal-node, tezos-signer, tezos-codec, tezos-client, tezos-admin-client, tezos-node, tezos-accuser-PsParisC, tezos-baker-PsParisC, tezos-accuser-PtParisB, tezos-baker-PtParisB, tezos-accuser-Proxford, tezos-baker-Proxford] + formula: [tezos-smart-rollup-wasm-debugger, tezos-smart-rollup-node, tezos-dac-client, tezos-dac-node, tezos-dal-node, tezos-signer, tezos-codec, tezos-client, tezos-admin-client, tezos-node, tezos-accuser-PsParisC, tezos-baker-PsParisC, tezos-accuser-PtParisB, tezos-baker-PtParisB] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/Formula/tezos-accuser-Proxford.rb b/Formula/tezos-accuser-Proxford.rb deleted file mode 100644 index 7c223b24a..000000000 --- a/Formula/tezos-accuser-Proxford.rb +++ /dev/null @@ -1,97 +0,0 @@ -# SPDX-FileCopyrightText: 2023 Oxhead Alpha -# SPDX-License-Identifier: LicenseRef-MIT-OA - -class TezosAccuserProxford < Formula - @all_bins = [] - - class << self - attr_accessor :all_bins - end - homepage "https://gitlab.com/tezos/tezos" - - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - - version "v20.1-1" - - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] - build_dependencies.each do |dependency| - depends_on dependency => :build - end - - dependencies = %w[gmp hidapi libev protobuf sqlite] - dependencies.each do |dependency| - depends_on dependency - end - desc "Daemon for accusing" - - bottle do - root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserProxford.version}/" - end - - def make_deps - ENV.deparallelize - ENV["CARGO_HOME"]="./.cargo" - # Disable usage of instructions from the ADX extension to avoid incompatibility - # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ - ENV["BLST_PORTABLE"]="yes" - # Force linker to use libraries from the current brew installation. - # Workaround for https://github.com/serokell/tezos-packaging/issues/700 - ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" - # Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer - arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" - system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" - system ["source .cargo/env", "make build-deps"].join(" && ") - end - - def install_template(dune_path, exec_path, name) - bin.mkpath - self.class.all_bins << name - system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") - bin.install name - ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" - end - - def install - startup_contents = - <<~EOS - #!/usr/bin/env bash - - set -euo pipefail - - accuser="#{bin}/octez-accuser-Proxford" - - accuser_config="$TEZOS_CLIENT_DIR/config" - mkdir -p "$TEZOS_CLIENT_DIR" - - if [ ! -f "$accuser_config" ]; then - "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ - config init --output "$accuser_config" >/dev/null 2>&1 - else - "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ - config update >/dev/null 2>&1 - fi - - exec "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" run - EOS - File.write("tezos-accuser-Proxford-start", startup_contents) - bin.install "tezos-accuser-Proxford-start" - make_deps - install_template "src/proto_018_Proxford/bin_accuser/main_accuser_018_Proxford.exe", - "_build/default/src/proto_018_Proxford/bin_accuser/main_accuser_018_Proxford.exe", - "octez-accuser-Proxford" - end - - service do - run opt_bin/"tezos-accuser-Proxford-start" - require_root true - environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", NODE_RPC_SCHEME: "http", NODE_RPC_ADDR: "localhost:8732" - keep_alive true - log_path var/"log/tezos-accuser-Proxford.log" - error_log_path var/"log/tezos-accuser-Proxford.log" - end - - def post_install - mkdir "#{var}/lib/tezos/client" - end -end diff --git a/Formula/tezos-baker-Proxford.rb b/Formula/tezos-baker-Proxford.rb deleted file mode 100644 index 84a5c1a3e..000000000 --- a/Formula/tezos-baker-Proxford.rb +++ /dev/null @@ -1,107 +0,0 @@ -# SPDX-FileCopyrightText: 2023 Oxhead Alpha -# SPDX-License-Identifier: LicenseRef-MIT-OA - -class TezosBakerProxford < Formula - @all_bins = [] - - class << self - attr_accessor :all_bins - end - homepage "https://gitlab.com/tezos/tezos" - - url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false - - version "v20.1-1" - - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] - build_dependencies.each do |dependency| - depends_on dependency => :build - end - - dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params] - dependencies.each do |dependency| - depends_on dependency - end - desc "Daemon for baking" - - bottle do - root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerProxford.version}/" - end - - def make_deps - ENV.deparallelize - ENV["CARGO_HOME"]="./.cargo" - # Disable usage of instructions from the ADX extension to avoid incompatibility - # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ - ENV["BLST_PORTABLE"]="yes" - # Force linker to use libraries from the current brew installation. - # Workaround for https://github.com/serokell/tezos-packaging/issues/700 - ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" - # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer - arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" - system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" - system ["source .cargo/env", "make build-deps"].join(" && ") - end - - def install_template(dune_path, exec_path, name) - bin.mkpath - self.class.all_bins << name - system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") - bin.install name - ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" - end - - def install - startup_contents = - <<~EOS - #!/usr/bin/env bash - - set -euo pipefail - - baker="#{bin}/octez-baker-Proxford" - - baker_config="$TEZOS_CLIENT_DIR/config" - mkdir -p "$TEZOS_CLIENT_DIR" - - if [ ! -f "$baker_config" ]; then - "$baker" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ - config init --output "$baker_config" >/dev/null 2>&1 - else - "$baker" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ - config update >/dev/null 2>&1 - fi - - launch_baker() { - exec "$baker" \ - --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ - run with local node "$TEZOS_NODE_DIR" "$@" - } - - if [[ -z "$BAKER_ACCOUNT" ]]; then - launch_baker - else - launch_baker "$BAKER_ACCOUNT" - fi - EOS - File.write("tezos-baker-Proxford-start", startup_contents) - bin.install "tezos-baker-Proxford-start" - make_deps - install_template "src/proto_018_Proxford/bin_baker/main_baker_018_Proxford.exe", - "_build/default/src/proto_018_Proxford/bin_baker/main_baker_018_Proxford.exe", - "octez-baker-Proxford" - end - - service do - run opt_bin/"tezos-baker-Proxford-start" - require_root true - environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", TEZOS_NODE_DIR: "", NODE_RPC_SCHEME: "http", NODE_RPC_ADDR: "localhost:8732", BAKER_ACCOUNT: "" - keep_alive true - log_path var/"log/tezos-baker-Proxford.log" - error_log_path var/"log/tezos-baker-Proxford.log" - end - - def post_install - mkdir "#{var}/lib/tezos/client" - end -end diff --git a/baking/src/tezos_baking/steps.py b/baking/src/tezos_baking/steps.py index 758ab485c..372789fbe 100644 --- a/baking/src/tezos_baking/steps.py +++ b/baking/src/tezos_baking/steps.py @@ -106,7 +106,6 @@ def pprint_options(self): networks = { "mainnet": "Main Tezos network", "ghostnet": "Long running test network, currently using the Oxford Tezos protocol", - "oxfordnet": "Test network using the Oxford2 Tezos protocol", "paris2net": "Test network using the PtParisB Tezos protocol", } diff --git a/baking/src/tezos_baking/tezos_setup_wizard.py b/baking/src/tezos_baking/tezos_setup_wizard.py index 34600bf39..9312763d2 100644 --- a/baking/src/tezos_baking/tezos_setup_wizard.py +++ b/baking/src/tezos_baking/tezos_setup_wizard.py @@ -197,7 +197,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 Proxford (used on `oxfordnet`, `ghostnet` and `mainnet`) and PtParisB (used on `paris2net`).\n" + "The currently supported protocol is PtParisB (used on `paris2net`, `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/active-protocols b/docker/active-protocols index 474c463c3..179c59da1 100644 --- a/docker/active-protocols +++ b/docker/active-protocols @@ -1,4 +1,3 @@ -Proxford PtParisB PsParisC alpha diff --git a/docker/octez-executables b/docker/octez-executables index 8616215cc..b8e47ca0c 100644 --- a/docker/octez-executables +++ b/docker/octez-executables @@ -13,5 +13,3 @@ octez-accuser-PsParisC octez-baker-PsParisC octez-accuser-PtParisB octez-baker-PtParisB -octez-accuser-Proxford -octez-baker-Proxford diff --git a/docker/package/packages.py b/docker/package/packages.py index a672032c5..107ea104f 100644 --- a/docker/package/packages.py +++ b/docker/package/packages.py @@ -19,13 +19,11 @@ networks = { "mainnet": "mainnet", "ghostnet": "ghostnet", - "oxfordnet": "https://teztnets.com/oxfordnet", "paris2net": "https://teztnets.com/paris2net", } networks_protos = { - "mainnet": ["Proxford", "PtParisB"], - "ghostnet": ["Proxford", "PtParisB"], - "oxfordnet": ["Proxford"], + "mainnet": ["PtParisB"], + "ghostnet": ["PtParisB"], "paris2net": ["PtParisB"], } diff --git a/docker/tests/binaries.json b/docker/tests/binaries.json index 16194a549..9f70e828f 100644 --- a/docker/tests/binaries.json +++ b/docker/tests/binaries.json @@ -15,8 +15,6 @@ "tezos-baker-PsParisC", "tezos-accuser-PtParisB", "tezos-baker-PtParisB", - "tezos-accuser-Proxford", - "tezos-baker-Proxford", "tezos-sapling-params", "tezos-baking" ], @@ -31,8 +29,6 @@ "tezos-client", "tezos-admin-client", "tezos-node", - "tezos-accuser-Proxford", - "tezos-baker-Proxford", "tezos-accuser-PtParisB", "tezos-baker-PtParisB", "tezos-sapling-params", diff --git a/docs/baking.md b/docs/baking.md index baf0eaff4..50787cb12 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 `Proxford` (used on `oxfordnet`, `ghostnet` and `mainnet`) and `ParisB` (used on `paris2net`). +The currently supported protocol is `ParisB` (used on `paris2net`, `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/fedora.md b/docs/fedora.md index ef8da20c5..7e7eb3cdd 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-Proxford +sudo dnf install tezos-baker-PsParisC # or use yum sudo yum copr enable @Serokell/Tezos -sudo yum install tezos-baker-Proxford +sudo yum install tezos-baker-PsParisC ``` Once you install these packages, the commands `tezos-*` and `octez-*` will be available. diff --git a/docs/systemd.md b/docs/systemd.md index 5f09cc15d..d77757257 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-Proxford +./gen_systemd_service_file.py tezos-baker-PsParisC ``` After that you'll have `.service` files in the current directory. @@ -63,7 +63,6 @@ networks. `tezos-node` packages provide multiple services out of the box: - `tezos-node-paris2net` -- `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-oxfordnet`), it's possible to run +(e.g. `tezos-node-mainnet` or `tezos-node-paris2net`), 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 c1b73b988..67b15f1a1 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 oxfordnet +tezos-vote --network paris2net ``` diff --git a/nix/modules/common.nix b/nix/modules/common.nix index 76fbf5671..3369b3f1a 100644 --- a/nix/modules/common.nix +++ b/nix/modules/common.nix @@ -21,11 +21,11 @@ rec { daemonOptions = sharedOptions // { baseProtocols = mkOption { - type = types.listOf (types.enum [ "Proxford" ]); + type = types.listOf (types.enum [ "PtParisB" ]); description = '' List of protocols for which daemons will be run. ''; - example = ["Proxford"]; + example = ["PtParisB"]; }; rpcPort = mkOption { diff --git a/nix/modules/tezos-accuser.nix b/nix/modules/tezos-accuser.nix index 27b07108e..1e6d92df4 100644 --- a/nix/modules/tezos-accuser.nix +++ b/nix/modules/tezos-accuser.nix @@ -7,8 +7,8 @@ with lib; let octez-accuser-pkgs = { - "Proxford" = - "${pkgs.octezPackages.octez-accuser-Proxford}/bin/octez-accuser-Proxford"; + "PtParisB" = + "${pkgs.octezPackages.octez-accuser-PtParisB}/bin/octez-accuser-PtParisB"; }; cfg = config.services.octez-accuser; common = import ./common.nix { inherit lib; inherit pkgs; }; diff --git a/nix/modules/tezos-baker.nix b/nix/modules/tezos-baker.nix index 05f80f977..ca9b1124f 100644 --- a/nix/modules/tezos-baker.nix +++ b/nix/modules/tezos-baker.nix @@ -7,8 +7,8 @@ with lib; let octez-baker-pkgs = { - "Proxford" = - "${pkgs.octezPackages.octez-baker-Proxford}/bin/octez-baker-Proxford"; + "PtParisB" = + "${pkgs.octezPackages.octez-baker-PtParisB}/bin/octez-baker-PtParisB"; }; octez-client = "${pkgs.octezPackages.octez-client}/bin/octez-client"; cfg = config.services.octez-baker; diff --git a/protocols.json b/protocols.json index fd3eb3d1f..e86f6b0fb 100644 --- a/protocols.json +++ b/protocols.json @@ -25,10 +25,10 @@ "PtKathma", "PtLimaPt", "PtMumbai", - "PtNairob" + "PtNairob", + "Proxford" ], "active": [ - "Proxford", "PtParisB", "PsParisC" ] diff --git a/scripts/build-all-bottles.sh b/scripts/build-all-bottles.sh index a173ab81d..91a14ec94 100755 --- a/scripts/build-all-bottles.sh +++ b/scripts/build-all-bottles.sh @@ -19,7 +19,7 @@ set -euo pipefail retval="0" # we don't bottle meta-formulas that contain only services -formulae=("tezos-smart-rollup-wasm-debugger" "tezos-smart-rollup-node" "tezos-dac-client" "tezos-dac-node" "tezos-dal-node" "tezos-signer" "tezos-codec" "tezos-client" "tezos-admin-client" "tezos-node" "tezos-accuser-PsParisC" "tezos-baker-PsParisC" "tezos-accuser-PtParisB" "tezos-baker-PtParisB" "tezos-accuser-Proxford" "tezos-baker-Proxford") +formulae=("tezos-smart-rollup-wasm-debugger" "tezos-smart-rollup-node" "tezos-dac-client" "tezos-dac-node" "tezos-dal-node" "tezos-signer" "tezos-codec" "tezos-client" "tezos-admin-client" "tezos-node" "tezos-accuser-PsParisC" "tezos-baker-PsParisC" "tezos-accuser-PtParisB" "tezos-baker-PtParisB") # tezos-sapling-params is used as a dependency for some of the formulas # so we handle it separately. diff --git a/tests/systemd/services_tests.py b/tests/systemd/services_tests.py index 4e3ca77d1..830aec96a 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_oxfordnet_service(): - node_service_test("oxfordnet") +def test_node_paris2net_service(): + node_service_test("paris2net") -def test_baking_oxfordnet_service(): - baking_service_test("oxfordnet", ["Proxford"]) +def test_baking_paris2net_service(): + baking_service_test("paris2net", ["PtParisB"]) def test_baking_mainnet_service(): - baking_service_test("mainnet", ["Proxford"]) + baking_service_test("mainnet", ["PtParisB"]) def test_http_signer_service(): @@ -149,9 +149,9 @@ def test_tcp_signer_service(): def test_standalone_accuser_service(): - with unit(f"tezos-node-oxfordnet.service") as _: - with unit(f"tezos-accuser-proxford.service") as _: - assert check_running_process(f"octez-accuser-Proxford") + with unit(f"tezos-node-paris2net.service") as _: + with unit(f"tezos-accuser-ptparisb.service") as _: + assert check_running_process(f"octez-accuser-PtParisB") 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-proxford", + "tezos-baker-ptparisb", "TEZOS_NODE_DIR", - "/var/lib/tezos/node-oxfordnet", + "/var/lib/tezos/node-paris2net", ) with account("baker") as _: - 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") + with unit(f"tezos-node-paris2net.service") as _: + with unit(f"tezos-baker-ptparisb.service") as _: + assert check_active_service(f"tezos-baker-ptparisb.service") + assert check_running_process(f"octez-baker-PtParisB") def test_nondefault_node_rpc_endpoint(): rpc_addr = "127.0.0.1:8735" - replace_systemd_service_env("tezos-node-oxfordnet", "NODE_RPC_ADDR", rpc_addr) - proc_call("cat /etc/default/tezos-node-oxfordnet") + replace_systemd_service_env("tezos-node-paris2net", "NODE_RPC_ADDR", rpc_addr) + proc_call("cat /etc/default/tezos-node-paris2net") try: - node_service_test("oxfordnet", f"http://{rpc_addr}") + node_service_test("paris2net", f"http://{rpc_addr}") finally: replace_systemd_service_env( - "tezos-node-oxfordnet", "NODE_RPC_ADDR", "127.0.0.1:8732" + "tezos-node-paris2net", "NODE_RPC_ADDR", "127.0.0.1:8732" ) def test_nondefault_baking_config(): replace_systemd_service_env( - "tezos-baking-oxfordnet", "BAKER_ADDRESS_ALIAS", "another_baker" + "tezos-baking-paris2net", "BAKER_ADDRESS_ALIAS", "another_baker" ) replace_systemd_service_env( - "tezos-baking-oxfordnet", "LIQUIDITY_BAKING_TOGGLE_VOTE", "on" + "tezos-baking-paris2net", "LIQUIDITY_BAKING_TOGGLE_VOTE", "on" ) - baking_service_test("oxfordnet", ["Proxford"], "another_baker") + baking_service_test("paris2net", ["PtParisB"], "another_baker") diff --git a/tests/tezos-binaries.nix b/tests/tezos-binaries.nix index a540bcdc7..1b5030231 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-Proxford" + octez_accuser = f"{path_to_binaries}/octez-accuser-PtParisB" octez_admin_client = f"{path_to_binaries}/octez-admin-client" - octez_baker = f"{path_to_binaries}/octez-baker-Proxford" + octez_baker = f"{path_to_binaries}/octez-baker-PtParisB" 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 c00d31056..eef16e37f 100644 --- a/tests/tezos-modules.nix +++ b/tests/tezos-modules.nix @@ -19,12 +19,12 @@ let octez-accuser = { enable = true; - baseProtocols = ["Proxford"]; + baseProtocols = ["PtParisB"]; }; octez-baker = { enable = true; - baseProtocols = ["Proxford"]; + baseProtocols = ["PtParisB"]; bakerAccountAlias = "baker"; bakerSecretKey = "unencrypted:edsk3KaTNj1d8Xd3kMBrZkJrfkqsz4XwwiBXatuuVgTdPye2KpE98o"; }; diff --git a/tests/tezos-nix-binaries.nix b/tests/tezos-nix-binaries.nix index 107cdb357..bbc4366ae 100644 --- a/tests/tezos-nix-binaries.nix +++ b/tests/tezos-nix-binaries.nix @@ -5,7 +5,7 @@ let inherit (pkgs) system; inherit (pkgs.octezPackages) octez-client octez-admin-client octez-node octez-signer octez-codec - octez-accuser-Proxford octez-baker-Proxford; + octez-accuser-PtParisB octez-baker-PtParisB; in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: { name = "tezos-nix-binaries-test"; nodes.machine = { ... }: { @@ -19,9 +19,9 @@ in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: { }; testScript = '' - octez_accuser = "${octez-accuser-Proxford}/bin/octez-accuser-Proxford" + octez_accuser = "${octez-accuser-PtParisB}/bin/octez-accuser-PtParisB" octez_admin_client = "${octez-admin-client}/bin/octez-admin-client" - octez_baker = "${octez-baker-Proxford}/bin/octez-baker-Proxford" + octez_baker = "${octez-baker-PtParisB}/bin/octez-baker-PtParisB" octez_client = ( "${octez-client}/bin/octez-client" ) From c33ee58fdb69ff66639fc4cd16606d54dbaba284 Mon Sep 17 00:00:00 2001 From: Roman Melnikov Date: Tue, 18 Jun 2024 16:19:55 +0200 Subject: [PATCH 7/7] [Chore] Support 'PsParisC' protocol Problem: Octez v20.1 introduced the new version of Paris protocol that needs to be supported. Solution: Support the new protocol and the new corresponding testnet. Mainnet and ghostnet baking services will run binaries for both 'PtParisB' and 'PsParisC' from the next native packages release since user activated upgrade is supposed to happen soon. --- Formula/tezos-accuser-PsParisC.rb | 97 ++++++++++++++++ Formula/tezos-baker-PsParisC.rb | 107 ++++++++++++++++++ baking/src/tezos_baking/steps.py | 3 +- baking/src/tezos_baking/tezos_setup_wizard.py | 3 +- docker/package/packages.py | 6 +- docs/baking.md | 2 +- docs/systemd.md | 1 + docs/voting.md | 2 +- nix/modules/common.nix | 2 +- nix/modules/tezos-accuser.nix | 2 + nix/modules/tezos-baker.nix | 2 + tests/systemd/services_tests.py | 40 ++++--- 12 files changed, 244 insertions(+), 23 deletions(-) create mode 100644 Formula/tezos-accuser-PsParisC.rb create mode 100644 Formula/tezos-baker-PsParisC.rb diff --git a/Formula/tezos-accuser-PsParisC.rb b/Formula/tezos-accuser-PsParisC.rb new file mode 100644 index 000000000..fb6366290 --- /dev/null +++ b/Formula/tezos-accuser-PsParisC.rb @@ -0,0 +1,97 @@ +# SPDX-FileCopyrightText: 2024 Oxhead Alpha +# SPDX-License-Identifier: LicenseRef-MIT-OA + +class TezosAccuserPsparisc < Formula + @all_bins = [] + + class << self + attr_accessor :all_bins + end + homepage "https://gitlab.com/tezos/tezos" + + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false + + version "v20.1-1" + + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies.each do |dependency| + depends_on dependency => :build + end + + dependencies = %w[gmp hidapi libev protobuf sqlite] + dependencies.each do |dependency| + depends_on dependency + end + desc "Daemon for accusing" + + bottle do + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPsparisc.version}/" + end + + def make_deps + ENV.deparallelize + ENV["CARGO_HOME"]="./.cargo" + # Disable usage of instructions from the ADX extension to avoid incompatibility + # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ + ENV["BLST_PORTABLE"]="yes" + # Force linker to use libraries from the current brew installation. + # Workaround for https://github.com/serokell/tezos-packaging/issues/700 + ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer + arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" + system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" + system ["source .cargo/env", "make build-deps"].join(" && ") + end + + def install_template(dune_path, exec_path, name) + bin.mkpath + self.class.all_bins << name + system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") + bin.install name + ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" + end + + def install + startup_contents = + <<~EOS + #!/usr/bin/env bash + + set -euo pipefail + + accuser="#{bin}/octez-accuser-PsParisC" + + accuser_config="$TEZOS_CLIENT_DIR/config" + mkdir -p "$TEZOS_CLIENT_DIR" + + if [ ! -f "$accuser_config" ]; then + "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ + config init --output "$accuser_config" >/dev/null 2>&1 + else + "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ + config update >/dev/null 2>&1 + fi + + exec "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" run + EOS + File.write("tezos-accuser-PsParisC-start", startup_contents) + bin.install "tezos-accuser-PsParisC-start" + make_deps + install_template "src/proto_020_PsParisC/bin_accuser/main_accuser_020_PsParisC.exe", + "_build/default/src/proto_20_PsParisC/bin_accuser/main_accuser_020_PsParisC.exe", + "octez-accuser-PsParisC" + end + + service do + run opt_bin/"tezos-accuser-PsParisC-start" + require_root true + environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", NODE_RPC_SCHEME: "http", NODE_RPC_ADDR: "localhost:8732" + keep_alive true + log_path var/"log/tezos-accuser-PsParisC.log" + error_log_path var/"log/tezos-accuser-PsParisC.log" + end + + def post_install + mkdir "#{var}/lib/tezos/client" + end +end diff --git a/Formula/tezos-baker-PsParisC.rb b/Formula/tezos-baker-PsParisC.rb new file mode 100644 index 000000000..6618f5e6e --- /dev/null +++ b/Formula/tezos-baker-PsParisC.rb @@ -0,0 +1,107 @@ +# SPDX-FileCopyrightText: 2024 Oxhead Alpha +# SPDX-License-Identifier: LicenseRef-MIT-OA + +class TezosBakerPsparisc < Formula + @all_bins = [] + + class << self + attr_accessor :all_bins + end + homepage "https://gitlab.com/tezos/tezos" + + url "https://gitlab.com/tezos/tezos.git", :tag => "octez-v20.1", :shallow => false + + version "v20.1-1" + + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies.each do |dependency| + depends_on dependency => :build + end + + dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params] + dependencies.each do |dependency| + depends_on dependency + end + desc "Daemon for baking" + + bottle do + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPtparisb.version}/" + end + + def make_deps + ENV.deparallelize + ENV["CARGO_HOME"]="./.cargo" + # Disable usage of instructions from the ADX extension to avoid incompatibility + # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ + ENV["BLST_PORTABLE"]="yes" + # Force linker to use libraries from the current brew installation. + # Workaround for https://github.com/serokell/tezos-packaging/issues/700 + ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer + arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" + system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" + system ["source .cargo/env", "make build-deps"].join(" && ") + end + + def install_template(dune_path, exec_path, name) + bin.mkpath + self.class.all_bins << name + system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") + bin.install name + ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" + end + + def install + startup_contents = + <<~EOS + #!/usr/bin/env bash + + set -euo pipefail + + baker="#{bin}/octez-baker-PsParisC" + + baker_config="$TEZOS_CLIENT_DIR/config" + mkdir -p "$TEZOS_CLIENT_DIR" + + if [ ! -f "$baker_config" ]; then + "$baker" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ + config init --output "$baker_config" >/dev/null 2>&1 + else + "$baker" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ + config update >/dev/null 2>&1 + fi + + launch_baker() { + exec "$baker" \ + --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ + run with local node "$TEZOS_NODE_DIR" "$@" + } + + if [[ -z "$BAKER_ACCOUNT" ]]; then + launch_baker + else + launch_baker "$BAKER_ACCOUNT" + fi + EOS + File.write("tezos-baker-PsParisC-start", startup_contents) + bin.install "tezos-baker-PsParisC-start" + make_deps + install_template "src/proto_020_PsParisC/bin_baker/main_baker_020_PsParisC.exe", + "_build/default/src/proto_020_PsParisC/bin_baker/main_baker_020_PsParisC.exe", + "octez-baker-PsParisC" + end + + service do + run opt_bin/"tezos-baker-PsParisC-start" + require_root true + environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", TEZOS_NODE_DIR: "", NODE_RPC_SCHEME: "http", NODE_RPC_ADDR: "localhost:8732", BAKER_ACCOUNT: "" + keep_alive true + log_path var/"log/tezos-baker-PsParisC.log" + error_log_path var/"log/tezos-baker-PsParisC.log" + end + + def post_install + mkdir "#{var}/lib/tezos/client" + end +end diff --git a/baking/src/tezos_baking/steps.py b/baking/src/tezos_baking/steps.py index 372789fbe..de4525ce2 100644 --- a/baking/src/tezos_baking/steps.py +++ b/baking/src/tezos_baking/steps.py @@ -105,8 +105,9 @@ def pprint_options(self): networks = { "mainnet": "Main Tezos network", - "ghostnet": "Long running test network, currently using the Oxford Tezos protocol", + "ghostnet": "Long running test network, currently using the Paris Tezos protocol", "paris2net": "Test network using the PtParisB Tezos protocol", + "pariscnet": "Test network using the PsParisC Tezos protocol", } # Steps diff --git a/baking/src/tezos_baking/tezos_setup_wizard.py b/baking/src/tezos_baking/tezos_setup_wizard.py index 9312763d2..9982eaf90 100644 --- a/baking/src/tezos_baking/tezos_setup_wizard.py +++ b/baking/src/tezos_baking/tezos_setup_wizard.py @@ -197,7 +197,8 @@ 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 PtParisB (used on `paris2net`, `ghostnet, and `mainnet`).\n" + "The currently supported protocol is PtParisB (used on `paris2net`, `ghostnet, and `mainnet`)\n" + "and PsParisC (used on `pariscnet`, is going to be used on `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/packages.py b/docker/package/packages.py index 107ea104f..0177c5295 100644 --- a/docker/package/packages.py +++ b/docker/package/packages.py @@ -20,11 +20,13 @@ "mainnet": "mainnet", "ghostnet": "ghostnet", "paris2net": "https://teztnets.com/paris2net", + "pariscnet": "https://teztnets.com/pariscnet", } networks_protos = { - "mainnet": ["PtParisB"], - "ghostnet": ["PtParisB"], + "mainnet": ["PtParisB", "PsParisC"], + "ghostnet": ["PtParisB", "PsParisC"], "paris2net": ["PtParisB"], + "pariscnet": ["PsParisC"], } protocol_numbers = { diff --git a/docs/baking.md b/docs/baking.md index 50787cb12..2d534fa51 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 `ParisB` (used on `paris2net`, `ghostnet` and `mainnet`). +The currently supported protocol is `ParisB` (used on `paris2net`, `ghostnet` and `mainnet`) and PsParisC (used on `pariscnet`, is going to be used on `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 d77757257..f073c4fad 100644 --- a/docs/systemd.md +++ b/docs/systemd.md @@ -62,6 +62,7 @@ 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-pariscnet` - `tezos-node-paris2net` - `tezos-node-ghostnet` - `tezos-node-mainnet` diff --git a/docs/voting.md b/docs/voting.md index 67b15f1a1..dcb971f6d 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 paris2net +tezos-vote --network pariscnet ``` diff --git a/nix/modules/common.nix b/nix/modules/common.nix index 3369b3f1a..a2743503c 100644 --- a/nix/modules/common.nix +++ b/nix/modules/common.nix @@ -21,7 +21,7 @@ rec { daemonOptions = sharedOptions // { baseProtocols = mkOption { - type = types.listOf (types.enum [ "PtParisB" ]); + type = types.listOf (types.enum [ "PtParisB" "PsParisC"]); description = '' List of protocols for which daemons will be run. ''; diff --git a/nix/modules/tezos-accuser.nix b/nix/modules/tezos-accuser.nix index 1e6d92df4..bae2a513a 100644 --- a/nix/modules/tezos-accuser.nix +++ b/nix/modules/tezos-accuser.nix @@ -9,6 +9,8 @@ let octez-accuser-pkgs = { "PtParisB" = "${pkgs.octezPackages.octez-accuser-PtParisB}/bin/octez-accuser-PtParisB"; + "PsParisC" = + "${pkgs.octezPackages.octez-accuser-PsParisC}/bin/octez-accuser-PsParisC"; }; cfg = config.services.octez-accuser; common = import ./common.nix { inherit lib; inherit pkgs; }; diff --git a/nix/modules/tezos-baker.nix b/nix/modules/tezos-baker.nix index ca9b1124f..4bfb24f1f 100644 --- a/nix/modules/tezos-baker.nix +++ b/nix/modules/tezos-baker.nix @@ -9,6 +9,8 @@ let octez-baker-pkgs = { "PtParisB" = "${pkgs.octezPackages.octez-baker-PtParisB}/bin/octez-baker-PtParisB"; + "PsParisC" = + "${pkgs.octezPackages.octez-baker-PtParisB}/bin/octez-baker-PsParisC"; }; octez-client = "${pkgs.octezPackages.octez-client}/bin/octez-client"; cfg = config.services.octez-baker; diff --git a/tests/systemd/services_tests.py b/tests/systemd/services_tests.py index 830aec96a..20ef62b52 100644 --- a/tests/systemd/services_tests.py +++ b/tests/systemd/services_tests.py @@ -140,6 +140,14 @@ def test_baking_mainnet_service(): baking_service_test("mainnet", ["PtParisB"]) +def test_node_pariscnet_service(): + node_service_test("pariscnet") + + +def test_baking_pariscnet_service(): + baking_service_test("pariscnet", ["PsParisC"]) + + def test_http_signer_service(): signer_service_test("http") @@ -149,9 +157,9 @@ def test_tcp_signer_service(): def test_standalone_accuser_service(): - with unit(f"tezos-node-paris2net.service") as _: - with unit(f"tezos-accuser-ptparisb.service") as _: - assert check_running_process(f"octez-accuser-PtParisB") + with unit(f"tezos-node-pariscnet.service") as _: + with unit(f"tezos-accuser-psparisc.service") as _: + assert check_running_process(f"octez-accuser-PsParisC") def test_unix_signer_service(): @@ -161,34 +169,34 @@ def test_unix_signer_service(): def test_standalone_baker_service(): replace_systemd_service_env( - "tezos-baker-ptparisb", + "tezos-baker-psparisc", "TEZOS_NODE_DIR", - "/var/lib/tezos/node-paris2net", + "/var/lib/tezos/node-pariscnet", ) with account("baker") as _: - with unit(f"tezos-node-paris2net.service") as _: - with unit(f"tezos-baker-ptparisb.service") as _: - assert check_active_service(f"tezos-baker-ptparisb.service") - assert check_running_process(f"octez-baker-PtParisB") + with unit(f"tezos-node-pariscnet.service") as _: + with unit(f"tezos-baker-psparisc.service") as _: + assert check_active_service(f"tezos-baker-psparisc.service") + assert check_running_process(f"octez-baker-PsParisC") def test_nondefault_node_rpc_endpoint(): rpc_addr = "127.0.0.1:8735" - replace_systemd_service_env("tezos-node-paris2net", "NODE_RPC_ADDR", rpc_addr) - proc_call("cat /etc/default/tezos-node-paris2net") + replace_systemd_service_env("tezos-node-pariscnet", "NODE_RPC_ADDR", rpc_addr) + proc_call("cat /etc/default/tezos-node-pariscnet") try: - node_service_test("paris2net", f"http://{rpc_addr}") + node_service_test("pariscnet", f"http://{rpc_addr}") finally: replace_systemd_service_env( - "tezos-node-paris2net", "NODE_RPC_ADDR", "127.0.0.1:8732" + "tezos-node-pariscnet", "NODE_RPC_ADDR", "127.0.0.1:8732" ) def test_nondefault_baking_config(): replace_systemd_service_env( - "tezos-baking-paris2net", "BAKER_ADDRESS_ALIAS", "another_baker" + "tezos-baking-pariscnet", "BAKER_ADDRESS_ALIAS", "another_baker" ) replace_systemd_service_env( - "tezos-baking-paris2net", "LIQUIDITY_BAKING_TOGGLE_VOTE", "on" + "tezos-baking-pariscnet", "LIQUIDITY_BAKING_TOGGLE_VOTE", "on" ) - baking_service_test("paris2net", ["PtParisB"], "another_baker") + baking_service_test("pariscnet", ["PsParisC"], "another_baker")