diff --git a/Formula/tezos-accuser-010-PtGRANAD.rb b/Formula/tezos-accuser-010-PtGRANAD.rb index 56496c1f6..1c73cf7c7 100644 --- a/Formula/tezos-accuser-010-PtGRANAD.rb +++ b/Formula/tezos-accuser-010-PtGRANAD.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v10.2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v11.0-rc1", :shallow => false - version "v10.2-1" + version "v11.0-rc1-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,8 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser010Ptgranad.version}/" - sha256 cellar: :any, mojave: "4ba3a76ae7db229c432039a84a2ca55fbdf93e37d49419201b81d96964eaf18a" - sha256 cellar: :any, catalina: "35659c58f1df616e046b836fa239a9d4b8ff47db954577606930c295d59146da" end def make_deps @@ -38,7 +36,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.44.0", "-y" + system "rustup-init", "--default-toolchain", "1.52.1", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-accuser-011-PtHangzH.rb b/Formula/tezos-accuser-011-PtHangzH.rb new file mode 100644 index 000000000..0fcd7ec95 --- /dev/null +++ b/Formula/tezos-accuser-011-PtHangzH.rb @@ -0,0 +1,118 @@ +# SPDX-FileCopyrightText: 2021 TQ Tezos +# +# SPDX-License-Identifier: LicenseRef-MIT-TQ + +class TezosAccuser011Pthangzh < Formula + @all_bins = [] + + class << self + attr_accessor :all_bins + end + homepage "https://gitlab.com/tezos/tezos" + + url "https://gitlab.com/tezos/tezos.git", :tag => "v11.0-rc1", :shallow => false + + version "v11.0-rc1-1" + + build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] + build_dependencies.each do |dependency| + depends_on dependency => :build + end + + dependencies = %w[gmp hidapi libev libffi] + dependencies.each do |dependency| + depends_on dependency + end + desc "Daemon for accusing" + + bottle do + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser011Pthangzh.version}/" + end + + def make_deps + ENV.deparallelize + ENV["CARGO_HOME"]="./.cargo" + # Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer + system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" + system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" + ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" + system "rustup-init", "--default-toolchain", "1.52.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 + end + + def install + startup_contents = + <<~EOS + #!/usr/bin/env bash + + set -euo pipefail + + accuser="#{bin}/tezos-accuser-011-PtHangzH" + + accuser_dir="$DATA_DIR" + + accuser_config="$accuser_dir/config" + mkdir -p "$accuser_dir" + + if [ ! -f "$accuser_config" ]; then + "$accuser" --base-dir "$accuser_dir" \ + --endpoint "$NODE_RPC_ENDPOINT" \ + config init --output "$accuser_config" >/dev/null 2>&1 + else + "$accuser" --base-dir "$accuser_dir" \ + --endpoint "$NODE_RPC_ENDPOINT" \ + config update >/dev/null 2>&1 + fi + + exec "$accuser" --base-dir "$accuser_dir" \ + --endpoint "$NODE_RPC_ENDPOINT" \ + run + EOS + File.write("tezos-accuser-011-PtHangzH-start", startup_contents) + bin.install "tezos-accuser-011-PtHangzH-start" + make_deps + install_template "src/proto_011_PtHangzH/bin_accuser/main_accuser_011_PtHangzH.exe", + "_build/default/src/proto_011_PtHangzH/bin_accuser/main_accuser_011_PtHangzH.exe", + "tezos-accuser-011-PtHangzH" + end + + plist_options manual: "tezos-accuser-011-PtHangzH run" + def plist + <<~EOS + + + + + Label + #{plist_name} + Program + #{opt_bin}/tezos-accuser-011-PtHangzH-start + EnvironmentVariables + + DATA_DIR + #{var}/lib/tezos/client + NODE_RPC_ENDPOINT + http://localhost:8732 + + RunAtLoad + StandardOutPath + #{var}/log/#{name}.log + StandardErrorPath + #{var}/log/#{name}.log + + + EOS + end + def post_install + mkdir "#{var}/lib/tezos/client" + end +end diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb index 3c40f70d9..915662d01 100644 --- a/Formula/tezos-admin-client.rb +++ b/Formula/tezos-admin-client.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v10.2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v11.0-rc1", :shallow => false - version "v10.2-1" + version "v11.0-rc1-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,8 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/" - sha256 cellar: :any, mojave: "13d05a8d96a584d1b97e80289e39ead20a57188fa9814eab4d075f22a0642ba4" - sha256 cellar: :any, catalina: "c431c23f6b92d8690be76b5135ae1d8569017e3a4c4b01f0aa020d51ddbc6e8b" end def make_deps @@ -38,7 +36,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.44.0", "-y" + system "rustup-init", "--default-toolchain", "1.52.1", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-baker-010-PtGRANAD.rb b/Formula/tezos-baker-010-PtGRANAD.rb index 01c7891b2..a6f60cdbf 100644 --- a/Formula/tezos-baker-010-PtGRANAD.rb +++ b/Formula/tezos-baker-010-PtGRANAD.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v10.2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v11.0-rc1", :shallow => false - version "v10.2-1" + version "v11.0-rc1-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,8 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker010Ptgranad.version}/" - sha256 cellar: :any, mojave: "83402ddc80e97fbc6bfc23721776f3db8419f754da62b57aff544180320fb850" - sha256 cellar: :any, catalina: "f5846339abc701c3a65524c62eb70a41b0c354ffde5e6601cde3693024e50460" end def make_deps @@ -38,7 +36,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.44.0", "-y" + system "rustup-init", "--default-toolchain", "1.52.1", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-baker-011-PtHangzH.rb b/Formula/tezos-baker-011-PtHangzH.rb new file mode 100644 index 000000000..dca50d390 --- /dev/null +++ b/Formula/tezos-baker-011-PtHangzH.rb @@ -0,0 +1,129 @@ +# SPDX-FileCopyrightText: 2021 TQ Tezos +# +# SPDX-License-Identifier: LicenseRef-MIT-TQ + +class TezosBaker011Pthangzh < Formula + @all_bins = [] + + class << self + attr_accessor :all_bins + end + homepage "https://gitlab.com/tezos/tezos" + + url "https://gitlab.com/tezos/tezos.git", :tag => "v11.0-rc1", :shallow => false + + version "v11.0-rc1-1" + + build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] + build_dependencies.each do |dependency| + depends_on dependency => :build + end + + dependencies = %w[gmp hidapi libev libffi 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/#{TezosBaker011Pthangzh.version}/" + end + + def make_deps + ENV.deparallelize + ENV["CARGO_HOME"]="./.cargo" + # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer + system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" + system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" + ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" + system "rustup-init", "--default-toolchain", "1.52.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 + end + + def install + startup_contents = + <<~EOS + #!/usr/bin/env bash + + set -euo pipefail + + baker="#{bin}/tezos-baker-011-PtHangzH" + + baker_dir="$DATA_DIR" + + baker_config="$baker_dir/config" + mkdir -p "$baker_dir" + + if [ ! -f "$baker_config" ]; then + "$baker" --base-dir "$baker_dir" \ + --endpoint "$NODE_RPC_ENDPOINT" \ + config init --output "$baker_config" >/dev/null 2>&1 + else + "$baker" --base-dir "$baker_dir" \ + --endpoint "$NODE_RPC_ENDPOINT" \ + config update >/dev/null 2>&1 + fi + + launch_baker() { + exec "$baker" \ + --base-dir "$baker_dir" --endpoint "$NODE_RPC_ENDPOINT" \ + run with local node "$NODE_DATA_DIR" "$@" + } + + if [[ -z "$BAKER_ACCOUNT" ]]; then + launch_baker + else + launch_baker "$BAKER_ACCOUNT" + fi + EOS + File.write("tezos-baker-011-PtHangzH-start", startup_contents) + bin.install "tezos-baker-011-PtHangzH-start" + make_deps + install_template "src/proto_011_PtHangzH/bin_baker/main_baker_011_PtHangzH.exe", + "_build/default/src/proto_011_PtHangzH/bin_baker/main_baker_011_PtHangzH.exe", + "tezos-baker-011-PtHangzH" + end + plist_options manual: "tezos-baker-011-PtHangzH run with local node" + def plist + <<~EOS + + + + + Label + #{plist_name} + Program + #{opt_bin}/tezos-baker-011-PtHangzH-start + EnvironmentVariables + + DATA_DIR + #{var}/lib/tezos/client + NODE_DATA_DIR + + NODE_RPC_ENDPOINT + http://localhost:8732 + BAKER_ACCOUNT + + + RunAtLoad + StandardOutPath + #{var}/log/#{name}.log + StandardErrorPath + #{var}/log/#{name}.log + + + EOS + end + def post_install + mkdir "#{var}/lib/tezos/client" + end +end diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb index 99a24b6e3..592b89d30 100644 --- a/Formula/tezos-client.rb +++ b/Formula/tezos-client.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v10.2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v11.0-rc1", :shallow => false - version "v10.2-1" + version "v11.0-rc1-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,8 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/" - sha256 cellar: :any, mojave: "654ffbc594b11f563e97119af2aeb304d5a1351625ea2aa3648d1e253ee2d58a" - sha256 cellar: :any, catalina: "340b4a52e21a15b7f52c7785179c4226d6a8bc6957f12ba6f5ffb2455e150706" end def make_deps @@ -38,7 +36,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.44.0", "-y" + system "rustup-init", "--default-toolchain", "1.52.1", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb index d31be4c5a..e1444e8f3 100644 --- a/Formula/tezos-codec.rb +++ b/Formula/tezos-codec.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v10.2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v11.0-rc1", :shallow => false - version "v10.2-1" + version "v11.0-rc1-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,8 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/" - sha256 cellar: :any, mojave: "864e31f9720ceda7d1075e5282eb89aadb57e79903a1c950909be5538d0588a9" - sha256 cellar: :any, catalina: "6234e4ecc9453179b4393840459302214acb10661631f96558c0bb68ff31c9ac" end def make_deps @@ -38,7 +36,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.44.0", "-y" + system "rustup-init", "--default-toolchain", "1.52.1", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-endorser-010-PtGRANAD.rb b/Formula/tezos-endorser-010-PtGRANAD.rb index a105143b2..714eb4d39 100644 --- a/Formula/tezos-endorser-010-PtGRANAD.rb +++ b/Formula/tezos-endorser-010-PtGRANAD.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v10.2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v11.0-rc1", :shallow => false - version "v10.2-1" + version "v11.0-rc1-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -28,8 +28,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser010Ptgranad.version}/" - sha256 cellar: :any, mojave: "a047be8cec6b9a03511313a55906462f9e1313efcf787f1b1072288b1d444a09" - sha256 cellar: :any, catalina: "c604ffec47910372a3a0c6442fa7090924d4d41eb64c5e1e00fef8c0068c9fc9" end def make_deps @@ -39,7 +37,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.44.0", "-y" + system "rustup-init", "--default-toolchain", "1.52.1", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-endorser-011-PtHangzH.rb b/Formula/tezos-endorser-011-PtHangzH.rb new file mode 100644 index 000000000..4a346b004 --- /dev/null +++ b/Formula/tezos-endorser-011-PtHangzH.rb @@ -0,0 +1,130 @@ +# SPDX-FileCopyrightText: 2021 TQ Tezos +# +# SPDX-License-Identifier: LicenseRef-MIT-TQ + +class TezosEndorser011Pthangzh < Formula + @all_bins = [] + + class << self + attr_accessor :all_bins + end + homepage "https://gitlab.com/tezos/tezos" + + url "https://gitlab.com/tezos/tezos.git", :tag => "v11.0-rc1", :shallow => false + + version "v11.0-rc1-1" + + build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] + build_dependencies.each do |dependency| + depends_on dependency => :build + end + + dependencies = %w[gmp hidapi libev libffi] + dependencies.each do |dependency| + depends_on dependency + end + + desc "Daemon for endorsing" + + bottle do + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser011Pthangzh.version}/" + end + + def make_deps + ENV.deparallelize + ENV["CARGO_HOME"]="./.cargo" + # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer + system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" + system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" + ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" + system "rustup-init", "--default-toolchain", "1.52.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 + end + + + def install + startup_contents = + <<~EOS + #!/usr/bin/env bash + + set -euo pipefail + + endorser="#{bin}/tezos-endorser-011-PtHangzH" + + endorser_dir="$DATA_DIR" + + endorser_config="$endorser_dir/config" + mkdir -p "$endorser_dir" + + if [ ! -f "$endorser_config" ]; then + "$endorser" --base-dir "$endorser_dir" \ + --endpoint "$NODE_RPC_ENDPOINT" \ + config init --output "$endorser_config" >/dev/null 2>&1 + else + "$endorser" --base-dir "$endorser_dir" \ + --endpoint "$NODE_RPC_ENDPOINT" \ + config update >/dev/null 2>&1 + fi + + launch_endorser() { + exec "$endorser" --base-dir "$endorser_dir" \ + --endpoint "$NODE_RPC_ENDPOINT" \ + run "$@" + } + + if [[ -z "$ENDORSER_ACCOUNT" ]]; then + launch_endorser + else + launch_endorser "$ENDORSER_ACCOUNT" + fi + EOS + File.write("tezos-endorser-011-PtHangzH-start", startup_contents) + bin.install "tezos-endorser-011-PtHangzH-start" + make_deps + install_template "src/proto_011_PtHangzH/bin_endorser/main_endorser_011_PtHangzH.exe", + "_build/default/src/proto_011_PtHangzH/bin_endorser/main_endorser_011_PtHangzH.exe", + "tezos-endorser-011-PtHangzH" + end + + plist_options manual: "tezos-endorser-011-PtHangzH run" + def plist + <<~EOS + + + + + Label + #{plist_name} + Program + #{opt_bin}/tezos-endorser-011-PtHangzH-start + EnvironmentVariables + + DATA_DIR + #{var}/lib/tezos/client + NODE_RPC_ENDPOINT + http://localhost:8732 + ENDORSER_ACCOUNT + + + RunAtLoad + StandardOutPath + #{var}/log/#{name}.log + StandardErrorPath + #{var}/log/#{name}.log + + + EOS + end + def post_install + mkdir "#{var}/lib/tezos/client" + end +end diff --git a/Formula/tezos-node-granadanet.rb b/Formula/tezos-node-granadanet.rb index 6e0a1e842..27c530475 100644 --- a/Formula/tezos-node-granadanet.rb +++ b/Formula/tezos-node-granadanet.rb @@ -4,7 +4,7 @@ class TezosNodeGranadanet < Formula url "file:///dev/null" - version "v10.2-1" + version "v11.0-rc1-1" bottle :unneeded depends_on "tezos-node" diff --git a/Formula/tezos-node-hangzhounet.rb b/Formula/tezos-node-hangzhounet.rb new file mode 100644 index 000000000..e2f6bbdab --- /dev/null +++ b/Formula/tezos-node-hangzhounet.rb @@ -0,0 +1,89 @@ +# SPDX-FileCopyrightText: 2021 TQ Tezos +# +# SPDX-License-Identifier: LicenseRef-MIT-TQ + +class TezosNodeHangzhounet < Formula + url "file:///dev/null" + version "v11.0-rc1-1" + + bottle :unneeded + depends_on "tezos-node" + + desc "Meta formula that provides background tezos-node service that runs on hangzhounet" + + def install + startup_contents = + <<~EOS + #!/usr/bin/env bash + + set -euo pipefail + + node="/usr/local/bin/tezos-node" + # default location of the config file + config_file="$DATA_DIR/config.json" + + mkdir -p "$DATA_DIR" + if [[ ! -f "$config_file" ]]; then + echo "Configuring the node..." + "$node" config init \ + --data-dir "$DATA_DIR" \ + --rpc-addr "$NODE_RPC_ADDR" \ + --network=hangzhounet \ + "$@" + else + echo "Updating the node configuration..." + "$node" config update \ + --data-dir "$DATA_DIR" \ + --rpc-addr "$NODE_RPC_ADDR" \ + --network=hangzhounet \ + "$@" + fi + + # Launching the node + if [[ -z "$CERT_PATH" || -z "$KEY_PATH" ]]; then + exec "$node" run --data-dir "$DATA_DIR" --config-file="$config_file" + else + exec "$node" run --data-dir "$DATA_DIR" --config-file="$config_file" \ + --rpc-tls="$CERT_PATH","$KEY_PATH" + fi + EOS + File.write("tezos-node-hangzhounet-start", startup_contents) + bin.install "tezos-node-hangzhounet-start" + print "Installing tezos-node-hangzhounet service" + end + def plist + <<~EOS + + + + + Label + #{plist_name} + Program + #{opt_bin}/tezos-node-hangzhounet-start + EnvironmentVariables + + DATA_DIR + #{var}/lib/tezos/node-hangzhounet + NODE_RPC_ADDR + 127.0.0.1:8732 + CERT_PATH + + KEY_PATH + + + RunAtLoad + StandardOutPath + #{var}/log/#{name}.log + StandardErrorPath + #{var}/log/#{name}.log + + + EOS + end + def post_install + mkdir_p "#{var}/lib/tezos/node-hangzhounet" + system "tezos-node", "config", "init", "--data-dir" "#{var}/lib/tezos/node-hangzhounet", "--network", "hangzhounet" + end +end diff --git a/Formula/tezos-node-mainnet.rb b/Formula/tezos-node-mainnet.rb index 4476f92f3..2a1e70936 100644 --- a/Formula/tezos-node-mainnet.rb +++ b/Formula/tezos-node-mainnet.rb @@ -4,7 +4,7 @@ class TezosNodeMainnet < Formula url "file:///dev/null" - version "v10.2-1" + version "v11.0-rc1-1" bottle :unneeded depends_on "tezos-node" diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index 5dc39925b..746cfb830 100644 --- a/Formula/tezos-node.rb +++ b/Formula/tezos-node.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v10.2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v11.0-rc1", :shallow => false - version "v10.2-1" + version "v11.0-rc1-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,8 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/" - sha256 cellar: :any, mojave: "357de6612ea77969189d4f6ea4aa2c50caffcfd6170a3a8c2179c36ccf7f27aa" - sha256 cellar: :any, catalina: "48d629b964558f0831420d119699b8aaeed5b2397206946a6e5737f3ed4fb1e7" end def make_deps @@ -38,7 +36,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.44.0", "-y" + system "rustup-init", "--default-toolchain", "1.52.1", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-sandbox.rb b/Formula/tezos-sandbox.rb index dc7c91e04..2e1555b17 100644 --- a/Formula/tezos-sandbox.rb +++ b/Formula/tezos-sandbox.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v10.2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v11.0-rc1", :shallow => false - version "v10.2-1" + version "v11.0-rc1-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,8 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/" - sha256 cellar: :any, mojave: "536f9184499a3fb993d510de1e88f3e09e2c161d64920f9f1875369d73150e72" - sha256 cellar: :any, catalina: "92e1d3123a088e3c897e9bf2f9ed1445007025015ad65c16ea8ea0b83706314c" end def make_deps @@ -38,7 +36,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.44.0", "-y" + system "rustup-init", "--default-toolchain", "1.52.1", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-signer-http.rb b/Formula/tezos-signer-http.rb index 09b55f348..05f099c57 100644 --- a/Formula/tezos-signer-http.rb +++ b/Formula/tezos-signer-http.rb @@ -4,7 +4,7 @@ class TezosSignerHttp < Formula url "file:///dev/null" - version "v10.2-1" + version "v11.0-rc1-1" bottle :unneeded depends_on "tezos-signer" diff --git a/Formula/tezos-signer-https.rb b/Formula/tezos-signer-https.rb index a99ae9e77..5610c8010 100644 --- a/Formula/tezos-signer-https.rb +++ b/Formula/tezos-signer-https.rb @@ -4,7 +4,7 @@ class TezosSignerHttps < Formula url "file:///dev/null" - version "v10.2-1" + version "v11.0-rc1-1" bottle :unneeded depends_on "tezos-signer" diff --git a/Formula/tezos-signer-tcp.rb b/Formula/tezos-signer-tcp.rb index 43bd93c3d..676b68007 100644 --- a/Formula/tezos-signer-tcp.rb +++ b/Formula/tezos-signer-tcp.rb @@ -4,7 +4,7 @@ class TezosSignerTcp < Formula url "file:///dev/null" - version "v10.2-1" + version "v11.0-rc1-1" bottle :unneeded depends_on "tezos-signer" diff --git a/Formula/tezos-signer-unix.rb b/Formula/tezos-signer-unix.rb index 7041d3ec5..07a91a63b 100644 --- a/Formula/tezos-signer-unix.rb +++ b/Formula/tezos-signer-unix.rb @@ -4,7 +4,7 @@ class TezosSignerUnix < Formula url "file:///dev/null" - version "v10.2-1" + version "v11.0-rc1-1" bottle :unneeded depends_on "tezos-signer" diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb index ce9d43f6e..cab83a340 100644 --- a/Formula/tezos-signer.rb +++ b/Formula/tezos-signer.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v10.2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v11.0-rc1", :shallow => false - version "v10.2-1" + version "v11.0-rc1-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,8 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/" - sha256 cellar: :any, mojave: "9f4feec8809d70275f42c65055f0374f8895a6a35d4f2da65d09e2498547c6a8" - sha256 cellar: :any, catalina: "c3ea1246af5ed67feed4fe4bc57bed3bee879ee8b3af180fe80f98f1f2861558" end def make_deps @@ -38,7 +36,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-x86_64-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam" system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam" ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}" - system "rustup-init", "--default-toolchain", "1.44.0", "-y" + system "rustup-init", "--default-toolchain", "1.52.1", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/docker/build/build-tezos.sh b/docker/build/build-tezos.sh index 16b680a64..dfc42e229 100755 --- a/docker/build/build-tezos.sh +++ b/docker/build/build-tezos.sh @@ -14,6 +14,13 @@ cd tezos git apply ../static.patch export OPAMYES="true" +wget https://sh.rustup.rs/rustup-init.sh +chmod +x rustup-init.sh +./rustup-init.sh --profile minimal --default-toolchain 1.52.1 -y +source "$HOME/.cargo/env" + +rustc --version opam init --bare --disable-sandboxing make build-deps -eval "$(opam env)" && make && make build-sandbox +eval "$(opam env)" && PROFILE="static" make build && make build-sandbox +chmod +w tezos-* diff --git a/docker/build/static_libs.patch b/docker/build/static_libs.patch index 4aa979b30..3a53f1d5b 100644 --- a/docker/build/static_libs.patch +++ b/docker/build/static_libs.patch @@ -1,233 +1,14 @@ # SPDX-FileCopyrightText: 2020 TQ Tezos # # SPDX-License-Identifier: LicenseRef-MIT-TQ -diff --git a/src/bin_client/dune b/src/bin_client/dune -index 862096adb..3c2dec974 100644 ---- a/src/bin_client/dune -+++ b/src/bin_client/dune -@@ -74,7 +74,9 @@ - -open Tezos_client_commands - -open Tezos_mockup_commands - -open Tezos_client_base_unix -- -linkall))) -+ -linkall -+ -ccopt -static -+ -cclib "-lusb-1.0 -lhidapi-libusb -ludev -lz"))) - - (rule - (action -diff --git a/src/bin_codec/dune b/src/bin_codec/dune -index 3249f6b22..d3266dddf 100644 ---- a/src/bin_codec/dune -+++ b/src/bin_codec/dune -@@ -30,7 +30,9 @@ - -open Tezos_clic - -open Tezos_stdlib_unix - -open Tezos_event_logging -- -linkall))) -+ -linkall -+ -ccopt -static -+ -cclib "-lusb-1.0 -lhidapi-libusb -ludev -lz"))) - - (rule - (action -diff --git a/src/bin_node/dune b/src/bin_node/dune -index dbc503632..0ba0671a8 100644 ---- a/src/bin_node/dune -+++ b/src/bin_node/dune -@@ -86,7 +86,8 @@ - -open Tezos_shell_context - -open Tezos_workers - -open Tezos_protocol_updater -- -linkall))) -+ -linkall -+ -ccopt -static))) - - (rule - (action -diff --git a/src/bin_signer/dune b/src/bin_signer/dune -index 2b8a8910f..847acd750 100644 ---- a/src/bin_signer/dune -+++ b/src/bin_signer/dune -@@ -21,4 +21,6 @@ - -open Tezos_rpc_http_server - -open Tezos_rpc_http_client_unix - -open Tezos_stdlib_unix -- -open Tezos_stdlib))) -+ -open Tezos_stdlib -+ -ccopt -static -+ -cclib "-lusb-1.0 -lhidapi-libusb -ludev -lz"))) - - (rule - (alias runtest_lint) diff --git a/src/bin_sandbox/dune b/src/bin_sandbox/dune -index 6289c6d12..aa2eb20a2 100644 +index ef3f1196e6..48be78fdb3 100644 --- a/src/bin_sandbox/dune +++ b/src/bin_sandbox/dune -@@ -3,4 +3,4 @@ +@@ -2,4 +2,5 @@ + (names main) (libraries tezos-base tezos-base.unix - flextesa) -- (flags :standard)) -+ (flags :standard -ccopt -static)) - - (rule - (alias runtest_sandbox_accusations_simple_double_baking) -diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune -index 7f2ec8a63..51ffdcc8b 100644 ---- a/src/lib_protocol_compiler/dune -+++ b/src/lib_protocol_compiler/dune -@@ -40,8 +40,7 @@ - tezos-protocol-compiler - compiler-libs.bytecomp) - (flags (:standard -open Tezos_base__TzPervasives -- -open Tezos_protocol_compiler)) -- (modules Byte)) -+ -open Tezos_protocol_compiler)) (modules Byte)) - - (library - (name tezos_protocol_compiler_native) -@@ -66,7 +65,7 @@ - (public_name tezos-protocol-compiler) - (modes native) - (libraries tezos_protocol_compiler_native) -- (flags (:standard -linkall)) -+ (flags (:standard -linkall -ccopt -static)) - (modules Main_native)) - - (executable -diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune -index ee20d869a..1d6b596e0 100644 ---- a/src/proto_alpha/bin_accuser/dune -+++ b/src/proto_alpha/bin_accuser/dune -@@ -10,4 +10,6 @@ - -open Tezos_client_commands - -open Tezos_baking_alpha_commands - -open Tezos_stdlib_unix -- -open Tezos_client_base_unix))) -+ -open Tezos_client_base_unix -+ -ccopt -static -+ -cclib "-lusb-1.0 -lhidapi-libusb -ludev -lz"))) - - (rule - (alias runtest_lint) -diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune -index 5931e5c99..3a6f285d6 100644 ---- a/src/proto_alpha/bin_baker/dune -+++ b/src/proto_alpha/bin_baker/dune -@@ -10,4 +10,6 @@ - -open Tezos_client_commands - -open Tezos_baking_alpha_commands - -open Tezos_stdlib_unix -- -open Tezos_client_base_unix))) -+ -open Tezos_client_base_unix -+ -ccopt -static -+ -cclib "-lusb-1.0 -lhidapi-libusb -ludev -lz"))) - - (rule - (alias runtest_lint) -diff --git a/src/proto_alpha/bin_endorser/dune b/src/proto_alpha/bin_endorser/dune -index e822ec9a1..f92c34805 100644 ---- a/src/proto_alpha/bin_endorser/dune -+++ b/src/proto_alpha/bin_endorser/dune -@@ -10,4 +10,6 @@ - -open Tezos_client_commands - -open Tezos_baking_alpha_commands - -open Tezos_stdlib_unix -- -open Tezos_client_base_unix))) -+ -open Tezos_client_base_unix -+ -ccopt -static -+ -cclib "-lusb-1.0 -lhidapi-libusb -ludev -lz"))) - - (rule - (alias runtest_lint) -diff --git a/src/proto_009_PsFLoren/bin_accuser/dune b/src/proto_009_PsFLoren/bin_accuser/dune -index 11c77973e3..43515f16ed 100644 ---- a/src/proto_009_PsFLoren/bin_accuser/dune -+++ b/src/proto_009_PsFLoren/bin_accuser/dune -@@ -10,4 +10,6 @@ - -open Tezos_client_commands - -open Tezos_baking_009_PsFLoren_commands - -open Tezos_stdlib_unix -- -open Tezos_client_base_unix))) -+ -open Tezos_client_base_unix -+ -ccopt -static -+ -cclib "-lusb-1.0 -lhidapi-libusb -ludev -lz"))) - - (rule - (alias runtest_lint) -diff --git a/src/proto_009_PsFLoren/bin_baker/dune b/src/proto_009_PsFLoren/bin_baker/dune -index 0535edf13c..f0c85ad447 100644 ---- a/src/proto_009_PsFLoren/bin_baker/dune -+++ b/src/proto_009_PsFLoren/bin_baker/dune -@@ -10,4 +10,6 @@ - -open Tezos_client_commands - -open Tezos_baking_009_PsFLoren_commands - -open Tezos_stdlib_unix -- -open Tezos_client_base_unix))) -+ -open Tezos_client_base_unix -+ -ccopt -static -+ -cclib "-lusb-1.0 -lhidapi-libusb -ludev -lz"))) - - (rule - (alias runtest_lint) -diff --git a/src/proto_009_PsFLoren/bin_endorser/dune b/src/proto_009_PsFLoren/bin_endorser/dune -index c19a310a8f..6c38226293 100644 ---- a/src/proto_009_PsFLoren/bin_endorser/dune -+++ b/src/proto_009_PsFLoren/bin_endorser/dune -@@ -10,4 +10,6 @@ - -open Tezos_client_commands - -open Tezos_baking_009_PsFLoren_commands - -open Tezos_stdlib_unix -- -open Tezos_client_base_unix))) -+ -open Tezos_client_base_unix -+ -ccopt -static -+ -cclib "-lusb-1.0 -lhidapi-libusb -ludev -lz"))) - - (rule - (alias runtest_lint) -diff --git a/src/proto_010_PtGRANAD/bin_accuser/dune b/src/proto_010_PtGRANAD/bin_accuser/dune -index 8cf78a6cb..1e169e66a 100644 ---- a/src/proto_010_PtGRANAD/bin_accuser/dune -+++ b/src/proto_010_PtGRANAD/bin_accuser/dune -@@ -10,4 +10,6 @@ - -open Tezos_client_commands - -open Tezos_baking_010_PtGRANAD_commands - -open Tezos_stdlib_unix -- -open Tezos_client_base_unix))) -+ -open Tezos_client_base_unix -+ -ccopt -static -+ -cclib "-lusb-1.0 -lhidapi-libusb -ludev -lz"))) - - (rule - (alias runtest_lint) -diff --git a/src/proto_010_PtGRANAD/bin_baker/dune b/src/proto_010_PtGRANAD/bin_baker/dune -index a8f2ec209..0a94aaecc 100644 ---- a/src/proto_010_PtGRANAD/bin_baker/dune -+++ b/src/proto_010_PtGRANAD/bin_baker/dune -@@ -10,4 +10,6 @@ - -open Tezos_client_commands - -open Tezos_baking_010_PtGRANAD_commands - -open Tezos_stdlib_unix -- -open Tezos_client_base_unix))) -+ -open Tezos_client_base_unix -+ -ccopt -static -+ -cclib "-lusb-1.0 -lhidapi-libusb -ludev -lz"))) - - (rule - (alias runtest_lint) -diff --git a/src/proto_010_PtGRANAD/bin_endorser/dune b/src/proto_010_PtGRANAD/bin_endorser/dune -index da13938ba..99b3cb746 100644 ---- a/src/proto_010_PtGRANAD/bin_endorser/dune -+++ b/src/proto_010_PtGRANAD/bin_endorser/dune -@@ -10,4 +10,6 @@ - -open Tezos_client_commands - -open Tezos_baking_010_PtGRANAD_commands - -open Tezos_stdlib_unix -- -open Tezos_client_base_unix))) -+ -open Tezos_client_base_unix -+ -ccopt -static -+ -cclib "-lusb-1.0 -lhidapi-libusb -ludev -lz"))) - - (rule - (alias runtest_lint) +- flextesa)) ++ flextesa) ++ (flags :standard -ccopt -static)) diff --git a/docker/package/fedora.py b/docker/package/fedora.py index 1c30dd5d1..1559a4b91 100644 --- a/docker/package/fedora.py +++ b/docker/package/fedora.py @@ -15,7 +15,8 @@ def build_fedora_package( run_deps: List[str], is_source: bool, ): - dir = f"{pkg.name}-{pkg.meta.version}" + version = pkg.meta.version.replace("-", "") + dir = f"{pkg.name}-{version}" cwd = os.path.dirname(__file__) home = os.environ["HOME"] diff --git a/docker/package/model.py b/docker/package/model.py index 14137f020..cd4335727 100644 --- a/docker/package/model.py +++ b/docker/package/model.py @@ -172,6 +172,8 @@ def gen_systemd_rules_contents(package): override_dh_install_init += f" dh_installinit --name={unit_name}\n" rules_contents = f"""#!/usr/bin/make -f +export DEB_CFLAGS_APPEND=-fPIC + %: dh $@ {"--with systemd" if len(package.systemd_units) > 0 else ""} override_dh_systemd_start: @@ -264,17 +266,18 @@ def gen_spec_file(self, build_deps, run_deps, out): systemd_files, systemd_macros, ) = gen_spec_systemd_part(self) + version = self.meta.version.replace("-", "") file_contents = f""" %define debug_package %{{nil}} Name: {self.name} -Version: {self.meta.version} +Version: {version} Release: {self.meta.release} Epoch: {self.meta.fedora_epoch} Summary: {self.desc} License: MIT BuildArch: x86_64 aarch64 -Source0: {self.name}-{self.meta.version}.tar.gz +Source0: {self.name}-{version}.tar.gz Source1: https://gitlab.com/tezos/tezos/tree/v{self.meta.version}/ BuildRequires: {build_requires} {systemd_deps} Requires: {requires}, {str_additional_native_deps} @@ -404,16 +407,17 @@ def gen_control_file(self, deps, ubuntu_version, out): f.write(file_contents) def gen_spec_file(self, build_deps, run_deps, out): + version = self.meta.version.replace("-", "") file_contents = f""" %define debug_package %{{nil}} Name: {self.name} -Version: {self.meta.version} +Version: {version} Release: {self.meta.release} Epoch: {self.meta.fedora_epoch} Summary: {self.desc} License: MIT BuildArch: x86_64 aarch64 -Source0: {self.name}-{self.meta.version}.tar.gz +Source0: {self.name}-{version}.tar.gz BuildRequires: wget %description {self.desc} @@ -578,16 +582,17 @@ def gen_spec_file(self, build_deps, run_deps, out): systemd_files, systemd_macros, ) = gen_spec_systemd_part(self) + version = self.meta.version.replace("-", "") file_contents = f""" %define debug_package %{{nil}} Name: {self.name} -Version: {self.meta.version} +Version: {version} Release: {self.meta.release} Epoch: {self.meta.fedora_epoch} Summary: {self.desc} License: MIT BuildArch: x86_64 aarch64 -Source0: {self.name}-{self.meta.version}.tar.gz +Source0: {self.name}-{version}.tar.gz Source1: https://gitlab.com/tezos/tezos/tree/v{self.meta.version}/ BuildRequires: {systemd_deps} Requires: {run_deps} diff --git a/docker/package/packages.py b/docker/package/packages.py index 8abf62e4b..9ecb4cd0d 100644 --- a/docker/package/packages.py +++ b/docker/package/packages.py @@ -13,10 +13,11 @@ from .systemd import Service, ServiceFile, SystemdUnit, Unit, Install -networks = ["mainnet", "granadanet"] +networks = ["mainnet", "granadanet", "hangzhounet"] networks_protos = { "mainnet": ["010-PtGRANAD"], "granadanet": ["010-PtGRANAD"], + "hangzhounet": ["011-PtHangzH"], } signer_units = [ diff --git a/docker/package/tezos_setup_wizard.py b/docker/package/tezos_setup_wizard.py index dbfb21f3a..def77d68f 100644 --- a/docker/package/tezos_setup_wizard.py +++ b/docker/package/tezos_setup_wizard.py @@ -22,6 +22,7 @@ networks = { "mainnet": "Main Tezos network", "granadanet": "Test network using version 010 of Tezos protocol (Granada)", + "hangzhounet": "Test network using version 011 of Tezos protocol (Hangzhou)", } modes = { diff --git a/nix/build/hacks.nix b/nix/build/hacks.nix index 81b65dccf..8f71d73aa 100644 --- a/nix/build/hacks.nix +++ b/nix/build/hacks.nix @@ -48,67 +48,35 @@ let ''; in rec { - ocaml = self.ocaml-ng.ocamlPackages_4_10.ocaml; + ocaml = self.ocaml-ng.ocamlPackages_4_12.ocaml; dune = self.ocamlPackages.dune_2; # FIXME opam-nix needs to do this ocamlfind = findlib; - # FIXME opam-nix needs to do version resolution - ezjsonm = osuper.ezjsonm.versions."1.2.0"; - hacl-star-raw = osuper.hacl-star-raw.versions."0.3.2".overrideAttrs (o: rec { + hacl-star-raw = osuper.hacl-star-raw.versions."0.4.1".overrideAttrs (o: rec { preConfigure = "patchShebangs raw/configure"; sourceRoot = "."; buildInputs = o.buildInputs ++ [ self.which ]; - propagatedBuildInputs = buildInputs; minimalOCamlVersion = "4.10"; }); - hacl-star = osuper.hacl-star.versions."0.3.2".overrideAttrs (_: rec { + hacl-star = osuper.hacl-star.versions."0.4.1".overrideAttrs (o: rec { sourceRoot = "."; - }); - optint = osuper.optint.versions."0.1.0"; - repr = osuper.repr.overrideAttrs (o: rec { - version = "0.4.0"; - src = self.fetchurl { - url = "https://github.com/mirage/${o.pname}/releases/download/${version}/${o.pname}-fuzz-${version}.tbz"; - sha256 = "1kpwgncyxcrq90dn7ilja7c5i88whc3fz4fmq1lwr0ar95d7d48p"; - }; - }); - ppx_repr = osuper.ppx_repr.overrideAttrs (_: { - doCheck = false; - }); - terminal = osuper.terminal.versions."0.2.1".overrideAttrs (o: { - buildPhase = '' - runHook preBuild - "dune" "build" "-p" "${o.pname}" "-j" "$NIX_BUILD_CORES" - runHook postBuild - ''; - }); - progress = osuper.progress.versions."0.2.1".overrideAttrs (o: { buildPhase = '' runHook preBuild - "dune" "build" "-p" "${o.pname}" "-j" "$NIX_BUILD_CORES" + dune build -p hacl-star -j $NIX_BUILD_CORES @install @doc runHook postBuild ''; }); - index = osuper.index.versions."1.4.1"; - ppx_irmin = osuper.ppx_irmin.versions."2.7.2"; - irmin = osuper.irmin.versions."2.7.2"; - irmin-pack = osuper.irmin-pack.versions."2.7.2"; - irmin-layers = osuper.irmin-layers.versions."2.7.2"; lwt-canceler = osuper.lwt-canceler.versions."0.3"; - - benchmark = osuper.benchmark.overrideAttrs (_: { - doCheck = false; + data-encoding = osuper.data-encoding.versions."0.4"; + json-data-encoding = osuper.json-data-encoding.versions."0.10"; + json-data-encoding-bson = osuper.json-data-encoding-bson.versions."0.10"; + ocamlformat = osuper.ocamlformat.overrideAttrs (o: { + buildInputs = o.buildInputs ++ [ alcotest ocp-indent ]; }); - data-encoding = osuper.data-encoding.versions."0.3"; - json-data-encoding = osuper.json-data-encoding.versions."0.9.1"; - json-data-encoding-bson = osuper.json-data-encoding-bson.versions."0.9.1"; - ff = osuper.ff.versions."0.4.0"; - - bls12-381-gen = osuper.bls12-381-gen.versions."0.4.3"; - bls12-381 = osuper.bls12-381.versions."0.4.3".overrideAttrs (o: + bls12-381 = osuper.bls12-381.versions."1.0.0".overrideAttrs (o: rec { buildInputs = o.buildInputs ++ [ rustc-bls12-381 ]; buildPhase = '' @@ -116,11 +84,16 @@ rec { '' + o.buildPhase; }); - bls12-381-unix = osuper.bls12-381-unix.versions."0.4.3".overrideAttrs (o: + bls12-381-unix = osuper.bls12-381-unix.overrideAttrs (o: + rec { + buildInputs = o.buildInputs ++ [ rustc-bls12-381 ]; + }); + + bls12-381-legacy = osuper.bls12-381-legacy.overrideAttrs (o: rec { buildInputs = o.buildInputs ++ [ rustc-bls12-381 ]; buildPhase = '' - cp ${rustc-bls12-381.src}/include/* src/unix/ + cp ${rustc-bls12-381.src}/include/* src/legacy/ '' + o.buildPhase; }); @@ -133,15 +106,14 @@ rec { } ); zarith = osuper.zarith.overrideAttrs(o : { - version = "1.10"; + version = "1.11"; buildInputs = o.buildInputs ++ [self.perl]; src = self.fetchurl { - url = "https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz"; - sha256 = "1qxrl0v2mk9wghc1iix3n0vfz2jbg6k5wpn1z7p02m2sqskb0zhb"; + url = "https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz"; + sha256 = "111n33flg4aq5xp5jfksqm4yyz6mzxx9ps9a4yl0dz8h189az5pr"; }; patchPhase = "patchShebangs ./z_pp.pl"; }); - # FIXME opam-nix needs to handle "external" (native) dependencies correctly conf-gmp = self.gmp; conf-libev = self.libev; @@ -157,37 +129,6 @@ rec { ctypes-foreign = ctypes; gmp = self.gmp; - zlib = osuper.zlib.overrideAttrs (o: { - src = self.fetchurl { - url = " https://github.com/madroach/ocaml-zlib/archive/0.6.tar.gz"; - sha256 = "sha256-QWc8Lrk8qZ7T3hg77z5rQ2xnoNkCsRC+XaFXqtkip+k="; - }; - }); - camlzip = osuper.camlzip.versions."1.10".overrideAttrs (_: { - src = self.fetchzip { - url = "https://github.com/xavierleroy/camlzip/archive/rel110.zip"; - sha256 = "1pm1vs947cbb4b4827pcz5kbj41miyxw599craznwm1ix27bmpj6"; - }; - }); - - ctypes = osuper.ctypes.versions."0.17.1".overrideAttrs (o: rec{ - pname = "ctypes"; - buildInputs = o.buildInputs ++ [ self.libffi ]; - src = self.fetchurl { - url = "https://github.com/ocamllabs/ocaml-ctypes/archive/0.17.1.tar.gz"; - sha256 = "sha256-QWc8Lrk8qZ7T3hg77z5rQ2xnoNkCsRC+XaFYqtkip+k="; - }; - installPhase = '' - runHook preInstall - mkdir -p $OCAMLFIND_DESTDIR - "make" "install" - if [[ -d $OCAMLFIND_DESTDIR/${pname} ]]; then mv $OCAMLFIND_DESTDIR/${pname} $lib; ln -s $lib $OCAMLFIND_DESTDIR/${pname}; else touch $lib; fi - if [[ -d $out/bin ]]; then mv $out/bin $bin; ln -s $bin $out/bin; else touch $bin; fi - if [[ -d $out/share ]]; then mv $out/share $share; ln -s $share $out/share; else touch $share; fi - runHook postInstall - ''; - }); - # FIXME X11 in nixpkgs musl lablgtk = null; @@ -199,6 +140,11 @@ rec { propagatedBuildInputs = buildInputs; }); + tezos-protocol-environment-structs = osuper.tezos-protocol-environment-structs.overrideAttrs (o: rec { + buildInputs = o.buildInputs ++ [ bls12-381-legacy ]; + propagatedBuildInputs = buildInputs; + }); + tezos-client-base-unix = osuper.tezos-client-base-unix.overrideAttrs (o: rec { buildInputs = o.buildInputs ++ [ lwt-exit tezos-shell-services tezos-signer-backends tezos-proxy @@ -271,6 +217,9 @@ rec { tezos-protocol-010-PtGRANAD = osuper.tezos-protocol-010-PtGRANAD.overrideAttrs (o : { buildInputs = o.buildInputs ++ [ tezos-protocol-environment ]; }); + tezos-protocol-011-PtHangzH = osuper.tezos-protocol-011-PtHangzH.overrideAttrs (o : { + buildInputs = o.buildInputs ++ [ tezos-protocol-environment ]; + }); tezos-protocol-demo-noops = osuper.tezos-protocol-demo-noops.overrideAttrs (o : { buildInputs = o.buildInputs ++ [ tezos-protocol-environment ]; }); @@ -295,6 +244,9 @@ rec { tezos-protocol-plugin-010-PtGRANAD = osuper.tezos-protocol-plugin-010-PtGRANAD.overrideAttrs (o : { buildInputs = o.buildInputs ++ [ tezos-protocol-environment ]; }); + tezos-protocol-plugin-011-PtHangzH = osuper.tezos-protocol-plugin-011-PtHangzH.overrideAttrs (o : { + buildInputs = o.buildInputs ++ [ tezos-protocol-environment ]; + }); # packages depend on rust library tezos-validator = osuper.tezos-validator.overrideAttrs @@ -336,6 +288,11 @@ rec { buildInputs = o.buildInputs ++ [ librustzcash ]; XDG_DATA_DIRS = "${zcash-params}:$XDG_DATA_DIRS"; }); + tezos-protocol-011-PtHangzH-parameters = osuper.tezos-protocol-011-PtHangzH-parameters.overrideAttrs + (o: rec { + buildInputs = o.buildInputs ++ [ librustzcash ]; + XDG_DATA_DIRS = "${zcash-params}:$XDG_DATA_DIRS"; + }); # FIXME apply this patch upstream tezos-stdlib-unix = osuper.tezos-stdlib-unix.overrideAttrs @@ -363,6 +320,21 @@ rec { buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ]; postFixup = zcash-post-fixup o; }); + tezos-accuser-011-PtHangzH = osuper.tezos-accuser-011-PtHangzH.overrideAttrs + (o: { + buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ]; + postFixup = zcash-post-fixup o; + }); + tezos-baker-011-PtHangzH = osuper.tezos-baker-011-PtHangzH.overrideAttrs + (o: { + buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ]; + postFixup = zcash-post-fixup o; + }); + tezos-endorser-011-PtHangzH = osuper.tezos-endorser-011-PtHangzH.overrideAttrs + (o: { + buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ]; + postFixup = zcash-post-fixup o; + }); tezos-codec = osuper.tezos-codec.overrideAttrs (o: { buildInputs = o.buildInputs ++ [ rustc-bls12-381 librustzcash self.makeWrapper ]; diff --git a/nix/build/ocaml-overlay.nix b/nix/build/ocaml-overlay.nix index 5270f936c..a5f1b1f22 100644 --- a/nix/build/ocaml-overlay.nix +++ b/nix/build/ocaml-overlay.nix @@ -7,7 +7,7 @@ , hacks ? import ./hacks.nix , pkgs ? import sources.nixpkgs { }, opam-nix ? import sources.opam-nix pkgs }: self: super: { - ocamlPackages = self.ocaml-ng.ocamlPackages_4_10.overrideScope' + ocamlPackages = self.ocaml-ng.ocamlPackages_4_12.overrideScope' (builtins.foldl' self.lib.composeExtensions (_: _: { }) [ (opam-nix.traverseOPAMRepo' sources.opam-repository) (oself: osuper: { index-super = osuper.index.versions."1.2.0"; }) diff --git a/nix/modules/common.nix b/nix/modules/common.nix index 682f023cd..ee5829f44 100644 --- a/nix/modules/common.nix +++ b/nix/modules/common.nix @@ -22,10 +22,10 @@ rec { daemonOptions = sharedOptions // { baseProtocol = mkOption { - type = types.enum [ "010-PtGRANAD"]; + type = types.enum [ "010-PtGRANAD" "011-PtHangzH" ]; description = '' Base protocol version, - '010-PtGRANAD' is supported. + '010-PtGRANAD' and '011-PtHangzH' are supported. ''; example = "010-PtGRANAD"; }; diff --git a/nix/modules/tezos-accuser.nix b/nix/modules/tezos-accuser.nix index 2b6fbccde..5443939b1 100644 --- a/nix/modules/tezos-accuser.nix +++ b/nix/modules/tezos-accuser.nix @@ -10,6 +10,8 @@ let tezos-accuser-pkgs = { "010-PtGRANAD" = "${pkgs.ocamlPackages.tezos-accuser-010-PtGRANAD}/bin/tezos-accuser-010-PtGRANAD"; + "011-PtHangzH" = + "${pkgs.ocamlPackages.tezos-accuser-011-PtHangzH}/bin/tezos-accuser-011-PtHangzH"; }; cfg = config.services.tezos-accuser; common = import ./common.nix { inherit lib; inherit pkgs; }; diff --git a/nix/modules/tezos-baker.nix b/nix/modules/tezos-baker.nix index 17e38ed2c..5b1d5197b 100644 --- a/nix/modules/tezos-baker.nix +++ b/nix/modules/tezos-baker.nix @@ -10,6 +10,8 @@ let tezos-baker-pkgs = { "010-PtGRANAD" = "${pkgs.ocamlPackages.tezos-baker-010-PtGRANAD}/bin/tezos-baker-010-PtGRANAD"; + "011-PtHangzH" = + "${pkgs.ocamlPackages.tezos-baker-011-PtHangzH}/bin/tezos-baker-011-PtHangzH"; }; cfg = config.services.tezos-baker; common = import ./common.nix { inherit lib; inherit pkgs; }; diff --git a/nix/modules/tezos-endorser.nix b/nix/modules/tezos-endorser.nix index 10a7c50c2..f42be9e36 100644 --- a/nix/modules/tezos-endorser.nix +++ b/nix/modules/tezos-endorser.nix @@ -10,6 +10,8 @@ let tezos-endorser-pkgs = { "010-PtGRANAD" = "${pkgs.ocamlPackages.tezos-endorser-010-PtGRANAD}/bin/tezos-endorser-010-PtGRANAD"; + "011-PtHangzH" = + "${pkgs.ocamlPackages.tezos-endorser-011-PtHangzH}/bin/tezos-endorser-011-PtHangzH"; }; common = import ./common.nix { inherit lib; inherit pkgs; }; cfg = config.services.tezos-endorser; diff --git a/nix/nix/sources.json b/nix/nix/sources.json index 79c0170ac..0c57a0837 100644 --- a/nix/nix/sources.json +++ b/nix/nix/sources.json @@ -29,23 +29,22 @@ "homepage": null, "owner": "serokell", "repo": "opam-nix", - "rev": "bdd7e6730bdf0ea91ada3ebc68387424b087c9f8", - "sha256": "1wda717d6391vbgrp0vcv27pxfj4xy1511mssky8ll3iy7i851hn", + "rev": "ee285a3b6e05dc274f9ebf59ad64d8a4fded915e", + "sha256": "0f3dm834zf7y4c4pp8xr12zl0n1xk0zql3a9m2wh6a5shdcdcwj7", "type": "tarball", - "url": "https://github.com/serokell/opam-nix/archive/bdd7e6730bdf0ea91ada3ebc68387424b087c9f8.tar.gz", + "url": "https://github.com/serokell/opam-nix/archive/ee285a3b6e05dc274f9ebf59ad64d8a4fded915e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "opam-repository": { "branch": "master", - "description": "Main public package repository for OPAM, the source package manager of OCaml.", - "homepage": "https://opam.ocaml.org", - "owner": "ocaml", + "description": "Tezos opam-repository fork.", + "owner": "tezos", "repo": "opam-repository", - "rev": "3e92793804b7f34fca09fb17e2ebafd6d29d90cf", - "sha256": "175fdlydmwn6kb09dyz2pz8z2wdsa2lkfys0yqdgv237m67mk2yh", + "rev": "393349af19bb54e3cb790ac8ef54a72adc71aecf", + "sha256": "1b89v9488qq0nxjbr249h8mcm6fgz6dyz6ph83gkf3yi83mpqcv0", "type": "tarball", - "url": "https://github.com/ocaml/opam-repository/archive/3e92793804b7f34fca09fb17e2ebafd6d29d90cf.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" + "url": "https://gitlab.com/tezos/opam-repository/-/archive/393349af19bb54e3cb790ac8ef54a72adc71aecf.tar.gz", + "url_template": "https://gitlab.com///-/archive/.tar.gz" }, "serokell-nix": { "branch": "master", @@ -60,9 +59,9 @@ "url_template": "https://github.com///archive/.tar.gz" }, "tezos": { - "ref": "refs/tags/v10.2", + "ref": "refs/tags/v11.0-rc1", "repo": "https://gitlab.com/tezos/tezos", - "rev": "5bfd311b701015381338e73a30c74415fa493c10", + "rev": "36055190bb560997f377ab7ee7bc6b66fe61835f", "type": "git" } } diff --git a/protocols.json b/protocols.json index 9eec8968c..b9858fa91 100644 --- a/protocols.json +++ b/protocols.json @@ -20,6 +20,7 @@ "009-PsFLoren" ], "active": [ - "010-PtGRANAD" + "010-PtGRANAD", + "011-PtHangzH" ] } diff --git a/scripts/build-bottles.sh b/scripts/build-bottles.sh index dc85e84da..250ba7341 100755 --- a/scripts/build-bottles.sh +++ b/scripts/build-bottles.sh @@ -18,11 +18,14 @@ brew install --formula ./Formula/tezos-sapling-params.rb # we don't bottle meta-formulas that contains only services build_bottle ./Formula/tezos-accuser-010-PtGRANAD.rb +build_bottle ./Formula/tezos-accuser-011-PtHangzH.rb build_bottle ./Formula/tezos-admin-client.rb build_bottle ./Formula/tezos-baker-010-PtGRANAD.rb +build_bottle ./Formula/tezos-baker-011-PtHangzH.rb build_bottle ./Formula/tezos-client.rb build_bottle ./Formula/tezos-codec.rb build_bottle ./Formula/tezos-endorser-010-PtGRANAD.rb +build_bottle ./Formula/tezos-endorser-011-PtHangzH.rb build_bottle ./Formula/tezos-node.rb build_bottle ./Formula/tezos-sandbox.rb build_bottle ./Formula/tezos-signer.rb diff --git a/tests/test_script.py b/tests/test_script.py index 3ca84693e..1bec1118b 100644 --- a/tests/test_script.py +++ b/tests/test_script.py @@ -78,8 +78,8 @@ def test_node_with_daemons_scenario(network, use_tls=False): kill_node_with_daemons() -with subtest("run node with daemons on granadanet"): - test_node_with_daemons_scenario("granadanet") +with subtest("run node with daemons on hangzhounet"): + test_node_with_daemons_scenario("hangzhounet") 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 1e2a290f0..8f9d73195 100644 --- a/tests/tezos-binaries.nix +++ b/tests/tezos-binaries.nix @@ -17,11 +17,11 @@ in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: testScript = '' path_to_binaries = "${path-to-binaries}" - tezos_accuser = f"{path_to_binaries}/tezos-accuser-010-PtGRANAD" + tezos_accuser = f"{path_to_binaries}/tezos-accuser-011-PtHangzH" tezos_admin_client = f"{path_to_binaries}/tezos-admin-client" - tezos_baker = f"{path_to_binaries}/tezos-baker-010-PtGRANAD" + tezos_baker = f"{path_to_binaries}/tezos-baker-011-PtHangzH" tezos_client = f"{path_to_binaries}/tezos-client" - tezos_endorser = f"{path_to_binaries}/tezos-endorser-010-PtGRANAD" + tezos_endorser = f"{path_to_binaries}/tezos-endorser-011-PtHangzH" tezos_node = f"{path_to_binaries}/tezos-node" tezos_signer = f"{path_to_binaries}/tezos-signer" tezos_codec = f"{path_to_binaries}/tezos-codec" diff --git a/tests/tezos-modules.nix b/tests/tezos-modules.nix index 2f52f1533..3eb4237ce 100644 --- a/tests/tezos-modules.nix +++ b/tests/tezos-modules.nix @@ -18,26 +18,26 @@ in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: ../nix/modules/tezos-endorser.nix ]; - services.tezos-node.instances.granadanet.enable = true; + services.tezos-node.instances.hangzhounet.enable = true; - services.tezos-signer.instances.granadanet = { + services.tezos-signer.instances.hangzhounet = { enable = true; networkProtocol = "http"; }; - services.tezos-accuser.instances.granadanet = { + services.tezos-accuser.instances.hangzhounet = { enable = true; - baseProtocol = "010-PtGRANAD"; + baseProtocol = "011-PtHangzH"; }; - services.tezos-baker.instances.granadanet = { + services.tezos-baker.instances.hangzhounet = { enable = true; - baseProtocol = "010-PtGRANAD"; + baseProtocol = "011-PtHangzH"; }; - services.tezos-endorser.instances.granadanet = { + services.tezos-endorser.instances.hangzhounet = { enable = true; - baseProtocol = "010-PtGRANAD"; + baseProtocol = "011-PtHangzH"; }; }; @@ -54,7 +54,7 @@ in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: ] for s in services: - machine.wait_for_unit(f"tezos-granadanet-{s}.service") + machine.wait_for_unit(f"tezos-hangzhounet-{s}.service") with subtest("check tezos-node rpc response"): machine.wait_for_open_port(8732) @@ -64,6 +64,6 @@ in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: with subtest("service status sanity check"): for s in services: - machine.succeed(f"systemctl status tezos-granadanet-{s}.service") + machine.succeed(f"systemctl status tezos-hangzhounet-{s}.service") ''; }) diff --git a/tests/tezos-nix-binaries.nix b/tests/tezos-nix-binaries.nix index 14bd897b9..7f1420d60 100644 --- a/tests/tezos-nix-binaries.nix +++ b/tests/tezos-nix-binaries.nix @@ -5,7 +5,7 @@ let nixpkgs = (import ../nix/nix/sources.nix).nixpkgs; pkgs = import ../nix/build/pkgs.nix {}; inherit (pkgs.ocamlPackages) tezos-client tezos-admin-client tezos-node tezos-signer tezos-codec - tezos-accuser-010-PtGRANAD tezos-baker-010-PtGRANAD tezos-endorser-010-PtGRANAD; + tezos-accuser-011-PtHangzH tezos-baker-011-PtHangzH tezos-endorser-011-PtHangzH; in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: { nodes.machine = { ... }: { @@ -20,13 +20,13 @@ in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: }; testScript = '' - tezos_accuser = "${tezos-accuser-010-PtGRANAD}/bin/tezos-accuser-010-PtGRANAD" + tezos_accuser = "${tezos-accuser-011-PtHangzH}/bin/tezos-accuser-011-PtHangzH" tezos_admin_client = "${tezos-admin-client}/bin/tezos-admin-client" - tezos_baker = "${tezos-baker-010-PtGRANAD}/bin/tezos-baker-010-PtGRANAD" + tezos_baker = "${tezos-baker-011-PtHangzH}/bin/tezos-baker-011-PtHangzH" tezos_client = ( "${tezos-client}/bin/tezos-client" ) - tezos_endorser = "${tezos-endorser-010-PtGRANAD}/bin/tezos-endorser-010-PtGRANAD" + tezos_endorser = "${tezos-endorser-011-PtHangzH}/bin/tezos-endorser-011-PtHangzH" tezos_node = "${tezos-node}/bin/tezos-node" tezos_signer = ( "${tezos-signer}/bin/tezos-signer"