bitcoin: Replace script hex decoding with new consensus crate

diff --git a/bitcoin/src/blockdata/script/owned.rs b/bitcoin/src/blockdata/script/owned.rs
index eb0fca18..d22bbd60 100644
--- a/bitcoin/src/blockdata/script/owned.rs
+++ b/bitcoin/src/blockdata/script/owned.rs
@@ -1,9 +1,11 @@
 // SPDX-License-Identifier: CC0-1.0
 
+use core::convert::Infallible;
 #[cfg(doc)]
 use core::ops::Deref;
+use core::fmt;
 
-use internals::ToU64 as _;
+use internals::{write_err, ToU64 as _};
 
 use super::{
     opcode_to_verify, write_scriptint, Builder, Error, Instruction, PushBytes, ScriptBuf,
@@ -18,9 +20,9 @@ use crate::opcodes::{self, Opcode};
 use crate::prelude::Vec;
 use crate::script::witness_program::{WitnessProgram, P2A_PROGRAM};
 use crate::script::witness_version::WitnessVersion;
-use crate::script::{self, ScriptHash, WScriptHash};
+use crate::script::{self, ScriptBufDecoderError, ScriptHash, WScriptHash};
 use crate::taproot::TapNodeHash;
-use crate::{consensus, internal_macros};
+use crate::internal_macros;
 
 internal_macros::define_extension_trait! {
     /// Extension functionality for the [`ScriptBuf`] type.
@@ -148,10 +150,11 @@ internal_macros::define_extension_trait! {
         /// Constructs a new [`ScriptBuf`] from a hex string.
         ///
         /// The input string is expected to be consensus encoded i.e., includes the length prefix.
-        fn from_hex_prefixed(s: &str) -> Result<Self, consensus::FromHexError>
+        fn from_hex_prefixed(s: &str) -> Result<Self, FromHexError>
             where Self: Sized
         {
-            consensus::encode::deserialize_hex(s)
+            let v = hex::decode_to_vec(s)?;
+            Ok(encoding::decode_from_slice(&v)?)
         }
 
         /// Constructs a new [`ScriptBuf`] from a hex string.
@@ -407,3 +410,44 @@ impl<T> Drop for ScriptBufAsVec<'_, T> {
         *(self.0) = ScriptBuf::from_bytes(vec);
     }
 }
+
+/// An error parsing a script from hex.
+#[derive(Debug, Clone, PartialEq, Eq)]
+#[non_exhaustive]
+pub enum FromHexError {
+    /// Error parsing the hex input string.
+    Hex(hex::DecodeVariableLengthBytesError),
+    /// Error when decoding the script.
+    Decoder(encoding::DecodeError<ScriptBufDecoderError>),
+}
+
+impl From<Infallible> for FromHexError {
+    fn from(never: Infallible) -> Self { match never {} }
+}
+
+impl fmt::Display for FromHexError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match *self {
+            Self::Hex(ref e) => write_err!(f, "script hex"; e),
+            Self::Decoder(ref e) => write_err!(f, "script decoder"; e),
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for FromHexError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        match *self {
+            Self::Hex(ref e) => Some(e),
+            Self::Decoder(ref e) => Some(e),
+        }
+    }
+}
+
+impl From<hex::DecodeVariableLengthBytesError> for FromHexError {
+    fn from(e: hex::DecodeVariableLengthBytesError) -> Self { Self::Hex(e) }
+}
+
+impl From<encoding::DecodeError<ScriptBufDecoderError>> for FromHexError {
+    fn from(e: encoding::DecodeError<ScriptBufDecoderError>) -> Self { Self::Decoder(e) }
+}