Merge branch 'master' into master

Cargo.toml

@@ -60,6 +60,7 @@ rustls-acme = { version = "0.8.1", features = ["axum"] }
 serde = { version = "1.0.137", features = ["derive"] }
 serde-hex = "0.1.0"
 serde_json = { version = "1.0.81", features = ["preserve_order"] }
+serde_with = "3.7.0"
 serde_yaml = "0.9.17"
 sha3 = "0.10.8"
 sysinfo = "0.30.3"

crates/ordinals/Cargo.toml

@@ -12,6 +12,7 @@ rust-version = "1.67"
 bitcoin = { version = "0.30.1", features = ["rand"] }
 derive_more = "0.99.17"
 serde = { version = "1.0.137", features = ["derive"] }
+serde_with = "3.7.0"
 thiserror = "1.0.56"
 
 [dev-dependencies]

crates/ordinals/src/lib.rs

@@ -7,7 +7,8 @@ use {
     OutPoint,
   },
   derive_more::{Display, FromStr},
-  serde::{Deserialize, Deserializer, Serialize, Serializer},
+  serde::{Deserialize, Serialize},
+  serde_with::{DeserializeFromStr, SerializeDisplay},
   std::{
     cmp,
     fmt::{self, Display, Formatter},
@@ -26,12 +27,8 @@ pub use {
   sat_point::SatPoint,
 };
 
-#[doc(hidden)]
-pub use self::deserialize_from_str::DeserializeFromStr;
-
 mod decimal_sat;
 mod degree;
-mod deserialize_from_str;
 mod epoch;
 mod height;
 mod rarity;

crates/ordinals/src/rarity.rs

@@ -1,6 +1,6 @@
 use super::*;
 
-#[derive(Debug, PartialEq, PartialOrd, Copy, Clone)]
+#[derive(Debug, PartialEq, PartialOrd, Copy, Clone, DeserializeFromStr, SerializeDisplay)]
 pub enum Rarity {
   Common,
   Uncommon,
@@ -90,24 +90,6 @@ impl FromStr for Rarity {
   }
 }
 
-impl Serialize for Rarity {
-  fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-  where
-    S: Serializer,
-  {
-    serializer.collect_str(self)
-  }
-}
-
-impl<'de> Deserialize<'de> for Rarity {
-  fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-  where
-    D: Deserializer<'de>,
-  {
-    DeserializeFromStr::with(deserializer)
-  }
-}
-
 #[cfg(test)]
 mod tests {
   use super::*;

crates/ordinals/src/sat_point.rs

@@ -9,7 +9,19 @@ use {super::*, bitcoin::transaction::ParseOutPointError};
 /// that of the second sat of the genesis block coinbase output is
 /// `000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f:0:1`, and
 /// so on and so on.
-#[derive(Debug, PartialEq, Copy, Clone, Eq, PartialOrd, Ord, Default, Hash)]
+#[derive(
+  Debug,
+  PartialEq,
+  Copy,
+  Clone,
+  Eq,
+  PartialOrd,
+  Ord,
+  Default,
+  Hash,
+  DeserializeFromStr,
+  SerializeDisplay,
+)]
 pub struct SatPoint {
   pub outpoint: OutPoint,
   pub offset: u64,
@@ -39,24 +51,6 @@ impl Decodable for SatPoint {
   }
 }
 
-impl Serialize for SatPoint {
-  fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-  where
-    S: Serializer,
-  {
-    serializer.collect_str(self)
-  }
-}
-
-impl<'de> Deserialize<'de> for SatPoint {
-  fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-  where
-    D: Deserializer<'de>,
-  {
-    DeserializeFromStr::with(deserializer)
-  }
-}
-
 impl FromStr for SatPoint {
   type Err = Error;
 

src/decimal.rs

@@ -1,6 +1,6 @@
 use super::*;
 
-#[derive(Debug, PartialEq, Copy, Clone, Default)]
+#[derive(Debug, PartialEq, Copy, Clone, Default, DeserializeFromStr, SerializeDisplay)]
 pub struct Decimal {
   value: u128,
   scale: u8,
@@ -85,24 +85,6 @@ impl FromStr for Decimal {
   }
 }
 
-impl Serialize for Decimal {
-  fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-  where
-    S: Serializer,
-  {
-    serializer.collect_str(self)
-  }
-}
-
-impl<'de> Deserialize<'de> for Decimal {
-  fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-  where
-    D: Deserializer<'de>,
-  {
-    DeserializeFromStr::with(deserializer)
-  }
-}
-
 #[cfg(test)]
 mod tests {
   use super::*;

crates/ordinals/src/deserialize_from_str.rs → src/deserialize_from_str.rs

@@ -2,18 +2,6 @@ use super::*;
 
 pub struct DeserializeFromStr<T: FromStr>(pub T);
 
-impl<'de, T: FromStr> DeserializeFromStr<T>
-where
-  T::Err: Display,
-{
-  pub fn with<D>(deserializer: D) -> Result<T, D::Error>
-  where
-    D: Deserializer<'de>,
-  {
-    Ok(DeserializeFromStr::<T>::deserialize(deserializer)?.0)
-  }
-}
-
 impl<'de, T: FromStr> Deserialize<'de> for DeserializeFromStr<T>
 where
   T::Err: Display,

src/inscriptions/inscription_id.rs

@@ -1,6 +1,8 @@
 use super::*;
 
-#[derive(Debug, PartialEq, Copy, Clone, Hash, Eq, PartialOrd, Ord)]
+#[derive(
+  Debug, PartialEq, Copy, Clone, Hash, Eq, PartialOrd, Ord, DeserializeFromStr, SerializeDisplay,
+)]
 pub struct InscriptionId {
   pub txid: Txid,
   pub index: u32,
@@ -34,24 +36,6 @@ impl InscriptionId {
   }
 }
 
-impl<'de> Deserialize<'de> for InscriptionId {
-  fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-  where
-    D: Deserializer<'de>,
-  {
-    DeserializeFromStr::with(deserializer)
-  }
-}
-
-impl Serialize for InscriptionId {
-  fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-  where
-    S: Serializer,
-  {
-    serializer.collect_str(self)
-  }
-}
-
 impl Display for InscriptionId {
   fn fmt(&self, f: &mut Formatter) -> fmt::Result {
     write!(f, "{}i{}", self.txid, self.index)

src/lib.rs

@@ -16,6 +16,7 @@ use {
     arguments::Arguments,
     blocktime::Blocktime,
     decimal::Decimal,
+    deserialize_from_str::DeserializeFromStr,
     index::BitcoinCoreRpcResultExt,
     inscriptions::{
       inscription_id,
@@ -52,10 +53,11 @@ use {
   html_escaper::{Escape, Trusted},
   http::HeaderMap,
   lazy_static::lazy_static,
-  ordinals::{DeserializeFromStr, Epoch, Height, Rarity, Sat, SatPoint},
+  ordinals::{Epoch, Height, Rarity, Sat, SatPoint},
   regex::Regex,
   reqwest::Url,
-  serde::{Deserialize, Deserializer, Serialize, Serializer},
+  serde::{Deserialize, Deserializer, Serialize},
+  serde_with::{DeserializeFromStr, SerializeDisplay},
   std::{
     cmp::{self, Reverse},
     collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecDeque},
@@ -111,6 +113,7 @@ pub mod arguments;
 mod blocktime;
 pub mod chain;
 mod decimal;
+mod deserialize_from_str;
 mod fee_rate;
 pub mod index;
 mod inscriptions;

src/object.rs

@@ -1,6 +1,6 @@
 use super::*;
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Clone, DeserializeFromStr, SerializeDisplay)]
 pub enum Object {
   Address(Address<NetworkUnchecked>),
   Hash([u8; 32]),
@@ -53,24 +53,6 @@ impl Display for Object {
   }
 }
 
-impl Serialize for Object {
-  fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-  where
-    S: Serializer,
-  {
-    serializer.collect_str(self)
-  }
-}
-
-impl<'de> Deserialize<'de> for Object {
-  fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-  where
-    D: Deserializer<'de>,
-  {
-    DeserializeFromStr::with(deserializer)
-  }
-}
-
 #[cfg(test)]
 mod tests {
   use super::*;