From 5f15af5401b8df52ebcc39d451e220c4022ee10b Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Sat, 27 Apr 2024 17:08:37 +0200
Subject: [PATCH] chore: bump ratatui; rm unused (#7934)

---
 Cargo.lock                     | 76 +++++++++++++++++-----------------
 Cargo.toml                     |  1 +
 bin/reth/Cargo.toml            |  9 +---
 crates/node-builder/Cargo.toml |  2 +-
 4 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a40fb4513b..478d38713c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -127,7 +127,7 @@ dependencies = [
  "num_enum",
  "proptest",
  "serde",
- "strum 0.26.2",
+ "strum",
 ]
 
 [[package]]
@@ -1470,6 +1470,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
+[[package]]
+name = "castaway"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "cc"
 version = "1.0.95"
@@ -1673,11 +1682,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7"
 dependencies = [
  "crossterm",
- "strum 0.26.2",
- "strum_macros 0.26.2",
+ "strum",
+ "strum_macros",
  "unicode-width",
 ]
 
+[[package]]
+name = "compact_str"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f"
+dependencies = [
+ "castaway",
+ "cfg-if",
+ "itoa",
+ "ryu",
+ "static_assertions",
+]
+
 [[package]]
 name = "concat-kdf"
 version = "0.1.0"
@@ -6017,19 +6039,20 @@ dependencies = [
 
 [[package]]
 name = "ratatui"
-version = "0.25.0"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb"
+checksum = "a564a852040e82671dc50a37d88f3aa83bbc690dfc6844cfe7a2591620206a80"
 dependencies = [
  "bitflags 2.5.0",
  "cassowary",
+ "compact_str",
  "crossterm",
  "indoc",
  "itertools 0.12.1",
  "lru",
  "paste",
  "stability",
- "strum 0.25.0",
+ "strum",
  "unicode-segmentation",
  "unicode-width",
 ]
@@ -6262,7 +6285,6 @@ dependencies = [
  "rand 0.8.5",
  "ratatui",
  "rayon",
- "reth-auto-seal-consensus",
  "reth-basic-payload-builder",
  "reth-beacon-consensus",
  "reth-blockchain-tree",
@@ -6294,7 +6316,6 @@ dependencies = [
  "reth-rpc",
  "reth-rpc-api",
  "reth-rpc-builder",
- "reth-rpc-engine-api",
  "reth-rpc-types",
  "reth-rpc-types-compat",
  "reth-stages",
@@ -6307,7 +6328,6 @@ dependencies = [
  "serde_json",
  "similar-asserts",
  "tempfile",
- "thiserror",
  "tikv-jemallocator",
  "tokio",
  "toml",
@@ -6537,7 +6557,7 @@ dependencies = [
  "rustc-hash",
  "serde",
  "serde_json",
- "strum 0.26.2",
+ "strum",
  "tempfile",
  "test-fuzz",
  "thiserror",
@@ -7412,7 +7432,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.8",
- "strum 0.26.2",
+ "strum",
  "sucds",
  "tempfile",
  "test-fuzz",
@@ -7446,7 +7466,7 @@ dependencies = [
  "reth-rpc-types",
  "reth-trie",
  "revm",
- "strum 0.26.2",
+ "strum",
  "tempfile",
  "tokio",
  "tokio-stream",
@@ -7602,7 +7622,7 @@ dependencies = [
  "reth-transaction-pool",
  "serde",
  "serde_json",
- "strum 0.26.2",
+ "strum",
  "thiserror",
  "tokio",
  "tower",
@@ -8868,12 +8888,12 @@ checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
 
 [[package]]
 name = "stability"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce"
+checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a"
 dependencies = [
  "quote",
- "syn 1.0.109",
+ "syn 2.0.60",
 ]
 
 [[package]]
@@ -8912,35 +8932,13 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
-[[package]]
-name = "strum"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
-dependencies = [
- "strum_macros 0.25.3",
-]
-
 [[package]]
 name = "strum"
 version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
 dependencies = [
- "strum_macros 0.26.2",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.25.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.60",
+ "strum_macros",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index d56392c1d3..478c2b4536 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -310,6 +310,7 @@ bytes = "1.5"
 bitflags = "2.4"
 clap = "4"
 derive_more = "0.99.17"
+fdlimit = "0.3.0"
 eyre = "0.6"
 tracing = "0.1.0"
 tracing-appender = "0.2"
diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml
index 5e47506db9..995b296107 100644
--- a/bin/reth/Cargo.toml
+++ b/bin/reth/Cargo.toml
@@ -24,11 +24,9 @@ reth-stages.workspace = true
 reth-interfaces = { workspace = true, features = ["clap"] }
 reth-transaction-pool.workspace = true
 reth-beacon-consensus.workspace = true
-reth-auto-seal-consensus.workspace = true
 reth-cli-runner.workspace = true
 reth-consensus-common.workspace = true
 reth-blockchain-tree.workspace = true
-reth-rpc-engine-api.workspace = true
 reth-rpc-builder.workspace = true
 reth-rpc.workspace = true
 reth-rpc-types.workspace = true
@@ -65,7 +63,7 @@ alloy-rlp.workspace = true
 tracing.workspace = true
 
 # io
-fdlimit = "0.3.0"
+fdlimit.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 confy.workspace = true
@@ -81,7 +79,7 @@ rand.workspace = true
 # tui
 comfy-table = "7.0"
 crossterm = "0.27.0"
-ratatui = "0.25.0"
+ratatui = {  version = "0.26", default-features = false, features = ["crossterm"] }
 human_bytes = "0.4.1"
 
 # async
@@ -104,7 +102,6 @@ itertools.workspace = true
 rayon.workspace = true
 boyer-moore-magiclen = "0.2.16"
 ahash = "0.8"
-thiserror.workspace = true
 
 # p2p
 discv5.workspace = true
@@ -136,10 +133,8 @@ optimism = [
     "reth-revm/optimism",
     "reth-interfaces/optimism",
     "reth-rpc/optimism",
-    "reth-rpc-engine-api/optimism",
     "reth-provider/optimism",
     "reth-beacon-consensus/optimism",
-    "reth-auto-seal-consensus/optimism",
     "reth-blockchain-tree/optimism",
     "dep:reth-node-optimism",
     "reth-node-core/optimism",
diff --git a/crates/node-builder/Cargo.toml b/crates/node-builder/Cargo.toml
index aae73f5a63..270b0dfe5b 100644
--- a/crates/node-builder/Cargo.toml
+++ b/crates/node-builder/Cargo.toml
@@ -51,6 +51,6 @@ tokio = { workspace = true, features = [
 ## misc
 aquamarine.workspace = true
 eyre.workspace = true
-fdlimit = "0.3.0"
+fdlimit.workspace = true
 confy.workspace = true
 rayon.workspace = true