From 49ea93686f1f85f19539ce01f942ebbed0e4c7dd Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Thu, 23 Nov 2023 12:33:26 +0300 Subject: [PATCH] [#518] Remove tx 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 binaries. --- README.md | 2 +- docker/package/packages.py | 2 +- docs/configuration.md | 14 ++++++++------ docs/tx-rollup.md | 25 ------------------------- 4 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 docs/tx-rollup.md diff --git a/README.md b/README.md index 8e88d07c7..94184b9f2 100644 --- 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/packages.py b/docker/package/packages.py index 74fdc3919..5ce4524f9 100644 --- a/docker/package/packages.py +++ b/docker/package/packages.py @@ -513,7 +513,7 @@ def mk_units(proto): Unit(after=["network.target"], description=f"Tezos smart rollup node"), Service( environment_files=[f"/etc/default/tezos-smart-rollup-node-{proto}"], - environment=[f"PROTOCOL={proto}", f"TYPE=sc"], + environment=[f"PROTOCOL={proto}"], exec_start_pre=[ "+/usr/bin/setfacl -m u:tezos:rwx /run/systemd/ask-password" ], diff --git a/docs/configuration.md b/docs/configuration.md index e87435d52..1fbfa3037 100644 --- 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-` | Path to the tezos client data directory, e.g. `/var/lib/tezos/.tezos-client` | `tezos-tx-rollup-node-` | -| `NODE_RPC_SCHEME` | `tezos-tx-rollup-node-` | Scheme of the node RPC endpoint, e.g. `http`, `https` | `tezos-tx-rollup-node-` | -| `NODE_RPC_ADDR` | `tezos-tx-rollup-node-` | Address of the node RPC endpoint, e.g. `localhost:8732`, `node.example.org:8732` | `tezos-tx-rollup-node-` | -| `ROLLUP_NODE_RPC_ENDPOINT` | `tezos-tx-rollup-node-` | Address of this rollup node RPC endpoint, e.g. `127.0.0.1:8472` | `tezos-tx-rollup-node-` | -| `ROLLUP_MODE` | `tezos-tx-rollup-node-` | Rollup mode used by this node, e.g. `accuser`, `observer`, `batcher` | `tezos-tx-rollup-node-` | -| `ROLLUP_ALIAS` | `tezos-tx-rollup-node-` | Alias of the address to be used for rollup, e.g. `rollup` | `tezos-tx-rollup-node-` | +| `TEZOS_CLIENT_DIR` | `tezos-smart-rollup-node-` | Path to the tezos client data directory, e.g. `/var/lib/tezos/.tezos-client` | `tezos-smart-rollup-node-` | +| `NODE_RPC_SCHEME` | `tezos-smart-rollup-node-` | Scheme of the node RPC endpoint, e.g. `http`, `https` | `tezos-smart-rollup-node-` | +| `NODE_RPC_ADDR` | `tezos-smart-rollup-node-` | Address of the node RPC endpoint, e.g. `localhost:8732`, `node.example.org:8732` | `tezos-smart-rollup-node-` | +| `ROLLUP_NODE_RPC_ENDPOINT` | `tezos-smart-rollup-node-` | Address of this rollup node RPC endpoint, e.g. `127.0.0.1:8472` | `tezos-smart-rollup-node-` | +| `ROLLUP_MODE` | `tezos-smart-rollup-node-` | Rollup mode used by this node, e.g. `accuser`, `observer`, `batcher` | `tezos-smart-rollup-node-` | +| `ROLLUP_ALIAS` | `tezos-smart-rollup-node-` | Alias of the address to be used for rollup, e.g. `rollup` | `tezos-smart-rollup-node-` | +| `ROLLUP_OPERATORS` | `tezos-smart-rollup-node-` | Operator address or alias for node operations in non-observer modes |`tezos-smart-rollup-node-`| +| `ROLLUP_DATA_DIR`| `tezos-smart-rollup-node-` | Directory to store rollup data | `tezos-smart-rollup-node-` | \ No newline at end of file diff --git a/docs/tx-rollup.md b/docs/tx-rollup.md deleted file mode 100644 index 018710cd0..000000000 --- a/docs/tx-rollup.md +++ /dev/null @@ -1,25 +0,0 @@ - - -# Setting up transaction 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 from -``` - -After that, with the active `tezos-node` service available with the provided uri, run the following command -``` -systemctl start tezos-tx-rollup-node-.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). - -## Options and defaults - -As any other `systemd` services ditributed here, rollup binaries have settable -options, see [the dedicated documentation](./configuration.md) to see their -default values and how to change these.