chore: refactor flows and align others (#22)

* review flow and align parts

* deduplicate

* dry code

* dedup

* add e2e test with ev-node

* comments addressed

Author: tac0turtle

.github/workflows/rust.yml

@@ -40,6 +40,20 @@ jobs:
       - name: Install protoc
         run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
       - run: cargo test -p evolve_testapp --test simulation_long_tests -- --ignored
+  e2e-docker:
+    name: e2e (evd + ev-node docker)
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Install protoc
+        run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
+      - name: Pull ev-node image
+        run: docker pull ghcr.io/evstack/ev-node-grpc:main
+      - name: Run e2e tests
+        run: cargo test -p evd --test external_consensus_e2e -- --ignored --nocapture
+        timeout-minutes: 10
   fmt:
     name: cargo fmt
     runs-on: ubuntu-latest

README.md

@@ -47,17 +47,9 @@ Run `evd` only:
 docker compose up --build evd
 ```
 
-Run `evd` + `ev-node`:
-
-```bash
-docker compose -f docker-compose.yml -f docker-compose.ev-node.yml up --build
-```
-
 Notes:
 - `evd` JSON-RPC is exposed on `http://localhost:8545`
 - `evd` gRPC is exposed on `localhost:50051`
-- `ev-node` gets `EVD_GRPC_ENDPOINT=evd:50051` in the compose network
-- if your `ev-node` image needs explicit startup flags, override `command` for the `ev-node` service with an extra compose override file
 
 ## Documentation
 

bin/evd/Cargo.toml

@@ -12,35 +12,30 @@ name = "evd"
 path = "src/main.rs"
 
 [dependencies]
-# Workspace dependencies
-evolve_core.workspace = true
-evolve_stf.workspace = true
-evolve_stf_traits.workspace = true
-evolve_mempool.workspace = true
-evolve_server.workspace = true
-evolve_storage.workspace = true
 evolve_node.workspace = true
 evolve_evnode = { workspace = true, features = ["testapp"] }
+evolve_storage.workspace = true
 evolve_testapp.workspace = true
-evolve_token.workspace = true
-evolve_scheduler.workspace = true
-evolve_testing.workspace = true
-evolve_tx_eth.workspace = true
-evolve_chain_index.workspace = true
-evolve_eth_jsonrpc.workspace = true
-evolve_rpc_types.workspace = true
 
-# External dependencies
-alloy-primitives.workspace = true
 commonware-runtime.workspace = true
-
-# External dependencies
-futures.workspace = true
 clap = { workspace = true }
-tokio.workspace = true
 tracing.workspace = true
-tracing-subscriber.workspace = true
+
+[dev-dependencies]
+alloy-consensus = { workspace = true, features = ["k256"] }
+alloy-primitives.workspace = true
 borsh.workspace = true
+commonware-runtime.workspace = true
+evolve_core.workspace = true
+evolve_server.workspace = true
+evolve_tx_eth.workspace = true
+hex = "0.4"
+k256 = { version = "0.13", features = ["ecdsa", "arithmetic"] }
+reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
+serde.workspace = true
+serde_json.workspace = true
+tempfile = "3.8"
+tokio.workspace = true
 
 [lints]
 workspace = true