From 9490cfa62674b5ad6aff089fb71b50979c42d9cd Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Thu, 17 Aug 2023 20:36:46 +0300 Subject: [PATCH 1/9] [Chore] Bump Tezos sources to v18.0-rc1 --- flake.lock | 12 ++++++------ meta.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 94f536fe3..5d36fdacd 100644 --- a/flake.lock +++ b/flake.lock @@ -380,11 +380,11 @@ "opam-repository_2": { "flake": false, "locked": { - "lastModified": 1686322648, - "narHash": "sha256-aH90yIb0oy2ssL+rBGHbu7GlNrJPH1aSV5ih4FUSpn8=", + "lastModified": 1690375350, + "narHash": "sha256-blbuXgC68vvccQGs2LQv6TBITXbYOobWf/d4CU3rrnc=", "owner": "tezos", "repo": "opam-repository", - "rev": "cf7920c4fe635f92bc703fe7ae6fd38c9b4ba8a3", + "rev": "14e619168449e86a5a8ff4029ab57174464e18bd", "type": "gitlab" }, "original": { @@ -451,11 +451,11 @@ "tezos": { "flake": false, "locked": { - "lastModified": 1692263564, - "narHash": "sha256-CYL3SlwsXhUbNfu5hQdWNGgNCgxnAnsAV4oQQ3iSZ94=", + "lastModified": 1692197267, + "narHash": "sha256-DFan2Z2OVwxxK7s2TT+2GI6zy9/NWhVa13D89JjscZg=", "owner": "tezos", "repo": "tezos", - "rev": "b2bc6d7f56171a259bd08732f008e7ffa1c9a120", + "rev": "f59e1b0eaa26e97a23824dc4fbd4af2bd8fcf8af", "type": "gitlab" }, "original": { diff --git a/meta.json b/meta.json index 1ebdaaa81..793cf5632 100644 --- a/meta.json +++ b/meta.json @@ -1,5 +1,5 @@ { "release": "2", "maintainer": "Serokell ", - "tezos_ref": "v17.3" + "tezos_ref": "v18.0-rc1" } From 1598ea124c778c7541a634f22b03cd55d65a5302 Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Thu, 17 Aug 2023 20:36:54 +0300 Subject: [PATCH 2/9] [Chore] Update brew formulae for v18.0-rc1 --- Formula/tezos-accuser-PtMumbai.rb | 4 ++-- Formula/tezos-accuser-PtNairob.rb | 7 ++----- Formula/tezos-admin-client.rb | 7 ++----- Formula/tezos-baker-PtMumbai.rb | 4 ++-- Formula/tezos-baker-PtNairob.rb | 7 ++----- Formula/tezos-client.rb | 7 ++----- Formula/tezos-codec.rb | 7 ++----- Formula/tezos-node-ghostnet.rb | 2 +- Formula/tezos-node-mainnet.rb | 2 +- Formula/tezos-node-mumbainet.rb | 2 +- Formula/tezos-node-nairobinet.rb | 2 +- Formula/tezos-node.rb | 7 ++----- Formula/tezos-signer-http.rb | 2 +- Formula/tezos-signer-https.rb | 2 +- Formula/tezos-signer-tcp.rb | 2 +- Formula/tezos-signer-unix.rb | 2 +- Formula/tezos-signer.rb | 7 ++----- Formula/tezos-smart-rollup-client-PtMumbai.rb | 4 ++-- Formula/tezos-smart-rollup-client-PtNairob.rb | 7 ++----- Formula/tezos-smart-rollup-node-PtMumbai.rb | 4 ++-- Formula/tezos-smart-rollup-node-PtNairob.rb | 7 ++----- 21 files changed, 34 insertions(+), 61 deletions(-) diff --git a/Formula/tezos-accuser-PtMumbai.rb b/Formula/tezos-accuser-PtMumbai.rb index 820d187ec..f22c47d36 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 => "v17.3", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - version "v17.3-1" + version "v18.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| diff --git a/Formula/tezos-accuser-PtNairob.rb b/Formula/tezos-accuser-PtNairob.rb index 1691ef4c7..3a2579b82 100644 --- a/Formula/tezos-accuser-PtNairob.rb +++ b/Formula/tezos-accuser-PtNairob.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v17.3", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - version "v17.3-1" + version "v18.0-rc1-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/#{TezosAccuserPtnairob.version}/" - sha256 cellar: :any, monterey: "8119294feaa1d2df9194f9ac214534ce4b9f0a17939a516c59861ab21b9d15ac" - sha256 cellar: :any, big_sur: "f6b5687d13de47e31f561d897c30137656f2cd873a671cfbf8fd7cc17b406d7a" - sha256 cellar: :any, arm64_big_sur: "3af1de2db0d10370828f5ae6a40576eba9ae0152574b16e70f2b4c3b66effcc5" end def make_deps diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb index c28887701..efb3e73c4 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 => "v17.3", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - version "v17.3-1" + version "v18.0-rc1-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, monterey: "ea8d94c9d06ccd9832923e3915e12a1e35256e719b254de89341a1772a80b62b" - sha256 cellar: :any, big_sur: "89b86b6f9ebdec27d9dcff19c6262a0e54f16917b244083f63581d042f1ad57f" - sha256 cellar: :any, arm64_big_sur: "b0a7aebaaf2b6c60a6f1748ab82c2ebe456cb948deda13830f72c18917786bbb" end def make_deps diff --git a/Formula/tezos-baker-PtMumbai.rb b/Formula/tezos-baker-PtMumbai.rb index 33d817d98..b872909b9 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 => "v17.3", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - version "v17.3-1" + version "v18.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| diff --git a/Formula/tezos-baker-PtNairob.rb b/Formula/tezos-baker-PtNairob.rb index cd4719375..ababf8636 100644 --- a/Formula/tezos-baker-PtNairob.rb +++ b/Formula/tezos-baker-PtNairob.rb @@ -9,9 +9,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v17.3", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - version "v17.3-1" + version "v18.0-rc1-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/#{TezosBakerPtnairob.version}/" - sha256 cellar: :any, monterey: "b0a2b5e165f14b15292f9dc2b8f1ddb3941f94dcce76ef91dd174b883e53674b" - sha256 cellar: :any, big_sur: "536e0645af7de6373c2c0116cffbdd3a510369457fc23b00a0cfcc2452df5203" - sha256 cellar: :any, arm64_big_sur: "4314adb34e9e8f2733b8e9e9d9b9fcfc983f4480d8233a8c66e25adbe819d8cc" end def make_deps diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb index 69a2a3ddc..5eaaa98d4 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 => "v17.3", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - version "v17.3-1" + version "v18.0-rc1-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, monterey: "b1a940683048debcc1daf873503d6aa95dab71050a9db003f32435c28c7e9694" - sha256 cellar: :any, big_sur: "61ed45838dc649bd5264e3f1520ca9af5c37e152b07d6255987de7d58e15a325" - sha256 cellar: :any, arm64_big_sur: "8af7c78c67ed61f3d16b3ffd08dc82d4914172ee3eecb8811568d044eb661b9f" end def make_deps diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb index cb4c4e4f6..c93330910 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 => "v17.3", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - version "v17.3-1" + version "v18.0-rc1-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, monterey: "a69309b6ecae9573faea0bd24e86d70d3981430831d81898760a17121f0e0546" - sha256 cellar: :any, big_sur: "e5c3da00b2b0afc9f417112002f6711e3eb5ff273bff1906dca3bfcd7038e4b0" - sha256 cellar: :any, arm64_big_sur: "2b61313c57008a420d9968f6b8713a3a54e1bb700e53cabdf91fa7b529c28c72" end def make_deps diff --git a/Formula/tezos-node-ghostnet.rb b/Formula/tezos-node-ghostnet.rb index d656d6bfb..b3972ed00 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 "v17.3-1" + version "v18.0-rc1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-mainnet.rb b/Formula/tezos-node-mainnet.rb index 85d6ad097..e9bfb9fd2 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 "v17.3-1" + version "v18.0-rc1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-mumbainet.rb b/Formula/tezos-node-mumbainet.rb index 28a568cb1..332f0c865 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 "v17.3-1" + version "v18.0-rc1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node-nairobinet.rb b/Formula/tezos-node-nairobinet.rb index ed8f7c990..543a2816f 100644 --- a/Formula/tezos-node-nairobinet.rb +++ b/Formula/tezos-node-nairobinet.rb @@ -5,7 +5,7 @@ class TezosNodeNairobinet < Formula url "file:///dev/null" - version "v17.3-1" + version "v18.0-rc1-1" depends_on "tezos-node" diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index c9ba663c0..04c801562 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 => "v17.3", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - version "v17.3-1" + version "v18.0-rc1-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, monterey: "f0a985b169577c3a11bb667697f56c3db97cd3fe7294de34a5ead4f7d00d67a0" - sha256 cellar: :any, big_sur: "663bc0853bdb526c206906847c3211f27bf00c75c4e098b20ae003fca0858a18" - sha256 cellar: :any, arm64_big_sur: "bf858a60ad8ff4bd81bd779f23d58b1899fb2d3b74d8996246e2fad88afad300" end def make_deps diff --git a/Formula/tezos-signer-http.rb b/Formula/tezos-signer-http.rb index 9cee592c4..def1526d5 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 "v17.3-1" + version "v18.0-rc1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-https.rb b/Formula/tezos-signer-https.rb index 0aa697e7f..66e630952 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 "v17.3-1" + version "v18.0-rc1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-tcp.rb b/Formula/tezos-signer-tcp.rb index b23420893..3525f1c89 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 "v17.3-1" + version "v18.0-rc1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer-unix.rb b/Formula/tezos-signer-unix.rb index 42105f0b1..5e96e1e60 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 "v17.3-1" + version "v18.0-rc1-1" depends_on "tezos-signer" diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb index 197f58fde..9307c939a 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 => "v17.3", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - version "v17.3-1" + version "v18.0-rc1-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, monterey: "7459d361f7c3210980fcbb9c922efeb4a7976c9d4e4238ddb8319aebbbd73925" - sha256 cellar: :any, big_sur: "6755d624dbce5366c0e407ab50ce8345bc431f6a204dd354108eddf9d1839d4e" - sha256 cellar: :any, arm64_big_sur: "903bc14077b0ff00b6924938542af1094031888440f32a8919a57843ffee4516" end def make_deps diff --git a/Formula/tezos-smart-rollup-client-PtMumbai.rb b/Formula/tezos-smart-rollup-client-PtMumbai.rb index bb9f125e3..0b865361f 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 => "v17.3", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - version "v17.3-1" + version "v18.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| diff --git a/Formula/tezos-smart-rollup-client-PtNairob.rb b/Formula/tezos-smart-rollup-client-PtNairob.rb index deaa782e9..a0056b5e4 100644 --- a/Formula/tezos-smart-rollup-client-PtNairob.rb +++ b/Formula/tezos-smart-rollup-client-PtNairob.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v17.3", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - version "v17.3-1" + version "v18.0-rc1-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/#{TezosSmartRollupClientPtnairob.version}/" - sha256 cellar: :any, monterey: "e3ec6b3abef855cc8ea1ed93b2c49bfff65c9b7dd12385c10cdd99182a585458" - sha256 cellar: :any, big_sur: "4ce7ac2c1c03eabb8dce4aa1afa2ea975c5c87d48875e53cfce99c8ee39fa7d3" - sha256 cellar: :any, arm64_big_sur: "3470927ae77f8bcf25715e8f0529fa401d08ef7fb442af588c48011cd6ee7c75" end def make_deps diff --git a/Formula/tezos-smart-rollup-node-PtMumbai.rb b/Formula/tezos-smart-rollup-node-PtMumbai.rb index d6de2739b..241e6c4b7 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 => "v17.3", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - version "v17.3-1" + version "v18.0-rc1-1" build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] build_dependencies.each do |dependency| diff --git a/Formula/tezos-smart-rollup-node-PtNairob.rb b/Formula/tezos-smart-rollup-node-PtNairob.rb index ccae69195..aa1817de3 100644 --- a/Formula/tezos-smart-rollup-node-PtNairob.rb +++ b/Formula/tezos-smart-rollup-node-PtNairob.rb @@ -11,9 +11,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v17.3", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - version "v17.3-1" + version "v18.0-rc1-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/#{TezosSmartRollupNodePtnairob.version}/" - sha256 cellar: :any, monterey: "1a6bf892de65b2ea354da02f3c633033ead8b014efafa9fb475ef4588ba6d32f" - sha256 cellar: :any, big_sur: "dbbe954b7cfee4c010a633cfcb70a1835cf4acfdc521f8196ce45b42b779d519" - sha256 cellar: :any, arm64_big_sur: "33bb3146915095b4d190c1a9f7739dfc4f6b5c077a9f3b6a94a7c946ce916957" end def make_deps From b7deed3b7d86f15e1465b23605dde72005743a85 Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Thu, 17 Aug 2023 20:36:55 +0300 Subject: [PATCH 3/9] [Chore] Reset release number for v18.0-rc1 --- baking/pyproject.toml | 2 +- docker/package/model.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/baking/pyproject.toml b/baking/pyproject.toml index 9db63611c..2da8bf8c8 100644 --- a/baking/pyproject.toml +++ b/baking/pyproject.toml @@ -14,7 +14,7 @@ description = "Package that provides systemd services that orchestrate other ser license = { text = "LicenseRef-MIT-OA" } requires-python = ">=3.8" readme = "README.md" -version = "v17.3a" +version = "v18.0-rc1" [tool.setuptools.packages.find] where= ["src"] diff --git a/docker/package/model.py b/docker/package/model.py index 4c2b64de9..4fd7b8c59 100644 --- a/docker/package/model.py +++ b/docker/package/model.py @@ -585,7 +585,7 @@ class TezosBakingServicesPackage(AbstractPackage): # native releases, so we append an extra letter to the version of # the package. # This should be reset to "" whenever the native version is bumped. - letter_version = "a" + letter_version = "" buildfile = "setup.py" From 5a1a11ee6297bb6cf2620d09aa325d96f1499628 Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Fri, 18 Aug 2023 11:06:06 +0300 Subject: [PATCH 4/9] [Chore] Remove PtMumbai and mumbainet support Problem: PtMumbai protocol is deprecated. Solution: Remove it support. --- .buildkite/pipeline-raw.yml | 4 +- .github/workflows/build-bottles.yml | 2 +- Formula/tezos-accuser-PtMumbai.rb | 100 ---------------- Formula/tezos-baker-PtMumbai.rb | 110 ------------------ Formula/tezos-node-mumbainet.rb | 66 ----------- Formula/tezos-smart-rollup-client-PtMumbai.rb | 65 ----------- Formula/tezos-smart-rollup-node-PtMumbai.rb | 97 --------------- baking/src/tezos_baking/tezos_setup_wizard.py | 2 +- baking/src/tezos_baking/wizard_structure.py | 5 +- docker/package/packages.py | 9 +- docs/baking.md | 2 +- docs/fedora.md | 4 +- docs/systemd.md | 5 +- docs/voting.md | 2 +- nix/modules/common.nix | 4 +- nix/modules/tezos-accuser.nix | 2 - nix/modules/tezos-baker.nix | 2 - nix/modules/tezos-node.nix | 2 +- protocols.json | 4 +- scripts/build-all-bottles.sh | 2 +- tests/systemd/services_tests.py | 42 +++---- tests/test_script.py | 4 +- tests/tezos-binaries.nix | 13 +-- tests/tezos-modules.nix | 16 +-- tests/tezos-nix-binaries.nix | 21 ++-- 25 files changed, 68 insertions(+), 517 deletions(-) delete mode 100644 Formula/tezos-accuser-PtMumbai.rb delete mode 100644 Formula/tezos-baker-PtMumbai.rb delete mode 100644 Formula/tezos-node-mumbainet.rb delete mode 100644 Formula/tezos-smart-rollup-client-PtMumbai.rb delete mode 100644 Formula/tezos-smart-rollup-node-PtMumbai.rb diff --git a/.buildkite/pipeline-raw.yml b/.buildkite/pipeline-raw.yml index 44cbe821d..1ee2c7bb3 100644 --- a/.buildkite/pipeline-raw.yml +++ b/.buildkite/pipeline-raw.yml @@ -117,7 +117,7 @@ steps: - eval "$SET_VERSION" # Building all binary packages will take significant amount of time, so we build only one # in order to ensure package generation sanity - - nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type binary -p tezos-baker-PtMumbai + - nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type binary -p tezos-baker-PtNairob - rm -rf out # It takes much time to build binary package, so we do it only on master branches: "master" @@ -141,7 +141,7 @@ steps: - eval "$SET_VERSION" # Building all binary packages will take significant amount of time, so we build only one # in order to ensure package generation sanity - - nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type binary -p tezos-baker-PtMumbai + - nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type binary -p tezos-baker-PtNairob - rm -rf out # It takes much time to build binary package, so we do it only on master branches: "master" diff --git a/.github/workflows/build-bottles.yml b/.github/workflows/build-bottles.yml index 63fffe136..971e587dd 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-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] + formula: [tezos-accuser-PtNairob, tezos-admin-client, tezos-baker-PtNairob, tezos-client, tezos-codec, tezos-node, tezos-signer, tezos-smart-rollup-client-PtNairob, tezos-smart-rollup-node-PtNairob] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/Formula/tezos-accuser-PtMumbai.rb b/Formula/tezos-accuser-PtMumbai.rb deleted file mode 100644 index f22c47d36..000000000 --- a/Formula/tezos-accuser-PtMumbai.rb +++ /dev/null @@ -1,100 +0,0 @@ -# SPDX-FileCopyrightText: 2022 Oxhead Alpha -# SPDX-License-Identifier: LicenseRef-MIT-OA - -class TezosAccuserPtmumbai < Formula - @all_bins = [] - - class << self - attr_accessor :all_bins - end - homepage "https://gitlab.com/tezos/tezos" - - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - - version "v18.0-rc1-1" - - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] - 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/#{TezosAccuserPtmumbai.version}/" - sha256 cellar: :any, monterey: "d99450586bb48016307ffdf7d76e7eb0555c31ab1ccde19b3dffd6c36642bcc5" - sha256 cellar: :any, big_sur: "98de4a2dff6201ee2d6435ec8f83a4a943868ec030567809a437a19b1988e9e7" - sha256 cellar: :any, arm64_big_sur: "52c01ff7b363dc1c61426817688fa32946e8bf4f1d3227f24ba1b0aabf6cfa88" - end - - def make_deps - ENV.deparallelize - ENV["CARGO_HOME"]="./.cargo" - # Disable usage of instructions from the ADX extension to avoid incompatibility - # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ - ENV["BLST_PORTABLE"]="yes" - # Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer - arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" - system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" - system ["source .cargo/env", "make build-deps"].join(" && ") - end - - def install_template(dune_path, exec_path, name) - bin.mkpath - self.class.all_bins << name - system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") - bin.install name - ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" - end - - def install - startup_contents = - <<~EOS - #!/usr/bin/env bash - - set -euo pipefail - - accuser="#{bin}/octez-accuser-PtMumbai" - - accuser_config="$TEZOS_CLIENT_DIR/config" - mkdir -p "$TEZOS_CLIENT_DIR" - - if [ ! -f "$accuser_config" ]; then - "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ - config init --output "$accuser_config" >/dev/null 2>&1 - else - "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ - config update >/dev/null 2>&1 - fi - - exec "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" run - EOS - File.write("tezos-accuser-PtMumbai-start", startup_contents) - bin.install "tezos-accuser-PtMumbai-start" - make_deps - install_template "src/proto_016_PtMumbai/bin_accuser/main_accuser_016_PtMumbai.exe", - "_build/default/src/proto_016_PtMumbai/bin_accuser/main_accuser_016_PtMumbai.exe", - "octez-accuser-PtMumbai" - end - - service do - run opt_bin/"tezos-accuser-PtMumbai-start" - require_root true - environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", NODE_RPC_SCHEME: "http", NODE_RPC_ADDR: "localhost:8732" - keep_alive true - log_path var/"log/tezos-accuser-PtMumbai.log" - error_log_path var/"log/tezos-accuser-PtMumbai.log" - end - - def post_install - mkdir "#{var}/lib/tezos/client" - end -end diff --git a/Formula/tezos-baker-PtMumbai.rb b/Formula/tezos-baker-PtMumbai.rb deleted file mode 100644 index b872909b9..000000000 --- a/Formula/tezos-baker-PtMumbai.rb +++ /dev/null @@ -1,110 +0,0 @@ -# SPDX-FileCopyrightText: 2022 Oxhead Alpha -# SPDX-License-Identifier: LicenseRef-MIT-OA - -class TezosBakerPtmumbai < Formula - @all_bins = [] - - class << self - attr_accessor :all_bins - end - homepage "https://gitlab.com/tezos/tezos" - - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - - version "v18.0-rc1-1" - - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] - 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/#{TezosBakerPtmumbai.version}/" - sha256 cellar: :any, monterey: "697990bac2a711f4f535008b6453980882cd7686e6db7f14c3670730535a7197" - sha256 cellar: :any, big_sur: "66facd7620ac17308a96b2cf69888f6de5101577b257b267d2ffd3ccecfb2050" - sha256 cellar: :any, arm64_big_sur: "3ffcfb3985b202a62efd09c8855b4c39e485ad4c7e30da64dd210d54cbdec904" - end - - def make_deps - ENV.deparallelize - ENV["CARGO_HOME"]="./.cargo" - # Disable usage of instructions from the ADX extension to avoid incompatibility - # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ - ENV["BLST_PORTABLE"]="yes" - # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer - arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" - system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" - system ["source .cargo/env", "make build-deps"].join(" && ") - end - - def install_template(dune_path, exec_path, name) - bin.mkpath - self.class.all_bins << name - system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") - bin.install name - ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" - end - - def install - startup_contents = - <<~EOS - #!/usr/bin/env bash - - set -euo pipefail - - baker="#{bin}/octez-baker-PtMumbai" - - baker_config="$TEZOS_CLIENT_DIR/config" - mkdir -p "$TEZOS_CLIENT_DIR" - - if [ ! -f "$baker_config" ]; then - "$baker" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ - config init --output "$baker_config" >/dev/null 2>&1 - else - "$baker" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ - config update >/dev/null 2>&1 - fi - - launch_baker() { - exec "$baker" \ - --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ - run with local node "$TEZOS_NODE_DIR" "$@" - } - - if [[ -z "$BAKER_ACCOUNT" ]]; then - launch_baker - else - launch_baker "$BAKER_ACCOUNT" - fi - EOS - File.write("tezos-baker-PtMumbai-start", startup_contents) - bin.install "tezos-baker-PtMumbai-start" - make_deps - install_template "src/proto_016_PtMumbai/bin_baker/main_baker_016_PtMumbai.exe", - "_build/default/src/proto_016_PtMumbai/bin_baker/main_baker_016_PtMumbai.exe", - "octez-baker-PtMumbai" - end - - service do - run opt_bin/"tezos-baker-PtMumbai-start" - require_root true - environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", TEZOS_NODE_DIR: "", NODE_RPC_SCHEME: "http", NODE_RPC_ADDR: "localhost:8732", BAKER_ACCOUNT: "" - keep_alive true - log_path var/"log/tezos-baker-PtMumbai.log" - error_log_path var/"log/tezos-baker-PtMumbai.log" - end - - def post_install - mkdir "#{var}/lib/tezos/client" - end -end diff --git a/Formula/tezos-node-mumbainet.rb b/Formula/tezos-node-mumbainet.rb deleted file mode 100644 index 332f0c865..000000000 --- a/Formula/tezos-node-mumbainet.rb +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env ruby - -# SPDX-FileCopyrightText: 2023 Oxhead Alpha -# SPDX-License-Identifier: LicenseRef-MIT-OA - -class TezosNodeMumbainet < Formula - url "file:///dev/null" - version "v18.0-rc1-1" - - depends_on "tezos-node" - - desc "Meta formula that provides background tezos-node service that runs on mumbainet" - - def install - startup_contents = - <<~EOS - #!/usr/bin/env bash - - set -euo pipefail - - node="/usr/local/bin/octez-node" - # default location of the config file - config_file="$TEZOS_CLIENT_DIR/config.json" - - mkdir -p "$TEZOS_CLIENT_DIR" - if [[ ! -f "$config_file" ]]; then - echo "Configuring the node..." - "$node" config init \ - --rpc-addr "$NODE_RPC_ADDR" \ - --network=mumbainet\ - "$@" - else - echo "Updating the node configuration..." - "$node" config update \ - --rpc-addr "$NODE_RPC_ADDR" \ - --network=mumbainet\ - "$@" - fi - - # Launching the node - if [[ -z "$CERT_PATH" || -z "$KEY_PATH" ]]; then - exec "$node" run --config-file="$config_file" - else - exec "$node" run --config-file="$config_file" \ - --rpc-tls="$CERT_PATH","$KEY_PATH" - fi - EOS - File.write("tezos-node-mumbainet-start", startup_contents) - bin.install "tezos-node-mumbainet-start" - print "Installing tezos-node-mumbainet service" - end - - service do - run opt_bin/"tezos-node-mumbainet-start" - require_root true - environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", NODE_RPC_ADDR: "127.0.0.1:8732", CERT_PATH: "", KEY_PATH: "" - keep_alive true - log_path var/"log/tezos-node-mumbainet.log" - error_log_path var/"log/tezos-node-mumbainet.log" - end - - def post_install - mkdir_p "#{var}/lib/tezos/node-mumbainet" - system "octez-node", "config", "init", "--data-dir" "#{var}/lib/tezos/node-mumbainet", "--network", "mumbainet" - end -end diff --git a/Formula/tezos-smart-rollup-client-PtMumbai.rb b/Formula/tezos-smart-rollup-client-PtMumbai.rb deleted file mode 100644 index 0b865361f..000000000 --- a/Formula/tezos-smart-rollup-client-PtMumbai.rb +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env ruby -# SPDX-FileCopyrightText: 2023 Oxhead Alpha -# SPDX-License-Identifier: LicenseRef-MIT-OA - -class TezosSmartRollupClientPtmumbai < Formula - @all_bins = [] - - class << self - attr_accessor :all_bins - end - homepage "https://gitlab.com/tezos/tezos" - - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - - version "v18.0-rc1-1" - - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] - 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 "Smart contract rollup CLI client for PtMumbai" - - bottle do - root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupClientPtmumbai.version}/" - sha256 cellar: :any, monterey: "dc56fe19714bcc58e9bde18bdefe1a7b9cbbfd5f239578a3fac99f76aa907de5" - sha256 cellar: :any, big_sur: "e9c60fe4bfb85c4199901458075ba54a28134994c3a1c306c4c8b8b2cf591727" - sha256 cellar: :any, arm64_big_sur: "1e423db1d4dd43e4a0fe431440c7a1dd3773fc02486b732f15a5200c59bb3216" - end - - def make_deps - ENV.deparallelize - ENV["CARGO_HOME"]="./.cargo" - # Disable usage of instructions from the ADX extension to avoid incompatibility - # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ - ENV["BLST_PORTABLE"]="yes" - # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer - arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" - system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" - system ["source .cargo/env", "make build-deps"].join(" && ") - end - - def install_template(dune_path, exec_path, name) - bin.mkpath - self.class.all_bins << name - system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") - bin.install name - ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" - end - - def install - make_deps - install_template "src/proto_016_PtMumbai/bin_sc_rollup_client/main_sc_rollup_client_016_PtMumbai.exe", - "_build/default/src/proto_016_PtMumbai/bin_sc_rollup_client/main_sc_rollup_client_016_PtMumbai.exe", - "octez-smart-rollup-client-PtMumbai" - end -end diff --git a/Formula/tezos-smart-rollup-node-PtMumbai.rb b/Formula/tezos-smart-rollup-node-PtMumbai.rb deleted file mode 100644 index 241e6c4b7..000000000 --- a/Formula/tezos-smart-rollup-node-PtMumbai.rb +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env ruby - -# SPDX-FileCopyrightText: 2023 Oxhead Alpha -# SPDX-License-Identifier: LicenseRef-MIT-OA - -class TezosSmartRollupNodePtmumbai < Formula - @all_bins = [] - - class << self - attr_accessor :all_bins - end - homepage "https://gitlab.com/tezos/tezos" - - url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false - - version "v18.0-rc1-1" - - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] - 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 "Tezos smart contract rollup node for PtMumbai" - - bottle do - root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNodePtmumbai.version}/" - sha256 cellar: :any, monterey: "1d78ad8bce8ce313e34d4ee52e265fa5f683efe8fcd5c76698ee850ff170b798" - sha256 cellar: :any, big_sur: "2c629ed60b7902dd6adeacf1b46324682d66292f7aaf16909329d2df7bd90f3d" - sha256 cellar: :any, arm64_big_sur: "31df9fb1d365aa14f8025c484050a04185354b28b9456cb4428aa7d9b2a36f43" - end - - def make_deps - ENV.deparallelize - ENV["CARGO_HOME"]="./.cargo" - # Disable usage of instructions from the ADX extension to avoid incompatibility - # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ - ENV["BLST_PORTABLE"]="yes" - # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer - arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" - system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" - system ["source .cargo/env", "make build-deps"].join(" && ") - end - - def install_template(dune_path, exec_path, name) - bin.mkpath - self.class.all_bins << name - system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") - bin.install name - ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" - end - - def install - startup_contents = - <<~EOS - #!/usr/bin/env bash - - set -euo pipefail - - node="#{bin}/octez-smart-rollup-node-PtMumbai" - - "$node" init "$ROLLUP_MODE" config \ - for "$ROLLUP_ALIAS" \ - --rpc-addr "$ROLLUP_NODE_RPC_ENDPOINT" \ - --force - - "$node" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ - run "$ROLLUP_MODE" for "$ROLLUP_ALIAS" - EOS - File.write("tezos-smart-rollup-node-PtMumbai-start", startup_contents) - bin.install "tezos-smart-rollup-node-PtMumbai-start" - make_deps - install_template "src/proto_016_PtMumbai/bin_sc_rollup_node/main_sc_rollup_node_016_PtMumbai.exe", - "_build/default/src/proto_016_PtMumbai/bin_sc_rollup_node/main_sc_rollup_node_016_PtMumbai.exe", - "octez-smart-rollup-node-PtMumbai" - end - - service do - run opt_bin/"tezos-smart-rollup-node-PtMumbai-start" - require_root true - environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", NODE_RPC_ENDPOINT: "http://localhost:8732", ROLLUP_NODE_RPC_ENDPOINT: "127.0.0.1:8472", ROLLUP_MODE: "observer", ROLLUP_ALIAS: "rollup" - keep_alive true - log_path var/"log/tezos-smart-rollup-node-PtMumbai.log" - error_log_path var/"log/tezos-smart-rollup-node-PtMumbai.log" - end - - def post_install - mkdir "#{var}/lib/tezos/client" - end -end diff --git a/baking/src/tezos_baking/tezos_setup_wizard.py b/baking/src/tezos_baking/tezos_setup_wizard.py index aa656b3b5..267fb54cf 100644 --- a/baking/src/tezos_baking/tezos_setup_wizard.py +++ b/baking/src/tezos_baking/tezos_setup_wizard.py @@ -178,7 +178,7 @@ def is_full_snapshot(snapshot_file, 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 `PtMumbai` (used on `mumbainet`, `ghostnet` and `mainnet`) and `PtNairob` (used on `nairobinet`).\n" + "The currently supported protocol is `PtNairob` (used on `nairobinet`, `ghostnet` and `mainnet`).\n" "Keep in mind that you must select the test network (e.g. ghostnet)\n" "if you plan on baking with a faucet JSON file.\n", options=networks, diff --git a/baking/src/tezos_baking/wizard_structure.py b/baking/src/tezos_baking/wizard_structure.py index c7953d506..d642085e5 100644 --- a/baking/src/tezos_baking/wizard_structure.py +++ b/baking/src/tezos_baking/wizard_structure.py @@ -303,9 +303,8 @@ def url_is_reachable(url): networks = { "mainnet": "Main Tezos network", - "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", + "ghostnet": "Long running test network, currently using the Nairobi Tezos protocol", + "nairobinet": "Test network using the Nairobi Tezos protocol", } http_request_headers = {"User-Agent": "Mozilla/5.0"} diff --git a/docker/package/packages.py b/docker/package/packages.py index ab24eaa42..1ab8ce997 100644 --- a/docker/package/packages.py +++ b/docker/package/packages.py @@ -19,18 +19,15 @@ networks = { "mainnet": "mainnet", "ghostnet": "ghostnet", - "mumbainet": "mumbainet", "nairobinet": "https://teztnets.xyz/nairobinet", } networks_protos = { - "mainnet": ["PtMumbai", "PtNairob"], - "ghostnet": ["PtMumbai", "PtNairob"], - "mumbainet": ["PtMumbai"], + "mainnet": ["PtNairob"], + "ghostnet": ["PtNairob"], "nairobinet": ["PtNairob"], } protocol_numbers = { - "PtMumbai": "016", "PtNairob": "017", } @@ -540,6 +537,6 @@ def mk_rollup_package(name, proto): ] -packages.extend(mk_rollup_packages("PtMumbai", "PtNairob")) +packages.extend(mk_rollup_packages("PtNairob")) packages = dict(ChainMap(*packages)) diff --git a/docs/baking.md b/docs/baking.md index cb569da4c..df70f2f09 100644 --- a/docs/baking.md +++ b/docs/baking.md @@ -30,7 +30,7 @@ that you can use by following the [installation instructions](https://www.raspbe In order to run a baking instance, you'll need the following Tezos binaries: `tezos-client`, `tezos-node`, `tezos-baker-`. -The currently supported protocol is `PtMumbai` (used on `mumbainet`, `ghostnet` and `mainnet`) and `PtNairob` (used on `nairobinet`). +The currently supported protocol is `PtNairob` (used on `nairobinet`, `ghostnet` and `mainnet`). Also, note that the corresponding packages have protocol suffix in lowercase, e.g. the list of available baker packages can be found [here](https://launchpad.net/~serokell/+archive/ubuntu/tezos/+packages?field.name_filter=tezos-baker&field.status_filter=published). diff --git a/docs/fedora.md b/docs/fedora.md index dddb56a16..581e64e59 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-PtMumbai +sudo dnf install tezos-baker-PtNairob # or use yum sudo yum copr enable @Serokell/Tezos -sudo yum install tezos-baker-PtMumbai +sudo yum install tezos-baker-PtNairob ``` Once you install these packages, the commands `tezos-*` and `octez-*` will be available. diff --git a/docs/systemd.md b/docs/systemd.md index c64f520ea..d2cf8432d 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-PtMumbai +./gen_systemd_service_file.py tezos-baker-PtNairob ``` After that you'll have `.service` files in the current directory. @@ -62,7 +62,6 @@ It's possible to run multiple similar services, e.g. two `tezos-node`s that run networks. `tezos-node` packages provide multiple services out of the box: -- `tezos-node-mumbainet` - `tezos-node-nairobinet` - `tezos-node-ghostnet` - `tezos-node-mainnet` @@ -78,7 +77,7 @@ Also, there are `tezos-node-` binary aliases that are equivalent to running `tezos-node` with [the service options](./configuration.md) given. In addition to node services where the config is predefined to a specific network -(e.g. `tezos-node-mainnet` or `tezos-node-mumbainet`), it's possible to run +(e.g. `tezos-node-mainnet` or `tezos-node-nairobinet`), 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 f8c4b2e27..4e48a65ea 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 mumbainet +tezos-vote --network nairobinet ``` diff --git a/nix/modules/common.nix b/nix/modules/common.nix index 76b6f2585..f2a0ccc97 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 [ "PtMumbai" "PtNairob" ]); + type = types.listOf (types.enum [ "PtNairob" ]); description = '' List of protocols for which daemons will be run. ''; - example = ["PtMumbai"]; + example = ["PtNairob"]; }; rpcPort = mkOption { diff --git a/nix/modules/tezos-accuser.nix b/nix/modules/tezos-accuser.nix index c65777848..f5176b6d4 100644 --- a/nix/modules/tezos-accuser.nix +++ b/nix/modules/tezos-accuser.nix @@ -7,8 +7,6 @@ with lib; let octez-accuser-pkgs = { - "PtMumbai" = - "${pkgs.octezPackages.octez-accuser-PtMumbai}/bin/octez-accuser-PtMumbai"; "PtNairob" = "${pkgs.octezPackages.octez-baker-PtNairob}/bin/octez-baker-PtNairob"; }; diff --git a/nix/modules/tezos-baker.nix b/nix/modules/tezos-baker.nix index bfd490a45..9802eb9f1 100644 --- a/nix/modules/tezos-baker.nix +++ b/nix/modules/tezos-baker.nix @@ -7,8 +7,6 @@ with lib; let octez-baker-pkgs = { - "PtMumbai" = - "${pkgs.octezPackages.octez-baker-PtMumbai}/bin/octez-baker-PtMumbai"; "PtNairob" = "${pkgs.octezPackages.octez-baker-PtNairob}/bin/octez-baker-PtNairob"; }; diff --git a/nix/modules/tezos-node.nix b/nix/modules/tezos-node.nix index 7870ef511..2cf91ce6e 100644 --- a/nix/modules/tezos-node.nix +++ b/nix/modules/tezos-node.nix @@ -45,7 +45,7 @@ let network = mkOption { type = types.str; - default = "mumbainet"; + default = "ghostnet"; 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 cc924323b..65a106f20 100644 --- a/protocols.json +++ b/protocols.json @@ -23,10 +23,10 @@ "012-Psithaca", "013-PtJakart", "PtKathma", - "PtLimaPt" + "PtLimaPt", + "PtMumbai" ], "active": [ - "PtMumbai", "PtNairob" ] } diff --git a/scripts/build-all-bottles.sh b/scripts/build-all-bottles.sh index 746dcdc69..886b17401 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-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") +formulae=("tezos-accuser-PtNairob" "tezos-admin-client" "tezos-baker-PtNairob" "tezos-client" "tezos-codec" "tezos-node" "tezos-signer" "tezos-smart-rollup-client-PtNairob" "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/tests/systemd/services_tests.py b/tests/systemd/services_tests.py index 92da84f3b..d124ffca3 100644 --- a/tests/systemd/services_tests.py +++ b/tests/systemd/services_tests.py @@ -128,16 +128,16 @@ def test_node_mainnet_service(): node_service_test("mainnet") -def test_node_mumbainet_service(): - node_service_test("mumbainet") +def test_node_nairobinet_service(): + node_service_test("nairobinet") -def test_baking_mumbainet_service(): - baking_service_test("mumbainet", ["PtMumbai"]) +def test_baking_nairobinet_service(): + baking_service_test("nairobinet", ["PtNairob"]) def test_baking_mainnet_service(): - baking_service_test("mainnet", ["PtMumbai"]) + baking_service_test("mainnet", ["PtNairob"]) def test_http_signer_service(): @@ -149,9 +149,9 @@ def test_tcp_signer_service(): def test_standalone_accuser_service(): - with unit(f"tezos-node-mumbainet.service") as _: - with unit(f"tezos-accuser-ptmumbai.service") as _: - assert check_running_process(f"octez-accuser-PtMumbai") + with unit(f"tezos-node-nairobinet.service") as _: + with unit(f"tezos-accuser-ptnairob.service") as _: + assert check_running_process(f"octez-accuser-PtNairob") def test_unix_signer_service(): @@ -161,34 +161,34 @@ def test_unix_signer_service(): def test_standalone_baker_service(): replace_systemd_service_env( - "tezos-baker-ptmumbai", + "tezos-baker-ptnairob", "TEZOS_NODE_DIR", - "/var/lib/tezos/node-mumbainet", + "/var/lib/tezos/node-nairobinet", ) with account("baker") as _: - with unit(f"tezos-node-mumbainet.service") as _: - with unit(f"tezos-baker-ptmumbai.service") as _: - assert check_active_service(f"tezos-baker-ptmumbai.service") - assert check_running_process(f"octez-baker-PtMumbai") + with unit(f"tezos-node-nairobinet.service") as _: + with unit(f"tezos-baker-ptnairob.service") as _: + assert check_active_service(f"tezos-baker-ptnairob.service") + assert check_running_process(f"octez-baker-PtNairob") def test_nondefault_node_rpc_endpoint(): rpc_addr = "127.0.0.1:8735" - replace_systemd_service_env("tezos-node-mumbainet", "NODE_RPC_ADDR", rpc_addr) - proc_call("cat /etc/default/tezos-node-mumbainet") + replace_systemd_service_env("tezos-node-nairobinet", "NODE_RPC_ADDR", rpc_addr) + proc_call("cat /etc/default/tezos-node-nairobinet") try: - node_service_test("mumbainet", f"http://{rpc_addr}") + node_service_test("nairobinet", f"http://{rpc_addr}") finally: replace_systemd_service_env( - "tezos-node-mumbainet", "NODE_RPC_ADDR", "127.0.0.1:8732" + "tezos-node-nairobinet", "NODE_RPC_ADDR", "127.0.0.1:8732" ) def test_nondefault_baking_config(): replace_systemd_service_env( - "tezos-baking-mumbainet", "BAKER_ADDRESS_ALIAS", "another_baker" + "tezos-baking-nairobinet", "BAKER_ADDRESS_ALIAS", "another_baker" ) replace_systemd_service_env( - "tezos-baking-mumbainet", "LIQUIDITY_BAKING_TOGGLE_VOTE", "on" + "tezos-baking-nairobinet", "LIQUIDITY_BAKING_TOGGLE_VOTE", "on" ) - baking_service_test("mumbainet", ["PtMumbai"], "another_baker") + baking_service_test("nairobinet", ["PtNairob"], "another_baker") diff --git a/tests/test_script.py b/tests/test_script.py index 058d99b37..7c90d86b5 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 mumbainet"): - test_node_with_daemons_scenario("mumbainet") +with subtest("run node with daemons on ghostnet"): + test_node_with_daemons_scenario("ghostnet") 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 8269d55bd..f1b1295bd 100644 --- a/tests/tezos-binaries.nix +++ b/tests/tezos-binaries.nix @@ -1,24 +1,23 @@ # SPDX-FileCopyrightText: 2021 Oxhead Alpha # SPDX-License-Identifier: LicenseRef-MIT-OA -{ nixpkgs, pkgs, ... }: { path-to-binaries } @ args: +{ nixpkgs, pkgs, ... }: +{ path-to-binaries }@args: let -in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: -{ +in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: { name = "tezos-binaries-test"; nodes.machine = { ... }: { virtualisation.memorySize = 2048; virtualisation.diskSize = 1024; - environment.sessionVariables.XDG_DATA_DIRS = - [ "${pkgs.zcash-params}" ]; + environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.zcash-params}" ]; security.pki.certificateFiles = [ ./ca.cert ]; }; testScript = '' path_to_binaries = "${path-to-binaries}" - octez_accuser = f"{path_to_binaries}/octez-accuser-PtMumbai" + octez_accuser = f"{path_to_binaries}/octez-accuser-PtNairob" octez_admin_client = f"{path_to_binaries}/octez-admin-client" - octez_baker = f"{path_to_binaries}/octez-baker-PtMumbai" + octez_baker = f"{path_to_binaries}/octez-baker-PtNairob" 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 633bcda2d..1ef99b800 100644 --- a/tests/tezos-modules.nix +++ b/tests/tezos-modules.nix @@ -19,12 +19,12 @@ let octez-accuser = { enable = true; - baseProtocols = ["PtMumbai"]; + baseProtocols = ["PtNairob"]; }; octez-baker = { enable = true; - baseProtocols = ["PtMumbai"]; + baseProtocols = ["PtNairob"]; bakerAccountAlias = "baker"; bakerSecretKey = "unencrypted:edsk3KaTNj1d8Xd3kMBrZkJrfkqsz4XwwiBXatuuVgTdPye2KpE98o"; }; @@ -44,10 +44,10 @@ import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: ]; services = { - octez-node.instances.mumbainet = octez-node; - octez-signer.instances.mumbainet = octez-signer; - octez-accuser.instances.mumbainet = octez-accuser; - octez-baker.instances.mumbainet = octez-baker; + octez-node.instances.ghostnet = octez-node; + octez-signer.instances.ghostnet = octez-signer; + octez-accuser.instances.ghostnet = octez-accuser; + octez-baker.instances.ghostnet = octez-baker; }; }; @@ -65,7 +65,7 @@ import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: ] for s in services: - machine.wait_for_unit(f"tezos-mumbainet-{s}.service") + machine.wait_for_unit(f"tezos-ghostnet-{s}.service") ${if octez-node.enable then '' with subtest("check octez-node rpc response"): @@ -78,6 +78,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-mumbainet-{s}.service") + machine.succeed(f"systemctl status tezos-ghostnet-{s}.service") ''; }) { inherit pkgs system; } diff --git a/tests/tezos-nix-binaries.nix b/tests/tezos-nix-binaries.nix index df0a75f16..b474f30c5 100644 --- a/tests/tezos-nix-binaries.nix +++ b/tests/tezos-nix-binaries.nix @@ -3,26 +3,25 @@ { nixpkgs, pkgs, ... }: let inherit (pkgs) system; - inherit (pkgs.octezPackages) octez-client octez-admin-client octez-node octez-signer octez-codec - octez-accuser-PtMumbai octez-baker-PtMumbai; -in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: -{ + inherit (pkgs.octezPackages) + octez-client octez-admin-client octez-node octez-signer octez-codec + octez-accuser-PtNairob octez-baker-PtNairob; +in import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ ... }: { name = "tezos-nix-binaries-test"; nodes.machine = { ... }: { virtualisation.memorySize = 1024; virtualisation.diskSize = 1024; - environment.systemPackages = with pkgs; [ - libev - ]; + environment.systemPackages = with pkgs; [ libev ]; security.pki.certificateFiles = [ ./ca.cert ]; - environment.sessionVariables.LD_LIBRARY_PATH = - [ "${pkgs.ocamlPackages.hacl-star-raw}/lib/ocaml/4.12.0/site-lib/hacl-star-raw" ]; + environment.sessionVariables.LD_LIBRARY_PATH = [ + "${pkgs.ocamlPackages.hacl-star-raw}/lib/ocaml/4.12.0/site-lib/hacl-star-raw" + ]; }; testScript = '' - octez_accuser = "${octez-accuser-PtMumbai}/bin/octez-accuser-PtMumbai" + octez_accuser = "${octez-accuser-PtNairob}/bin/octez-accuser-PtNairob" octez_admin_client = "${octez-admin-client}/bin/octez-admin-client" - octez_baker = "${octez-baker-PtMumbai}/bin/octez-baker-PtMumbai" + octez_baker = "${octez-baker-PtNairob}/bin/octez-baker-PtNairob" octez_client = ( "${octez-client}/bin/octez-client" ) From e1dfd72e41248fa732f6d1c462e524eb5312cd7e Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Fri, 18 Aug 2023 11:16:19 +0300 Subject: [PATCH 5/9] [Chore] Support Proxford and oxfordnet Problem: `Proxford` protocol released, along with the `oxfordnet`. Solution: Support them. --- baking/src/tezos_baking/tezos_setup_wizard.py | 2 +- baking/src/tezos_baking/wizard_structure.py | 1 + docker/package/packages.py | 5 ++++- docs/baking.md | 2 +- docs/systemd.md | 1 + nix/modules/common.nix | 2 +- nix/modules/tezos-accuser.nix | 4 +++- nix/modules/tezos-baker.nix | 2 ++ protocols.json | 3 ++- 9 files changed, 16 insertions(+), 6 deletions(-) diff --git a/baking/src/tezos_baking/tezos_setup_wizard.py b/baking/src/tezos_baking/tezos_setup_wizard.py index 267fb54cf..9dabffb39 100644 --- a/baking/src/tezos_baking/tezos_setup_wizard.py +++ b/baking/src/tezos_baking/tezos_setup_wizard.py @@ -178,7 +178,7 @@ def is_full_snapshot(snapshot_file, 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 `PtNairob` (used on `nairobinet`, `ghostnet` and `mainnet`).\n" + "The currently supported protocol is `PtNairob` (used on `nairobinet`, `ghostnet` and `mainnet`) and Proxford (used on `oxfordnet`).\n" "Keep in mind that you must select the test network (e.g. ghostnet)\n" "if you plan on baking with a faucet JSON file.\n", options=networks, diff --git a/baking/src/tezos_baking/wizard_structure.py b/baking/src/tezos_baking/wizard_structure.py index d642085e5..c2ea5347f 100644 --- a/baking/src/tezos_baking/wizard_structure.py +++ b/baking/src/tezos_baking/wizard_structure.py @@ -305,6 +305,7 @@ def url_is_reachable(url): "mainnet": "Main Tezos network", "ghostnet": "Long running test network, currently using the Nairobi Tezos protocol", "nairobinet": "Test network using the Nairobi Tezos protocol", + "oxfordnet": "Test network using the Oxford Tezos protocol", } http_request_headers = {"User-Agent": "Mozilla/5.0"} diff --git a/docker/package/packages.py b/docker/package/packages.py index 1ab8ce997..0103af99a 100644 --- a/docker/package/packages.py +++ b/docker/package/packages.py @@ -20,15 +20,18 @@ "mainnet": "mainnet", "ghostnet": "ghostnet", "nairobinet": "https://teztnets.xyz/nairobinet", + "oxfordnet": "https://teztnets.xyz/oxfordnet", } networks_protos = { "mainnet": ["PtNairob"], "ghostnet": ["PtNairob"], "nairobinet": ["PtNairob"], + "oxfordnet": ["Proxford"], } protocol_numbers = { "PtNairob": "017", + "Proxford": "018", } signer_units = [ @@ -537,6 +540,6 @@ def mk_rollup_package(name, proto): ] -packages.extend(mk_rollup_packages("PtNairob")) +packages.extend(mk_rollup_packages("PtNairob", "Proxford")) packages = dict(ChainMap(*packages)) diff --git a/docs/baking.md b/docs/baking.md index df70f2f09..9ffd85e60 100644 --- a/docs/baking.md +++ b/docs/baking.md @@ -30,7 +30,7 @@ that you can use by following the [installation instructions](https://www.raspbe In order to run a baking instance, you'll need the following Tezos binaries: `tezos-client`, `tezos-node`, `tezos-baker-`. -The currently supported protocol is `PtNairob` (used on `nairobinet`, `ghostnet` and `mainnet`). +The currently supported protocol is `PtNairob` (used on `nairobinet`, `ghostnet` and `mainnet`) and `Proxford` (used on `oxfordnet`). Also, note that the corresponding packages have protocol suffix in lowercase, e.g. the list of available baker packages can be found [here](https://launchpad.net/~serokell/+archive/ubuntu/tezos/+packages?field.name_filter=tezos-baker&field.status_filter=published). diff --git a/docs/systemd.md b/docs/systemd.md index d2cf8432d..cf8f3d3ef 100644 --- a/docs/systemd.md +++ b/docs/systemd.md @@ -63,6 +63,7 @@ networks. `tezos-node` packages provide multiple services out of the box: - `tezos-node-nairobinet` +- `tezos-node-oxfordnet` - `tezos-node-ghostnet` - `tezos-node-mainnet` diff --git a/nix/modules/common.nix b/nix/modules/common.nix index f2a0ccc97..20bb38529 100644 --- a/nix/modules/common.nix +++ b/nix/modules/common.nix @@ -21,7 +21,7 @@ rec { daemonOptions = sharedOptions // { baseProtocols = mkOption { - type = types.listOf (types.enum [ "PtNairob" ]); + type = types.listOf (types.enum [ "PtNairob" "Proxford" ]); description = '' List of protocols for which daemons will be run. ''; diff --git a/nix/modules/tezos-accuser.nix b/nix/modules/tezos-accuser.nix index f5176b6d4..e40f1817e 100644 --- a/nix/modules/tezos-accuser.nix +++ b/nix/modules/tezos-accuser.nix @@ -8,7 +8,9 @@ with lib; let octez-accuser-pkgs = { "PtNairob" = - "${pkgs.octezPackages.octez-baker-PtNairob}/bin/octez-baker-PtNairob"; + "${pkgs.octezPackages.octez-accuser-PtNairob}/bin/octez-accuser-PtNairob"; + "Proxford" = + "${pkgs.octezPackages.octez-accuser-Proxford}/bin/octez-accuser-Proxford"; }; 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 9802eb9f1..db51a5e1a 100644 --- a/nix/modules/tezos-baker.nix +++ b/nix/modules/tezos-baker.nix @@ -9,6 +9,8 @@ let octez-baker-pkgs = { "PtNairob" = "${pkgs.octezPackages.octez-baker-PtNairob}/bin/octez-baker-PtNairob"; + "Proxford" = + "${pkgs.octezPackages.octez-baker-Proxford}/bin/octez-baker-Proxford"; }; octez-client = "${pkgs.octezPackages.octez-client}/bin/octez-client"; cfg = config.services.octez-baker; diff --git a/protocols.json b/protocols.json index 65a106f20..d2b26ca41 100644 --- a/protocols.json +++ b/protocols.json @@ -27,6 +27,7 @@ "PtMumbai" ], "active": [ - "PtNairob" + "PtNairob", + "Proxford" ] } From ce17913557c5cfe4bfeae596af630b039c249faa Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Fri, 18 Aug 2023 11:30:48 +0300 Subject: [PATCH 6/9] [Chore] Add formulae for Proxford binaries Problem: `Proxford` protocol release, so there should be brew Formulae for related binaries. Solution: Add them. --- .github/workflows/build-bottles.yml | 2 +- Formula/tezos-accuser-Proxford.rb | 97 ++++++++++++++++ Formula/tezos-baker-Proxford.rb | 107 ++++++++++++++++++ Formula/tezos-node-oxfordnet.rb | 66 +++++++++++ Formula/tezos-smart-rollup-client-Proxford.rb | 62 ++++++++++ Formula/tezos-smart-rollup-node-Proxford.rb | 94 +++++++++++++++ scripts/build-all-bottles.sh | 2 +- 7 files changed, 428 insertions(+), 2 deletions(-) create mode 100644 Formula/tezos-accuser-Proxford.rb create mode 100644 Formula/tezos-baker-Proxford.rb create mode 100644 Formula/tezos-node-oxfordnet.rb create mode 100644 Formula/tezos-smart-rollup-client-Proxford.rb create mode 100644 Formula/tezos-smart-rollup-node-Proxford.rb diff --git a/.github/workflows/build-bottles.yml b/.github/workflows/build-bottles.yml index 971e587dd..2d9eae945 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-PtNairob, tezos-admin-client, tezos-baker-PtNairob, tezos-client, tezos-codec, tezos-node, tezos-signer, tezos-smart-rollup-client-PtNairob, tezos-smart-rollup-node-PtNairob] + formula: [tezos-accuser-PtNairob, tezos-accuser-Proxford, tezos-admin-client, tezos-baker-PtNairob, tezos-baker-Proxford, tezos-client, tezos-codec, tezos-node, tezos-signer, tezos-smart-rollup-client-PtNairob, tezos-smart-rollup-client-Proxford, tezos-smart-rollup-node-PtNairob, tezos-smart-rollup-node-Proxford] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/Formula/tezos-accuser-Proxford.rb b/Formula/tezos-accuser-Proxford.rb new file mode 100644 index 000000000..a90d5fd88 --- /dev/null +++ b/Formula/tezos-accuser-Proxford.rb @@ -0,0 +1,97 @@ +# SPDX-FileCopyrightText: 2023 Oxhead Alpha +# SPDX-License-Identifier: LicenseRef-MIT-OA + +class TezosAccuserProxford < Formula + @all_bins = [] + + class << self + attr_accessor :all_bins + end + homepage "https://gitlab.com/tezos/tezos" + + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false + + version "v18.0-rc1-1" + + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] + 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/#{TezosAccuserProxford.version}/" + end + + def make_deps + ENV.deparallelize + ENV["CARGO_HOME"]="./.cargo" + # Disable usage of instructions from the ADX extension to avoid incompatibility + # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ + ENV["BLST_PORTABLE"]="yes" + # Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer + arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" + system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" + system ["source .cargo/env", "make build-deps"].join(" && ") + end + + def install_template(dune_path, exec_path, name) + bin.mkpath + self.class.all_bins << name + system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") + bin.install name + ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" + end + + def install + startup_contents = + <<~EOS + #!/usr/bin/env bash + + set -euo pipefail + + accuser="#{bin}/octez-accuser-Proxford" + + accuser_config="$TEZOS_CLIENT_DIR/config" + mkdir -p "$TEZOS_CLIENT_DIR" + + if [ ! -f "$accuser_config" ]; then + "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ + config init --output "$accuser_config" >/dev/null 2>&1 + else + "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ + config update >/dev/null 2>&1 + fi + + exec "$accuser" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" run + EOS + File.write("tezos-accuser-Proxford-start", startup_contents) + bin.install "tezos-accuser-Proxford-start" + make_deps + install_template "src/proto_018_Proxford/bin_accuser/main_accuser_018_Proxford.exe", + "_build/default/src/proto_018_Proxford/bin_accuser/main_accuser_018_Proxford.exe", + "octez-accuser-Proxford" + end + + service do + run opt_bin/"tezos-accuser-Proxford-start" + require_root true + environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", NODE_RPC_SCHEME: "http", NODE_RPC_ADDR: "localhost:8732" + keep_alive true + log_path var/"log/tezos-accuser-Proxford.log" + error_log_path var/"log/tezos-accuser-Proxford.log" + end + + def post_install + mkdir "#{var}/lib/tezos/client" + end +end diff --git a/Formula/tezos-baker-Proxford.rb b/Formula/tezos-baker-Proxford.rb new file mode 100644 index 000000000..969482cc4 --- /dev/null +++ b/Formula/tezos-baker-Proxford.rb @@ -0,0 +1,107 @@ +# SPDX-FileCopyrightText: 2023 Oxhead Alpha +# SPDX-License-Identifier: LicenseRef-MIT-OA + +class TezosBakerProxford < Formula + @all_bins = [] + + class << self + attr_accessor :all_bins + end + homepage "https://gitlab.com/tezos/tezos" + + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false + + version "v18.0-rc1-1" + + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] + 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/#{TezosBakerProxford.version}/" + end + + def make_deps + ENV.deparallelize + ENV["CARGO_HOME"]="./.cargo" + # Disable usage of instructions from the ADX extension to avoid incompatibility + # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ + ENV["BLST_PORTABLE"]="yes" + # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer + arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" + system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" + system ["source .cargo/env", "make build-deps"].join(" && ") + end + + def install_template(dune_path, exec_path, name) + bin.mkpath + self.class.all_bins << name + system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") + bin.install name + ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" + end + + def install + startup_contents = + <<~EOS + #!/usr/bin/env bash + + set -euo pipefail + + baker="#{bin}/octez-baker-Proxford" + + baker_config="$TEZOS_CLIENT_DIR/config" + mkdir -p "$TEZOS_CLIENT_DIR" + + if [ ! -f "$baker_config" ]; then + "$baker" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ + config init --output "$baker_config" >/dev/null 2>&1 + else + "$baker" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ + config update >/dev/null 2>&1 + fi + + launch_baker() { + exec "$baker" \ + --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ + run with local node "$TEZOS_NODE_DIR" "$@" + } + + if [[ -z "$BAKER_ACCOUNT" ]]; then + launch_baker + else + launch_baker "$BAKER_ACCOUNT" + fi + EOS + File.write("tezos-baker-Proxford-start", startup_contents) + bin.install "tezos-baker-Proxford-start" + make_deps + install_template "src/proto_018_Proxford/bin_baker/main_baker_018_Proxford.exe", + "_build/default/src/proto_018_Proxford/bin_baker/main_baker_018_Proxford.exe", + "octez-baker-Proxford" + end + + service do + run opt_bin/"tezos-baker-Proxford-start" + require_root true + environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", TEZOS_NODE_DIR: "", NODE_RPC_SCHEME: "http", NODE_RPC_ADDR: "localhost:8732", BAKER_ACCOUNT: "" + keep_alive true + log_path var/"log/tezos-baker-Proxford.log" + error_log_path var/"log/tezos-baker-Proxford.log" + end + + def post_install + mkdir "#{var}/lib/tezos/client" + end +end diff --git a/Formula/tezos-node-oxfordnet.rb b/Formula/tezos-node-oxfordnet.rb new file mode 100644 index 000000000..888ad510e --- /dev/null +++ b/Formula/tezos-node-oxfordnet.rb @@ -0,0 +1,66 @@ +#!/usr/bin/env ruby + +# SPDX-FileCopyrightText: 2023 Oxhead Alpha +# SPDX-License-Identifier: LicenseRef-MIT-OA + +class TezosNodeOxfordnet < Formula + url "file:///dev/null" + version "v18.0-rc1-1" + + depends_on "tezos-node" + + desc "Meta formula that provides background tezos-node service that runs on oxfordnet" + + def install + startup_contents = + <<~EOS + #!/usr/bin/env bash + + set -euo pipefail + + node="/usr/local/bin/octez-node" + # default location of the config file + config_file="$TEZOS_CLIENT_DIR/config.json" + + mkdir -p "$TEZOS_CLIENT_DIR" + if [[ ! -f "$config_file" ]]; then + echo "Configuring the node..." + "$node" config init \ + --rpc-addr "$NODE_RPC_ADDR" \ + --network=https://teztnets.xyz/oxfordnet\ + "$@" + else + echo "Updating the node configuration..." + "$node" config update \ + --rpc-addr "$NODE_RPC_ADDR" \ + --network=https://teztnets.xyz/oxfordnet\ + "$@" + fi + + # Launching the node + if [[ -z "$CERT_PATH" || -z "$KEY_PATH" ]]; then + exec "$node" run --config-file="$config_file" + else + exec "$node" run --config-file="$config_file" \ + --rpc-tls="$CERT_PATH","$KEY_PATH" + fi + EOS + File.write("tezos-node-oxfordnet-start", startup_contents) + bin.install "tezos-node-oxfordnet-start" + print "Installing tezos-node-oxfordnet service" + end + + service do + run opt_bin/"tezos-node-oxfordnet-start" + require_root true + environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", NODE_RPC_ADDR: "127.0.0.1:8732", CERT_PATH: "", KEY_PATH: "" + keep_alive true + log_path var/"log/tezos-node-oxfordnet.log" + error_log_path var/"log/tezos-node-oxfordnet.log" + end + + def post_install + mkdir_p "#{var}/lib/tezos/node-oxfordnet" + system "octez-node", "config", "init", "--data-dir" "#{var}/lib/tezos/node-oxfordnet", "--network", "https://teztnets.xyz/oxfordnet" + end +end diff --git a/Formula/tezos-smart-rollup-client-Proxford.rb b/Formula/tezos-smart-rollup-client-Proxford.rb new file mode 100644 index 000000000..5c19fc17d --- /dev/null +++ b/Formula/tezos-smart-rollup-client-Proxford.rb @@ -0,0 +1,62 @@ +#!/usr/bin/env ruby +# SPDX-FileCopyrightText: 2023 Oxhead Alpha +# SPDX-License-Identifier: LicenseRef-MIT-OA + +class TezosSmartRollupClientProxford < Formula + @all_bins = [] + + class << self + attr_accessor :all_bins + end + homepage "https://gitlab.com/tezos/tezos" + + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false + + version "v18.0-rc1-1" + + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] + 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 "Smart contract rollup CLI client for Proxford" + + bottle do + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupClientProxford.version}/" + end + + def make_deps + ENV.deparallelize + ENV["CARGO_HOME"]="./.cargo" + # Disable usage of instructions from the ADX extension to avoid incompatibility + # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ + ENV["BLST_PORTABLE"]="yes" + # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer + arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" + system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" + system ["source .cargo/env", "make build-deps"].join(" && ") + end + + def install_template(dune_path, exec_path, name) + bin.mkpath + self.class.all_bins << name + system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") + bin.install name + ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" + end + + def install + make_deps + install_template "src/proto_018_Proxford/bin_sc_rollup_client/main_sc_rollup_client_018_Proxford.exe", + "_build/default/src/proto_018_Proxford/bin_sc_rollup_client/main_sc_rollup_client_018_Proxford.exe", + "octez-smart-rollup-client-Proxford" + end +end diff --git a/Formula/tezos-smart-rollup-node-Proxford.rb b/Formula/tezos-smart-rollup-node-Proxford.rb new file mode 100644 index 000000000..e40048eeb --- /dev/null +++ b/Formula/tezos-smart-rollup-node-Proxford.rb @@ -0,0 +1,94 @@ +#!/usr/bin/env ruby + +# SPDX-FileCopyrightText: 2023 Oxhead Alpha +# SPDX-License-Identifier: LicenseRef-MIT-OA + +class TezosSmartRollupNodeProxford < Formula + @all_bins = [] + + class << self + attr_accessor :all_bins + end + homepage "https://gitlab.com/tezos/tezos" + + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false + + version "v18.0-rc1-1" + + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] + 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 "Tezos smart contract rollup node for Proxford" + + bottle do + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNodeProxford.version}/" + end + + def make_deps + ENV.deparallelize + ENV["CARGO_HOME"]="./.cargo" + # Disable usage of instructions from the ADX extension to avoid incompatibility + # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ + ENV["BLST_PORTABLE"]="yes" + # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer + arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" + system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" + system ["source .cargo/env", "make build-deps"].join(" && ") + end + + def install_template(dune_path, exec_path, name) + bin.mkpath + self.class.all_bins << name + system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") + bin.install name + ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" + end + + def install + startup_contents = + <<~EOS + #!/usr/bin/env bash + + set -euo pipefail + + node="#{bin}/octez-smart-rollup-node-Proxford" + + "$node" init "$ROLLUP_MODE" config \ + for "$ROLLUP_ALIAS" \ + --rpc-addr "$ROLLUP_NODE_RPC_ENDPOINT" \ + --force + + "$node" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \ + run "$ROLLUP_MODE" for "$ROLLUP_ALIAS" + EOS + File.write("tezos-smart-rollup-node-Proxford-start", startup_contents) + bin.install "tezos-smart-rollup-node-Proxford-start" + make_deps + install_template "src/proto_018_Proxford/bin_sc_rollup_node/main_sc_rollup_node_018_Proxford.exe", + "_build/default/src/proto_018_Proxford/bin_sc_rollup_node/main_sc_rollup_node_018_Proxford.exe", + "octez-smart-rollup-node-Proxford" + end + + service do + run opt_bin/"tezos-smart-rollup-node-Proxford-start" + require_root true + environment_variables TEZOS_CLIENT_DIR: var/"lib/tezos/client", NODE_RPC_ENDPOINT: "http://localhost:8732", ROLLUP_NODE_RPC_ENDPOINT: "127.0.0.1:8472", ROLLUP_MODE: "observer", ROLLUP_ALIAS: "rollup" + keep_alive true + log_path var/"log/tezos-smart-rollup-node-Proxford.log" + error_log_path var/"log/tezos-smart-rollup-node-Proxford.log" + end + + def post_install + mkdir "#{var}/lib/tezos/client" + end +end diff --git a/scripts/build-all-bottles.sh b/scripts/build-all-bottles.sh index 886b17401..d234b26dc 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-PtNairob" "tezos-admin-client" "tezos-baker-PtNairob" "tezos-client" "tezos-codec" "tezos-node" "tezos-signer" "tezos-smart-rollup-client-PtNairob" "tezos-smart-rollup-node-PtNairob") +formulae=("tezos-accuser-PtNairob" "tezos-accuser-Proxford" "tezos-admin-client" "tezos-baker-PtNairob" "tezos-baker-Proxford" "tezos-client" "tezos-codec" "tezos-node" "tezos-signer" "tezos-smart-rollup-client-PtNairob" "tezos-smart-rollup-client-Proxford" "tezos-smart-rollup-node-PtNairob" "tezos-smart-rollup-node-Proxford") # tezos-sapling-params is used as a dependency for some of the formulas # so we handle it separately. From 990224ffdb93b7514e966cc69b0fd471a26f0829 Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Fri, 18 Aug 2023 11:34:17 +0300 Subject: [PATCH 7/9] [Chore] Support dac binaries Problem: New experimental dac binaries were released. Solution: Support them. --- .github/workflows/build-bottles.yml | 2 +- Formula/tezos-dac-client.rb | 61 +++++++++++++++++++++++++++++ Formula/tezos-dac-node.rb | 61 +++++++++++++++++++++++++++++ docker/docker-static-build.sh | 2 +- docker/package/packages.py | 16 ++++++++ nix/build/release-binaries.nix | 11 ++++++ scripts/build-all-bottles.sh | 2 +- 7 files changed, 152 insertions(+), 3 deletions(-) create mode 100644 Formula/tezos-dac-client.rb create mode 100644 Formula/tezos-dac-node.rb diff --git a/.github/workflows/build-bottles.yml b/.github/workflows/build-bottles.yml index 2d9eae945..288659918 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-PtNairob, tezos-accuser-Proxford, tezos-admin-client, tezos-baker-PtNairob, tezos-baker-Proxford, tezos-client, tezos-codec, tezos-node, tezos-signer, tezos-smart-rollup-client-PtNairob, tezos-smart-rollup-client-Proxford, tezos-smart-rollup-node-PtNairob, tezos-smart-rollup-node-Proxford] + formula: [tezos-accuser-PtNairob, tezos-accuser-Proxford, tezos-admin-client, tezos-baker-PtNairob, tezos-baker-Proxford, tezos-client, tezos-codec, tezos-node, tezos-signer, tezos-smart-rollup-client-PtNairob, tezos-smart-rollup-client-Proxford, tezos-smart-rollup-node-PtNairob, tezos-smart-rollup-node-Proxford, tezos-dac-client, tezos-dac-node] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/Formula/tezos-dac-client.rb b/Formula/tezos-dac-client.rb new file mode 100644 index 000000000..b324739ec --- /dev/null +++ b/Formula/tezos-dac-client.rb @@ -0,0 +1,61 @@ +# SPDX-FileCopyrightText: 2021 Oxhead Alpha +# SPDX-License-Identifier: LicenseRef-MIT-OA + +class TezosDacClient < Formula + @all_bins = [] + + class << self + attr_accessor :all_bins + end + homepage "https://gitlab.com/tezos/tezos" + + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false + + version "v18.0-rc1-1" + + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] + 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 "A Data Availability Committee Tezos client" + + bottle do + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacClient.version}/" + end + + def make_deps + ENV.deparallelize + ENV["CARGO_HOME"]="./.cargo" + # Disable usage of instructions from the ADX extension to avoid incompatibility + # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ + ENV["BLST_PORTABLE"]="yes" + # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer + arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" + system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.64.0", "-y" + system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" + system ["source .cargo/env", "make build-deps"].join(" && ") + end + + def install_template(dune_path, exec_path, name) + bin.mkpath + self.class.all_bins << name + system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") + bin.install name + ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" + end + + def install + make_deps + install_template "src/bin_dac_client/main_dac_client.exe", + "_build/default/src/bin_dac_client/main_dac_client.exe", + "octez-dac-client" + end +end diff --git a/Formula/tezos-dac-node.rb b/Formula/tezos-dac-node.rb new file mode 100644 index 000000000..607b11154 --- /dev/null +++ b/Formula/tezos-dac-node.rb @@ -0,0 +1,61 @@ +# SPDX-FileCopyrightText: 2021 Oxhead Alpha +# SPDX-License-Identifier: LicenseRef-MIT-OA + +class TezosDacNode < Formula + @all_bins = [] + + class << self + attr_accessor :all_bins + end + homepage "https://gitlab.com/tezos/tezos" + + url "https://gitlab.com/tezos/tezos.git", :tag => "v18.0-rc1", :shallow => false + + version "v18.0-rc1-1" + + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake] + 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 "A Data Availability Committee Tezos node" + + bottle do + root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosDacNode.version}/" + end + + def make_deps + ENV.deparallelize + ENV["CARGO_HOME"]="./.cargo" + # Disable usage of instructions from the ADX extension to avoid incompatibility + # with old CPUs, see https://gitlab.com/dannywillems/ocaml-bls12-381/-/merge_requests/135/ + ENV["BLST_PORTABLE"]="yes" + # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer + arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" + system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.64.0", "-y" + system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" + system ["source .cargo/env", "make build-deps"].join(" && ") + end + + def install_template(dune_path, exec_path, name) + bin.mkpath + self.class.all_bins << name + system ["eval $(opam env)", "dune build #{dune_path}", "cp #{exec_path} #{name}"].join(" && ") + bin.install name + ln_sf "#{bin}/#{name}", "#{bin}/#{name.gsub("octez", "tezos")}" + end + + def install + make_deps + install_template "src/bin_dac_node/main_dac.exe", + "_build/default/src/bin_dac_node/main_dac.exe", + "octez-dac-node" + end +end diff --git a/docker/docker-static-build.sh b/docker/docker-static-build.sh index 2957934fc..650eadf99 100755 --- a/docker/docker-static-build.sh +++ b/docker/docker-static-build.sh @@ -8,7 +8,7 @@ set -euo pipefail -binaries=("octez-admin-client" "octez-client" "octez-node" "octez-signer" "octez-codec") +binaries=("octez-admin-client" "octez-dac-client" "octez-dac-node" "octez-client" "octez-node" "octez-signer" "octez-codec") for proto in $(jq -r ".active | .[]" ../protocols.json); do binaries+=("octez-accuser-$proto" "octez-baker-$proto" "octez-smart-rollup-client-$proto" "octez-smart-rollup-node-$proto") diff --git a/docker/package/packages.py b/docker/package/packages.py index 0103af99a..508573df9 100644 --- a/docker/package/packages.py +++ b/docker/package/packages.py @@ -176,6 +176,22 @@ dune_filepath="src/bin_codec/codec.exe", ) }, + { + "tezos-dac-client": TezosBinaryPackage( + "tezos-dac-client", + "A Data Availability Committee Tezos client", + meta=packages_meta, + dune_filepath="src/bin_dac_client/main_dac_client.exe", + ) + }, + { + "tezos-dac-node": TezosBinaryPackage( + "tezos-dac-node", + "A Data Availability Committee Tezos node", + meta=packages_meta, + dune_filepath="src/bin_dac_node/main_dac.exe", + ) + }, ] diff --git a/nix/build/release-binaries.nix b/nix/build/release-binaries.nix index f2cb71dfd..b05df935e 100644 --- a/nix/build/release-binaries.nix +++ b/nix/build/release-binaries.nix @@ -11,6 +11,11 @@ in [ description = "CLI client for interacting with octez blockchain"; supports = protocolsFormatted; } + { + name = "octez-dac-client"; + description = "A Data Availability Committee Tezos client"; + supports = protocolsFormatted; + } { name = "octez-admin-client"; description = "Administration tool for the node"; @@ -22,6 +27,12 @@ in [ "Entry point for initializing, configuring and running a Octez node"; supports = protocolsFormatted; } + { + name = "octez-dac-node"; + description = + "A Data Availability Committee Tezos node"; + supports = protocolsFormatted; + } { name = "octez-signer"; description = "A client to remotely sign operations or blocks"; diff --git a/scripts/build-all-bottles.sh b/scripts/build-all-bottles.sh index d234b26dc..122deb93f 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-PtNairob" "tezos-accuser-Proxford" "tezos-admin-client" "tezos-baker-PtNairob" "tezos-baker-Proxford" "tezos-client" "tezos-codec" "tezos-node" "tezos-signer" "tezos-smart-rollup-client-PtNairob" "tezos-smart-rollup-client-Proxford" "tezos-smart-rollup-node-PtNairob" "tezos-smart-rollup-node-Proxford") +formulae=("tezos-accuser-PtNairob" "tezos-accuser-Proxford" "tezos-admin-client" "tezos-baker-PtNairob" "tezos-baker-Proxford" "tezos-client" "tezos-codec" "tezos-node" "tezos-signer" "tezos-smart-rollup-client-PtNairob" "tezos-smart-rollup-client-Proxford" "tezos-smart-rollup-node-PtNairob" "tezos-smart-rollup-node-Proxford" "tezos-dac-client" "tezos-dac-node") # tezos-sapling-params is used as a dependency for some of the formulas # so we handle it separately. From 2c8aa1cc73e53173d937e17e67431e59ee755d76 Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Fri, 18 Aug 2023 11:38:50 +0300 Subject: [PATCH 8/9] [Chore] Update rust toolchain version Problem: new recommended Rust version is 1.64.0 now for octez. Solution: Update it. --- Formula/tezos-accuser-Proxford.rb | 2 +- Formula/tezos-accuser-PtNairob.rb | 2 +- Formula/tezos-admin-client.rb | 2 +- Formula/tezos-baker-Proxford.rb | 2 +- Formula/tezos-baker-PtNairob.rb | 2 +- Formula/tezos-client.rb | 2 +- Formula/tezos-codec.rb | 2 +- Formula/tezos-node.rb | 2 +- Formula/tezos-signer.rb | 2 +- Formula/tezos-smart-rollup-client-Proxford.rb | 2 +- Formula/tezos-smart-rollup-client-PtNairob.rb | 2 +- Formula/tezos-smart-rollup-node-Proxford.rb | 2 +- Formula/tezos-smart-rollup-node-PtNairob.rb | 2 +- docker/build/build-rust.sh | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Formula/tezos-accuser-Proxford.rb b/Formula/tezos-accuser-Proxford.rb index a90d5fd88..c99094736 100644 --- a/Formula/tezos-accuser-Proxford.rb +++ b/Formula/tezos-accuser-Proxford.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-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-PtNairob.rb b/Formula/tezos-accuser-PtNairob.rb index 3a2579b82..7d35e6935 100644 --- a/Formula/tezos-accuser-PtNairob.rb +++ b/Formula/tezos-accuser-PtNairob.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb index efb3e73c4..45c663b63 100644 --- a/Formula/tezos-admin-client.rb +++ b/Formula/tezos-admin-client.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-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-Proxford.rb b/Formula/tezos-baker-Proxford.rb index 969482cc4..5c4d4ef88 100644 --- a/Formula/tezos-baker-Proxford.rb +++ b/Formula/tezos-baker-Proxford.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-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-PtNairob.rb b/Formula/tezos-baker-PtNairob.rb index ababf8636..892fec0cb 100644 --- a/Formula/tezos-baker-PtNairob.rb +++ b/Formula/tezos-baker-PtNairob.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb index 5eaaa98d4..a677a1840 100644 --- a/Formula/tezos-client.rb +++ b/Formula/tezos-client.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-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 c93330910..0bae64cea 100644 --- a/Formula/tezos-codec.rb +++ b/Formula/tezos-codec.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index 04c801562..fbea106a5 100644 --- a/Formula/tezos-node.rb +++ b/Formula/tezos-node.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-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.rb b/Formula/tezos-signer.rb index 9307c939a..aefc2c0fb 100644 --- a/Formula/tezos-signer.rb +++ b/Formula/tezos-signer.rb @@ -39,7 +39,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-smart-rollup-client-Proxford.rb b/Formula/tezos-smart-rollup-client-Proxford.rb index 5c19fc17d..4949ffcc8 100644 --- a/Formula/tezos-smart-rollup-client-Proxford.rb +++ b/Formula/tezos-smart-rollup-client-Proxford.rb @@ -40,7 +40,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-smart-rollup-client-PtNairob.rb b/Formula/tezos-smart-rollup-client-PtNairob.rb index a0056b5e4..844fe75f8 100644 --- a/Formula/tezos-smart-rollup-client-PtNairob.rb +++ b/Formula/tezos-smart-rollup-client-PtNairob.rb @@ -40,7 +40,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-smart-rollup-node-Proxford.rb b/Formula/tezos-smart-rollup-node-Proxford.rb index e40048eeb..11f73a268 100644 --- a/Formula/tezos-smart-rollup-node-Proxford.rb +++ b/Formula/tezos-smart-rollup-node-Proxford.rb @@ -41,7 +41,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-y" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-smart-rollup-node-PtNairob.rb b/Formula/tezos-smart-rollup-node-PtNairob.rb index aa1817de3..359d368d0 100644 --- a/Formula/tezos-smart-rollup-node-PtNairob.rb +++ b/Formula/tezos-smart-rollup-node-PtNairob.rb @@ -41,7 +41,7 @@ def make_deps system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-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.60.0", "-y" + system "rustup-init", "--default-toolchain", "1.64.0", "-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-rust.sh b/docker/build/build-rust.sh index 5e44cf251..6419060e1 100755 --- a/docker/build/build-rust.sh +++ b/docker/build/build-rust.sh @@ -7,4 +7,4 @@ set -euo pipefail wget https://sh.rustup.rs/rustup-init.sh chmod +x rustup-init.sh -./rustup-init.sh --profile minimal --default-toolchain 1.60.0 -y +./rustup-init.sh --profile minimal --default-toolchain 1.64.0 -y From 975ae475d7eef6e239512dcd523b1818fead816e Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Sat, 19 Aug 2023 14:35:58 +0300 Subject: [PATCH 9/9] [Chore] Add hacks for nix build Problem: `octez-protocol-compiler` requires some docs files for `octez-libs` to be present. Also, `tezos-event-logging` is undiscoverable for some reason. Solution: Add dummy docs and provide exclidit opam file. --- flake.lock | 1195 +++++++++++++++++++++++++--- nix/build/hacks.nix | 15 +- nix/build/ocaml-overlay.nix | 7 +- nix/build/tezos-event-logging.opam | 8 + 4 files changed, 1115 insertions(+), 110 deletions(-) create mode 100644 nix/build/tezos-event-logging.opam diff --git a/flake.lock b/flake.lock index 5d36fdacd..9c69b961c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,13 +1,192 @@ { "nodes": { + "HTTP": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, + "blank": { + "locked": { + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "blank", + "type": "github" + } + }, + "cabal-32": { + "flake": false, + "locked": { + "lastModified": 1603716527, + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "owner": "haskell", + "repo": "cabal", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.2", + "repo": "cabal", + "type": "github" + } + }, + "cabal-34": { + "flake": false, + "locked": { + "lastModified": 1645834128, + "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", + "owner": "haskell", + "repo": "cabal", + "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, + "cabal-36": { + "flake": false, + "locked": { + "lastModified": 1669081697, + "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", + "owner": "haskell", + "repo": "cabal", + "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, + "cardano-shell": { + "flake": false, + "locked": { + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "type": "github" + } + }, + "deploy-rs": { + "inputs": { + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_4", + "utils": "utils" + }, + "locked": { + "lastModified": 1648475189, + "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=", + "owner": "serokell", + "repo": "deploy-rs", + "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3", + "type": "github" + }, + "original": { + "id": "deploy-rs", + "type": "indirect" + } + }, + "devshell": { + "inputs": { + "flake-utils": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1663445644, + "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", + "owner": "numtide", + "repo": "devshell", + "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "dmerge": { + "inputs": { + "nixlib": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "nixpkgs" + ], + "yants": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "yants" + ] + }, + "locked": { + "lastModified": 1659548052, + "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", + "owner": "divnix", + "repo": "data-merge", + "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "data-merge", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -32,6 +211,54 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "type": "github" + }, + "original": { + "id": "flake-compat", + "type": "indirect" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "hkm/gitlab-fix", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1650374568, @@ -48,12 +275,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -78,11 +308,25 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, + "flake-utils_4": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -91,122 +335,585 @@ "type": "github" } }, + "flake-utils_5": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "get-tested-src": { + "flake": false, + "locked": { + "lastModified": 1687355864, + "narHash": "sha256-yQ4coxfnp2Jsw1kvwf2/Zn72Kltze2WrfHN54eLR070=", + "owner": "Sereja313", + "repo": "get-tested", + "rev": "455bbd047374ed907900b49641a4ea7f0a905709", + "type": "github" + }, + "original": { + "owner": "Sereja313", + "ref": "issue-8-emit-ghc-versions", + "repo": "get-tested", + "type": "github" + } + }, + "ghc-8.6.5-iohk": { + "flake": false, + "locked": { + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", + "type": "github" + } + }, "gitignore-nix": { "flake": false, "locked": { - "lastModified": 1611672876, - "narHash": "sha256-qHu3uZ/o9jBHiA3MEKHJ06k7w4heOhA+4HCSIvflRxo=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "211907489e9f198594c0eb0ca9256a1949c9d412", + "lastModified": 1611672876, + "narHash": "sha256-qHu3uZ/o9jBHiA3MEKHJ06k7w4heOhA+4HCSIvflRxo=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "211907489e9f198594c0eb0ca9256a1949c9d412", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gomod2nix": { + "inputs": { + "nixpkgs": "nixpkgs_6", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1655245309, + "narHash": "sha256-d/YPoQ/vFn1+GTmSdvbSBSTOai61FONxB4+Lt6w/IVI=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "40d32f82fc60d66402eb0972e6e368aeab3faf58", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, + "hackage": { + "flake": false, + "locked": { + "lastModified": 1678926579, + "narHash": "sha256-5t1QRBTsEM2wREtDf3xrHp9Kphs+AdQZKAEltaylIJQ=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "fb58b0ba5773c5f0211f284b0fae061426cf8267", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "haskell-nix": { + "inputs": { + "HTTP": "HTTP", + "cabal-32": "cabal-32", + "cabal-34": "cabal-34", + "cabal-36": "cabal-36", + "cardano-shell": "cardano-shell", + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_4", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", + "hackage": "hackage", + "hpc-coveralls": "hpc-coveralls", + "hydra": "hydra", + "iserv-proxy": "iserv-proxy", + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "nixpkgs-unstable" + ], + "nixpkgs-2003": "nixpkgs-2003", + "nixpkgs-2105": "nixpkgs-2105", + "nixpkgs-2111": "nixpkgs-2111", + "nixpkgs-2205": "nixpkgs-2205", + "nixpkgs-2211": "nixpkgs-2211", + "nixpkgs-unstable": "nixpkgs-unstable_2", + "old-ghc-nix": "old-ghc-nix", + "stackage": "stackage", + "tullia": "tullia" + }, + "locked": { + "lastModified": 1678950661, + "narHash": "sha256-lvL54W90BTvwLVnFjPYmFVmgHyaGcFrt5FBy1F0rro8=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "fce554bc6a41d12f7a18a0e8290bf43f925d7a29", + "type": "github" + }, + "original": { + "id": "haskell-nix", + "type": "indirect" + } + }, + "hpc-coveralls": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "type": "github" + } + }, + "hydra": { + "inputs": { + "nix": "nix_2", + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", + "owner": "NixOS", + "repo": "hydra", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, + "incl": { + "inputs": { + "nixlib": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1669263024, + "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", + "owner": "divnix", + "repo": "incl", + "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, + "iserv-proxy": { + "flake": false, + "locked": { + "lastModified": 1670983692, + "narHash": "sha256-avLo34JnI9HNyOuauK5R69usJm+GfW3MlyGlYxZhTgY=", + "ref": "hkm/remote-iserv", + "rev": "50d0abb3317ac439a4e7495b185a64af9b7b9300", + "revCount": 10, + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + }, + "original": { + "ref": "hkm/remote-iserv", + "type": "git", + "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + } + }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "lowdown-src_2": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "lowdown-src_3": { + "flake": false, + "locked": { + "lastModified": 1632468475, + "narHash": "sha256-NNOm9CbdA8cuwbvaBHslGbPTiU6bh1Ao+MpEPx4rSGo=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "6bd668af3fd098bdd07a1bedd399564141e275da", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "mirage-opam-overlays": { + "flake": false, + "locked": { + "lastModified": 1661959605, + "narHash": "sha256-CPTuhYML3F4J58flfp3ZbMNhkRkVFKmBEYBZY5tnQwA=", + "owner": "dune-universe", + "repo": "mirage-opam-overlays", + "rev": "05f1c1823d891ce4d8adab91f5db3ac51d86dc0b", + "type": "github" + }, + "original": { + "owner": "dune-universe", + "repo": "mirage-opam-overlays", + "type": "github" + } + }, + "n2c": { + "inputs": { + "flake-utils": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "flake-utils" + ], + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1665039323, + "narHash": "sha256-SAh3ZjFGsaCI8FRzXQyp56qcGdAqgKEfJWPCQ0Sr7tQ=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "b008fe329ffb59b67bf9e7b08ede6ee792f2741a", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": "nixpkgs", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1657815848, + "narHash": "sha256-O0zNDRux3Yyplp5MkJ+A+wLzMUWnhbc/l8EnaHskQAI=", + "owner": "nixos", + "repo": "nix", + "rev": "ca4d5bee09df0393dd525b3cd5159a23d4683f2e", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nix", + "type": "github" + } + }, + "nix-nomad": { + "inputs": { + "flake-compat": "flake-compat_6", + "flake-utils": [ + "serokell-nix", + "haskell-nix", + "tullia", + "nix2container", + "flake-utils" + ], + "gomod2nix": "gomod2nix", + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "tullia", + "nixpkgs" + ], + "nixpkgs-lib": [ + "serokell-nix", + "haskell-nix", + "tullia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658277770, + "narHash": "sha256-T/PgG3wUn8Z2rnzfxf2VqlR1CBjInPE0l1yVzXxPnt0=", + "owner": "tristanpemble", + "repo": "nix-nomad", + "rev": "054adcbdd0a836ae1c20951b67ed549131fd2d70", + "type": "github" + }, + "original": { + "owner": "tristanpemble", + "repo": "nix-nomad", + "type": "github" + } + }, + "nix2container": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1658567952, + "narHash": "sha256-XZ4ETYAMU7XcpEeAFP3NOl9yDXNuZAen/aIJ84G+VgA=", + "owner": "nlewo", + "repo": "nix2container", + "rev": "60bb43d405991c1378baf15a40b5811a53e32ffa", + "type": "github" + }, + "original": { + "owner": "nlewo", + "repo": "nix2container", + "type": "github" + } + }, + "nix_2": { + "inputs": { + "lowdown-src": "lowdown-src_2", + "nixpkgs": "nixpkgs_5", + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", + "owner": "NixOS", + "repo": "nix", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.11.0", + "repo": "nix", + "type": "github" + } + }, + "nix_3": { + "inputs": { + "lowdown-src": "lowdown-src_3", + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "lastModified": 1633098935, + "narHash": "sha256-UtuBczommNLwUNEnfRI7822z4vPA7OoRKsgAZ8zsHQI=", + "owner": "nixos", + "repo": "nix", + "rev": "4f496150eb4e0012914c11f0a3ff4df2412b1d09", + "type": "github" + }, + "original": { + "id": "nix", + "type": "indirect" + } + }, + "nixago": { + "inputs": { + "flake-utils": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "flake-utils" + ], + "nixago-exts": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "blank" + ], + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1661824785, + "narHash": "sha256-/PnwdWoO/JugJZHtDUioQp3uRiWeXHUdgvoyNbXesz8=", + "owner": "nix-community", + "repo": "nixago", + "rev": "8c1f9e5f1578d4b2ea989f618588d62a335083c3", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", + "owner": "nix-community", + "repo": "nixago", "type": "github" } }, - "lowdown-src": { - "flake": false, + "nixpkgs": { "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1653988320, + "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", "type": "github" } }, - "lowdown-src_2": { - "flake": false, + "nixpkgs-2003": { "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", "type": "github" } }, - "mirage-opam-overlays": { - "flake": false, + "nixpkgs-2105": { "locked": { - "lastModified": 1661959605, - "narHash": "sha256-CPTuhYML3F4J58flfp3ZbMNhkRkVFKmBEYBZY5tnQwA=", - "owner": "dune-universe", - "repo": "mirage-opam-overlays", - "rev": "05f1c1823d891ce4d8adab91f5db3ac51d86dc0b", + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", "type": "github" }, "original": { - "owner": "dune-universe", - "repo": "mirage-opam-overlays", + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", "type": "github" } }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs", - "nixpkgs-regression": "nixpkgs-regression" - }, + "nixpkgs-2111": { "locked": { - "lastModified": 1657815848, - "narHash": "sha256-O0zNDRux3Yyplp5MkJ+A+wLzMUWnhbc/l8EnaHskQAI=", - "owner": "nixos", - "repo": "nix", - "rev": "ca4d5bee09df0393dd525b3cd5159a23d4683f2e", + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", "type": "github" }, "original": { - "owner": "nixos", - "repo": "nix", + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", "type": "github" } }, - "nix-unstable": { - "inputs": { - "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_4", - "nixpkgs-regression": "nixpkgs-regression_2" - }, + "nixpkgs-2205": { "locked": { - "lastModified": 1657815848, - "narHash": "sha256-O0zNDRux3Yyplp5MkJ+A+wLzMUWnhbc/l8EnaHskQAI=", - "owner": "nixos", - "repo": "nix", - "rev": "ca4d5bee09df0393dd525b3cd5159a23d4683f2e", + "lastModified": 1672580127, + "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0874168639713f547c05947c76124f78441ea46c", "type": "github" }, "original": { - "owner": "nixos", - "repo": "nix", + "owner": "NixOS", + "ref": "nixpkgs-22.05-darwin", + "repo": "nixpkgs", "type": "github" } }, - "nixpkgs": { + "nixpkgs-2211": { "locked": { - "lastModified": 1653988320, - "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=", + "lastModified": 1675730325, + "narHash": "sha256-uNvD7fzO5hNlltNQUAFBPlcEjNG5Gkbhl/ROiX+GZU4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1", + "rev": "b7ce17b1ebf600a72178f6302c77b6382d09323f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05-small", + "ref": "nixpkgs-22.11-darwin", "repo": "nixpkgs", "type": "github" } @@ -259,6 +966,36 @@ "type": "github" } }, + "nixpkgs-unstable_2": { + "locked": { + "lastModified": 1675758091, + "narHash": "sha256-7gFSQbSVAFUHtGCNHPF7mPc5CcqDk9M2+inlVPZSneg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "747927516efcb5e31ba03b7ff32f61f6d47e7d87", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_10": { + "locked": { + "lastModified": 1674736538, + "narHash": "sha256-/DszFMkAgYyB9dTWKkoZa9i0zcrA6Z4hYrOr/u/FSxY=", + "owner": "serokell", + "repo": "nixpkgs", + "rev": "1dfdbb65d77430fc0935e8592d0abc4addcce711", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1674736538, @@ -276,11 +1013,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1657802959, - "narHash": "sha256-9+JWARSdlL8KiH3ymnKDXltE1vM+/WEJ78F5B1kjXys=", + "lastModified": 1682362401, + "narHash": "sha256-/UMUHtF2CyYNl4b60Z2y4wwTTdIWGKhj9H301EDcT9M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4a01ca36d6bfc133bc617e661916a81327c9bbc8", + "rev": "884ac294018409e0d1adc0cae185439a44bd6b0b", "type": "github" }, "original": { @@ -292,35 +1029,130 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1653988320, - "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=", + "lastModified": 1648219316, + "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1", + "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05-small", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1655108282, - "narHash": "sha256-snIu1rBgc+IwoG+mjvp2Thq9C5L+RYvV/DEdfYVzp2s=", - "owner": "serokell", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "7887e272ab2ad8376d54ca5f58df0ed7f67676e6", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", "type": "github" }, "original": { - "owner": "serokell", + "owner": "NixOS", + "ref": "nixos-22.05-small", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1654807842, + "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc909087cc3386955f21b4665731dbdaceefb1d8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1665087388, + "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "95fda953f6db2e9496d2682c4fc7b82f959878f7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" + } + }, + "nosys": { + "locked": { + "lastModified": 1667881534, + "narHash": "sha256-FhwJ15uPLRsvaxtt/bNuqE/ykMpNAPF0upozFKhTtXM=", + "owner": "divnix", + "repo": "nosys", + "rev": "2d0d5207f6a230e9d0f660903f8db9807b54814f", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "nosys", + "type": "github" + } + }, + "old-ghc-nix": { + "flake": false, + "locked": { + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", + "owner": "angerman", + "repo": "old-ghc-nix", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "type": "github" + }, + "original": { + "owner": "angerman", + "ref": "master", + "repo": "old-ghc-nix", + "type": "github" + } + }, "opam-nix": { "inputs": { "flake-compat": "flake-compat_2", @@ -332,11 +1164,11 @@ "opam2json": "opam2json" }, "locked": { - "lastModified": 1670004517, - "narHash": "sha256-7SffiN2S9pVfOoBCcEdY/iJe28p/eiRqVLXG7/8Jb3I=", + "lastModified": 1692284409, + "narHash": "sha256-Cql9CKy/k+LmSab3Rd2ZkuoEpmWVDb5oRhE/UHM4fT8=", "owner": "tweag", "repo": "opam-nix", - "rev": "b12b7fcd6f9ea0a8a939c05c68a95525f0d80af6", + "rev": "e83bd1d949c5e330a49f89d394b51b744248e3ca", "type": "github" }, "original": { @@ -364,11 +1196,11 @@ "opam-repository": { "flake": false, "locked": { - "lastModified": 1661161626, - "narHash": "sha256-J3P+mXLwE2oEKTlMnx8sYRxwD/uNGSKM0AkAB7BNTxA=", + "lastModified": 1682021363, + "narHash": "sha256-nDUDFwyOTZDALeqqEDnF2PTPIHT4sVYdQXUbRt03oNs=", "owner": "ocaml", "repo": "opam-repository", - "rev": "54e69ff0949a3aaec0d5e3d67898bb7f279ab09f", + "rev": "786c55fa77c37f07eceea7d6a9bec04d2225e302", "type": "github" }, "original": { @@ -401,11 +1233,11 @@ ] }, "locked": { - "lastModified": 1665671715, - "narHash": "sha256-7f75C6fIkiLzfkwLpJxlQIKf+YORGsXGV8Dr2LDDi+A=", + "lastModified": 1671540003, + "narHash": "sha256-5pXfbUfpVABtKbii6aaI2EdAZTjHJ2QntEf0QD2O5AM=", "owner": "tweag", "repo": "opam2json", - "rev": "32fa2dcd993a27f9e75ee46fb8b78a7cd5d05113", + "rev": "819d291ea95e271b0e6027679de6abb4d4f7f680", "type": "github" }, "original": { @@ -429,18 +1261,21 @@ }, "serokell-nix": { "inputs": { - "flake-compat": "flake-compat_3", + "deploy-rs": "deploy-rs", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_3", + "get-tested-src": "get-tested-src", "gitignore-nix": "gitignore-nix", - "nix-unstable": "nix-unstable", - "nixpkgs": "nixpkgs_5" + "haskell-nix": "haskell-nix", + "nix": "nix_3", + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1629443741, - "narHash": "sha256-7bZGo9qXYxYD2FMZWlWoQbp3/NNG1YSHLEjEOHI4YRM=", + "lastModified": 1691752608, + "narHash": "sha256-5rACo9LXUgvkp7MLqMVV7FOQSLsFoyqAXLwFvJ0BG/g=", "owner": "serokell", "repo": "serokell.nix", - "rev": "46d762e5107d10ad409295a7f668939c21cc048d", + "rev": "54e230e895e44049d45cca16433ddc9fa5ab6c6a", "type": "github" }, "original": { @@ -448,6 +1283,85 @@ "type": "indirect" } }, + "stackage": { + "flake": false, + "locked": { + "lastModified": 1678925630, + "narHash": "sha256-rl8qnpAUJl4tRZpaZ5DpgSueNfreArW09t4zTnOaoYA=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "bf29b23fb77017e78c6e7b199b2c7bfb5079c4cd", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, + "std": { + "inputs": { + "arion": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "blank" + ], + "blank": "blank", + "devshell": "devshell", + "dmerge": "dmerge", + "flake-utils": "flake-utils_6", + "incl": "incl", + "makes": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "blank" + ], + "microvm": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "blank" + ], + "n2c": "n2c", + "nixago": "nixago", + "nixpkgs": "nixpkgs_8", + "nosys": "nosys", + "yants": "yants" + }, + "locked": { + "lastModified": 1674526466, + "narHash": "sha256-tMTaS0bqLx6VJ+K+ZT6xqsXNpzvSXJTmogkraBGzymg=", + "owner": "divnix", + "repo": "std", + "rev": "516387e3d8d059b50e742a2ff1909ed3c8f82826", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "std", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tezos": { "flake": false, "locked": { @@ -463,6 +1377,85 @@ "repo": "tezos", "type": "gitlab" } + }, + "tullia": { + "inputs": { + "nix-nomad": "nix-nomad", + "nix2container": "nix2container", + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "nixpkgs" + ], + "std": "std" + }, + "locked": { + "lastModified": 1675695930, + "narHash": "sha256-B7rEZ/DBUMlK1AcJ9ajnAPPxqXY6zW2SBX+51bZV0Ac=", + "owner": "input-output-hk", + "repo": "tullia", + "rev": "621365f2c725608f381b3ad5b57afef389fd4c31", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "tullia", + "type": "github" + } + }, + "utils": { + "locked": { + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_2": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "yants": { + "inputs": { + "nixpkgs": [ + "serokell-nix", + "haskell-nix", + "tullia", + "std", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667096281, + "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", + "owner": "divnix", + "repo": "yants", + "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "yants", + "type": "github" + } } }, "root": "root", diff --git a/nix/build/hacks.nix b/nix/build/hacks.nix index 9ada8b657..43434eaf9 100644 --- a/nix/build/hacks.nix +++ b/nix/build/hacks.nix @@ -3,19 +3,20 @@ # This file needs to become empty. self: super: rec { - octez-protocol-compiler = super.octez-protocol-compiler.overrideAttrs (_: { - postFixup = '' - ln -s $OCAMLFIND_DESTDIR/octez-protocol-compiler/* $OCAMLFIND_DESTDIR - ''; - }); - # For some reason octez-protocol-compiler wants some docs to be present in tezos-protocol-environment - tezos-protocol-environment = super.tezos-protocol-environment.overrideAttrs (o: { + # For some reason octez-protocol-compiler wants some docs to be present in octez-libs + octez-libs = super.octez-libs.overrideAttrs (o: { postFixup = '' DUMMY_DOCS_DIR="$OCAMLFIND_DESTDIR/../doc/${o.pname}" mkdir -p "$DUMMY_DOCS_DIR" for doc in "README.md" "CHANGES.rst" "LICENSE"; do touch "$DUMMY_DOCS_DIR/$doc" done + + DUMMY_ODOC_PAGES_DIR="$DUMMY_DOCS_DIR/odoc-pages" + mkdir -p "$DUMMY_ODOC_PAGES_DIR" + for doc in "tezos_workers.mld" "tezos_lwt_result_stdlib.mld" "index.mld"; do + touch "$DUMMY_ODOC_PAGES_DIR/$doc" + done ''; }); octez-admin-client = super.octez-client.overrideAttrs (_ : { diff --git a/nix/build/ocaml-overlay.nix b/nix/build/ocaml-overlay.nix index 2a00af05d..7a9d09db3 100644 --- a/nix/build/ocaml-overlay.nix +++ b/nix/build/ocaml-overlay.nix @@ -11,9 +11,12 @@ with opam-nix.lib.${self.system}; let zcash-overlay = import ./zcash-overlay.nix; hacks = import ./hacks.nix; octezSourcesResolved = - self.runCommand "resolve-octez-sources" {} "cp --no-preserve=all -Lr ${sources.tezos} $out"; + self.runCommand "resolve-octez-sources" {} '' + cp --no-preserve=all -Lr ${sources.tezos} $out + cp ${./tezos-event-logging.opam} $out/opam/tezos-event-logging.opam + ''; octezScope = buildOpamProject' { - repos = [sources.opam-repository]; + repos = with sources; [opam-repository]; recursive = true; resolveArgs = { }; } octezSourcesResolved { }; diff --git a/nix/build/tezos-event-logging.opam b/nix/build/tezos-event-logging.opam new file mode 100644 index 000000000..650ae0bc5 --- /dev/null +++ b/nix/build/tezos-event-logging.opam @@ -0,0 +1,8 @@ +# SPDX-FileCopyrightText: 2023 Oxhead Alpha +# SPDX-License-Identifier: LicenseRef-MIT-OA +opam-version: "2.0" +build: [ + ["rm" "-r" "vendors"] + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} +]