From d54792b3d3b87c066610b2ff5f6e8a61a2983198 Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Wed, 11 Sep 2024 14:50:05 +0200 Subject: [PATCH 1/2] EVM Node: Remove it from the binaries distributed with Octez Since we are distributing the Octez EVM Node using a dedicated release channel, there is no reason to keep it in the official Octez suite. It is actually likely to be more confusing than necessary. We keep it as experimental so that the binary remains in the build artifacts (Docker images, static binaries, etc.). (cherry picked from commit 029caaa5410a9652d6f9c4801f84dff492cda6a8) --- .gitlab/ci/pipelines/before_merging.yml | 26 +++++++++---------- .gitlab/ci/pipelines/merge_train.yml | 26 +++++++++---------- .../ci/pipelines/schedule_extended_test.yml | 26 +++++++++---------- manifest/product_etherlink.ml | 2 +- script-inputs/ci-opam-package-tests | 26 +++++++++---------- script-inputs/experimental-executables | 1 + script-inputs/released-executables | 1 - 7 files changed, 50 insertions(+), 58 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index ffde65ba7b66..d523fa74c450 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -1173,8 +1173,8 @@ opam:all_6: - tezos-protocol-021-PsquebeC - tezos-protocol-020-PsParisC - tezos-protocol-019-PtParisB - - tezos-protocol-018-Proxford - - tezos-protocol-017-PtNairob + - tezos-dal-node-services + - tezos-benchmark - octez-shell-libs - octez-riscv-pvm - octez-proto-libs @@ -1323,8 +1323,6 @@ opam:all_2: - octez-smart-rollup-node-alpha - octez-smart-rollup-node-PtParisB - octez-smart-rollup-node-PtNairob - - octez-smart-rollup-node-PsquebeC - - octez-smart-rollup-node-PsParisC - octez-protocol-alpha-libs - octez-protocol-021-PsquebeC-libs - octez-protocol-020-PsParisC-libs @@ -1332,6 +1330,8 @@ opam:all_2: - octez-protocol-018-Proxford-libs - octez-protocol-017-PtNairob-libs - octez-protocol-016-PtMumbai-libs + - octez-protocol-000-Ps9mPmXa-libs + - octez-injector opam:all_1: image: ${ci_image_name}/prebuild:${ci_image_tag} @@ -1401,8 +1401,9 @@ opam:all_1: parallel: matrix: - package: + - octez-smart-rollup-node-PsquebeC + - octez-smart-rollup-node-PsParisC - octez-smart-rollup-node-Proxford - - octez-evm-node-libs opam:all_3: image: ${ci_image_name}/prebuild:${ci_image_tag} @@ -1472,6 +1473,8 @@ opam:all_3: parallel: matrix: - package: + - octez-protocol-015-PtLimaPt-libs + - octez-protocol-014-PtKathma-libs - octez-protocol-013-PtJakart-libs - octez-protocol-012-Psithaca-libs - octez-protocol-011-PtHangz2-libs @@ -1485,8 +1488,6 @@ opam:all_3: - octez-protocol-003-PsddFKi3-libs - octez-protocol-002-PsYLVpVv-libs - octez-protocol-001-PtCJ7pwo-libs - - octez-protocol-000-Ps9mPmXa-libs - - octez-injector opam:exec_4: image: ${ci_image_name}/prebuild:${ci_image_tag} @@ -1624,6 +1625,8 @@ opam:all_4: parallel: matrix: - package: + - tezos-protocol-005-PsBABY5H + - tezos-protocol-004-Pt24m4xi - tezos-protocol-003-PsddFKi3 - tezos-protocol-002-PsYLVpVv - tezos-protocol-001-PtCJ7pwo @@ -1634,8 +1637,6 @@ opam:all_4: - tezos-client-genesis - tezos-client-demo-counter - octez-rpc-process - - octez-protocol-015-PtLimaPt-libs - - octez-protocol-014-PtKathma-libs - octez-node-config - octez-crawler @@ -1708,7 +1709,6 @@ opam:exec_1: - octez-smart-rollup-wasm-debugger - octez-smart-rollup-node - octez-node - - octez-evm-node - octez-dal-node - octez-dac-node - octez-dac-client @@ -1787,6 +1787,8 @@ opam:all_5: parallel: matrix: - package: + - tezos-protocol-018-Proxford + - tezos-protocol-017-PtNairob - tezos-protocol-016-PtMumbai - tezos-protocol-015-PtLimaPt - tezos-protocol-014-PtKathma @@ -1800,8 +1802,6 @@ opam:all_5: - tezos-protocol-007-PsDELPH1 - tezos-protocol-006-PsCARTHA - tezos-protocol-005-PsBabyM1 - - tezos-protocol-005-PsBABY5H - - tezos-protocol-004-Pt24m4xi opam:all_7: image: ${ci_image_name}/prebuild:${ci_image_tag} @@ -1873,8 +1873,6 @@ opam:all_7: - package: - tezt-tezos - tezos-openapi - - tezos-dal-node-services - - tezos-benchmark - octez-smart-rollup-wasm-debugger-plugin - octez-rust-deps - octez-riscv-api diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index ffde65ba7b66..d523fa74c450 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -1173,8 +1173,8 @@ opam:all_6: - tezos-protocol-021-PsquebeC - tezos-protocol-020-PsParisC - tezos-protocol-019-PtParisB - - tezos-protocol-018-Proxford - - tezos-protocol-017-PtNairob + - tezos-dal-node-services + - tezos-benchmark - octez-shell-libs - octez-riscv-pvm - octez-proto-libs @@ -1323,8 +1323,6 @@ opam:all_2: - octez-smart-rollup-node-alpha - octez-smart-rollup-node-PtParisB - octez-smart-rollup-node-PtNairob - - octez-smart-rollup-node-PsquebeC - - octez-smart-rollup-node-PsParisC - octez-protocol-alpha-libs - octez-protocol-021-PsquebeC-libs - octez-protocol-020-PsParisC-libs @@ -1332,6 +1330,8 @@ opam:all_2: - octez-protocol-018-Proxford-libs - octez-protocol-017-PtNairob-libs - octez-protocol-016-PtMumbai-libs + - octez-protocol-000-Ps9mPmXa-libs + - octez-injector opam:all_1: image: ${ci_image_name}/prebuild:${ci_image_tag} @@ -1401,8 +1401,9 @@ opam:all_1: parallel: matrix: - package: + - octez-smart-rollup-node-PsquebeC + - octez-smart-rollup-node-PsParisC - octez-smart-rollup-node-Proxford - - octez-evm-node-libs opam:all_3: image: ${ci_image_name}/prebuild:${ci_image_tag} @@ -1472,6 +1473,8 @@ opam:all_3: parallel: matrix: - package: + - octez-protocol-015-PtLimaPt-libs + - octez-protocol-014-PtKathma-libs - octez-protocol-013-PtJakart-libs - octez-protocol-012-Psithaca-libs - octez-protocol-011-PtHangz2-libs @@ -1485,8 +1488,6 @@ opam:all_3: - octez-protocol-003-PsddFKi3-libs - octez-protocol-002-PsYLVpVv-libs - octez-protocol-001-PtCJ7pwo-libs - - octez-protocol-000-Ps9mPmXa-libs - - octez-injector opam:exec_4: image: ${ci_image_name}/prebuild:${ci_image_tag} @@ -1624,6 +1625,8 @@ opam:all_4: parallel: matrix: - package: + - tezos-protocol-005-PsBABY5H + - tezos-protocol-004-Pt24m4xi - tezos-protocol-003-PsddFKi3 - tezos-protocol-002-PsYLVpVv - tezos-protocol-001-PtCJ7pwo @@ -1634,8 +1637,6 @@ opam:all_4: - tezos-client-genesis - tezos-client-demo-counter - octez-rpc-process - - octez-protocol-015-PtLimaPt-libs - - octez-protocol-014-PtKathma-libs - octez-node-config - octez-crawler @@ -1708,7 +1709,6 @@ opam:exec_1: - octez-smart-rollup-wasm-debugger - octez-smart-rollup-node - octez-node - - octez-evm-node - octez-dal-node - octez-dac-node - octez-dac-client @@ -1787,6 +1787,8 @@ opam:all_5: parallel: matrix: - package: + - tezos-protocol-018-Proxford + - tezos-protocol-017-PtNairob - tezos-protocol-016-PtMumbai - tezos-protocol-015-PtLimaPt - tezos-protocol-014-PtKathma @@ -1800,8 +1802,6 @@ opam:all_5: - tezos-protocol-007-PsDELPH1 - tezos-protocol-006-PsCARTHA - tezos-protocol-005-PsBabyM1 - - tezos-protocol-005-PsBABY5H - - tezos-protocol-004-Pt24m4xi opam:all_7: image: ${ci_image_name}/prebuild:${ci_image_tag} @@ -1873,8 +1873,6 @@ opam:all_7: - package: - tezt-tezos - tezos-openapi - - tezos-dal-node-services - - tezos-benchmark - octez-smart-rollup-wasm-debugger-plugin - octez-rust-deps - octez-riscv-api diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index 16cede4056a8..d330f0d113ce 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -754,8 +754,8 @@ opam:all_6: - tezos-protocol-021-PsquebeC - tezos-protocol-020-PsParisC - tezos-protocol-019-PtParisB - - tezos-protocol-018-Proxford - - tezos-protocol-017-PtNairob + - tezos-dal-node-services + - tezos-benchmark - octez-shell-libs - octez-riscv-pvm - octez-proto-libs @@ -872,8 +872,6 @@ opam:all_2: - octez-smart-rollup-node-alpha - octez-smart-rollup-node-PtParisB - octez-smart-rollup-node-PtNairob - - octez-smart-rollup-node-PsquebeC - - octez-smart-rollup-node-PsParisC - octez-protocol-alpha-libs - octez-protocol-021-PsquebeC-libs - octez-protocol-020-PsParisC-libs @@ -881,6 +879,8 @@ opam:all_2: - octez-protocol-018-Proxford-libs - octez-protocol-017-PtNairob-libs - octez-protocol-016-PtMumbai-libs + - octez-protocol-000-Ps9mPmXa-libs + - octez-injector opam:all_1: image: ${ci_image_name}/prebuild:${ci_image_tag} @@ -933,8 +933,9 @@ opam:all_1: parallel: matrix: - package: + - octez-smart-rollup-node-PsquebeC + - octez-smart-rollup-node-PsParisC - octez-smart-rollup-node-Proxford - - octez-evm-node-libs opam:all_3: image: ${ci_image_name}/prebuild:${ci_image_tag} @@ -987,6 +988,8 @@ opam:all_3: parallel: matrix: - package: + - octez-protocol-015-PtLimaPt-libs + - octez-protocol-014-PtKathma-libs - octez-protocol-013-PtJakart-libs - octez-protocol-012-Psithaca-libs - octez-protocol-011-PtHangz2-libs @@ -1000,8 +1003,6 @@ opam:all_3: - octez-protocol-003-PsddFKi3-libs - octez-protocol-002-PsYLVpVv-libs - octez-protocol-001-PtCJ7pwo-libs - - octez-protocol-000-Ps9mPmXa-libs - - octez-injector opam:exec_4: image: ${ci_image_name}/prebuild:${ci_image_tag} @@ -1107,6 +1108,8 @@ opam:all_4: parallel: matrix: - package: + - tezos-protocol-005-PsBABY5H + - tezos-protocol-004-Pt24m4xi - tezos-protocol-003-PsddFKi3 - tezos-protocol-002-PsYLVpVv - tezos-protocol-001-PtCJ7pwo @@ -1117,8 +1120,6 @@ opam:all_4: - tezos-client-genesis - tezos-client-demo-counter - octez-rpc-process - - octez-protocol-015-PtLimaPt-libs - - octez-protocol-014-PtKathma-libs - octez-node-config - octez-crawler @@ -1176,7 +1177,6 @@ opam:exec_1: - octez-smart-rollup-wasm-debugger - octez-smart-rollup-node - octez-node - - octez-evm-node - octez-dal-node - octez-dac-node - octez-dac-client @@ -1238,6 +1238,8 @@ opam:all_5: parallel: matrix: - package: + - tezos-protocol-018-Proxford + - tezos-protocol-017-PtNairob - tezos-protocol-016-PtMumbai - tezos-protocol-015-PtLimaPt - tezos-protocol-014-PtKathma @@ -1251,8 +1253,6 @@ opam:all_5: - tezos-protocol-007-PsDELPH1 - tezos-protocol-006-PsCARTHA - tezos-protocol-005-PsBabyM1 - - tezos-protocol-005-PsBABY5H - - tezos-protocol-004-Pt24m4xi opam:all_7: image: ${ci_image_name}/prebuild:${ci_image_tag} @@ -1307,8 +1307,6 @@ opam:all_7: - package: - tezt-tezos - tezos-openapi - - tezos-dal-node-services - - tezos-benchmark - octez-smart-rollup-wasm-debugger-plugin - octez-rust-deps - octez-riscv-api diff --git a/manifest/product_etherlink.ml b/manifest/product_etherlink.ml index 727fe77363b9..0e033e46d634 100644 --- a/manifest/product_etherlink.ml +++ b/manifest/product_etherlink.ml @@ -213,7 +213,7 @@ let _evm_node = ~synopsis: "An implementation of a subset of Ethereum JSON-RPC API for the EVM \ rollup" - ~release_status:Released + ~release_status:Experimental ~with_macos_security_framework:true ~deps: [ diff --git a/script-inputs/ci-opam-package-tests b/script-inputs/ci-opam-package-tests index 48ed870873ca..f3a99ce6fca6 100644 --- a/script-inputs/ci-opam-package-tests +++ b/script-inputs/ci-opam-package-tests @@ -12,16 +12,14 @@ octez-dac-node exec 1 octez-dal-node exec 1 octez-distributed-internal all 7 octez-distributed-lwt-internal all 7 -octez-evm-node exec 1 -octez-evm-node-libs all 1 -octez-injector all 3 +octez-injector all 2 octez-internal-libs all 7 octez-l2-libs all 6 octez-libs all 7 octez-node exec 1 octez-node-config all 4 octez-proto-libs all 6 -octez-protocol-000-Ps9mPmXa-libs all 3 +octez-protocol-000-Ps9mPmXa-libs all 2 octez-protocol-001-PtCJ7pwo-libs all 3 octez-protocol-002-PsYLVpVv-libs all 3 octez-protocol-003-PsddFKi3-libs all 3 @@ -35,8 +33,8 @@ octez-protocol-010-PtGRANAD-libs all 3 octez-protocol-011-PtHangz2-libs all 3 octez-protocol-012-Psithaca-libs all 3 octez-protocol-013-PtJakart-libs all 3 -octez-protocol-014-PtKathma-libs all 4 -octez-protocol-015-PtLimaPt-libs all 4 +octez-protocol-014-PtKathma-libs all 3 +octez-protocol-015-PtLimaPt-libs all 3 octez-protocol-016-PtMumbai-libs all 2 octez-protocol-017-PtNairob-libs all 2 octez-protocol-018-Proxford-libs all 2 @@ -53,8 +51,8 @@ octez-shell-libs all 6 octez-signer exec 4 octez-smart-rollup-node exec 1 octez-smart-rollup-node-Proxford all 1 -octez-smart-rollup-node-PsParisC all 2 -octez-smart-rollup-node-PsquebeC all 2 +octez-smart-rollup-node-PsParisC all 1 +octez-smart-rollup-node-PsquebeC all 1 octez-smart-rollup-node-PtNairob all 2 octez-smart-rollup-node-PtParisB all 2 octez-smart-rollup-node-alpha all 2 @@ -63,21 +61,21 @@ octez-smart-rollup-wasm-debugger exec 1 octez-smart-rollup-wasm-debugger-lib all 2 octez-smart-rollup-wasm-debugger-plugin all 7 octez-version exec 6 -tezos-benchmark all 7 +tezos-benchmark all 6 tezos-client-demo-counter all 4 tezos-client-genesis all 4 tezos-dac-client-lib all 4 tezos-dac-lib all 4 tezos-dac-node-lib all 2 tezos-dal-node-lib all 4 -tezos-dal-node-services all 7 +tezos-dal-node-services all 6 tezos-openapi all 7 tezos-protocol-000-Ps9mPmXa all 4 tezos-protocol-001-PtCJ7pwo all 4 tezos-protocol-002-PsYLVpVv all 4 tezos-protocol-003-PsddFKi3 all 4 -tezos-protocol-004-Pt24m4xi all 5 -tezos-protocol-005-PsBABY5H all 5 +tezos-protocol-004-Pt24m4xi all 4 +tezos-protocol-005-PsBABY5H all 4 tezos-protocol-005-PsBabyM1 all 5 tezos-protocol-006-PsCARTHA all 5 tezos-protocol-007-PsDELPH1 all 5 @@ -91,8 +89,8 @@ tezos-protocol-013-PtJakart all 5 tezos-protocol-014-PtKathma all 5 tezos-protocol-015-PtLimaPt all 5 tezos-protocol-016-PtMumbai all 5 -tezos-protocol-017-PtNairob all 6 -tezos-protocol-018-Proxford all 6 +tezos-protocol-017-PtNairob all 5 +tezos-protocol-018-Proxford all 5 tezos-protocol-019-PtParisB all 6 tezos-protocol-020-PsParisC all 6 tezos-protocol-021-PsquebeC all 6 diff --git a/script-inputs/experimental-executables b/script-inputs/experimental-executables index 6e39e5c97b79..d8b61cd9bbd3 100644 --- a/script-inputs/experimental-executables +++ b/script-inputs/experimental-executables @@ -1,4 +1,5 @@ octez-teztale-archiver octez-teztale-server +octez-evm-node octez-accuser-alpha octez-baker-alpha diff --git a/script-inputs/released-executables b/script-inputs/released-executables index 12c073789ed7..6e62495dc0e1 100644 --- a/script-inputs/released-executables +++ b/script-inputs/released-executables @@ -1,4 +1,3 @@ -octez-evm-node octez-smart-rollup-wasm-debugger octez-smart-rollup-node octez-dac-client -- GitLab From 8ac3715bdf4d7e57b01609f0b8334342d4700336 Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Thu, 12 Sep 2024 09:10:50 +0200 Subject: [PATCH 2/2] Packages: Remove the Octez EVM node package definition (cherry picked from commit f2658f2ac97ab0b1bc8fa937e0230272ebaa383e) --- docs/introduction/install-bin-deb.sh | 1 - scripts/dpkg/B/evmnode-control.in | 6 -- scripts/dpkg/B/evmnode.postinst | 15 ----- scripts/pkg-common/evmnode-binaries | 1 - scripts/pkg-common/evmnode.conf | 38 ----------- scripts/pkg-common/evmnode.initd.in | 99 ---------------------------- scripts/rpm/evmnode-spec.in | 29 -------- 7 files changed, 189 deletions(-) delete mode 100644 scripts/dpkg/B/evmnode-control.in delete mode 100644 scripts/dpkg/B/evmnode.postinst delete mode 100644 scripts/pkg-common/evmnode-binaries delete mode 100644 scripts/pkg-common/evmnode.conf delete mode 100755 scripts/pkg-common/evmnode.initd.in delete mode 100644 scripts/rpm/evmnode-spec.in diff --git a/docs/introduction/install-bin-deb.sh b/docs/introduction/install-bin-deb.sh index 52517937bc0f..2fc5f7d842dd 100755 --- a/docs/introduction/install-bin-deb.sh +++ b/docs/introduction/install-bin-deb.sh @@ -108,7 +108,6 @@ if [ -n "$PREFIX" ]; then else # [install octez current packages] sudo apt-get install -y octez-smartrollup - sudo apt-get install -y octez-evmnode fi # [test executables] diff --git a/scripts/dpkg/B/evmnode-control.in b/scripts/dpkg/B/evmnode-control.in deleted file mode 100644 index 174fb3f83b0a..000000000000 --- a/scripts/dpkg/B/evmnode-control.in +++ /dev/null @@ -1,6 +0,0 @@ -Package: @PKG@ -Version: @VERSION@ -Architecture: @ARCH@ -Maintainer: @MAINT@ -Description: The Octez EVM node -Depends: systemd, @DEPENDS@ diff --git a/scripts/dpkg/B/evmnode.postinst b/scripts/dpkg/B/evmnode.postinst deleted file mode 100644 index d72a95727a8c..000000000000 --- a/scripts/dpkg/B/evmnode.postinst +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -user=tezos -group=tezos -homedir=/var/tezos - -# Ensure the tezos user is created -getent group ${group} >/dev/null 2>&1 || addgroup ${group} -getent passwd ${user} >/dev/null 2>&1 || adduser --home $homedir \ - --shell /bin/bash \ - --disabled-password \ - --ingroup ${group} ${user} - -# Reload to get new init scripts -systemctl daemon-reload || exit 0 diff --git a/scripts/pkg-common/evmnode-binaries b/scripts/pkg-common/evmnode-binaries deleted file mode 100644 index 58f972c91b5f..000000000000 --- a/scripts/pkg-common/evmnode-binaries +++ /dev/null @@ -1 +0,0 @@ -octez-evm-node diff --git a/scripts/pkg-common/evmnode.conf b/scripts/pkg-common/evmnode.conf deleted file mode 100644 index 9c558bde47ab..000000000000 --- a/scripts/pkg-common/evmnode.conf +++ /dev/null @@ -1,38 +0,0 @@ -# User to run as -#user=tezos -#group=tezos - -# My details -evmaddr=0.0.0.0 -evmport=8545 -evmmode=proxy # or sequencer or observer - -# Assume the Smart Rollup node is on the local machine. Change if not. -# Only relevant for proxy or sequencer. -sraddr=127.0.0.1 -srrpcport=8932 - -# endpointurl has two uses: -# 1. for proxy and sequencer - to point to a Smart Rollup node. -# This overrides sraddr and srrpcport -# -#endpointurl="http://127.0.0.1:8732" -# -# 2. for observer - to point to a sequencer -#endpointurl="http://127.0.0.1:8545" - -# Sequencer options -# Key for the sequencer (secret key must be in a wallet) -sequencer_key="" - -# Where to store the local chain -# -evmdatadir=/var/tezos/evmnode - -# additional options -additional_cliopts="" - -# e.g. -#additional_cliopts="--devmode" -#additional_cliopts="--cors-origins '*' --cors-headers '*'" - diff --git a/scripts/pkg-common/evmnode.initd.in b/scripts/pkg-common/evmnode.initd.in deleted file mode 100755 index e54e531b0795..000000000000 --- a/scripts/pkg-common/evmnode.initd.in +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/bash -# Start/stop the Octez EVM node compatibility endpoint -# -### BEGIN INIT INFO -# Provides: octez-evmnode -# Required-Start: -# Required-Stop: -# Should-Start: $network $named -# Should-Stop: $network $named -# Default-Start: 2 3 4 5 -# Default-Stop: -# Short-Description: The Octez EVM node endpoint -# Description: The Octez EVM node endpoint is used for Etherlink and -# EVM rollups -### END INIT INFO - -PATH=/bin:/usr/bin:/sbin:/usr/sbin -DESC="octez evm node" -NAME=octez-evmnode -PIDDIR=/var/run/tezos -SCRIPTNAME=/etc/init.d/"$NAME" - -if [ -f "/lib/lsb/init-functions" ]; then - . /lib/lsb/init-functions -else - . /etc/rc.d/init.d/functions -fi - -# Defaults -user=tezos -group=tezos -sraddr=127.0.0.1 -srrpcport=8932 - -evmaddr=0.0.0.0 -evmport=8545 -evmmode=proxy -sequencer_key="" -seq_opts="" - -additional_cliopts="" - -logdir=/var/log/tezos -rotateonstart=yes - -[ -r /etc/octez/evmnode.conf ] && . /etc/octez/evmnode.conf - -[ -z "$srnodeurl" ] && srnodeurl="http://$sraddr:$srrpcport" -[ -z "$endpointurl" ] && endpointurl="$srnodeurl" - -[ ! -z "$sequencer_key" ] && [ "$evmmode" = "sequencer" ] && \ - seq_opts="signing with ${sequencer_key}" - -[ ! -z "$evmdatadir" ] && \ - additional_cliopts="$additional_cliopts --data-dir ${evmdatadir}" - -logfile="${logdir}/evmnode.log" -evm="/usr/bin/octez-evm-node" - -initial_checks() -{ - mkdir -p ${PIDDIR} - chown $user:$group ${PIDDIR} - - mkdir -p ${logdir} - chown $user:$group ${logdir} - -} - -rotate_logs () -{ - if [ ${rotateonstart} = "yes" ]; then - [ -f "${logfile}" ] && mv -f "${logfile}" "${logfile}.1" - fi -} - -case "$1" in -start) initial_checks - rotate_logs - su $user -c "${evm} run ${evmmode} with endpoint $endpointurl ${seq_opts} --rpc-addr ${evmaddr} --rpc-port ${evmport} ${additional_cliopts} >> ${logfile} 2>&1 &" - ;; -stop) - pkill -f octez-evm-node - ;; -restart) - $0 stop - $0 start - ;; -reload|force-reload) - ;; -status) - status_of_proc ${evm} $NAME || exit $? - exit 0 - ;; -*) echo "Usage: $0 {start|stop|status|restart|reload|force-reload}" >&2 - exit 2 - ;; -esac -exit 0 diff --git a/scripts/rpm/evmnode-spec.in b/scripts/rpm/evmnode-spec.in deleted file mode 100644 index f931b4a47535..000000000000 --- a/scripts/rpm/evmnode-spec.in +++ /dev/null @@ -1,29 +0,0 @@ -Name: @PKG@ -Version: @VERSION@ -Release: @REVISION@ -Summary: The Octez EVM node - -License: MIT -URL: http://tezos.gitlab.io - -Packager: @MAINT@ -Source0: @FAKESRC@ - -%prep -%setup -q - -%install -tar cpf - . | (cd $RPM_BUILD_ROOT && tar xpf -) - -%description -The Octez EVM node - -%files -%{_bindir}/octez-* -%{_sysconfdir}/init.d/octez-evmnode -%config /etc/octez/evmnode.conf - -%post -getent group tezos >/dev/null 2>&1 || groupadd tezos -getent passwd tezos >/dev/null 2>&1 || useradd -g tezos -d /var/tezos tezos -/usr/bin/systemctl daemon-reload -- GitLab