chore: serde cleanup (#2233)

jbencin-stacks · web-flow · commit 3459dbd885b7 · 2026-02-23T17:11:54.000Z
* Clean up `serde` usage

* Fix warning
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -59,7 +59,6 @@ rpassword = "7.4"
 schemars = "1.2.1"
 serde = "1.0.225"
 serde_json = "1.0.149"
-serde_derive = "1.0.225"
 serde-wasm-bindgen = "0.6.4"
 yaml_serde = "0.10.3"
 signal-hook = "0.4.3"
diff --git a/components/chainhook-sdk/Cargo.toml b/components/chainhook-sdk/Cargo.toml
@@ -8,9 +8,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = {  workspace = true, features = ["rc"] }
+serde = {  workspace = true, features = ["derive", "rc"] }
 serde_json = {  workspace = true, features = ["arbitrary_precision"] }
-serde_derive = { workspace = true }
 clarity = { workspace = true, default-features = false, features = ["slog_json"] }
 axum = { version = "0.8.6", features = ["json"] }
 tower = "0.5.2"
diff --git a/components/chainhook-sdk/src/chainhooks/bitcoin/mod.rs b/components/chainhook-sdk/src/chainhooks/bitcoin/mod.rs
@@ -13,8 +13,8 @@ use hiro_system_kit::slog;
 use miniscript::bitcoin::secp256k1::Secp256k1;
 use miniscript::Descriptor;
 use reqwest::{Client, Method, RequestBuilder};
-use serde::{de, Deserialize, Deserializer};
-use serde_json::Value as JsonValue;
+use serde::{de, Deserialize, Deserializer, Serialize};
+use serde_json::{json, Value as JsonValue};
 
 use super::types::{
     append_error_context, validate_txid, ChainhookInstance, ExactMatchingRule, HookAction,
diff --git a/components/chainhook-sdk/src/chainhooks/stacks/mod.rs b/components/chainhook-sdk/src/chainhooks/stacks/mod.rs
@@ -15,7 +15,8 @@ use clarity::vm::ClarityName;
 use hiro_system_kit::slog;
 use regex::Regex;
 use reqwest::{Client, Method, RequestBuilder};
-use serde_json::Value as JsonValue;
+use serde::{Deserialize, Serialize};
+use serde_json::{json, Value as JsonValue};
 
 use super::types::{
     append_error_context, validate_txid, BlockIdentifierIndexRule, ChainhookInstance,
diff --git a/components/chainhook-sdk/src/indexer/bitcoin/mod.rs b/components/chainhook-sdk/src/indexer/bitcoin/mod.rs
@@ -13,7 +13,8 @@ use chainhook_types::{
 };
 use hiro_system_kit::slog;
 use reqwest::Client as HttpClient;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
+use serde_json::json;
 
 use super::fork_scratch_pad::CONFIRMED_SEGMENT_MINIMUM_LENGTH;
 use crate::chainhooks::bitcoin::{
diff --git a/components/chainhook-sdk/src/indexer/mod.rs b/components/chainhook-sdk/src/indexer/mod.rs
@@ -9,6 +9,7 @@ use chainhook_types::{
     StacksBlockData, StacksChainEvent, StacksNetwork, StacksNodeConfig,
 };
 use hiro_system_kit::slog;
+use serde::Deserialize;
 use serde_json::Value as JsonValue;
 use stacks::StacksBlockPool;
 
diff --git a/components/chainhook-sdk/src/indexer/stacks/mod.rs b/components/chainhook-sdk/src/indexer/stacks/mod.rs
@@ -10,7 +10,7 @@ use chainhook_types::*;
 use clarity::codec::StacksMessageCodec;
 use clarity::vm::types::{SequenceData, Value as ClarityValue};
 use hiro_system_kit::slog;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use serde_json::Value as JsonValue;
 use stacks_codec::codec::{StacksTransaction, TransactionAuth, TransactionPayload};
 
diff --git a/components/chainhook-sdk/src/lib.rs b/components/chainhook-sdk/src/lib.rs
@@ -1,11 +1,3 @@
-extern crate serde;
-
-#[macro_use]
-extern crate serde_derive;
-
-#[macro_use]
-extern crate serde_json;
-
 pub extern crate bitcoincore_rpc;
 pub extern crate bitcoincore_rpc_json;
 
diff --git a/components/chainhook-sdk/src/observer/mod.rs b/components/chainhook-sdk/src/observer/mod.rs
@@ -17,7 +17,7 @@ use chainhook_types::{
     DEFAULT_STACKS_NODE_RPC,
 };
 use hiro_system_kit::slog;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
 // Custom shutdown wrapper to replace Rocket's Shutdown
 pub struct Shutdown(tokio::sync::oneshot::Sender<()>);
diff --git a/components/chainhook-sdk/src/utils/mod.rs b/components/chainhook-sdk/src/utils/mod.rs
@@ -9,7 +9,7 @@ use chainhook_types::{
 };
 use hiro_system_kit::slog::{self, Logger};
 use reqwest::RequestBuilder;
-use serde_json::Value as JsonValue;
+use serde_json::{json, Value as JsonValue};
 
 #[derive(Clone)]
 pub struct Context {
diff --git a/components/chainhook-types/Cargo.toml b/components/chainhook-types/Cargo.toml
@@ -6,8 +6,7 @@ version = "1.3.7"
 edition = "2021"
 
 [dependencies]
-serde = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-serde_derive = { workspace = true }
 strum = { workspace = true, features = ["derive"] }
 hex = "0.4.3"
diff --git a/components/chainhook-types/src/bitcoin.rs b/components/chainhook-types/src/bitcoin.rs
@@ -1,3 +1,5 @@
+use serde::{Deserialize, Serialize};
+
 use crate::TransactionIdentifier;
 
 /// A transaction input, which defines old coins to be consumed
diff --git a/components/chainhook-types/src/contract_interface.rs b/components/chainhook-types/src/contract_interface.rs
@@ -2,6 +2,8 @@
 // `clarity-vm` repository's [ContractInterface](https://github.com/stacks-network/stacks-blockchain/blob/eca1cfe81f0c0989ebd3e53c32e3e5d70ed83757/clarity/src/vm/analysis/contract_interface_builder/mod.rs#L368) type.
 // We've copied it here rather than using `clarity-vm` as a dependency to avoid circular dependencies.
 
+use serde::{Deserialize, Serialize};
+
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct ContractInterface {
     pub functions: Vec<ContractInterfaceFunction>,
diff --git a/components/chainhook-types/src/events.rs b/components/chainhook-types/src/events.rs
@@ -1,3 +1,5 @@
+use serde::{Deserialize, Serialize};
+
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
 pub struct STXTransferEventData {
     pub sender: String,
diff --git a/components/chainhook-types/src/lib.rs b/components/chainhook-types/src/lib.rs
@@ -1,8 +1,3 @@
-extern crate serde;
-
-#[macro_use]
-extern crate serde_derive;
-
 pub mod bitcoin;
 mod contract_interface;
 mod events;
diff --git a/components/chainhook-types/src/rosetta.rs b/components/chainhook-types/src/rosetta.rs
@@ -3,6 +3,8 @@ use std::collections::HashSet;
 use std::fmt::Display;
 use std::hash::{Hash, Hasher};
 
+use serde::{Deserialize, Serialize};
+
 use super::bitcoin::{TxIn, TxOut};
 use crate::contract_interface::ContractInterface;
 use crate::events::*;
diff --git a/components/chainhook-types/src/signers.rs b/components/chainhook-types/src/signers.rs
@@ -1,3 +1,5 @@
+use serde::{Deserialize, Serialize};
+
 use crate::StacksTransactionData;
 
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
diff --git a/components/clarinet-cli/src/bin.rs b/components/clarinet-cli/src/bin.rs
@@ -1,8 +1,3 @@
-extern crate serde;
-
-#[macro_use]
-extern crate serde_json;
-
 #[macro_use]
 extern crate hiro_system_kit;
 
diff --git a/components/clarinet-cli/src/frontend/telemetry.rs b/components/clarinet-cli/src/frontend/telemetry.rs
@@ -3,6 +3,7 @@ use clarity_repl::clarity::util::hash::{bytes_to_hex, Hash160};
 use mac_address::get_mac_address;
 use segment::message::{Message, Track, User};
 use segment::{Client, HttpClient};
+use serde_json::json;
 
 pub enum DeveloperUsageEvent {
     NewProject(DeveloperUsageDigest),
diff --git a/components/clarinet-cli/src/lib.rs b/components/clarinet-cli/src/lib.rs
@@ -1,8 +1,3 @@
-extern crate serde;
-
-#[macro_use]
-extern crate serde_json;
-
 #[macro_use]
 extern crate hiro_system_kit;
 
diff --git a/components/clarinet-deployments/Cargo.toml b/components/clarinet-deployments/Cargo.toml
@@ -7,9 +7,8 @@ edition = "2021"
 clarity = { workspace = true }
 colored = { workspace = true }
 base64 = { workspace = true }
-serde = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-serde_derive = { workspace = true }
 yaml_serde = { workspace = true }
 strum = { workspace = true, features = ["derive"] }
 rand = { workspace = true }
diff --git a/components/clarinet-deployments/src/lib.rs b/components/clarinet-deployments/src/lib.rs
@@ -1,11 +1,6 @@
 use std::collections::{BTreeMap, BTreeSet, HashMap, VecDeque};
 use std::fmt::Write;
 
-extern crate serde;
-
-#[macro_use]
-extern crate serde_derive;
-
 pub mod diagnostic_digest;
 #[cfg(not(target_arch = "wasm32"))]
 pub mod onchain;
diff --git a/components/clarinet-deployments/src/requirements.rs b/components/clarinet-deployments/src/requirements.rs
@@ -7,6 +7,7 @@ use clarity_repl::clarity::{Address, ClarityVersion, StacksEpochId};
 use clarity_repl::repl::remote_data::epoch_for_height;
 use clarity_repl::repl::{clarity_version_from_u8, DEFAULT_CLARITY_VERSION, DEFAULT_EPOCH};
 use reqwest;
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ContractMetadata {
diff --git a/components/clarinet-files/Cargo.toml b/components/clarinet-files/Cargo.toml
@@ -9,8 +9,7 @@ license = "GPL-3.0"
 dirs = { workspace = true }
 libsecp256k1 = { workspace = true }
 rpassword = { workspace = true }
-serde = { workspace = true }
-serde_derive = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 toml = { workspace = true }
 url = { version = "2.5.4", features = ["serde"] }
diff --git a/components/clarinet-files/src/clarinetrc.rs b/components/clarinet-files/src/clarinetrc.rs
@@ -1,5 +1,7 @@
 use std::env;
 
+use serde::{Deserialize, Serialize};
+
 #[derive(Serialize, Deserialize, Default, Debug)]
 pub struct ClarinetRC {
     pub enable_hints: Option<bool>,
diff --git a/components/clarinet-files/src/lib.rs b/components/clarinet-files/src/lib.rs
@@ -1,8 +1,3 @@
-extern crate serde;
-
-#[macro_use]
-extern crate serde_derive;
-
 pub mod clarinetrc;
 pub mod paths;
 
diff --git a/components/clarinet-files/src/network_manifest.rs b/components/clarinet-files/src/network_manifest.rs
@@ -7,7 +7,7 @@ use clarity::types::chainstate::{StacksAddress, StacksPrivateKey};
 use clarity::util::hash::bytes_to_hex;
 use clarity::util::secp256k1::Secp256k1PublicKey;
 use libsecp256k1::PublicKey;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use toml::value::Value;
 
 use super::FileAccessor;
diff --git a/components/clarinet-files/src/project_manifest.rs b/components/clarinet-files/src/project_manifest.rs
@@ -10,7 +10,7 @@ use clarity_repl::repl::{ClarityCodeSource, ClarityContract, ContractDeployer};
 #[cfg(feature = "json_schema")]
 use schemars::JsonSchema;
 use serde::ser::SerializeMap;
-use serde::{Deserializer, Serialize, Serializer};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value as JsonValue;
 use toml::Value as TomlValue;
 
diff --git a/components/clarity-events/Cargo.toml b/components/clarity-events/Cargo.toml
@@ -8,7 +8,6 @@ clarinet-files = { path = "../clarinet-files", default-features = false }
 clarity-repl = { path = "../clarity-repl", default-features = false }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["preserve_order"] }
-serde_derive = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 clap = { workspace = true, features = ["derive"] }
diff --git a/components/clarity-events/src/analysis/mod.rs b/components/clarity-events/src/analysis/mod.rs
@@ -13,7 +13,7 @@ use clarity_repl::clarity::{ClarityVersion, SymbolicExpressionType};
 use clarity_repl::repl::clarity_values::value_to_string;
 use serde::ser::SerializeMap;
 use serde::{Serialize, Serializer};
-use serde_json::Value as JsonValue;
+use serde_json::{json, Value as JsonValue};
 
 pub struct Settings {
     pub clarity_version: ClarityVersion,
diff --git a/components/clarity-events/src/bin.rs b/components/clarity-events/src/bin.rs
@@ -1,10 +1,3 @@
-extern crate serde;
-
-extern crate serde_derive;
-
-#[macro_use]
-extern crate serde_json;
-
 pub mod analysis;
 
 use std::path::Path;
@@ -16,6 +9,7 @@ use clarity_repl::clarity::analysis::type_checker::v2_05::TypeChecker;
 use clarity_repl::clarity::costs::LimitedCostTracker;
 use clarity_repl::clarity::EvaluationResult;
 use clarity_repl::repl::{Session, SessionSettings};
+use serde_json::json;
 
 #[derive(Parser, Debug)]
 #[clap(author, version, about, long_about = None)]
diff --git a/components/clarity-events/src/lib.rs b/components/clarity-events/src/lib.rs
@@ -1,6 +1 @@
-extern crate serde;
-
-#[macro_use]
-extern crate serde_json;
-
 pub mod analysis;
diff --git a/components/clarity-repl/Cargo.toml b/components/clarity-repl/Cargo.toml
@@ -29,7 +29,6 @@ regex = { workspace = true }
 reqwest = { workspace = true, features = ["blocking"] }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, features = ["derive"] }
-serde_derive = { workspace = true }
 serde_json = { workspace = true, features = ["unbounded_depth"] }
 sha2 = "0.10"
 strum = { workspace = true, features = ["derive"] }
diff --git a/components/clarity-repl/src/analysis/check_checker/mod.rs b/components/clarity-repl/src/analysis/check_checker/mod.rs
@@ -14,6 +14,7 @@ use clarity::vm::{ClarityName, ClarityVersion, SymbolicExpression};
 use clarity_types::types::TypeSignature;
 #[cfg(feature = "json_schema")]
 use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 
 use crate::analysis::annotation::{get_index_of_span, Annotation, AnnotationKind, WarningKind};
 use crate::analysis::ast_visitor::{traverse, ASTVisitor, LetBinding, TypedVar};
diff --git a/components/clarity-repl/src/analysis/coverage.rs b/components/clarity-repl/src/analysis/coverage.rs
@@ -6,6 +6,7 @@ use clarity::vm::functions::define::DefineFunctionsParsed;
 use clarity::vm::functions::NativeFunctions::{self, Filter, Fold, Map};
 use clarity::vm::{EvalHook, SymbolicExpression};
 use clarity_types::types::QualifiedContractIdentifier;
+use serde::{Deserialize, Serialize};
 
 type ExprCoverage = HashMap<u64, u64>;
 type ExecutableLines = HashMap<u32, Vec<u64>>;
diff --git a/components/clarity-repl/src/analysis/linter.rs b/components/clarity-repl/src/analysis/linter.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use clarity_types::diagnostic::Level as ClarityDiagnosticLevel;
 #[cfg(feature = "json_schema")]
 use schemars::JsonSchema;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use strum::{EnumString, VariantArray};
 
 use crate::analysis::annotation::Annotation;
diff --git a/components/clarity-repl/src/analysis/mod.rs b/components/clarity-repl/src/analysis/mod.rs
diff --git a/components/clarity-repl/src/bin.rs b/components/clarity-repl/src/bin.rs
diff --git a/components/clarity-repl/src/lib.rs b/components/clarity-repl/src/lib.rs
diff --git a/components/clarity-repl/src/repl/debug/mod.rs b/components/clarity-repl/src/repl/debug/mod.rs
diff --git a/components/clarity-repl/src/repl/mod.rs b/components/clarity-repl/src/repl/mod.rs
diff --git a/components/clarity-repl/src/repl/session.rs b/components/clarity-repl/src/repl/session.rs
diff --git a/components/clarity-repl/src/repl/settings.rs b/components/clarity-repl/src/repl/settings.rs
diff --git a/components/clarity-repl/src/utils.rs b/components/clarity-repl/src/utils.rs
diff --git a/components/stacks-network/Cargo.toml b/components/stacks-network/Cargo.toml
diff --git a/components/stacks-network/src/chains_coordinator.rs b/components/stacks-network/src/chains_coordinator.rs
diff --git a/components/stacks-network/src/lib.rs b/components/stacks-network/src/lib.rs
diff --git a/components/stacks-rpc-client/Cargo.toml b/components/stacks-rpc-client/Cargo.toml
diff --git a/components/stacks-rpc-client/src/lib.rs b/components/stacks-rpc-client/src/lib.rs
diff --git a/components/stacks-rpc-client/src/mock_stacks_rpc.rs b/components/stacks-rpc-client/src/mock_stacks_rpc.rs
diff --git a/components/stacks-rpc-client/src/rpc_client.rs b/components/stacks-rpc-client/src/rpc_client.rs
