diff --git a/.buildkite/pipeline-raw.yml b/.buildkite/pipeline-raw.yml index cc8f19882..5620490f9 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/docker-tezos-packages.py --os ubuntu --type binary -p tezos-baker-PtLimaPt + - nix develop .#docker-tezos-packages -c ./docker/docker-tezos-packages.py --os ubuntu --type binary -p tezos-baker-PtMumbai - rm -rf out # It takes much time to build binary package, so we do it only on master branches: "master" @@ -140,7 +140,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/docker-tezos-packages.py --os fedora --type binary -p tezos-baker-PtLimaPt + - nix develop .#docker-tezos-packages -c ./docker/docker-tezos-packages.py --os fedora --type binary -p tezos-baker-PtMumbai - rm -rf out # It takes much time to build binary package, so we do it only on master branches: "master" @@ -198,8 +198,8 @@ steps: - label: update RC mirror repository if: | build.branch == "master" && - (build.message =~ /^Merge pull request .* from serokell\/auto\/v[0-9]+\.[0-9]+-rc.*-release/ || - build.message =~ /^Merge pull request .* from serokell\/auto\/update-brew-formulae-v[.0-9]+-rc.*/) + (build.message =~ /^Merge pull request .* from serokell\/auto\/v[0-9]+\.[0-9]+-(rc|beta).*-release/ || + build.message =~ /^Merge pull request .* from serokell\/auto\/update-brew-formulae-v[.0-9]+-(rc|beta).*/) depends_on: - "auto-release" env: diff --git a/.github/workflows/build-bottles.yml b/.github/workflows/build-bottles.yml index 00c930eee..63fffe136 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-accuser-PtLimaPt, tezos-accuser-PtMumbai, tezos-admin-client, tezos-baker-PtLimaPt, tezos-baker-PtMumbai, tezos-client, tezos-codec, tezos-node, tezos-signer, tezos-smart-rollup-client-PtMumbai, tezos-smart-rollup-node-PtMumbai, tezos-tx-rollup-client-PtLimaPt, tezos-tx-rollup-node-PtLimaPt] + formula: [tezos-accuser-PtMumbai, tezos-accuser-PtNairob, tezos-admin-client, tezos-baker-PtMumbai, tezos-baker-PtNairob, tezos-client, tezos-codec, tezos-node, tezos-signer, tezos-smart-rollup-client-PtMumbai, tezos-smart-rollup-client-PtNairob, tezos-smart-rollup-node-PtMumbai, tezos-smart-rollup-node-PtNairob] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.reuse/dep5 b/.reuse/dep5 index ba124ea19..7bf0e43b9 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -1,5 +1,5 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Files: .github/* nix/nix/* protocols.json meta.json tests/buildkite/golden/* tests/host.key tests/host.cert tests/ca.cert +Files: .github/* nix/nix/* nix/build/install_topfind_196.patch protocols.json meta.json tests/buildkite/golden/* tests/host.key tests/host.cert tests/ca.cert Copyright: 2022 Oxhead Alpha License: LicenseRef-MIT-OA diff --git a/Formula/tezos-accuser-PtMumbai.rb b/Formula/tezos-accuser-PtMumbai.rb index b4b342261..2f872bb2d 100644 --- a/Formula/tezos-accuser-PtMumbai.rb +++ b/Formula/tezos-accuser-PtMumbai.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v16.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v17.0-beta1", :shallow => false - version "v16.1-1" + version "v17.0-beta1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPtmumbai.version}/" - sha256 cellar: :any, big_sur: "ac30c114dc7ffe806b9529fb43684427a9666f879edc061de60c177b22da23ee" - sha256 cellar: :any, arm64_big_sur: "de1a56da5ff7cc2e00eca9b9319ccb6aaf2efa86e066de460f42266ab661f080" - sha256 cellar: :any, monterey: "ff26c55cb014a10a6592ae934096a7fe7ac984e846bba075e42c99430eb7b315" end def make_deps diff --git a/Formula/tezos-accuser-PtLimaPt.rb b/Formula/tezos-accuser-PtNairob.rb similarity index 76% rename from Formula/tezos-accuser-PtLimaPt.rb rename to Formula/tezos-accuser-PtNairob.rb index 4d313fef7..b6e125d21 100644 --- a/Formula/tezos-accuser-PtLimaPt.rb +++ b/Formula/tezos-accuser-PtNairob.rb @@ -1,7 +1,7 @@ -# SPDX-FileCopyrightText: 2022 Oxhead Alpha +# SPDX-FileCopyrightText: 2023 Oxhead Alpha # SPDX-License-Identifier: LicenseRef-MIT-OA -class TezosAccuserPtlimapt < Formula +class TezosAccuserPtnairob < Formula @all_bins = [] class << self @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v16.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v17.0-beta1", :shallow => false - version "v16.1-1" + version "v17.0-beta1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -25,10 +25,7 @@ class << self desc "Daemon for accusing" bottle do - root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPtlimapt.version}/" - sha256 cellar: :any, big_sur: "f21295def2dfb5c8439223071353ccce587ace71501fa4260f3e457a49f0ec65" - sha256 cellar: :any, arm64_big_sur: "62d4291dda7ab2c1cc21f3876e115bc72a5905668f41643930e4c7c6558fad87" - sha256 cellar: :any, monterey: "c4688d06d8514f027b00d23574716b37437fee9ce21edde5e896667e968c9f6e" + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuserPtnairob.version}/" end def make_deps @@ -62,7 +59,7 @@ def install set -euo pipefail - accuser="#{bin}/octez-accuser-PtLimaPt" + accuser="#{bin}/octez-accuser-PtNairob" accuser_config="$TEZOS_CLIENT_DIR/config" mkdir -p "$TEZOS_CLIENT_DIR" @@ -77,15 +74,15 @@ def install exec "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" run EOS - File.write("tezos-accuser-PtLimaPt-start", startup_contents) - bin.install "tezos-accuser-PtLimaPt-start" + File.write("tezos-accuser-PtNairob-start", startup_contents) + bin.install "tezos-accuser-PtNairob-start" make_deps - install_template "src/proto_015_PtLimaPt/bin_accuser/main_accuser_015_PtLimaPt.exe", - "_build/default/src/proto_015_PtLimaPt/bin_accuser/main_accuser_015_PtLimaPt.exe", - "octez-accuser-PtLimaPt" + install_template "src/proto_016_PtNairob/bin_accuser/main_accuser_016_PtNairob.exe", + "_build/default/src/proto_016_PtNairob/bin_accuser/main_accuser_016_PtNairob.exe", + "octez-accuser-PtNairob" end - plist_options manual: "tezos-accuser-PtLimaPt run" + plist_options manual: "tezos-accuser-PtNairob run" def plist <<~EOS @@ -96,7 +93,7 @@ def plist Label #{plist_name} Program - #{opt_bin}/tezos-accuser-PtLimaPt-start + #{opt_bin}/tezos-accuser-PtNairob-start EnvironmentVariables TEZOS_CLIENT_DIR diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb index e751a3816..851fdc5c7 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 => "v16.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v17.0-beta1", :shallow => false - version "v16.1-1" + version "v17.0-beta1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/" - sha256 cellar: :any, big_sur: "dd01610aae07bda9b99f77d46b6a911f2a6b2ed13797cef0435f1c6861593c01" - sha256 cellar: :any, arm64_big_sur: "346d11a244cd4c042c1bed3a0f6511b6d22bc4135bc7041957b4a1c9d6c22053" - sha256 cellar: :any, monterey: "ab653324f2ff21160b5c1c65ca0af652b95dabbdc03228d3dca648a48ef31c7d" end def make_deps diff --git a/Formula/tezos-baker-PtMumbai.rb b/Formula/tezos-baker-PtMumbai.rb index 4b2f1146b..4e01abb64 100644 --- a/Formula/tezos-baker-PtMumbai.rb +++ b/Formula/tezos-baker-PtMumbai.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v16.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v17.0-beta1", :shallow => false - version "v16.1-1" + version "v17.0-beta1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPtmumbai.version}/" - sha256 cellar: :any, big_sur: "7fb83efcbf3f0d5d1b33d4cd987a8ec32aa9f1686f305c857f35038b7ada4963" - sha256 cellar: :any, arm64_big_sur: "237563df0a4af9ae72859d4164defbaf71a91a13b093425acbd962dd09129d30" - sha256 cellar: :any, monterey: "c99cc3b34f7dfc830630be130a4cbb724dfde9300fe763786f57b48a27f81a8e" end def make_deps diff --git a/Formula/tezos-baker-PtLimaPt.rb b/Formula/tezos-baker-PtNairob.rb similarity index 78% rename from Formula/tezos-baker-PtLimaPt.rb rename to Formula/tezos-baker-PtNairob.rb index 72d7ab664..9d9bdf136 100644 --- a/Formula/tezos-baker-PtLimaPt.rb +++ b/Formula/tezos-baker-PtNairob.rb @@ -1,7 +1,7 @@ -# SPDX-FileCopyrightText: 2022 Oxhead Alpha +# SPDX-FileCopyrightText: 2023 Oxhead Alpha # SPDX-License-Identifier: LicenseRef-MIT-OA -class TezosBakerPtlimapt < Formula +class TezosBakerPtnairob < Formula @all_bins = [] class << self @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v16.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v17.0-beta1", :shallow => false - version "v16.1-1" + version "v17.0-beta1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -25,10 +25,7 @@ class << self desc "Daemon for baking" bottle do - root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPtlimapt.version}/" - sha256 cellar: :any, big_sur: "c91f35661b7e3d3abd62c0f00e4a78653c78916b700fd672f09a7d94bd384002" - sha256 cellar: :any, arm64_big_sur: "1a3c4605dd4dc2244a4adc000fa04b9ba9c95c58e5b30c62a5315735016cb5bb" - sha256 cellar: :any, monterey: "0a02e5e15ee02f6beeb1ea7e8b0b69a6a506547f3b20107b824e90512a1a67d2" + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBakerPtnairob.version}/" end def make_deps @@ -62,7 +59,7 @@ def install set -euo pipefail - baker="#{bin}/octez-baker-PtLimaPt" + baker="#{bin}/octez-baker-PtNairob" baker_config="$TEZOS_CLIENT_DIR/config" mkdir -p "$TEZOS_CLIENT_DIR" @@ -87,14 +84,14 @@ def install launch_baker "$BAKER_ACCOUNT" fi EOS - File.write("tezos-baker-PtLimaPt-start", startup_contents) - bin.install "tezos-baker-PtLimaPt-start" + File.write("tezos-baker-PtNairob-start", startup_contents) + bin.install "tezos-baker-PtNairob-start" make_deps - install_template "src/proto_015_PtLimaPt/bin_baker/main_baker_015_PtLimaPt.exe", - "_build/default/src/proto_015_PtLimaPt/bin_baker/main_baker_015_PtLimaPt.exe", - "octez-baker-PtLimaPt" + install_template "src/proto_016_PtNairob/bin_baker/main_baker_016_PtNairob.exe", + "_build/default/src/proto_016_PtNairob/bin_baker/main_baker_016_PtNairob.exe", + "octez-baker-PtNairob" end - plist_options manual: "tezos-baker-PtLimaPt run with local node" + plist_options manual: "tezos-baker-PtNairob run with local node" def plist <<~EOS @@ -105,7 +102,7 @@ def plist Label #{plist_name} Program - #{opt_bin}/tezos-baker-PtLimaPt-start + #{opt_bin}/tezos-baker-PtNairob-start EnvironmentVariables TEZOS_CLIENT_DIR diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb index 754c9853a..c1cb6331f 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 => "v16.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v17.0-beta1", :shallow => false - version "v16.1-1" + version "v17.0-beta1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/" - sha256 cellar: :any, big_sur: "688ae46c9d67a1e9c80f490a4fac5405f940c6b5e57600adcd704f176b9d0f11" - sha256 cellar: :any, arm64_big_sur: "650398c1637298b551a6c5f263ba110543d5a2e6555d5680a86d853b44c2eeaf" - sha256 cellar: :any, monterey: "fcc8dca8c821dc3cd07d4b66a2bec249b9482a2faf8245effd78ab512af21c70" end def make_deps diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb index f850fd84f..4fff5037d 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 => "v16.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v17.0-beta1", :shallow => false - version "v16.1-1" + version "v17.0-beta1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/" - sha256 cellar: :any, big_sur: "d97c0c5659a41f0b1102ab192267d688766b2e0c160583832c4b59cbea712586" - sha256 cellar: :any, arm64_big_sur: "3dfd1662917b6c1fac35002a8355ab4f13f143132073ae2ac9e4b086f05291fb" - sha256 cellar: :any, monterey: "2046e0c3f57f8ac15de142dbc5f6a1849ddc60d0c947f2380624dc1688320f76" end def make_deps diff --git a/Formula/tezos-node-ghostnet.rb b/Formula/tezos-node-ghostnet.rb index bbe18d9d5..b0943d61e 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 "v16.1-1" + version "v17.0-beta1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-mainnet.rb b/Formula/tezos-node-mainnet.rb index 27ffd4869..da61d4513 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 "v16.1-1" + version "v17.0-beta1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-mumbainet.rb b/Formula/tezos-node-mumbainet.rb index d5b973bfb..900ee92c5 100644 --- a/Formula/tezos-node-mumbainet.rb +++ b/Formula/tezos-node-mumbainet.rb @@ -5,7 +5,7 @@ class TezosNodeMumbainet < Formula url "file:///dev/null" - version "v16.1-1" + version "v17.0-beta1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-limanet.rb b/Formula/tezos-node-nairobinet.rb similarity index 75% rename from Formula/tezos-node-limanet.rb rename to Formula/tezos-node-nairobinet.rb index 66debe4f1..dd0fbc053 100644 --- a/Formula/tezos-node-limanet.rb +++ b/Formula/tezos-node-nairobinet.rb @@ -1,13 +1,15 @@ -# SPDX-FileCopyrightText: 2022 Oxhead Alpha +#!/usr/bin/env ruby + +# SPDX-FileCopyrightText: 2023 Oxhead Alpha # SPDX-License-Identifier: LicenseRef-MIT-OA -class TezosNodeLimanet < Formula +class TezosNodeNairobinet < Formula url "file:///dev/null" - version "v16.1-1" + version "v17.0-beta1-1" depends_on "tezos-node" - desc "Meta formula that provides background tezos-node service that runs on limanet" + desc "Meta formula that provides background tezos-node service that runs on nairobinet" def install startup_contents = @@ -25,13 +27,13 @@ def install echo "Configuring the node..." "$node" config init \ --rpc-addr "$NODE_RPC_ADDR" \ - --network=limanet \ + --network=https://teztnets.xyz/nairobinet\ "$@" else echo "Updating the node configuration..." "$node" config update \ --rpc-addr "$NODE_RPC_ADDR" \ - --network=limanet \ + --network=https://teztnets.xyz/nairobinet\ "$@" fi @@ -43,9 +45,9 @@ def install --rpc-tls="$CERT_PATH","$KEY_PATH" fi EOS - File.write("tezos-node-limanet-start", startup_contents) - bin.install "tezos-node-limanet-start" - print "Installing tezos-node-limanet service" + File.write("tezos-node-nairobinet-start", startup_contents) + bin.install "tezos-node-nairobinet-start" + print "Installing tezos-node-nairobinet service" end def plist <<~EOS @@ -57,11 +59,11 @@ def plist Label #{plist_name} Program - #{opt_bin}/tezos-node-limanet-start + #{opt_bin}/tezos-node-nairobinet-start EnvironmentVariables TEZOS_CLIENT_DIR - #{var}/lib/tezos/node-limanet + #{var}/lib/tezos/node-nairobinet NODE_RPC_ADDR 127.0.0.1:8732 CERT_PATH @@ -79,7 +81,7 @@ def plist EOS end def post_install - mkdir_p "#{var}/lib/tezos/node-limanet" - system "octez-node", "config", "init", "--data-dir" "#{var}/lib/tezos/node-limanet", "--network", "limanet" + mkdir_p "#{var}/lib/tezos/node-nairobinet" + system "octez-node", "config", "init", "--data-dir" "#{var}/lib/tezos/node-nairobinet", "--network", "https://teztnets.xyz/nairobinet" end end diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index 4aae7e7b8..bd73aaacc 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 => "v16.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v17.0-beta1", :shallow => false - version "v16.1-1" + version "v17.0-beta1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/" - sha256 cellar: :any, big_sur: "73ad0db1374210e71bea66c1ba504cbad6b424d686d4f80f5c681550bf6f8afb" - sha256 cellar: :any, arm64_big_sur: "3489c65beadf3103c2a3a1de546d2d3277ad4859b27b2c354cbc1111e73f6a51" - sha256 cellar: :any, monterey: "9def37cbf3da2645c56283825cda6fa60c9e7077675220898c9cc82231a704a8" end def make_deps diff --git a/Formula/tezos-signer-http.rb b/Formula/tezos-signer-http.rb index 2fe439064..a8517e599 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 "v16.1-1" + version "v17.0-beta1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-https.rb b/Formula/tezos-signer-https.rb index 7e8262234..5818fe03f 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 "v16.1-1" + version "v17.0-beta1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-tcp.rb b/Formula/tezos-signer-tcp.rb index 8019733f5..b451acb72 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 "v16.1-1" + version "v17.0-beta1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-unix.rb b/Formula/tezos-signer-unix.rb index dba3acec5..7d3fce6e6 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 "v16.1-1" + version "v17.0-beta1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb index a5c2c02ce..648c4f86e 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 => "v16.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v17.0-beta1", :shallow => false - version "v16.1-1" + version "v17.0-beta1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -26,9 +26,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/" - sha256 cellar: :any, big_sur: "141fa18f11c716c84f4358aeef2345a87c670779b6ab1792b351d0f41e074a6d" - sha256 cellar: :any, arm64_big_sur: "525d2d85dbf8a1f36afef9a246f943ee93aebfaabca8104524fdd7aed451d7d5" - sha256 cellar: :any, monterey: "5165406325a24d3a2ffb365f34a8a53fb5cd5f9b82283fc0207500da3f335b1e" end def make_deps diff --git a/Formula/tezos-smart-rollup-client-PtMumbai.rb b/Formula/tezos-smart-rollup-client-PtMumbai.rb index 99c8c5e58..232982aa9 100644 --- a/Formula/tezos-smart-rollup-client-PtMumbai.rb +++ b/Formula/tezos-smart-rollup-client-PtMumbai.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v16.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v17.0-beta1", :shallow => false - version "v16.1-1" + version "v17.0-beta1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupClientPtmumbai.version}/" - sha256 cellar: :any, big_sur: "7d09b3d04f285b6f1d99eda8f3f2be89cdedf0c17028ef8ef8d72effc4632c79" - sha256 cellar: :any, arm64_big_sur: "ec74b2a2c0c8765b10db9710328f0fd236ba12015d4d8e2b421b12bf4dccd1d7" - sha256 cellar: :any, monterey: "5bc13d7c4c344cd8c30d116525cac8d10198fa54d2c87ecc7d7375cae2cdb27c" end def make_deps diff --git a/Formula/tezos-tx-rollup-client-PtLimaPt.rb b/Formula/tezos-smart-rollup-client-PtNairob.rb similarity index 67% rename from Formula/tezos-tx-rollup-client-PtLimaPt.rb rename to Formula/tezos-smart-rollup-client-PtNairob.rb index 4d8117160..58bda58db 100644 --- a/Formula/tezos-tx-rollup-client-PtLimaPt.rb +++ b/Formula/tezos-smart-rollup-client-PtNairob.rb @@ -1,7 +1,8 @@ -# SPDX-FileCopyrightText: 2022 Oxhead Alpha +#!/usr/bin/env ruby +# SPDX-FileCopyrightText: 2023 Oxhead Alpha # SPDX-License-Identifier: LicenseRef-MIT-OA -class TezosTxRollupClientPtlimapt < Formula +class TezosSmartRollupClientPtnairob < Formula @all_bins = [] class << self @@ -9,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v16.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v17.0-beta1", :shallow => false - version "v16.1-1" + version "v17.0-beta1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -22,13 +23,10 @@ class << self dependencies.each do |dependency| depends_on dependency end - desc "Transaction rollup CLI client for PtLimaPt" + desc "Smart contract rollup CLI client for PtNairob" bottle do - root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosTxRollupClientPtlimapt.version}/" - sha256 cellar: :any, big_sur: "2e0cd8e30e1446f18116e6d72eec879c8bb47b584032f5e7aa773eee9994f39e" - sha256 cellar: :any, arm64_big_sur: "4953653e1fb2772633fbffd87582b7b3fa12496da8d775ff749554ea3768b7a2" - sha256 cellar: :any, monterey: "97ea765ffaaf4d8f8e4762d79b1a7d9c3ee9b254a98bee2c860eddde3e72e611" + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupClientPtnairob.version}/" end def make_deps @@ -57,8 +55,8 @@ def install_template(dune_path, exec_path, name) def install make_deps - install_template "src/proto_015_PtLimaPt/bin_tx_rollup_client/main_tx_rollup_client_015_PtLimaPt.exe", - "_build/default/src/proto_015_PtLimaPt/bin_tx_rollup_client/main_tx_rollup_client_015_PtLimaPt.exe", - "octez-tx-rollup-client-PtLimaPt" + install_template "src/proto_016_PtNairob/bin_sc_rollup_client/main_sc_rollup_client_016_PtNairob.exe", + "_build/default/src/proto_016_PtNairob/bin_sc_rollup_client/main_sc_rollup_client_016_PtNairob.exe", + "octez-smart-rollup-client-PtNairob" end end diff --git a/Formula/tezos-smart-rollup-node-PtMumbai.rb b/Formula/tezos-smart-rollup-node-PtMumbai.rb index 0ed94bca9..d4565f714 100644 --- a/Formula/tezos-smart-rollup-node-PtMumbai.rb +++ b/Formula/tezos-smart-rollup-node-PtMumbai.rb @@ -11,9 +11,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v16.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v17.0-beta1", :shallow => false - version "v16.1-1" + version "v17.0-beta1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -28,9 +28,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNodePtmumbai.version}/" - sha256 cellar: :any, big_sur: "7e58bc5d0254fcdb32b10f33aa33d279297240df88ec87ab39d927ab33eb7239" - sha256 cellar: :any, arm64_big_sur: "10ee5b0cb42662aeb69fe951ebcb75f15d073ab04fd4a6b2908d7762d5a37aa8" - sha256 cellar: :any, monterey: "41792950bdd6e821787d928e1a5babdf9703f0925d3ffb434384c58cc0a39aa6" end def make_deps diff --git a/Formula/tezos-tx-rollup-node-PtLimaPt.rb b/Formula/tezos-smart-rollup-node-PtNairob.rb similarity index 74% rename from Formula/tezos-tx-rollup-node-PtLimaPt.rb rename to Formula/tezos-smart-rollup-node-PtNairob.rb index 5aaece979..bbc410d69 100644 --- a/Formula/tezos-tx-rollup-node-PtLimaPt.rb +++ b/Formula/tezos-smart-rollup-node-PtNairob.rb @@ -1,9 +1,9 @@ #!/usr/bin/env ruby -# SPDX-FileCopyrightText: 2022 Oxhead Alpha +# SPDX-FileCopyrightText: 2023 Oxhead Alpha # SPDX-License-Identifier: LicenseRef-MIT-OA -class TezosTxRollupNodePtlimapt < Formula +class TezosSmartRollupNodePtnairob < Formula @all_bins = [] class << self @@ -11,9 +11,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v16.1", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v17.0-beta1", :shallow => false - version "v16.1-1" + version "v17.0-beta1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| @@ -24,13 +24,10 @@ class << self dependencies.each do |dependency| depends_on dependency end - desc "Tezos transaction rollup node for PtLimaPt" + desc "Tezos smart contract rollup node for PtNairob" bottle do - root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosTxRollupNodePtlimapt.version}/" - sha256 cellar: :any, big_sur: "deafe82ae4bc56f2e4261a3de328a3e33a50c0bbc2ce0872b8d3e5a9356b118c" - sha256 cellar: :any, arm64_big_sur: "b3327eec558d983df1b028f93cb3f904237deb9caa5f25caa790dde77c17a5a4" - sha256 cellar: :any, monterey: "c9681de9deef9c0fd03797af800f8f6da926e5008de803d420135d2d8b4826ec" + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNodePtnairob.version}/" end def make_deps @@ -64,7 +61,7 @@ def install set -euo pipefail - node="#{bin}/octez-tx-rollup-node-PtLimaPt" + node="#{bin}/octez-smart-rollup-node-PtNairob" "$node" init "$ROLLUP_MODE" config \ for "$ROLLUP_ALIAS" \ @@ -74,14 +71,14 @@ def install "$node" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ run "$ROLLUP_MODE" for "$ROLLUP_ALIAS" EOS - File.write("tezos-tx-rollup-node-PtLimaPt-start", startup_contents) - bin.install "tezos-tx-rollup-node-PtLimaPt-start" + File.write("tezos-smart-rollup-node-PtNairob-start", startup_contents) + bin.install "tezos-smart-rollup-node-PtNairob-start" make_deps - install_template "src/proto_015_PtLimaPt/bin_tx_rollup_node/main_tx_rollup_node_015_PtLimaPt.exe", - "_build/default/src/proto_015_PtLimaPt/bin_tx_rollup_node/main_tx_rollup_node_015_PtLimaPt.exe", - "octez-tx-rollup-node-PtLimaPt" + install_template "src/proto_016_PtNairob/bin_sc_rollup_node/main_sc_rollup_node_016_PtNairob.exe", + "_build/default/src/proto_016_PtNairob/bin_sc_rollup_node/main_sc_rollup_node_016_PtNairob.exe", + "octez-smart-rollup-node-PtNairob" end - plist_options manual: "tezos-tx-rollup-node-PtLimaPt run for" + plist_options manual: "tezos-smart-rollup-node-PtNairob run for" def plist <<~EOS @@ -92,7 +89,7 @@ def plist Label #{plist_name} Program - #{opt_bin}/tezos-tx-rollup-node-PtLimaPt-start + #{opt_bin}/tezos-smart-rollup-node-PtNairob-start EnvironmentVariables TEZOS_CLIENT_DIR diff --git a/docker/docker-static-build.sh b/docker/docker-static-build.sh index 0b2b5c585..2957934fc 100755 --- a/docker/docker-static-build.sh +++ b/docker/docker-static-build.sh @@ -11,12 +11,9 @@ set -euo pipefail binaries=("octez-admin-client" "octez-client" "octez-node" "octez-signer" "octez-codec") for proto in $(jq -r ".active | .[]" ../protocols.json); do - binaries+=("octez-accuser-$proto" "octez-baker-$proto") + binaries+=("octez-accuser-$proto" "octez-baker-$proto" "octez-smart-rollup-client-$proto" "octez-smart-rollup-node-$proto") done -binaries+=("octez-tx-rollup-node-PtLimaPt" "octez-tx-rollup-client-PtLimaPt") -binaries+=("octez-smart-rollup-client-PtMumbai" "octez-smart-rollup-node-PtMumbai") - if [[ "${USE_PODMAN-}" == "True" ]]; then virtualisation_engine="podman" else diff --git a/docker/package/package_generator.py b/docker/package/package_generator.py index 436c93787..03da7098a 100755 --- a/docker/package/package_generator.py +++ b/docker/package/package_generator.py @@ -162,7 +162,9 @@ def main(): for package in packages: if getattr(package, "letter_version", None) is None: version = package.meta.version - repo = "tezos-rc" if "rc" in version else "tezos" + repo = ( + "tezos-rc" if "rc" in version or "beta" in version else "tezos" + ) release = package.meta.release name = package.name.lower() # distributions list is always unempty at this point diff --git a/docker/package/packages.py b/docker/package/packages.py index a4e444ef5..dc4dd0c25 100644 --- a/docker/package/packages.py +++ b/docker/package/packages.py @@ -19,19 +19,19 @@ networks = { "mainnet": "mainnet", "ghostnet": "ghostnet", - "limanet": "limanet", "mumbainet": "mumbainet", + "nairobinet": "https://teztnets.xyz/nairobinet", } networks_protos = { - "mainnet": ["PtLimaPt", "PtMumbai"], - "ghostnet": ["PtLimaPt", "PtMumbai"], - "limanet": ["PtLimaPt"], + "mainnet": ["PtMumbai"], + "ghostnet": ["PtMumbai"], "mumbainet": ["PtMumbai"], + "nairobinet": ["PtNairob"], } protocol_numbers = { - "PtLimaPt": "015", "PtMumbai": "016", + "PtNairob": "017", } signer_units = [ @@ -484,20 +484,14 @@ def mk_node_unit( ) -def mk_rollup_packages(type, protos, full_type=None): - - if full_type is None: - full_type = type - +def mk_rollup_packages(*protos): def mk_units(proto): - startup_script = f"/usr/bin/tezos-{type}-rollup-node-{proto}-start" + startup_script = f"/usr/bin/tezos-sc-rollup-node-{proto}-start" service_file = ServiceFile( - Unit(after=["network.target"], description=f"Tezos {type} rollup node"), + Unit(after=["network.target"], description=f"Tezos smart rollup node"), Service( - environment_files=[ - f"/etc/default/tezos-{full_type}-rollup-node-{proto}" - ], - environment=[f"PROTOCOL={proto}", f"TYPE={type}"], + environment_files=[f"/etc/default/tezos-smart-rollup-node-{proto}"], + environment=[f"PROTOCOL={proto}", f"TYPE=sc"], exec_start_pre=[ "+/usr/bin/setfacl -m u:tezos:rwx /run/systemd/ask-password" ], @@ -524,8 +518,8 @@ def mk_units(proto): def mk_rollup_package(name, proto): proto_snake_case = protocol_numbers[proto] + "_" + proto return TezosBinaryPackage( - f"tezos-{full_type}-rollup-{name}-{proto}", - f"Tezos {type} rollup {name} using {proto}", + f"tezos-smart-rollup-{name}-{proto}", + f"Tezos smart rollup {name} using {proto}", meta=packages_meta, systemd_units=mk_units(proto) if name == "node" else [], target_proto=proto, @@ -535,18 +529,17 @@ def mk_rollup_package(name, proto): "tezos-sapling-params", ], postinst_steps=daemon_postinst_common, - dune_filepath=f"src/proto_{proto_snake_case}/bin_{type}_rollup_{name}/main_{type}_rollup_{name}_{proto_snake_case}.exe", + dune_filepath=f"src/proto_{proto_snake_case}/bin_sc_rollup_{name}/main_sc_rollup_{name}_{proto_snake_case}.exe", ) packages = ["node", "client"] return [ - {f"tezos-{full_type}-rollup-{name}-{proto}": mk_rollup_package(name, proto)} + {f"tezos-smart-rollup-{name}-{proto}": mk_rollup_package(name, proto)} for name in packages for proto in protos ] -packages.extend(mk_rollup_packages("tx", ["PtLimaPt"])) -packages.extend(mk_rollup_packages("sc", ["PtMumbai"], "smart")) +packages.extend(mk_rollup_packages("PtMumbai", "PtNairob")) packages = dict(ChainMap(*packages)) diff --git a/docker/package/tezos_setup_wizard.py b/docker/package/tezos_setup_wizard.py index 3ff3be864..515ef823e 100644 --- a/docker/package/tezos_setup_wizard.py +++ b/docker/package/tezos_setup_wizard.py @@ -99,8 +99,8 @@ def is_full_snapshot(import_mode): 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 `PtLimaPt` (used on `limanet`, `ghostnet` and `mainnet`) and `PtMumbai` (used on `mumbainet`).\n" - "Keep in mind that you must select the test network (e.g. limanet)\n" + "The currently supported protocol is `PtMumbai` (used on `mumbainet`, `ghostnet` and `mainnet`) and `PtNairob` (used on `nairobinet`).\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, validator=Validator(enum_range_validator(networks)), diff --git a/docker/package/wizard_structure.py b/docker/package/wizard_structure.py index 79e015f00..a81fd4566 100644 --- a/docker/package/wizard_structure.py +++ b/docker/package/wizard_structure.py @@ -303,9 +303,9 @@ def url_is_reachable(url): networks = { "mainnet": "Main Tezos network", - "ghostnet": "Long running test network, currently using the lima Tezos protocol", - "limanet": "Test network using the lima Tezos protocol", + "ghostnet": "Long running test network, currently using the mumbai Tezos protocol", "mumbainet": "Test network using the mumbai Tezos protocol", + "nairobinet": "Test network using the nairobi Tezos protocol", } http_request_headers = {"User-Agent": "Mozilla/5.0"} diff --git a/docs/baking.md b/docs/baking.md index 974de55c0..1e3959082 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 `PtLimaPt` (used on `limanet`, `ghostnet` and `mainnet`) and `PtMumbai` (used on `mumbainet`). +The currently supported protocol is `PtMumbai` (used on `mumbainet`, `ghostnet` and `mainnet`) and `PtNairob` (used on `nairobinet`). 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 5d13ae6a1..dddb56a16 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-PtLimaPt +sudo dnf install tezos-baker-PtMumbai # or use yum sudo yum copr enable @Serokell/Tezos -sudo yum install tezos-baker-PtLimaPt +sudo yum install tezos-baker-PtMumbai ``` Once you install these packages, the commands `tezos-*` and `octez-*` will be available. diff --git a/docs/systemd.md b/docs/systemd.md index c0025f231..c64f520ea 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-PtLimaPt +./gen_systemd_service_file.py tezos-baker-PtMumbai ``` After that you'll have `.service` files in the current directory. @@ -63,7 +63,7 @@ networks. `tezos-node` packages provide multiple services out of the box: - `tezos-node-mumbainet` -- `tezos-node-limanet` +- `tezos-node-nairobinet` - `tezos-node-ghostnet` - `tezos-node-mainnet` @@ -78,7 +78,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-limanet`), it's possible to run +(e.g. `tezos-node-mainnet` or `tezos-node-mumbainet`), 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 fbf136cea..398562e33 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 limanet +tezos-vote --network mumbainet ``` diff --git a/flake.lock b/flake.lock index 7c40eccf1..3669957ad 100644 --- a/flake.lock +++ b/flake.lock @@ -380,11 +380,11 @@ "opam-repository_2": { "flake": false, "locked": { - "lastModified": 1677750302, - "narHash": "sha256-R1IrX8HoBPLF7RIlutsGQ0Vob9th2W4dqhQgrU1+UDE=", + "lastModified": 1680688373, + "narHash": "sha256-l1ZWo3yZOOesBCEkrUsrpkTgzMGqALKwrS3VYR7R2QM=", "owner": "tezos", "repo": "opam-repository", - "rev": "b95158f1d22c9aaf9cbf5450299dfbdc18b294be", + "rev": "e865763ca8a9cd8921877de094c60a94c1549f32", "type": "gitlab" }, "original": { @@ -451,11 +451,11 @@ "tezos": { "flake": false, "locked": { - "lastModified": 1679589658, - "narHash": "sha256-pcE8Tce0r4bnu4WTXTiEodUhIsHu3wb4L16LSxGkhHQ=", + "lastModified": 1681913089, + "narHash": "sha256-8wMOhdB8Vz24KLtAMheZkf9R4PXzdAd/PcFZjkJKeFM=", "owner": "tezos", "repo": "tezos", - "rev": "5977cc15a33c0fc98becd562185e3dc5e9003df7", + "rev": "96c910ddf8351bb630bd633a13e8966df180145e", "type": "gitlab" }, "original": { diff --git a/meta.json b/meta.json index 4914a5ee3..cf5e2379e 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { "release": "1", "maintainer": "Serokell ", - "tezos_ref": "v16.1" + "tezos_ref": "v17.0-beta1" } diff --git a/nix/build/hacks.nix b/nix/build/hacks.nix index 795fd9643..9ada8b657 100644 --- a/nix/build/hacks.nix +++ b/nix/build/hacks.nix @@ -28,4 +28,7 @@ self: super: rec { octez-node = super.octez-node.overrideAttrs (_ : { postInstall = "rm $out/bin/*.sh"; }); + ocamlfind = super.ocamlfind.overrideAttrs (drv: { + patches = [ ./install_topfind_196.patch ]; + }); } diff --git a/nix/build/install_topfind_196.patch b/nix/build/install_topfind_196.patch new file mode 100644 index 000000000..9eeffa16a --- /dev/null +++ b/nix/build/install_topfind_196.patch @@ -0,0 +1,14 @@ +diff --git a/src/findlib/Makefile b/src/findlib/Makefile +index 69a19d1..4ea250c 100644 +--- a/src/findlib/Makefile ++++ b/src/findlib/Makefile +@@ -123,8 +123,7 @@ clean: + install: all + $(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" + $(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" +- test $(INSTALL_TOPFIND) -eq 0 || $(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)" +- test $(INSTALL_TOPFIND) -eq 0 || $(INSTALLFILE) topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)/" ++ test $(INSTALL_TOPFIND) -eq 0 || $(INSTALLFILE) topfind "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/" + files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config \ + findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs \ + findlib_config.cmi findlib_config.ml topfind.cmi topfind.mli \ diff --git a/nix/build/release-binaries.nix b/nix/build/release-binaries.nix index ac7e5eaf8..f2cb71dfd 100644 --- a/nix/build/release-binaries.nix +++ b/nix/build/release-binaries.nix @@ -32,26 +32,6 @@ in [ description = "A client to decode and encode JSON"; supports = protocolsFormatted; } - { - name = "octez-tx-rollup-node-PtLimaPt"; - description = "Transaction rollup node"; - supports = "PtLimaPt"; - } - { - name = "octez-tx-rollup-client-PtLimaPt"; - description = "Client for interacting with transaction rollup node"; - supports = "PtLimaPt"; - } - { - name = "octez-smart-rollup-client-PtMumbai"; - description = "Smart contract rollup CLI client for PtMumbai"; - supports = "PtMumbai"; - } - { - name = "octez-smart-rollup-node-PtMumbai"; - description = "Tezos smart contract rollup node for PtMumbai"; - supports = "PtMumbai"; - } ] ++ builtins.concatMap (protocol: [ { name = "octez-baker-${protocol}"; @@ -63,4 +43,14 @@ in [ description = "Daemon for accusing"; supports = protocol; } + { + name = "octez-smart-rollup-client-${protocol}"; + description = "Smart contract rollup CLI client for ${protocol}"; + supports = protocol; + } + { + name = "octez-smart-rollup-node-${protocol}"; + description = "Tezos smart contract rollup node for ${protocol}"; + supports = protocol; + } ]) protocols.active diff --git a/nix/modules/common.nix b/nix/modules/common.nix index 8af5deff3..a4992c091 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 [ "PtLimaPt" "PtMumbai" ]); + type = types.listOf (types.enum [ "PtMumbai" "PtNairob" ]); description = '' List of protocols for which daemons will be run. ''; - example = ["PtLimaPt"]; + example = ["PtMumbai"]; }; rpcPort = mkOption { diff --git a/nix/modules/tezos-accuser.nix b/nix/modules/tezos-accuser.nix index 319e73166..c65777848 100644 --- a/nix/modules/tezos-accuser.nix +++ b/nix/modules/tezos-accuser.nix @@ -7,10 +7,10 @@ with lib; let octez-accuser-pkgs = { - "PtLimaPt" = - "${pkgs.octezPackages.octez-accuser-PtLimaPt}/bin/octez-accuser-PtLimaPt"; "PtMumbai" = "${pkgs.octezPackages.octez-accuser-PtMumbai}/bin/octez-accuser-PtMumbai"; + "PtNairob" = + "${pkgs.octezPackages.octez-baker-PtNairob}/bin/octez-baker-PtNairob"; }; 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 0339aedcf..bfd490a45 100644 --- a/nix/modules/tezos-baker.nix +++ b/nix/modules/tezos-baker.nix @@ -7,10 +7,10 @@ with lib; let octez-baker-pkgs = { - "PtLimaPt" = - "${pkgs.octezPackages.octez-baker-PtLimaPt}/bin/octez-baker-PtLimaPt"; "PtMumbai" = "${pkgs.octezPackages.octez-baker-PtMumbai}/bin/octez-baker-PtMumbai"; + "PtNairob" = + "${pkgs.octezPackages.octez-baker-PtNairob}/bin/octez-baker-PtNairob"; }; octez-client = "${pkgs.octezPackages.octez-client}/bin/octez-client"; cfg = config.services.octez-baker; diff --git a/nix/modules/tezos-node.nix b/nix/modules/tezos-node.nix index a49f74d4f..7870ef511 100644 --- a/nix/modules/tezos-node.nix +++ b/nix/modules/tezos-node.nix @@ -45,7 +45,7 @@ let network = mkOption { type = types.str; - default = "limanet"; + default = "mumbainet"; description = '' Network which node will be running on. Can be either a predefined network name or a URL to the network config. diff --git a/protocols.json b/protocols.json index 328ad8d8b..cc924323b 100644 --- a/protocols.json +++ b/protocols.json @@ -22,10 +22,11 @@ "011-PtHangz2", "012-Psithaca", "013-PtJakart", - "PtKathma" + "PtKathma", + "PtLimaPt" ], "active": [ - "PtLimaPt", - "PtMumbai" + "PtMumbai", + "PtNairob" ] } diff --git a/scripts/autorelease.sh b/scripts/autorelease.sh index 063e982af..921fbd150 100755 --- a/scripts/autorelease.sh +++ b/scripts/autorelease.sh @@ -34,7 +34,7 @@ for asset in "$assets_dir"/*; do done msg_regex="Merge pull request .* from serokell\/auto\/(v.*)-release" -rc_regex="^v[0-9]+\.[0-9]+-rc[0-9]+" +rc_regex="^v[0-9]+\.[0-9]+-(rc|beta)[0-9]+" # We create a pre-release in any case except if we are merging a stable version release PR mode_flag="--prerelease" diff --git a/scripts/build-all-bottles.sh b/scripts/build-all-bottles.sh index 7198168b2..746dcdc69 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-accuser-PtLimaPt" "tezos-accuser-PtMumbai" "tezos-admin-client" "tezos-baker-PtLimaPt" "tezos-baker-PtMumbai" "tezos-client" "tezos-codec" "tezos-node" "tezos-signer" "tezos-smart-rollup-client-PtMumbai" "tezos-smart-rollup-node-PtMumbai" "tezos-tx-rollup-client-PtLimaPt" "tezos-tx-rollup-node-PtLimaPt") +formulae=("tezos-accuser-PtMumbai" "tezos-accuser-PtNairob" "tezos-admin-client" "tezos-baker-PtMumbai" "tezos-baker-PtNairob" "tezos-client" "tezos-codec" "tezos-node" "tezos-signer" "tezos-smart-rollup-client-PtMumbai" "tezos-smart-rollup-client-PtNairob" "tezos-smart-rollup-node-PtMumbai" "tezos-smart-rollup-node-PtNairob") # tezos-sapling-params is used as a dependency for some of the formulas # so we handle it separately. diff --git a/scripts/publish-native-packages.py b/scripts/publish-native-packages.py index ef87c25bf..fc35f2faf 100755 --- a/scripts/publish-native-packages.py +++ b/scripts/publish-native-packages.py @@ -48,7 +48,7 @@ octez_version = os.getenv("OCTEZ_VERSION", None) -if re.search("v.*-rc[0-9]*", octez_version): +if re.search("v.*-(rc|beta)[0-9]*", octez_version): launchpad_ppa = "tezos-rc-serokell" copr_project = "@Serokell/Tezos-rc" else: diff --git a/tests/test_script.py b/tests/test_script.py index 816a38640..058d99b37 100644 --- a/tests/test_script.py +++ b/tests/test_script.py @@ -77,8 +77,8 @@ def test_node_with_daemons_scenario(network, use_tls=False): kill_node_with_daemons() -with subtest("run node with daemons on limanet"): - test_node_with_daemons_scenario("limanet") +with subtest("run node with daemons on mumbainet"): + test_node_with_daemons_scenario("mumbainet") with subtest("run node with daemons on mainnet"): test_node_with_daemons_scenario("mainnet") diff --git a/tests/tezos-binaries.nix b/tests/tezos-binaries.nix index f98adf702..8269d55bd 100644 --- a/tests/tezos-binaries.nix +++ b/tests/tezos-binaries.nix @@ -16,9 +16,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-PtLimaPt" + octez_accuser = f"{path_to_binaries}/octez-accuser-PtMumbai" octez_admin_client = f"{path_to_binaries}/octez-admin-client" - octez_baker = f"{path_to_binaries}/octez-baker-PtLimaPt" + octez_baker = f"{path_to_binaries}/octez-baker-PtMumbai" 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 879f089d5..85ba0fa61 100644 --- a/tests/tezos-modules.nix +++ b/tests/tezos-modules.nix @@ -18,7 +18,7 @@ import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: ../nix/modules/tezos-baker.nix ]; - services.octez-node.instances.limanet = { + services.octez-node.instances.mumbainet = { enable = true; additionalOptions = [ "--bootstrap-threshold=1" @@ -26,19 +26,19 @@ import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: ]; }; - services.octez-signer.instances.limanet = { + services.octez-signer.instances.mumbainet = { enable = true; networkProtocol = "http"; }; - services.octez-accuser.instances.limanet = { + services.octez-accuser.instances.mumbainet = { enable = true; - baseProtocols = ["PtLimaPt"]; + baseProtocols = ["PtMumbai"]; }; - services.octez-baker.instances.limanet = { + services.octez-baker.instances.mumbainet = { enable = true; - baseProtocols = ["PtLimaPt"]; + baseProtocols = ["PtMumbai"]; bakerAccountAlias = "baker"; bakerSecretKey = "unencrypted:edsk3KaTNj1d8Xd3kMBrZkJrfkqsz4XwwiBXatuuVgTdPye2KpE98o"; }; @@ -56,7 +56,7 @@ import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: ] for s in services: - machine.wait_for_unit(f"tezos-limanet-{s}.service") + machine.wait_for_unit(f"tezos-mumbainet-{s}.service") with subtest("check octez-node rpc response"): machine.wait_for_open_port(8732) @@ -66,6 +66,6 @@ import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: with subtest("service status sanity check"): for s in services: - machine.succeed(f"systemctl status tezos-limanet-{s}.service") + machine.succeed(f"systemctl status tezos-mumbainet-{s}.service") ''; }) { inherit pkgs system; } diff --git a/tests/tezos-nix-binaries.nix b/tests/tezos-nix-binaries.nix index 6aadb3ffd..df0a75f16 100644 --- a/tests/tezos-nix-binaries.nix +++ b/tests/tezos-nix-binaries.nix @@ -4,7 +4,7 @@ let inherit (pkgs) system; inherit (pkgs.octezPackages) octez-client octez-admin-client octez-node octez-signer octez-codec - octez-accuser-PtLimaPt octez-baker-PtLimaPt; + octez-accuser-PtMumbai octez-baker-PtMumbai; in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: { name = "tezos-nix-binaries-test"; @@ -20,9 +20,9 @@ in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: }; testScript = '' - octez_accuser = "${octez-accuser-PtLimaPt}/bin/octez-accuser-PtLimaPt" + octez_accuser = "${octez-accuser-PtMumbai}/bin/octez-accuser-PtMumbai" octez_admin_client = "${octez-admin-client}/bin/octez-admin-client" - octez_baker = "${octez-baker-PtLimaPt}/bin/octez-baker-PtLimaPt" + octez_baker = "${octez-baker-PtMumbai}/bin/octez-baker-PtMumbai" octez_client = ( "${octez-client}/bin/octez-client" )