From 63003b73a2bb65116dc07d25db04f156cb544574 Mon Sep 17 00:00:00 2001
From: Rakan Alhneiti <rakan.alhneiti@gmail.com>
Date: Tue, 16 Jul 2024 11:42:45 +0300
Subject: [PATCH] Cleanup dependencies

---
 Cargo.lock                                    |  9 --
 .../provers/risc0/guest-bitcoin/Cargo.lock    |  2 -
 .../provers/risc0/guest-mock/Cargo.lock       |  2 -
 .../full-node/sov-stf-runner/Cargo.toml       | 96 +++++++------------
 .../sov-modules-rollup-blueprint/Cargo.toml   |  1 -
 5 files changed, 36 insertions(+), 74 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dcd7d0932..638328d70 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8691,7 +8691,6 @@ dependencies = [
  "borsh",
  "hex",
  "jsonrpsee",
- "sequencer-client",
  "serde",
  "serde_json",
  "sov-cli",
@@ -8922,7 +8921,6 @@ version = "0.4.0-rc.3"
 dependencies = [
  "anyhow",
  "async-trait",
- "backoff",
  "borsh",
  "futures",
  "hex",
@@ -8930,28 +8928,21 @@ dependencies = [
  "jsonrpsee",
  "num_cpus",
  "rand 0.8.5",
- "rayon",
- "rs_merkle",
- "sequencer-client",
  "serde",
  "serde_json",
  "sha2 0.10.8",
  "shared-backup-db",
  "sov-db",
  "sov-mock-da",
- "sov-mock-zkvm",
  "sov-modules-api",
- "sov-modules-stf-blueprint",
  "sov-prover-storage-manager",
  "sov-rollup-interface",
  "sov-state",
- "sov-stf-runner",
  "tempfile",
  "thiserror",
  "tokio",
  "toml",
  "tower",
- "tower-http",
  "tracing",
 ]
 
diff --git a/bin/citrea/provers/risc0/guest-bitcoin/Cargo.lock b/bin/citrea/provers/risc0/guest-bitcoin/Cargo.lock
index a1836e856..5a8c88155 100644
--- a/bin/citrea/provers/risc0/guest-bitcoin/Cargo.lock
+++ b/bin/citrea/provers/risc0/guest-bitcoin/Cargo.lock
@@ -3180,11 +3180,9 @@ dependencies = [
  "borsh",
  "hex",
  "num_cpus",
- "rs_merkle",
  "serde",
  "serde_json",
  "sov-modules-api",
- "sov-modules-stf-blueprint",
  "sov-rollup-interface",
 ]
 
diff --git a/bin/citrea/provers/risc0/guest-mock/Cargo.lock b/bin/citrea/provers/risc0/guest-mock/Cargo.lock
index 8d3440a90..42f4783ec 100644
--- a/bin/citrea/provers/risc0/guest-mock/Cargo.lock
+++ b/bin/citrea/provers/risc0/guest-mock/Cargo.lock
@@ -2965,11 +2965,9 @@ dependencies = [
  "borsh",
  "hex",
  "num_cpus",
- "rs_merkle",
  "serde",
  "serde_json",
  "sov-modules-api",
- "sov-modules-stf-blueprint",
  "sov-rollup-interface",
 ]
 
diff --git a/crates/sovereign-sdk/full-node/sov-stf-runner/Cargo.toml b/crates/sovereign-sdk/full-node/sov-stf-runner/Cargo.toml
index a96f0cbeb..894d05be8 100644
--- a/crates/sovereign-sdk/full-node/sov-stf-runner/Cargo.toml
+++ b/crates/sovereign-sdk/full-node/sov-stf-runner/Cargo.toml
@@ -1,90 +1,66 @@
 [package]
 name = "sov-stf-runner"
+version = { workspace = true }
 authors = { workspace = true }
-description = "Runs Sovereign SDK rollups and their verifiers"
 edition = { workspace = true }
 homepage = { workspace = true }
 license = { workspace = true }
-repository = { workspace = true }
-version = { workspace = true }
 readme = "README.md"
+repository = { workspace = true }
 resolver = "2"
+description = "Runs Sovereign SDK rollups and their verifiers"
 
 [dependencies]
+# 3rd-Party deps
 anyhow = { workspace = true }
-backoff = { workspace = true, optional = true }
-num_cpus = { workspace = true }
-thiserror = { workspace = true, optional = true }
+async-trait = { workspace = true, optional = true }
 borsh = { workspace = true }
-serde_json = { workspace = true }
-serde = { workspace = true }
-toml = { workspace = true, optional = true }
-rs_merkle = { workspace = true }
+futures = { workspace = true, optional = true }
+hex = { workspace = true }
+hyper = { workspace = true, optional = true }
+jsonrpsee = { workspace = true, features = ["http-client", "server"], optional = true }
+num_cpus = { workspace = true }
 rand = { workspace = true, optional = true }
-jsonrpsee = { workspace = true, features = [
-    "http-client",
-    "server",
-], optional = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+thiserror = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true }
-hex = { workspace = true }
+toml = { workspace = true, optional = true }
+tower = { workspace = true, optional = true }
 tracing = { workspace = true, optional = true }
-futures = { workspace = true, optional = true }
-async-trait = { workspace = true, optional = true }
-rayon = { workspace = true, optional = true }
-sov-db = { path = "../db/sov-db", optional = true }
-sov-rollup-interface = { path = "../../rollup-interface" }
-sov-modules-stf-blueprint = { path = "../../module-system/sov-modules-stf-blueprint" }
-sequencer-client = { path = "../../../sequencer-client", optional = true }
 
+# Sovereign-SDK deps
+sov-db = { path = "../db/sov-db", optional = true }
 sov-modules-api = { path = "../../module-system/sov-modules-api", default-features = false }
+sov-rollup-interface = { path = "../../rollup-interface" }
 
+# Citrea-Deps
 shared-backup-db = { path = "../../../shared-backup-db", optional = true }
 
-tower-http = { workspace = true, optional = true }
-tower = { workspace = true, optional = true }
-hyper = { workspace = true, optional = true }
-
 [dev-dependencies]
-tempfile = { workspace = true }
 sha2 = { workspace = true }
-
-sov-modules-stf-blueprint = { path = "../../module-system/sov-modules-stf-blueprint", features = [
-    "native",
-] }
-
-sov-state = { path = "../../module-system/sov-state", features = ["native"] }
-sov-modules-api = { path = "../../module-system/sov-modules-api", features = [
-    "native",
-] }
-sov-stf-runner = { path = ".", features = ["mock"] }
+tempfile = { workspace = true }
 
 sov-mock-da = { path = "../../adapters/mock-da", features = ["native"] }
-sov-mock-zkvm = { path = "../../adapters/mock-zkvm" }
-sov-prover-storage-manager = { path = "../sov-prover-storage-manager", features = [
-    "test-utils",
-] }
-
+sov-modules-api = { path = "../../module-system/sov-modules-api", features = ["native"] }
+sov-prover-storage-manager = { path = "../sov-prover-storage-manager", features = ["test-utils"] }
+sov-state = { path = "../../module-system/sov-state", features = ["native"] }
 
 [features]
 default = []
 mock = ["native"]
 native = [
-    "sov-db",
-    "sequencer-client",
-    "sov-modules-api/native",
-    "sov-modules-stf-blueprint/native",
-    "jsonrpsee",
-    "toml",
-    "tokio",
-    "tracing",
-    "futures",
-    "async-trait",
-    "rayon",
-    "thiserror",
-    "shared-backup-db",
-    "backoff",
-    "rand",
-    "tower-http",
-    "tower",
-    "hyper",
+  "sov-db",
+  "sov-modules-api/native",
+  "jsonrpsee",
+  "toml",
+  "tokio",
+  "tracing",
+  "futures",
+  "async-trait",
+  "thiserror",
+  "shared-backup-db",
+  "rand",
+  "tower",
+  "hyper",
 ]
diff --git a/crates/sovereign-sdk/module-system/sov-modules-rollup-blueprint/Cargo.toml b/crates/sovereign-sdk/module-system/sov-modules-rollup-blueprint/Cargo.toml
index c51d31fad..706a2f309 100644
--- a/crates/sovereign-sdk/module-system/sov-modules-rollup-blueprint/Cargo.toml
+++ b/crates/sovereign-sdk/module-system/sov-modules-rollup-blueprint/Cargo.toml
@@ -12,7 +12,6 @@ resolver = "2"
 description = "This crate contains abstractions needed to create a new rollup"
 
 [dependencies]
-sequencer-client = { path = "../../../sequencer-client" }
 sov-cli = { path = "../../module-system/sov-cli" }
 sov-modules-api = { path = "../../module-system/sov-modules-api", features = ["native"] }
 sov-rollup-interface = { path = "../../rollup-interface", features = ["native"] }