[#518] Remove transaction rollup mentions from repo

Problem: Despite that transaction rollup was depricated, we still have a lot of mentions of it in our repo Solution: Remove all mentions of transaction rollup and patched some scripts that used old bianries
serokell · Oct 22, 2023 · 5aae691 · 5aae691
1 parent b3b7f3a
commit 5aae691
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ tezos-setup
 You can also read [the dedicated article](./docs/baking.md) to find out more about
 this setup, the binaries, and the services used.
 
-For setting up experimental transaction rollup node, see [this doc](./docs/tx-rollup.md).
+For setting up experimental smart rollup node, see [this doc](./docs/smart-rollup.md).
 
 #### Voting on Ubuntu
 

diff --git a/docker/package/defaults/tezos-rollup-node.conf b/docker/package/defaults/tezos-rollup-node.conf
@@ -9,3 +9,4 @@ NODE_RPC_ADDR="localhost:8732"
 ROLLUP_NODE_RPC_ENDPOINT="127.0.0.1:8472"
 ROLLUP_MODE="observer"
 ROLLUP_ALIAS="rollup"
+ROLLUP_OPERATORS=""
diff --git a/docker/package/scripts/tezos-rollup-node-start b/docker/package/scripts/tezos-rollup-node-start
@@ -7,12 +7,20 @@ set -euo pipefail
 # Note: the 'TEZOS_CLIENT_DIR' env var is expected and used by the rollup node
 
 # $PROTOCOL should be defined in the system unit environment
-node="/usr/bin/octez-$TYPE-rollup-node-$PROTOCOL"
+node="/usr/bin/octez-smart-rollup-node-$PROTOCOL"
+
+# By default this script runs init in observer mode, which
+# does not require rollup operator. If you want to run this script in
+# any other mode, you should provide at least one operator, using
+# ROLLUP_OPERATORS env variable.
 
 "$node" init "$ROLLUP_MODE" config \
     for "$ROLLUP_ALIAS" \
+    with operators \
+    "$ROLLUP_OPERATORS" \
     --rpc-addr "$ROLLUP_NODE_RPC_ENDPOINT" \
     --force
 
 "$node" --endpoint "$NODE_RPC_SCHEME://$NODE_RPC_ADDR" \
-    run "$ROLLUP_MODE" for "$ROLLUP_ALIAS" &
+    run "$ROLLUP_MODE" for "$ROLLUP_ALIAS" \
+    with operators $ROLLUP_OPERATORS
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -98,9 +98,11 @@ aware of the change as well.
 | `PORT`                         | `tezos-signer-tcp`              | Listening TCP port for the signer, e.g. `7732`                                           | `tezos-signer-tcp`                                                                           |
 | `TIMEOUT`                      | `tezos-signer-tcp`              | Timeout used by the signer to close client connections (in seconds), e.g. `8`            | `tezos-signer-tcp`                                                                           |
 | `SOCKET`                       | `tezos-signer-unix`             | Path to the local socket file, e.g. `/var/lib/tezos/.tezos-signer/socket`                | `tezos-signer-unix`                                                                          |
-| `TEZOS_CLIENT_DIR`             | `tezos-tx-rollup-node-<proto>`  | Path to the tezos client data directory, e.g. `/var/lib/tezos/.tezos-client`             | `tezos-tx-rollup-node-<proto>`                                                               |
-| `NODE_RPC_SCHEME`              | `tezos-tx-rollup-node-<proto>`  | Scheme of the node RPC endpoint, e.g. `http`, `https`                                    | `tezos-tx-rollup-node-<proto>`                                                               |
-| `NODE_RPC_ADDR`                | `tezos-tx-rollup-node-<proto>`  | Address of the node RPC endpoint, e.g. `localhost:8732`, `node.example.org:8732`         | `tezos-tx-rollup-node-<proto>`                                                               |
-| `ROLLUP_NODE_RPC_ENDPOINT`     | `tezos-tx-rollup-node-<proto>`  | Address of this rollup node RPC endpoint, e.g. `127.0.0.1:8472`                          | `tezos-tx-rollup-node-<proto>`                                                               |
-| `ROLLUP_MODE`                  | `tezos-tx-rollup-node-<proto>`  | Rollup mode used by this node, e.g. `accuser`, `observer`, `batcher`                     | `tezos-tx-rollup-node-<proto>`                                                               |
-| `ROLLUP_ALIAS`                 | `tezos-tx-rollup-node-<proto>`  | Alias of the address to be used for rollup, e.g. `rollup`                                | `tezos-tx-rollup-node-<proto>`                                                               |
+| `TEZOS_CLIENT_DIR`             | `tezos-smart-rollup-node-<proto>`  | Path to the tezos client data directory, e.g. `/var/lib/tezos/.tezos-client`             | `tezos-smart-rollup-node-<proto>`                                                               |
+| `NODE_RPC_SCHEME`              | `tezos-smart-rollup-node-<proto>`  | Scheme of the node RPC endpoint, e.g. `http`, `https`                                    | `tezos-smart-rollup-node-<proto>`                                                               |
+| `NODE_RPC_ADDR`                | `tezos-smart-rollup-node-<proto>`  | Address of the node RPC endpoint, e.g. `localhost:8732`, `node.example.org:8732`         | `tezos-smart-rollup-node-<proto>`                                                               |
+| `ROLLUP_NODE_RPC_ENDPOINT`     | `tezos-smart-rollup-node-<proto>`  | Address of this rollup node RPC endpoint, e.g. `127.0.0.1:8472`                          | `tezos-smart-rollup-node-<proto>`                                                               |
+| `ROLLUP_MODE`                  | `tezos-smart-rollup-node-<proto>`  | Rollup mode used by this node, e.g. `accuser`, `observer`, `batcher`                     | `tezos-smart-rollup-node-<proto>`                                                               |
+| `ROLLUP_ALIAS`                 | `tezos-smart-rollup-node-<proto>`  | Alias of the address to be used for rollup, e.g. `rollup`                                | `tezos-smart-rollup-node-<proto>`                                                               |
+| `ROLLUP_OPERATORS`             | `tezos-smart-rollup-node-<proto>`  | Operator address or alias for node operations in non-observer modes                     |
+`tezos-smart-rollup-node-<proto>`                                                               |
diff --git a/docs/tx-rollup.md → docs/smart-rollup.md b/docs/tx-rollup.md → docs/smart-rollup.md
@@ -3,20 +3,20 @@
    - SPDX-License-Identifier: LicenseRef-MIT-OA
    -->
 
-# Setting up transaction rollup node on Ubuntu
+# Setting up smart rollup node on Ubuntu
 
 At first you should originate rollup with the provided alias for some implicit account:
 ```
-sudo -u tezos tezos-client originate tx rollup <ROLLUP_ALIAS> from <IMPLICIT_ACCOUNT_ALIAS>
+sudo -u tezos tezos-client originate smart rollup <ROLLUP_ALIAS> from <IMPLICIT_ACCOUNT_ALIAS>
 ```
 
 After that, with the active `tezos-node` service available with the provided uri, run the following command
 ```
-systemctl start tezos-tx-rollup-node-<proto>.service
+systemctl start tezos-smart-rollup-node-<proto>.service
 ```
 Note: The `proto` variable can be every active protocol.
 
-For futher details, see [the upstream documentation on transaction rollups](http://tezos.gitlab.io/active/transaction_rollups.html).
+For further details, see [the upstream documentation on smart rollups](http://tezos.gitlab.io/active/smart_rollups.html).
 
 ## Options and defaults