chore: cleanup Cargo.toml deps (#1503)

Lightprotocol · Jan 21, 2025 · 910ff8a · 910ff8a
1 parent 47c92f6
commit 910ff8a
Show file tree

Hide file tree

Showing 36 changed files with 843 additions and 325 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -78,9 +78,18 @@ bb8 = "0.8.6"
 
 # Logging
 log = "0.4"
+env_logger = "0.11"
 
 # Error handling
 thiserror = "1.0"
+anyhow = "1.0"
+
+# Arkworks
+ark-ff = "0.4"
+ark-bn254 = "0.4"
+ark-serialize = "0.4"
+ark-std = "0.4"
+
 
 # Light Protocol
 light-hash-set = { version = "1.2.0", path = "program-libs/hash-set" }
@@ -120,10 +129,13 @@ num-traits = "0.2.19"
 zerocopy = { version = "0.8.14"}
 
 # HTTP client
-reqwest = "0.11.26"
+reqwest = "0.11"
 
 # Testing
-serial_test = "3.1.1"
+serial_test = "3.2.0"
+
+# Random
+rand = "0.8.5"
 
 [patch.crates-io]
 "solana-account-decoder" = { git = "https://github.com/lightprotocol/agave", branch = "v1.18.22-enforce-cpi-tracking" }

diff --git a/examples/token-escrow/programs/token-escrow/Cargo.toml b/examples/token-escrow/programs/token-escrow/Cargo.toml
@@ -36,7 +36,7 @@ light-client = { workspace = true }
 light-test-utils = { workspace = true, features = ["devenv"] }
 light-program-test = { workspace = true, features = ["devenv"] }
 tokio = { workspace = true }
-light-prover-client = { workspace = true, version = "1.2.0" }
+light-prover-client = { workspace = true }
 anchor-spl = { workspace = true }
 
 [lints.rust.unexpected_cfgs]

diff --git a/forester-utils/Cargo.toml b/forester-utils/Cargo.toml
@@ -7,12 +7,11 @@ repository = "https://github.com/lightprotocol/light-protocol"
 description = "Utility library for Light's Forester node implementation"
 
 [dependencies]
+
 # Light Protocol
 account-compression = { workspace = true }
-light-compressed-token = { workspace = true }
 light-hash-set = { workspace=true }
 light-hasher = { workspace = true }
-light-merkle-tree-reference = { workspace = true }
 light-concurrent-merkle-tree = { workspace = true }
 light-indexed-merkle-tree = { workspace = true }
 light-prover-client = { workspace = true }
@@ -21,34 +20,23 @@ light-system-program = { workspace = true, features = ["cpi"] }
 light-utils = { workspace = true }
 light-batched-merkle-tree = { workspace = true }
 light-verifier = { workspace = true }
-photon-api = { workspace = true }
 light-client = { workspace = true }
 
 # Anchor
 anchor-lang = { workspace = true }
-anchor-spl = { workspace = true }
 
 # Solana
-spl-token = { workspace = true, features = ["no-entrypoint"] }
-solana-program-test = { workspace = true }
 solana-sdk = { workspace = true }
-solana-client = { workspace = true }
-solana-transaction-status = { workspace = true }
-
-# Async ecosystem
-tokio = { workspace = true }
-async-trait = { workspace = true }
 
 # Error handling
-thiserror = "1.0"
+thiserror = { workspace = true }
 
 # Logging
-log = "0.4"
+log = { workspace = true }
 
 # Big numbers
-num-bigint = { workspace = true }
 num-traits = { workspace = true }
 
 # HTTP client
-reqwest = "0.11.26"
+reqwest = { workspace = true }
 
diff --git a/forester/Cargo.toml b/forester/Cargo.toml
@@ -24,21 +24,19 @@ light-merkle-tree-metadata = { workspace = true }
 light-sdk = { workspace = true }
 light-program-test = { workspace = true}
 solana-transaction-status = { workspace = true }
-bincode = "1.3"
 url = "2.2"
-tokio-tungstenite = "0.16"
 bb8 = { workspace = true }
 
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
-reqwest = { version = "0.11", features = ["json", "rustls-tls", "blocking"]  }
+reqwest = { workspace = true, features = ["json", "rustls-tls", "blocking"]  }
 futures = "0.3.31"
-thiserror = "1"
-borsh = "0.10.3"
+thiserror = { workspace = true }
+borsh = { workspace = true }
 bs58 = "0.5.1"
-env_logger = "0.11"
-async-trait = "0.1.81"
+env_logger = { workspace = true }
+async-trait = { workspace = true}
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
 tracing-appender = "0.2.3"
@@ -47,11 +45,11 @@ lazy_static = "1.4"
 warp = "0.3"
 dashmap = "6.1.0"
 scopeguard = "1.2.0"
-anyhow = "1.0.94"
+anyhow = { workspace = true }
 itertools = "0.14.0"
 
 [dev-dependencies]
-serial_test = "3.2.0"
+serial_test = { workspace = true }
 light-prover-client = { workspace = true }
 light-test-utils = { workspace = true }
 light-program-test = { workspace = true, features = ["devenv"] }

diff --git a/program-libs/batched-merkle-tree/Cargo.toml b/program-libs/batched-merkle-tree/Cargo.toml
@@ -27,7 +27,7 @@ anchor-lang = { workspace = true , optional = true }
 zerocopy =  { workspace = true }
 
 [dev-dependencies]
-rand = "0.8.5"
+rand = { workspace = true }
 light-prover-client = { workspace = true }
 light-merkle-tree-reference = { workspace = true }
 tokio = {workspace = true}

diff --git a/program-libs/bloom-filter/Cargo.toml b/program-libs/bloom-filter/Cargo.toml
@@ -12,11 +12,10 @@ solana = ["solana-program"]
 [dependencies]
 bitvec = "1.0.1"
 fastmurmur3 = "0.2.0"
-num-bigint = "0.4"
-num-traits = "0.2"
+num-bigint = { workspace = true }
 solana-program = { workspace = true, optional = true }
-thiserror = "1.0"
+thiserror = { workspace = true }
 
 [dev-dependencies]
-rand = "0.8"
+rand = { workspace = true }
 light-utils = { workspace = true }
diff --git a/program-libs/concurrent-merkle-tree/Cargo.toml b/program-libs/concurrent-merkle-tree/Cargo.toml
@@ -15,22 +15,22 @@ solana = [
 ]
 
 [dependencies]
-borsh = "0.10"
+borsh = { workspace = true }
 light-bounded-vec = { workspace = true }
 light-hasher = { workspace = true }
-light-utils = { version = "1.1.0"}
+light-utils = { workspace = true }
 memoffset = "0.9"
 solana-program = { workspace = true, optional = true }
-thiserror = "1.0"
+thiserror = { workspace = true}
 
 [dev-dependencies]
-ark-bn254 = "0.4"
-ark-ff = "0.4"
+ark-bn254 = { workspace = true }
+ark-ff = { workspace = true }
 light-merkle-tree-reference = { workspace = true}
 light-hash-set = { workspace = true, features = ["solana"] }
-rand = "0.8"
+rand = { workspace = true }
 solana-program = {  workspace = true }
 spl-concurrent-merkle-tree = { version = "0.2.0", default-features = false}
 tokio = { workspace = true }
-num-bigint = "0.4"
-num-traits = "0.2"
+num-bigint = { workspace = true }
+num-traits = { workspace = true}
diff --git a/program-libs/hash-set/Cargo.toml b/program-libs/hash-set/Cargo.toml
@@ -11,14 +11,14 @@ solana = ["solana-program"]
 
 [dependencies]
 light-utils = { workspace = true }
-num-bigint = "0.4"
-num-traits = "0.2"
+num-bigint = { workspace = true }
+num-traits = { workspace = true }
 solana-program = { workspace = true, optional = true }
-thiserror = "1.0"
+thiserror = { workspace = true}
 [target.'cfg(target_os = "solana")'.dependencies]
 light-heap = { workspace = true }
 
 [dev-dependencies]
-ark-bn254 = "0.4"
-ark-ff = "0.4"
-rand = "0.8"
+ark-bn254 = { workspace = true }
+ark-ff = { workspace = true }
+rand = { workspace = true }
diff --git a/program-libs/hasher/Cargo.toml b/program-libs/hasher/Cargo.toml
@@ -12,10 +12,10 @@ solana = []
 [dependencies]
 light-poseidon = "0.2.0"
 solana-program = { workspace = true }
-thiserror = "1.0"
+thiserror = { workspace = true }
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
-ark-bn254 = "0.4.0"
+ark-bn254 = { workspace = true }
 sha2 = "0.10"
 sha3 = "0.10"
 

diff --git a/program-libs/indexed-merkle-tree/Cargo.toml b/program-libs/indexed-merkle-tree/Cargo.toml
@@ -13,23 +13,17 @@ solana = [
 ]
 
 [dependencies]
-borsh = { version = "0.10" }
 light-bounded-vec = { workspace = true }
 light-hasher = { workspace = true }
 light-concurrent-merkle-tree = { workspace = true }
 light-merkle-tree-reference = { workspace = true }
-light-utils = { version = "1.1.0"}
-memoffset = "0.9"
-num-bigint = "0.4"
-num-traits = "0.2"
+light-utils = { workspace = true }
+num-bigint = { workspace = true }
+num-traits = { workspace = true }
 
 solana-program = { workspace = true, optional = true }
-thiserror = "1.0"
+thiserror = { workspace = true }
 
 [dev-dependencies]
 light-hash-set = { workspace = true }
-thiserror = "1.0"
-rand = "0.8"
-hex = "0.4"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+rand = { workspace = true}
diff --git a/program-libs/macros/Cargo.toml b/program-libs/macros/Cargo.toml
@@ -12,10 +12,5 @@ proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn = { workspace = true }
 
-light-hasher = { workspace = true }
-
-[dev-dependencies]
-light-utils = { workspace = true }
-
 [lib]
 proc-macro = true
diff --git a/program-libs/merkle-tree-metadata/Cargo.toml b/program-libs/merkle-tree-metadata/Cargo.toml
@@ -12,8 +12,8 @@ anchor = ["anchor-lang", "solana"]
 solana = []
 
 [dependencies]
-thiserror = "1.0"
-borsh = "0.10.0"
+thiserror = { workspace = true}
+borsh = { workspace = true }
 bytemuck = "1.17"
 solana-program = { workspace = true }
 anchor-lang = { workspace = true , optional = true }

diff --git a/program-libs/utils/Cargo.toml b/program-libs/utils/Cargo.toml
@@ -11,19 +11,21 @@ default = []
 anchor = ["anchor-lang"]
 
 [dependencies]
-anyhow = "1.0"
-ark-ff = "0.4"
+anyhow = { workspace = true }
+ark-ff = { workspace = true }
+ark-bn254 = { workspace = true }
 light-hasher = { workspace = true }
-num-bigint = { version = "0.4", features = ["rand"] }
-thiserror = "1.0"
+num-bigint = { workspace = true, features = ["rand"] }
+thiserror = { workspace = true }
 solana-program = { workspace = true }
-ark-bn254 = "0.4.0"
-rand = "0.8"
+rand = { workspace = true }
 zerocopy = { workspace = true, features = ["derive"] }
 borsh = { workspace = true }
 bytemuck = { workspace = true }
 anchor-lang = { workspace = true, optional = true }
+light-bounded-vec = { workspace = true }
 
 [dev-dependencies]
 light-poseidon = { workspace = true }
 borsh = { workspace = true }
+memoffset = "0.9"
diff --git a/program-libs/utils/src/lib.rs b/program-libs/utils/src/lib.rs
@@ -16,6 +16,7 @@ pub mod account;
 pub mod bigint;
 pub mod fee;
 pub mod hashchain;
+pub mod offset;
 pub mod prime;
 pub mod pubkey;
 pub mod rand;