[Chore] Remove protocol name from rollup node

Problem: New release unifies smart rollup node. Solution: Remove protocol names from it.
serokell · Nov 20, 2023 · a8ae88f · a8ae88f
1 parent c0ecf17
commit a8ae88f
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 119 deletions.
diff --git 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, tezos-dac-client, tezos-dac-node, tezos-smart-rollup-wasm-debugger]
+        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, tezos-smart-rollup-node, tezos-dac-client, tezos-dac-node, tezos-smart-rollup-wasm-debugger]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/Formula/tezos-smart-rollup-node-PtNairob.rb b/Formula/tezos-smart-rollup-node-PtNairob.rb
diff --git a/Formula/tezos-smart-rollup-node-Proxford.rb → Formula/tezos-smart-rollup-node.rb b/Formula/tezos-smart-rollup-node-Proxford.rb → Formula/tezos-smart-rollup-node.rb
@@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: 2023 Oxhead Alpha
 # SPDX-License-Identifier: LicenseRef-MIT-OA
 
-class TezosSmartRollupNodeProxford < Formula
+class TezosSmartRollupNode < Formula
   @all_bins = []
 
   class << self
@@ -24,10 +24,10 @@ class << self
   dependencies.each do |dependency|
     depends_on dependency
   end
-  desc "Tezos smart contract rollup node for Proxford"
+  desc "Tezos smart contract rollup node"
 
   bottle do
-    root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNodeProxford.version}/"
+    root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSmartRollupNode.version}/"
   end
 
   def make_deps
@@ -61,7 +61,7 @@ def install
 
       set -euo pipefail
 
-      node="#{bin}/octez-smart-rollup-node-Proxford"
+      node="#{bin}/octez-smart-rollup-node"
 
       "$node" init "$ROLLUP_MODE" config \
           for "$ROLLUP_ALIAS" \
@@ -71,21 +71,21 @@ def install
       "$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"
+    File.write("tezos-smart-rollup-node-start", startup_contents)
+    bin.install "tezos-smart-rollup-node-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"
+    install_template "src/bin_smart_rollup_node/main_smart_rollup_node.exe",
+                     "_build/default/src/bin_smart_rollup_node/main_smart_rollup_node.exe",
+                     "octez-smart-rollup-node"
   end
 
   service do
-    run opt_bin/"tezos-smart-rollup-node-Proxford-start"
+    run opt_bin/"tezos-smart-rollup-node-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"
+    log_path var/"log/tezos-smart-rollup-node.log"
+    error_log_path var/"log/tezos-smart-rollup-node.log"
   end
 
   def post_install

diff --git a/docker/docker-static-build.sh b/docker/docker-static-build.sh
@@ -10,10 +10,10 @@ set -euo pipefail
 
 if [ -z ${OCTEZ_EXECUTABLES+x} ]; then
 
-    binaries=("octez-admin-client" "octez-dac-client" "octez-dac-node" "octez-client" "octez-node" "octez-signer" "octez-codec" "octez-smart-rollup-wasm-debugger")
+    binaries=("octez-admin-client" "octez-dac-client" "octez-dac-node" "octez-client" "octez-node" "octez-signer" "octez-codec" "octez-smart-rollup-wasm-debugger" "octez-smart-rollup-node")
 
     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")
+        binaries+=("octez-accuser-$proto" "octez-baker-$proto" "octez-smart-rollup-client-$proto")
     done
 
     OCTEZ_EXECUTABLES="$( IFS=$' '; echo "${binaries[*]}" )"

diff --git a/docker/package/packages.py b/docker/package/packages.py
@@ -554,12 +554,28 @@ def mk_rollup_package(name, proto):
             dune_filepath=f"src/proto_{proto_snake_case}/bin_sc_rollup_{name}/main_sc_rollup_{name}_{proto_snake_case}.exe",
         )
 
-    packages = ["node", "client"]
+    def mk_node_package():
+        return TezosBinaryPackage(
+            f"tezos-smart-rollup-node",
+            f"Tezos smart rollup node",
+            meta=packages_meta,
+            systemd_units=[],
+            additional_native_deps=[
+                "tezos-client",
+                "tezos-node",
+                "tezos-sapling-params",
+            ],
+            postinst_steps=daemon_postinst_common,
+            dune_filepath="src/bin_smart_rollup_node/main_smart_rollup_node.exe",
+        )
+
+    packages = ["client"]
+    # FIXME with #740 PR
     return [
         {f"tezos-smart-rollup-{name}-{proto}": mk_rollup_package(name, proto)}
         for name in packages
         for proto in protos
-    ]
+    ] + [{f"tezos-smart-rollup-node": mk_node_package()}]
 
 
 packages.extend(mk_rollup_packages("PtNairob", "Proxford"))

diff --git a/nix/build/release-binaries.nix b/nix/build/release-binaries.nix
@@ -67,6 +67,14 @@ in [
     '';
     supports = protocolsFormatted;
   }
+  {
+    name = "octez-smart-rollup-node";
+    description = ''
+      Tezos smart contract rollup node.
+      For more info please check - https://tezos.gitlab.io/active/smart_rollups.html#tools
+    '';
+    supports = protocolsFormatted;
+  }
 ] ++ builtins.concatMap (protocol: [
   {
     name = "octez-baker-${protocol}";
@@ -92,12 +100,4 @@ in [
     '';
     supports = protocol;
   }
-  {
-    name = "octez-smart-rollup-node-${protocol}";
-    description = ''
-      Tezos smart contract rollup node for ${protocol}.
-      For more info please check - https://tezos.gitlab.io/active/smart_rollups.html#tools
-    '';
-    supports = protocol;
-  }
 ]) protocols.active