all: Unify/simplify some of our dependencies

Author: lutter

Cargo.lock

@@ -45,6 +45,7 @@ axum = "0.8.8"
 chrono = "0.4.43"
 bs58 = "0.5.1"
 clap = { version = "4.5.4", features = ["derive", "env", "wrap_help"] }
+clap_complete = "4"
 derivative = "2.2.0"
 diesel = { version = "2.2.7", features = [
     "postgres",
@@ -59,7 +60,9 @@ diesel-derive-enum = { version = "2.1.0", features = ["postgres"] }
 diesel-dynamic-schema = { version = "0.2.3", features = ["postgres"] }
 diesel_derives = "2.3.7"
 diesel_migrations = "2.3.1"
+env_logger = "0.11.8"
 envconfig = "0.11.1"
+git-testament = "0.2"
 graph = { path = "./graph" }
 graph-core = { path = "./core" }
 graph-store-postgres = { path = "./store/postgres" }
@@ -79,6 +82,7 @@ redis = { version = "1.0.3", features = [
 ] }
 regex = "1.5.4"
 reqwest = "0.12.23"
+semver = { version = "1", features = ["serde"] }
 serde = { version = "1.0.126", features = ["rc"] }
 serde_derive = "1.0.125"
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }

Cargo.toml

@@ -14,7 +14,7 @@ prost-types = { workspace = true }
 anyhow = "1.0"
 tiny-keccak = "1.5.0"
 hex = "0.4.3"
-semver = "1.0.27"
+semver = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }

chain/ethereum/Cargo.toml

@@ -24,13 +24,13 @@ graph-node = { path = "../node" }
 # Direct dependencies from current dev.rs
 anyhow = { workspace = true }
 clap = { workspace = true }
-clap_complete = "4"
-env_logger = "0.11.8"
-git-testament = "0.2"
-lazy_static = "1.5.0"
+clap_complete = { workspace = true }
+env_logger = { workspace = true }
+git-testament = { workspace = true }
+lazy_static = { workspace = true }
 serde = { workspace = true }
 tokio = { workspace = true }
-tokio-util.workspace = true
+tokio-util = { workspace = true }
 
 # File watching
 notify = "8.2.0"
@@ -51,14 +51,14 @@ indicatif = "0.17"
 console = "0.15"
 
 # Code generation
-graphql-parser = "0.4"
-regex = "1"
+graphql-tools = { workspace = true }
+regex = { workspace = true }
 ethabi = "17.2"
-serde_yaml = "0.9"
+serde_yaml = { workspace = true }
 Inflector = { workspace = true }
 
 # Migrations
-semver = "1"
+semver = { workspace = true }
 
 # Build command
 sha1 = "0.10"

gnd/Cargo.toml

@@ -3,7 +3,9 @@
 //! Generates AssemblyScript entity classes from GraphQL schemas.
 
 use anyhow::{anyhow, Result};
-use graphql_parser::schema::{Definition, Document, Field, ObjectType, Type, TypeDefinition};
+use graphql_tools::parser::schema::{
+    Definition, Document, Field, ObjectType, Type, TypeDefinition,
+};
 
 use super::types::{asc_type_for_value, value_from_asc, value_to_asc};
 use super::typescript::{
@@ -711,7 +713,7 @@ enum StoreMethod {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use graphql_parser::parse_schema;
+    use graphql_tools::parser::parse_schema;
 
     #[test]
     fn test_simple_entity() {
@@ -1045,7 +1047,7 @@ mod tests {
 
     #[test]
     fn test_list_depth() {
-        use graphql_parser::parse_schema;
+        use graphql_tools::parser::parse_schema;
 
         // Helper to get list depth from schema field type
         fn get_field_list_depth(schema_str: &str) -> u8 {

gnd/src/codegen/schema.rs

@@ -12,7 +12,7 @@ use std::path::{Path, PathBuf};
 use anyhow::{anyhow, Context, Result};
 use clap::Parser;
 use ethabi::Contract;
-use graphql_parser::schema as gql;
+use graphql_tools::parser::schema as gql;
 use semver::Version;
 
 use crate::abi::normalize_abi_json;

gnd/src/commands/codegen.rs

@@ -15,7 +15,7 @@ use std::path::{Path, PathBuf};
 
 use anyhow::{anyhow, Context, Result};
 use clap::{Parser, ValueEnum};
-use graphql_parser::schema as gql;
+use graphql_tools::parser::schema as gql;
 
 use crate::commands::add::{run_add, AddOpt};
 use crate::commands::codegen::{run_codegen, CodegenOpt};

gnd/src/commands/init.rs

@@ -36,14 +36,14 @@ hyper-util = { version = "0.1", features = ["full"] }
 futures01 = { package = "futures", version = "0.1.31" }
 lru_time_cache = "0.11"
 graphql-tools = { workspace = true }
-lazy_static = "1.5.0"
+lazy_static = { workspace = true }
 num-bigint = { version = "=0.2.6", features = ["serde"] }
 num-integer = { version = "=0.1.46" }
 num-traits = "=0.2.19"
 rand.workspace = true
 redis = { workspace = true }
-regex = "1.5.4"
-semver = { version = "1.0.27", features = ["serde"] }
+regex = { workspace = true }
+semver = { workspace = true }
 serde = { workspace = true }
 serde_derive = { workspace = true }
 serde_json = { workspace = true }

graph/Cargo.toml

@@ -8,7 +8,7 @@ async-trait = { workspace = true }
 crossbeam = "0.8"
 graph = { path = "../graph" }
 graphql-tools = { workspace = true }
-lazy_static = "1.5.0"
+lazy_static = { workspace = true }
 stable-hash = { git = "https://github.com/graphprotocol/stable-hash", branch = "main"}
 stable-hash_legacy = { git = "https://github.com/graphprotocol/stable-hash", branch = "old", package = "stable-hash" }
 parking_lot = "0.12"

graphql/Cargo.toml

@@ -14,11 +14,11 @@ path = "src/bin/manager.rs"
 
 [dependencies]
 anyhow = { workspace = true }
-env_logger = "0.11.8"
+env_logger = { workspace = true }
 clap.workspace = true
-git-testament = "0.2"
+git-testament = { workspace = true }
 itertools = { workspace = true }
-lazy_static = "1.5.0"
+lazy_static = { workspace = true }
 url = "2.5.8"
 graph = { path = "../graph" }
 graph-core = { path = "../core" }