update app name to emerald (#81)

* update app name to emerald

* fix tests and lint

Author: sryps

.github/workflows/emerald.yml

@@ -50,12 +50,12 @@ jobs:
           cargo build
           # `make all` equivalent but with --no-wait
           ./scripts/generate_testnet_config.sh --nodes 3 --testnet-config-dir .testnet
-          cargo run --bin malachitebft-eth-app -- testnet --home nodes --testnet-config .testnet/testnet_config.toml --log-level info
-          ls nodes/*/config/priv_validator_key.json | xargs -I{} cargo run --bin malachitebft-eth-app show-pubkey {} > nodes/validator_public_keys.txt
-          cargo run --bin malachitebft-eth-utils genesis --public-keys-file ./nodes/validator_public_keys.txt
-          docker compose up -d reth0 reth1 reth2 prometheus grafana otterscan
+          cargo run --bin emerald -- testnet --home nodes --testnet-config .testnet/testnet_config.toml
+          ls nodes/*/config/priv_validator_key.json | xargs -I{} cargo run --bin emerald show-pubkey {} > nodes/validator_public_keys.txt
+          cargo run --bin emerald-utils genesis --public-keys-file ./nodes/validator_public_keys.txt
+          docker compose up -d
           ./scripts/add_peers.sh --nodes 3
-          bash scripts/spawn.bash --nodes 3 --home nodes --no-wait
+          bash scripts/spawn.bash --nodes 3 --home nodes --no-delay --no-wait
 
       - name: Upload test logs
         if: failure()

Cargo.lock

@@ -48,7 +48,7 @@ redundant_clone               = "deny"
 std_instead_of_core           = "deny"
 
 [workspace.dependencies]
-malachitebft-eth-app    = { version = "0.0.1", path = "app" }
+emerald                 = { version = "0.0.1", path = "app" }
 malachitebft-eth-cli    = { version = "0.0.1", path = "cli" }
 malachitebft-eth-engine = { version = "0.0.1", path = "engine" }
 malachitebft-eth-types  = { version = "0.0.1", path = "types" }

Cargo.toml

@@ -2,48 +2,43 @@ FROM rust:1.90.0-bookworm AS build-env
 
 ARG TAG
 
-ENV DEBIAN_FRONTEND=noninteractive
 ENV CARGO_TERM_COLOR=never
 ENV CARGO_TERM_PROGRESS_WHEN=never
 
 WORKDIR /root
 
 RUN apt-get update -qq && \
 	apt-get install -yqq --no-install-recommends \
-	  build-essential \
-	  ca-certificates \
-	  clang \
-	  git \
-	  libclang-dev \
-	  libssl-dev \
-	  llvm-dev \
-	  pkg-config \
-	  protobuf-compiler && \
+	build-essential \
+	ca-certificates \
+	clang \
+	git \
+	libclang-dev \
+	libssl-dev \
+	llvm-dev \
+	pkg-config \
+	protobuf-compiler && \
 	rm -rf /var/lib/apt/lists/*
 
 COPY . /root
 RUN cargo build --release --locked
 
-FROM debian:bookworm-slim
-
-ENV DEBIAN_FRONTEND=noninteractive
+FROM debian:trixie-slim
 
 RUN apt-get update -qq && \
 	apt-get install -yqq --no-install-recommends \
-		libssl-dev \
-		ca-certificates && \
+	libssl-dev \
+	ca-certificates && \
 	apt-get clean && \
 	rm -rf /var/lib/apt/lists/*
 
-COPY --chown=0:0 --from=build-env /root/target/release/malachitebft-eth-app /usr/local/bin/malachitebft-eth-app
-COPY --chown=0:0 --from=build-env /root/target/release/malachitebft-eth-utils /usr/local/bin/malachitebft-eth-utils
-
-RUN useradd -m mbft -s /bin/bash
-WORKDIR /home/mbft
-USER mbft:mbft
+COPY --chown=0:0 --from=build-env /root/target/release/emerald /usr/local/bin/emerald
+COPY --chown=0:0 --from=build-env /root/target/release/emerald-utils /usr/local/bin/emerald-utils
 
-VOLUME ["/home/mbft/.malachite"]
+RUN useradd -m emerald -s /bin/bash
+WORKDIR /home/emerald
+USER emerald:emerald
 
-RUN mkdir -p /home/mbft/.emerald/config /home/mbft/.malachite
+RUN mkdir -p /home/emerald/.emerald
 
-ENTRYPOINT ["/usr/local/bin/malachitebft-eth-app"]
+ENTRYPOINT ["/usr/local/bin/emerald"]

Dockerfile

@@ -1,28 +1,28 @@
 all: clean build
 	./scripts/generate_testnet_config.sh --nodes 3 --testnet-config-dir .testnet
-	cargo run --bin malachitebft-eth-app -- testnet --home nodes --testnet-config .testnet/testnet_config.toml --log-level info
-	ls nodes/*/config/priv_validator_key.json | xargs -I{} cargo run --bin malachitebft-eth-app show-pubkey {} > nodes/validator_public_keys.txt
-	cargo run --bin malachitebft-eth-utils genesis --public-keys-file ./nodes/validator_public_keys.txt
+	cargo run --bin emerald -- testnet --home nodes --testnet-config .testnet/testnet_config.toml --log-level info
+	ls nodes/*/config/priv_validator_key.json | xargs -I{} cargo run --bin emerald show-pubkey {} > nodes/validator_public_keys.txt
+	cargo run --bin emerald-utils genesis --public-keys-file ./nodes/validator_public_keys.txt
 	docker compose up -d reth0 reth1 reth2 prometheus grafana otterscan
 	./scripts/add_peers.sh --nodes 3
 	@echo 👉 Grafana dashboard is available at http://localhost:3000
 	bash scripts/spawn.bash --nodes 3 --home nodes --no-delay
 
 four: clean build
 	./scripts/generate_testnet_config.sh --nodes 4 --testnet-config-dir .testnet
-	cargo run --bin malachitebft-eth-app -- testnet --home nodes --testnet-config .testnet/testnet_config.toml
-	ls nodes/*/config/priv_validator_key.json | xargs -I{} cargo run --bin malachitebft-eth-app show-pubkey {} > nodes/validator_public_keys.txt
-	cargo run --bin malachitebft-eth-utils genesis --public-keys-file ./nodes/validator_public_keys.txt
+	cargo run --bin emerald -- testnet --home nodes --testnet-config .testnet/testnet_config.toml
+	ls nodes/*/config/priv_validator_key.json | xargs -I{} cargo run --bin emerald show-pubkey {} > nodes/validator_public_keys.txt
+	cargo run --bin emerald-utils genesis --public-keys-file ./nodes/validator_public_keys.txt
 	docker compose up -d reth0 reth1 reth2 reth3 prometheus grafana otterscan
 	./scripts/add_peers.sh --nodes 4
 	@echo 👉 Grafana dashboard is available at http://localhost:3000
 	bash scripts/spawn.bash --nodes 4 --home nodes --no-delay
 
 sync: clean build
 	./scripts/generate_testnet_config.sh --nodes 4 --testnet-config-dir .testnet
-	cargo run --bin malachitebft-eth-app -- testnet --home nodes --testnet-config .testnet/testnet_config.toml
-	ls nodes/*/config/priv_validator_key.json | xargs -I{} cargo run --bin malachitebft-eth-app show-pubkey {} > nodes/validator_public_keys.txt
-	cargo run --bin malachitebft-eth-utils genesis --public-keys-file ./nodes/validator_public_keys.txt
+	cargo run --bin emerald -- testnet --home nodes --testnet-config .testnet/testnet_config.toml
+	ls nodes/*/config/priv_validator_key.json | xargs -I{} cargo run --bin emerald show-pubkey {} > nodes/validator_public_keys.txt
+	cargo run --bin emerald-utils genesis --public-keys-file ./nodes/validator_public_keys.txt
 	docker compose up -d
 	./scripts/add_peers.sh --nodes 4
 	@echo 👉 Grafana dashboard is available at http://localhost:3000
@@ -51,7 +51,7 @@ clean-prometheus: stop
 	rm -rf ./monitoring/data-prometheus
 
 spam:
-	cargo run --bin malachitebft-eth-utils spam --time=60 --rate=5000 --rpc-url=127.0.0.1:8645
+	cargo run --bin emerald-utils spam --time=60 --rate=5000 --rpc-url=127.0.0.1:8645
 
 spam-contract:
 	@if [ -z "$(CONTRACT)" ]; then \
@@ -66,7 +66,7 @@ spam-contract:
 		echo "Example with args: make spam-contract CONTRACT=0x5FbDB... FUNCTION=\"setNumber(uint256)\" ARGS=\"12345\""; \
 		exit 1; \
 	fi; \
-	cargo run --release --bin malachitebft-eth-utils spam-contract \
+	cargo run --release --bin emerald-utils spam-contract \
 		--contract="$(CONTRACT)" \
 		--function="$(FUNCTION)" \
 		--args="$(ARGS)" \

Makefile

@@ -310,7 +310,7 @@ Check out the metrics in the Grafana dashboards at http://localhost:3000.
 In a separate terminal, run the following command to send transactions during 60 seconds at a rate
 of 1000 tx/s to one of Reth RPC endpoints.
 ```
-cargo run --bin malachitebft-eth-utils spam --time=60 --rate=1000
+cargo run --bin emerald-utils spam --time=60 --rate=1000
 ```
 
 > [!TIP]

README.md

@@ -1,5 +1,5 @@
 [package]
-name         = "malachitebft-eth-app"
+name         = "emerald"
 version      = { workspace = true }
 edition      = { workspace = true }
 repository   = { workspace = true }

app/Cargo.toml

@@ -8,7 +8,7 @@ fi
 
 NODE=$1
 NODES_HOME="nodes"
-APP_BINARY="malachitebft-eth-app"
+APP_BINARY="emerald"
 
 export RUST_BACKTRACE=full
 

scripts/restart_node.sh

@@ -95,7 +95,7 @@ if [ -z "$NODES_COUNT" ] || [ -z "$NODES_HOME" ]; then
 fi
 
 # Set defaults
-app_name=${app_name:-"malachitebft-eth-app"}
+app_name=${app_name:-"emerald"}
 profile=${profile:-false}
 debug=${debug:-false}
 lldb=${lldb:-false}

scripts/spawn-tmux.bash

@@ -35,7 +35,7 @@ if [[ -z "$NODES_HOME" ]]; then
 fi
 
 if [[ -z "$APP_BINARY" ]]; then
-    APP_BINARY="malachitebft-eth-app"
+    APP_BINARY="emerald"
 fi
 
 echo "Compiling '$APP_BINARY'..."