feat: add strict_encoding optional

BP-WG · Oct 26, 2023 · da2abbd · da2abbd
1 parent 3525ada
commit da2abbd
Show file tree

Hide file tree

Showing 18 changed files with 305 additions and 150 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -118,7 +118,9 @@ electrum = [
     "bitcoin_onchain/electrum"
 ]
 strict_encoding = [
-    "slip132/strict_encoding"
+    "slip132/strict_encoding",
+    "psbt/strict_encoding",
+    "descriptors/strict_encoding",
 ]
 sign = ["psbt/sign"]
 construct = ["psbt/construct"]

diff --git a/descriptors/Cargo.toml b/descriptors/Cargo.toml
@@ -15,7 +15,6 @@ exclude = []
 
 [dependencies]
 amplify = { workspace = true }
-strict_encoding = { workspace = true }
 bitcoin = { workspace = true }
 bitcoin_scripts = { workspace = true }
 bitcoin_blockchain = { workspace = true }
@@ -24,12 +23,14 @@ miniscript_crate = { workspace = true, features = ["compiler"], optional = true
 chrono = { workspace = true }
 serde_crate = { package = "serde", version = "1", optional = true }
 serde_with = { version = "2.3", features = ["hex"], optional = true }
+strict_encoding = { workspace = true, optional = true }
 
 [features]
 all = [
     "rand",
     "miniscript",
-    "serde"
+    "serde",
+    "strict_encoding"
 ]
 default = []
 rand = [

diff --git a/descriptors/src/descriptor.rs b/descriptors/src/descriptor.rs
@@ -12,7 +12,6 @@
 use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;
 
-use amplify::Wrapper;
 use bitcoin::hashes::Hash;
 use bitcoin::schnorr::{TweakedPublicKey, UntweakedPublicKey};
 use bitcoin::secp256k1::{self, Secp256k1, Verification};
@@ -32,7 +31,7 @@ use miniscript::policy::compiler::CompilerError;
 use miniscript::{Descriptor, MiniscriptKey, Terminal};
 
 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug)]
-#[derive(StrictEncode, StrictDecode)]
+#[cfg_attr(feature = "strict_encoding", derive(StrictEncode, StrictDecode))]
 #[cfg_attr(
     feature = "serde",
     derive(Serialize, Deserialize),
@@ -97,7 +96,7 @@ impl DescriptorClass {
 #[derive(
     Clone, Copy, Ord, PartialOrd, Eq, PartialEq, Hash, Default, Debug, Display
 )]
-#[derive(StrictEncode, StrictDecode)]
+#[cfg_attr(feature = "strict_encoding", derive(StrictEncode, StrictDecode))]
 #[repr(u8)]
 pub enum SpkClass {
     #[display("bare")]
@@ -203,7 +202,7 @@ impl FromStr for SpkClass {
     serde(crate = "serde_crate")
 )]
 #[derive(Clone, Copy, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, Display)]
-#[derive(StrictEncode, StrictDecode)]
+#[cfg_attr(feature = "strict_encoding", derive(StrictEncode, StrictDecode))]
 #[repr(u8)]
 pub enum CompositeDescrType {
     #[display("bare")]
@@ -328,7 +327,7 @@ impl FromStr for CompositeDescrType {
     serde(crate = "serde_crate")
 )]
 #[derive(Clone, Copy, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, Display)]
-#[derive(StrictEncode, StrictDecode)]
+#[cfg_attr(feature = "strict_encoding", derive(StrictEncode, StrictDecode))]
 #[repr(u8)]
 pub enum OuterDescrType {
     #[display("bare")]
@@ -410,8 +409,8 @@ impl FromStr for OuterDescrType {
     derive(Serialize, Deserialize),
     serde(crate = "serde_crate")
 )]
+#[cfg_attr(feature = "strict_encoding", derive(StrictEncode, StrictDecode))]
 #[derive(Clone, Copy, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, Display)]
-#[derive(StrictEncode, StrictDecode)]
 #[repr(u8)]
 pub enum InnerDescrType {
     #[display("bare")]
@@ -494,7 +493,7 @@ impl FromStr for InnerDescrType {
     serde(crate = "serde_crate")
 )]
 #[derive(Clone, Copy, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, Default)]
-#[derive(StrictEncode, StrictDecode)]
+#[cfg_attr(feature = "strict_encoding", derive(StrictEncode, StrictDecode))]
 #[repr(C)]
 pub struct DescrVariants {
     pub bare: bool,
@@ -566,7 +565,7 @@ impl DescrVariants {
 }
 
 #[derive(Clone, PartialOrd, Ord, PartialEq, Eq, Hash, Debug, Display)]
-#[derive(StrictEncode, StrictDecode)]
+#[cfg_attr(feature = "strict_encoding", derive(StrictEncode, StrictDecode))]
 #[non_exhaustive]
 pub enum ScriptPubkeyDescr {
     #[display("bare({0})", alt = "bare({0:#})")]
@@ -663,7 +662,7 @@ impl TryFrom<PubkeyScript> for ScriptPubkeyDescr {
     type Error = UnsupportedScriptPubkey;
 
     fn try_from(spk: PubkeyScript) -> Result<Self, Self::Error> {
-        let script = spk.as_inner();
+        let script = spk.clone();
         let bytes = script.as_bytes();
         match (&spk, spk.witness_version()) {
             (spk, _) if spk.is_p2pk() && script.len() == 67 => Ok(ScriptPubkeyDescr::Pk(
@@ -707,7 +706,7 @@ impl TryFrom<PubkeyScript> for ScriptPubkeyDescr {
 /// Descriptors exposing bare scripts (unlike [`miniscript::Descriptor`] which
 /// uses miniscript representation of the scripts).
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
-#[derive(StrictEncode, StrictDecode)]
+#[cfg_attr(feature = "strict_encoding", derive(StrictEncode, StrictDecode))]
 #[non_exhaustive]
 pub enum BareDescriptor {
     Bare(PubkeyScript),

diff --git a/descriptors/src/input.rs b/descriptors/src/input.rs
@@ -21,7 +21,6 @@ use bitcoin_blockchain::locks::{self, SeqNo};
 use bitcoin_hd::{DerivationSubpath, UnhardenedIndex};
 
 #[derive(Clone, PartialEq, Eq, Debug)]
-#[derive(StrictEncode, StrictDecode)]
 pub struct InputDescriptor {
     pub outpoint: OutPoint,
     pub terminal: DerivationSubpath<UnhardenedIndex>,

diff --git a/descriptors/src/lib.rs b/descriptors/src/lib.rs
@@ -22,6 +22,7 @@
 
 #[macro_use]
 extern crate amplify;
+#[cfg(feature = "strict_encoding")]
 #[macro_use]
 extern crate strict_encoding;
 #[cfg(feature = "miniscript")]