Merge rust-bitcoin/rust-bitcoin#2794: Enforce script size limit when hashing scripts

6014788a74 api: Run just check-api (Tobin C. Harding)
e87a54f617 Enforce script size limit when hashing scripts (Tobin C. Harding)
4686d48ec4 Rename p2wsh script to witness_script (Tobin C. Harding)
9cdb514434 Remove odd script hash test (Tobin C. Harding)

Pull request description:

  There are two limits that the Bitcoin network enforces in regard to hashing scripts

  - For P2SH the redeem script must be less than 520 bytes (bip 16)
  - For P2WSH the witness script must be less than 10,000 bytes (bip 141)

  Currently we are only enforcing the p2sh limit when creating an address with `Address::p2sh`.

  There are various ways to create addresses from script hashes and if users manually hash a script then use the `ScriptHash` (or `WScritpHash`) our APIs assume the script that was hashed is valid. This means there is the potential for users to get burned by creating addresses that cannot be spent, something we would like to avoid.

  - Add fallible constructors to `ScriptHash` and `WScriptHash`
  - Add `TryFrom` impls as well to both types
  - Remove the `From` impls

  Close: #2794

ACKs for top commit:
  apoelstra:
    ACK 6014788a74

Tree-SHA512: 90c722ee6b63d02ebf39b77bf003f71ec90e745b32831a0d69aa4d6f363624bd6d2c86445f8807ed319d1845d639d2494756a8321207f917e57377d4557c436f

api/bitcoin/all-features.txt

@@ -5,10 +5,8 @@
 #[non_exhaustive] pub enum bitcoin::address::AddressType
 #[non_exhaustive] pub enum bitcoin::address::FromScriptError
 #[non_exhaustive] pub enum bitcoin::address::KnownHrp
-#[non_exhaustive] pub enum bitcoin::address::P2shError
 #[non_exhaustive] pub enum bitcoin::address::ParseError
 #[non_exhaustive] pub enum bitcoin::address::error::FromScriptError
-#[non_exhaustive] pub enum bitcoin::address::error::P2shError
 #[non_exhaustive] pub enum bitcoin::address::error::ParseError
 #[non_exhaustive] pub enum bitcoin::bip152::Error
 #[non_exhaustive] pub enum bitcoin::bip158::Error
@@ -554,7 +552,6 @@ impl core::clone::Clone for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::clone::Clone for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::clone::Clone for bitcoin::address::error::LegacyAddressTooLongError
 impl core::clone::Clone for bitcoin::address::error::NetworkValidationError
-impl core::clone::Clone for bitcoin::address::error::P2shError
 impl core::clone::Clone for bitcoin::address::error::ParseError
 impl core::clone::Clone for bitcoin::address::error::UnknownAddressTypeError
 impl core::clone::Clone for bitcoin::address::error::UnknownHrpError
@@ -599,9 +596,11 @@ impl core::clone::Clone for bitcoin::blockdata::script::Builder
 impl core::clone::Clone for bitcoin::blockdata::script::Error
 impl core::clone::Clone for bitcoin::blockdata::script::PushBytesBuf
 impl core::clone::Clone for bitcoin::blockdata::script::PushBytesError
+impl core::clone::Clone for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::clone::Clone for bitcoin::blockdata::script::ScriptBuf
 impl core::clone::Clone for bitcoin::blockdata::script::ScriptHash
 impl core::clone::Clone for bitcoin::blockdata::script::WScriptHash
+impl core::clone::Clone for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::clone::Clone for bitcoin::blockdata::script::witness_program::Error
 impl core::clone::Clone for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::clone::Clone for bitcoin::blockdata::script::witness_version::FromStrError
@@ -753,7 +752,6 @@ impl core::cmp::Eq for bitcoin::address::error::InvalidBase58PayloadLengthError
 impl core::cmp::Eq for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::cmp::Eq for bitcoin::address::error::LegacyAddressTooLongError
 impl core::cmp::Eq for bitcoin::address::error::NetworkValidationError
-impl core::cmp::Eq for bitcoin::address::error::P2shError
 impl core::cmp::Eq for bitcoin::address::error::ParseError
 impl core::cmp::Eq for bitcoin::address::error::UnknownAddressTypeError
 impl core::cmp::Eq for bitcoin::address::error::UnknownHrpError
@@ -799,10 +797,12 @@ impl core::cmp::Eq for bitcoin::blockdata::script::Error
 impl core::cmp::Eq for bitcoin::blockdata::script::PushBytes
 impl core::cmp::Eq for bitcoin::blockdata::script::PushBytesBuf
 impl core::cmp::Eq for bitcoin::blockdata::script::PushBytesError
+impl core::cmp::Eq for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::cmp::Eq for bitcoin::blockdata::script::Script
 impl core::cmp::Eq for bitcoin::blockdata::script::ScriptBuf
 impl core::cmp::Eq for bitcoin::blockdata::script::ScriptHash
 impl core::cmp::Eq for bitcoin::blockdata::script::WScriptHash
+impl core::cmp::Eq for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::cmp::Eq for bitcoin::blockdata::script::witness_program::Error
 impl core::cmp::Eq for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::cmp::Eq for bitcoin::blockdata::script::witness_version::FromStrError
@@ -1041,7 +1041,6 @@ impl core::cmp::PartialEq for bitcoin::address::error::InvalidBase58PayloadLengt
 impl core::cmp::PartialEq for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::cmp::PartialEq for bitcoin::address::error::LegacyAddressTooLongError
 impl core::cmp::PartialEq for bitcoin::address::error::NetworkValidationError
-impl core::cmp::PartialEq for bitcoin::address::error::P2shError
 impl core::cmp::PartialEq for bitcoin::address::error::ParseError
 impl core::cmp::PartialEq for bitcoin::address::error::UnknownAddressTypeError
 impl core::cmp::PartialEq for bitcoin::address::error::UnknownHrpError
@@ -1087,10 +1086,12 @@ impl core::cmp::PartialEq for bitcoin::blockdata::script::Error
 impl core::cmp::PartialEq for bitcoin::blockdata::script::PushBytes
 impl core::cmp::PartialEq for bitcoin::blockdata::script::PushBytesBuf
 impl core::cmp::PartialEq for bitcoin::blockdata::script::PushBytesError
+impl core::cmp::PartialEq for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::cmp::PartialEq for bitcoin::blockdata::script::Script
 impl core::cmp::PartialEq for bitcoin::blockdata::script::ScriptBuf
 impl core::cmp::PartialEq for bitcoin::blockdata::script::ScriptHash
 impl core::cmp::PartialEq for bitcoin::blockdata::script::WScriptHash
+impl core::cmp::PartialEq for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::cmp::PartialEq for bitcoin::blockdata::script::witness_program::Error
 impl core::cmp::PartialEq for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::cmp::PartialEq for bitcoin::blockdata::script::witness_version::FromStrError
@@ -1561,10 +1562,6 @@ impl core::convert::From<&bitcoin::PublicKey> for bitcoin::PubkeyHash
 impl core::convert::From<&bitcoin::bip32::Xpub> for bitcoin::bip32::XKeyIdentifier
 impl core::convert::From<&bitcoin::blockdata::block::Block> for bitcoin::blockdata::block::BlockHash
 impl core::convert::From<&bitcoin::blockdata::block::Header> for bitcoin::blockdata::block::BlockHash
-impl core::convert::From<&bitcoin::blockdata::script::Script> for bitcoin::blockdata::script::ScriptHash
-impl core::convert::From<&bitcoin::blockdata::script::Script> for bitcoin::blockdata::script::WScriptHash
-impl core::convert::From<&bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::ScriptHash
-impl core::convert::From<&bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::WScriptHash
 impl core::convert::From<&bitcoin::blockdata::transaction::Transaction> for bitcoin::blockdata::transaction::Txid
 impl core::convert::From<&bitcoin::blockdata::transaction::Transaction> for bitcoin::blockdata::transaction::Wtxid
 impl core::convert::From<&bitcoin::network::Network> for &'static bitcoin::consensus::params::Params
@@ -1827,8 +1824,6 @@ impl core::convert::From<bitcoin::blockdata::script::PushBytesBuf> for alloc::ve
 impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for alloc::borrow::Cow<'_, bitcoin::blockdata::script::Script>
 impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for alloc::boxed::Box<bitcoin::blockdata::script::Script>
 impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for alloc::vec::Vec<u8>
-impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::ScriptHash
-impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::WScriptHash
 impl core::convert::From<bitcoin::blockdata::script::ScriptHash> for bitcoin::blockdata::script::PushBytesBuf
 impl core::convert::From<bitcoin::blockdata::script::ScriptHash> for bitcoin_hashes::hash160::Hash
 impl core::convert::From<bitcoin::blockdata::script::WScriptHash> for bitcoin::blockdata::script::PushBytesBuf
@@ -1913,7 +1908,6 @@ impl core::convert::From<bitcoin_units::locktime::relative::Height> for bitcoin:
 impl core::convert::From<bitcoin_units::locktime::relative::Time> for bitcoin::blockdata::locktime::relative::LockTime
 impl core::convert::From<bitcoin_units::parse::ParseIntError> for bitcoin::blockdata::script::witness_version::FromStrError
 impl core::convert::From<core::convert::Infallible> for bitcoin::address::error::FromScriptError
-impl core::convert::From<core::convert::Infallible> for bitcoin::address::error::P2shError
 impl core::convert::From<core::convert::Infallible> for bitcoin::address::error::ParseError
 impl core::convert::From<core::convert::Infallible> for bitcoin::bip152::Error
 impl core::convert::From<core::convert::Infallible> for bitcoin::bip158::Error
@@ -1921,6 +1915,8 @@ impl core::convert::From<core::convert::Infallible> for bitcoin::bip32::Error
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::block::Bip34Error
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::block::ValidationError
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::Error
+impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::RedeemScriptSizeError
+impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::witness_program::Error
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::witness_version::FromStrError
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::witness_version::TryFromInstructionError
@@ -1969,6 +1965,10 @@ impl core::convert::From<u8> for bitcoin::blockdata::opcodes::Opcode
 impl core::convert::From<u8> for bitcoin::consensus::encode::VarInt
 impl core::convert::From<usize> for bitcoin::consensus::encode::VarInt
 impl core::convert::TryFrom<&[bitcoin::taproot::TapNodeHash]> for bitcoin::taproot::merkle_branch::TaprootMerkleBranch
+impl core::convert::TryFrom<&bitcoin::blockdata::script::Script> for bitcoin::blockdata::script::ScriptHash
+impl core::convert::TryFrom<&bitcoin::blockdata::script::Script> for bitcoin::blockdata::script::WScriptHash
+impl core::convert::TryFrom<&bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::ScriptHash
+impl core::convert::TryFrom<&bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::WScriptHash
 impl core::convert::TryFrom<&str> for bitcoin::blockdata::locktime::absolute::LockTime
 impl core::convert::TryFrom<&str> for bitcoin::blockdata::transaction::Sequence
 impl core::convert::TryFrom<alloc::boxed::Box<[bitcoin::taproot::TapNodeHash]>> for bitcoin::taproot::merkle_branch::TaprootMerkleBranch
@@ -1984,6 +1984,8 @@ impl core::convert::TryFrom<bech32::primitives::gf32::Fe32> for bitcoin::blockda
 impl core::convert::TryFrom<bitcoin::PublicKey> for bitcoin::CompressedPublicKey
 impl core::convert::TryFrom<bitcoin::blockdata::constants::ChainHash> for bitcoin::network::Network
 impl core::convert::TryFrom<bitcoin::blockdata::opcodes::Opcode> for bitcoin::blockdata::script::witness_version::WitnessVersion
+impl core::convert::TryFrom<bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::ScriptHash
+impl core::convert::TryFrom<bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::WScriptHash
 impl core::convert::TryFrom<bitcoin::blockdata::transaction::Sequence> for bitcoin::blockdata::locktime::relative::LockTime
 impl core::convert::TryFrom<bitcoin::p2p::Magic> for bitcoin::network::Network
 impl core::convert::TryFrom<bitcoin::taproot::NodeInfo> for bitcoin::taproot::TapTree
@@ -2017,7 +2019,6 @@ impl core::error::Error for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::error::Error for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::error::Error for bitcoin::address::error::LegacyAddressTooLongError
 impl core::error::Error for bitcoin::address::error::NetworkValidationError
-impl core::error::Error for bitcoin::address::error::P2shError
 impl core::error::Error for bitcoin::address::error::ParseError
 impl core::error::Error for bitcoin::address::error::UnknownAddressTypeError
 impl core::error::Error for bitcoin::address::error::UnknownHrpError
@@ -2033,6 +2034,8 @@ impl core::error::Error for bitcoin::blockdata::locktime::relative::Incompatible
 impl core::error::Error for bitcoin::blockdata::locktime::relative::IncompatibleTimeError
 impl core::error::Error for bitcoin::blockdata::script::Error
 impl core::error::Error for bitcoin::blockdata::script::PushBytesError
+impl core::error::Error for bitcoin::blockdata::script::RedeemScriptSizeError
+impl core::error::Error for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::error::Error for bitcoin::blockdata::script::witness_program::Error
 impl core::error::Error for bitcoin::blockdata::script::witness_version::FromStrError
 impl core::error::Error for bitcoin::blockdata::script::witness_version::TryFromError
@@ -2102,7 +2105,6 @@ impl core::fmt::Debug for bitcoin::address::error::InvalidBase58PayloadLengthErr
 impl core::fmt::Debug for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::fmt::Debug for bitcoin::address::error::LegacyAddressTooLongError
 impl core::fmt::Debug for bitcoin::address::error::NetworkValidationError
-impl core::fmt::Debug for bitcoin::address::error::P2shError
 impl core::fmt::Debug for bitcoin::address::error::ParseError
 impl core::fmt::Debug for bitcoin::address::error::UnknownAddressTypeError
 impl core::fmt::Debug for bitcoin::address::error::UnknownHrpError
@@ -2149,10 +2151,12 @@ impl core::fmt::Debug for bitcoin::blockdata::script::Error
 impl core::fmt::Debug for bitcoin::blockdata::script::PushBytes
 impl core::fmt::Debug for bitcoin::blockdata::script::PushBytesBuf
 impl core::fmt::Debug for bitcoin::blockdata::script::PushBytesError
+impl core::fmt::Debug for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::fmt::Debug for bitcoin::blockdata::script::Script
 impl core::fmt::Debug for bitcoin::blockdata::script::ScriptBuf
 impl core::fmt::Debug for bitcoin::blockdata::script::ScriptHash
 impl core::fmt::Debug for bitcoin::blockdata::script::WScriptHash
+impl core::fmt::Debug for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::fmt::Debug for bitcoin::blockdata::script::witness_program::Error
 impl core::fmt::Debug for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::fmt::Debug for bitcoin::blockdata::script::witness_version::FromStrError
@@ -2301,7 +2305,6 @@ impl core::fmt::Display for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::fmt::Display for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::fmt::Display for bitcoin::address::error::LegacyAddressTooLongError
 impl core::fmt::Display for bitcoin::address::error::NetworkValidationError
-impl core::fmt::Display for bitcoin::address::error::P2shError
 impl core::fmt::Display for bitcoin::address::error::ParseError
 impl core::fmt::Display for bitcoin::address::error::UnknownAddressTypeError
 impl core::fmt::Display for bitcoin::address::error::UnknownHrpError
@@ -2336,10 +2339,12 @@ impl core::fmt::Display for bitcoin::blockdata::opcodes::Opcode
 impl core::fmt::Display for bitcoin::blockdata::script::Builder
 impl core::fmt::Display for bitcoin::blockdata::script::Error
 impl core::fmt::Display for bitcoin::blockdata::script::PushBytesError
+impl core::fmt::Display for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::fmt::Display for bitcoin::blockdata::script::Script
 impl core::fmt::Display for bitcoin::blockdata::script::ScriptBuf
 impl core::fmt::Display for bitcoin::blockdata::script::ScriptHash
 impl core::fmt::Display for bitcoin::blockdata::script::WScriptHash
+impl core::fmt::Display for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::fmt::Display for bitcoin::blockdata::script::witness_program::Error
 impl core::fmt::Display for bitcoin::blockdata::script::witness_version::FromStrError
 impl core::fmt::Display for bitcoin::blockdata::script::witness_version::TryFromError
@@ -2695,7 +2700,6 @@ impl core::marker::Freeze for bitcoin::address::error::InvalidBase58PayloadLengt
 impl core::marker::Freeze for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::Freeze for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::Freeze for bitcoin::address::error::NetworkValidationError
-impl core::marker::Freeze for bitcoin::address::error::P2shError
 impl core::marker::Freeze for bitcoin::address::error::ParseError
 impl core::marker::Freeze for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::Freeze for bitcoin::address::error::UnknownHrpError
@@ -2744,10 +2748,12 @@ impl core::marker::Freeze for bitcoin::blockdata::script::Error
 impl core::marker::Freeze for bitcoin::blockdata::script::PushBytes
 impl core::marker::Freeze for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::Freeze for bitcoin::blockdata::script::PushBytesError
+impl core::marker::Freeze for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::Freeze for bitcoin::blockdata::script::Script
 impl core::marker::Freeze for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::Freeze for bitcoin::blockdata::script::ScriptHash
 impl core::marker::Freeze for bitcoin::blockdata::script::WScriptHash
+impl core::marker::Freeze for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::Freeze for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::Freeze for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::Freeze for bitcoin::blockdata::script::witness_version::FromStrError
@@ -2906,7 +2912,6 @@ impl core::marker::Send for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::marker::Send for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::Send for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::Send for bitcoin::address::error::NetworkValidationError
-impl core::marker::Send for bitcoin::address::error::P2shError
 impl core::marker::Send for bitcoin::address::error::ParseError
 impl core::marker::Send for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::Send for bitcoin::address::error::UnknownHrpError
@@ -2955,10 +2960,12 @@ impl core::marker::Send for bitcoin::blockdata::script::Error
 impl core::marker::Send for bitcoin::blockdata::script::PushBytes
 impl core::marker::Send for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::Send for bitcoin::blockdata::script::PushBytesError
+impl core::marker::Send for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::Send for bitcoin::blockdata::script::Script
 impl core::marker::Send for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::Send for bitcoin::blockdata::script::ScriptHash
 impl core::marker::Send for bitcoin::blockdata::script::WScriptHash
+impl core::marker::Send for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::Send for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::Send for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::Send for bitcoin::blockdata::script::witness_version::FromStrError
@@ -3117,7 +3124,6 @@ impl core::marker::StructuralPartialEq for bitcoin::address::error::InvalidBase5
 impl core::marker::StructuralPartialEq for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::NetworkValidationError
-impl core::marker::StructuralPartialEq for bitcoin::address::error::P2shError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::ParseError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::UnknownHrpError
@@ -3163,10 +3169,12 @@ impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::Error
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::PushBytes
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::PushBytesError
+impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::Script
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::ScriptHash
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::WScriptHash
+impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::witness_version::FromStrError
@@ -3312,7 +3320,6 @@ impl core::marker::Sync for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::marker::Sync for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::Sync for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::Sync for bitcoin::address::error::NetworkValidationError
-impl core::marker::Sync for bitcoin::address::error::P2shError
 impl core::marker::Sync for bitcoin::address::error::ParseError
 impl core::marker::Sync for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::Sync for bitcoin::address::error::UnknownHrpError
@@ -3361,10 +3368,12 @@ impl core::marker::Sync for bitcoin::blockdata::script::Error
 impl core::marker::Sync for bitcoin::blockdata::script::PushBytes
 impl core::marker::Sync for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::Sync for bitcoin::blockdata::script::PushBytesError
+impl core::marker::Sync for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::Sync for bitcoin::blockdata::script::Script
 impl core::marker::Sync for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::Sync for bitcoin::blockdata::script::ScriptHash
 impl core::marker::Sync for bitcoin::blockdata::script::WScriptHash
+impl core::marker::Sync for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::Sync for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::Sync for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::Sync for bitcoin::blockdata::script::witness_version::FromStrError
@@ -3523,7 +3532,6 @@ impl core::marker::Unpin for bitcoin::address::error::InvalidBase58PayloadLength
 impl core::marker::Unpin for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::Unpin for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::Unpin for bitcoin::address::error::NetworkValidationError
-impl core::marker::Unpin for bitcoin::address::error::P2shError
 impl core::marker::Unpin for bitcoin::address::error::ParseError
 impl core::marker::Unpin for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::Unpin for bitcoin::address::error::UnknownHrpError
@@ -3572,10 +3580,12 @@ impl core::marker::Unpin for bitcoin::blockdata::script::Error
 impl core::marker::Unpin for bitcoin::blockdata::script::PushBytes
 impl core::marker::Unpin for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::Unpin for bitcoin::blockdata::script::PushBytesError
+impl core::marker::Unpin for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::Unpin for bitcoin::blockdata::script::Script
 impl core::marker::Unpin for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::Unpin for bitcoin::blockdata::script::ScriptHash
 impl core::marker::Unpin for bitcoin::blockdata::script::WScriptHash
+impl core::marker::Unpin for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::Unpin for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::Unpin for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::Unpin for bitcoin::blockdata::script::witness_version::FromStrError
@@ -3766,7 +3776,6 @@ impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::Invali
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::LegacyAddressTooLongError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::NetworkValidationError
-impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::P2shError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::ParseError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::UnknownAddressTypeError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::UnknownHrpError
@@ -3814,10 +3823,12 @@ impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::Err
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::PushBytes
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::PushBytesBuf
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::PushBytesError
+impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::Script
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::ScriptBuf
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::ScriptHash
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::WScriptHash
+impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::witness_program::Error
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::witness_version::FromStrError
@@ -3972,7 +3983,6 @@ impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::InvalidBa
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::LegacyAddressTooLongError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::NetworkValidationError
-impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::P2shError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::ParseError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::UnknownAddressTypeError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::UnknownHrpError
@@ -4020,10 +4030,12 @@ impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::Error
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::PushBytes
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::PushBytesBuf
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::PushBytesError
+impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::Script
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::ScriptBuf
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::ScriptHash
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::WScriptHash
+impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::witness_program::Error
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::witness_version::FromStrError
@@ -5001,7 +5013,6 @@ pub bitcoin::address::FromScriptError::WitnessVersion(bitcoin::blockdata::script
 pub bitcoin::address::KnownHrp::Mainnet
 pub bitcoin::address::KnownHrp::Regtest
 pub bitcoin::address::KnownHrp::Testnets
-pub bitcoin::address::P2shError::ExcessiveScriptSize
 pub bitcoin::address::ParseError::Base58(base58ck::error::Error)
 pub bitcoin::address::ParseError::Bech32(bech32::segwit::DecodeError)
 pub bitcoin::address::ParseError::InvalidBase58PayloadLength(bitcoin::address::error::InvalidBase58PayloadLengthError)
@@ -5014,7 +5025,6 @@ pub bitcoin::address::ParseError::WitnessVersion(bitcoin::blockdata::script::wit
 pub bitcoin::address::error::FromScriptError::UnrecognizedScript
 pub bitcoin::address::error::FromScriptError::WitnessProgram(bitcoin::blockdata::script::witness_program::Error)
 pub bitcoin::address::error::FromScriptError::WitnessVersion(bitcoin::blockdata::script::witness_version::TryFromError)
-pub bitcoin::address::error::P2shError::ExcessiveScriptSize
 pub bitcoin::address::error::ParseError::Base58(base58ck::error::Error)
 pub bitcoin::address::error::ParseError::Bech32(bech32::segwit::DecodeError)
 pub bitcoin::address::error::ParseError::InvalidBase58PayloadLength(bitcoin::address::error::InvalidBase58PayloadLengthError)
@@ -5118,6 +5128,8 @@ pub bitcoin::blockdata::script::Error::Serialization
 pub bitcoin::blockdata::script::Error::UnknownSpentOutput(bitcoin::blockdata::transaction::OutPoint)
 pub bitcoin::blockdata::script::Instruction::Op(bitcoin::blockdata::opcodes::Opcode)
 pub bitcoin::blockdata::script::Instruction::PushBytes(&'a bitcoin::blockdata::script::PushBytes)
+pub bitcoin::blockdata::script::RedeemScriptSizeError::size: usize
+pub bitcoin::blockdata::script::WitnessScriptSizeError::size: usize
 pub bitcoin::blockdata::script::witness_program::Error::InvalidLength(usize)
 pub bitcoin::blockdata::script::witness_program::Error::InvalidSegwitV0Length(usize)
 pub bitcoin::blockdata::script::witness_version::FromStrError::Invalid(bitcoin::blockdata::script::witness_version::TryFromError)
@@ -5539,6 +5551,8 @@ pub bitcoin::script::Error::Serialization
 pub bitcoin::script::Error::UnknownSpentOutput(bitcoin::blockdata::transaction::OutPoint)
 pub bitcoin::script::Instruction::Op(bitcoin::blockdata::opcodes::Opcode)
 pub bitcoin::script::Instruction::PushBytes(&'a bitcoin::blockdata::script::PushBytes)
+pub bitcoin::script::RedeemScriptSizeError::size: usize
+pub bitcoin::script::WitnessScriptSizeError::size: usize
 pub bitcoin::script::witness_program::Error::InvalidLength(usize)
 pub bitcoin::script::witness_program::Error::InvalidSegwitV0Length(usize)
 pub bitcoin::script::witness_version::FromStrError::Invalid(bitcoin::blockdata::script::witness_version::TryFromError)
@@ -5724,8 +5738,10 @@ pub const bitcoin::blockdata::constants::ChainHash::TESTNET: Self
 pub const bitcoin::blockdata::constants::DIFFCHANGE_INTERVAL: u32 = 2_016u32
 pub const bitcoin::blockdata::constants::DIFFCHANGE_TIMESPAN: _
 pub const bitcoin::blockdata::constants::MAX_BLOCK_SIGOPS_COST: i64 = 80_000i64
+pub const bitcoin::blockdata::constants::MAX_REDEEM_SCRIPT_SIZE: usize = 520usize
 pub const bitcoin::blockdata::constants::MAX_SCRIPTNUM_VALUE: u32 = 2_147_483_648u32
-pub const bitcoin::blockdata::constants::MAX_SCRIPT_ELEMENT_SIZE: usize = 520usize
+pub const bitcoin::blockdata::constants::MAX_STACK_ELEMENT_SIZE: usize = 520usize
+pub const bitcoin::blockdata::constants::MAX_WITNESS_SCRIPT_SIZE: usize = 10_000usize
 pub const bitcoin::blockdata::constants::PUBKEY_ADDRESS_PREFIX_MAIN: u8 = 0u8
 pub const bitcoin::blockdata::constants::PUBKEY_ADDRESS_PREFIX_TEST: u8 = 111u8
 pub const bitcoin::blockdata::constants::SCRIPT_ADDRESS_PREFIX_MAIN: u8 = 5u8
@@ -6030,8 +6046,10 @@ pub const bitcoin::constants::COINBASE_MATURITY: u32 = 100u32
 pub const bitcoin::constants::DIFFCHANGE_INTERVAL: u32 = 2_016u32
 pub const bitcoin::constants::DIFFCHANGE_TIMESPAN: _
 pub const bitcoin::constants::MAX_BLOCK_SIGOPS_COST: i64 = 80_000i64
+pub const bitcoin::constants::MAX_REDEEM_SCRIPT_SIZE: usize = 520usize
 pub const bitcoin::constants::MAX_SCRIPTNUM_VALUE: u32 = 2_147_483_648u32
-pub const bitcoin::constants::MAX_SCRIPT_ELEMENT_SIZE: usize = 520usize
+pub const bitcoin::constants::MAX_STACK_ELEMENT_SIZE: usize = 520usize
+pub const bitcoin::constants::MAX_WITNESS_SCRIPT_SIZE: usize = 10_000usize
 pub const bitcoin::constants::PUBKEY_ADDRESS_PREFIX_MAIN: u8 = 0u8
 pub const bitcoin::constants::PUBKEY_ADDRESS_PREFIX_TEST: u8 = 111u8
 pub const bitcoin::constants::SCRIPT_ADDRESS_PREFIX_MAIN: u8 = 5u8
@@ -7112,14 +7130,15 @@ pub fn bitcoin::address::Address::is_related_to_xonly_pubkey(&self, xonly_pubkey
 pub fn bitcoin::address::Address::is_spend_standard(&self) -> bool
 pub fn bitcoin::address::Address::matches_script_pubkey(&self, script: &bitcoin::blockdata::script::Script) -> bool
 pub fn bitcoin::address::Address::p2pkh(pk: impl core::convert::Into<bitcoin::PubkeyHash>, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> bitcoin::address::Address
-pub fn bitcoin::address::Address::p2sh(script: &bitcoin::blockdata::script::Script, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> core::result::Result<bitcoin::address::Address, bitcoin::address::error::P2shError>
+pub fn bitcoin::address::Address::p2sh(redeem_script: &bitcoin::blockdata::script::Script, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> core::result::Result<bitcoin::address::Address, bitcoin::blockdata::script::RedeemScriptSizeError>
 pub fn bitcoin::address::Address::p2sh_from_hash(hash: bitcoin::blockdata::script::ScriptHash, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> bitcoin::address::Address
 pub fn bitcoin::address::Address::p2shwpkh(pk: bitcoin::CompressedPublicKey, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> bitcoin::address::Address
-pub fn bitcoin::address::Address::p2shwsh(script: &bitcoin::blockdata::script::Script, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> bitcoin::address::Address
+pub fn bitcoin::address::Address::p2shwsh(witness_script: &bitcoin::blockdata::script::Script, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> core::result::Result<bitcoin::address::Address, bitcoin::blockdata::script::WitnessScriptSizeError>
 pub fn bitcoin::address::Address::p2tr<C: secp256k1::context::Verification>(secp: &secp256k1::Secp256k1<C>, internal_key: bitcoin::key::UntweakedPublicKey, merkle_root: core::option::Option<bitcoin::taproot::TapNodeHash>, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> bitcoin::address::Address
 pub fn bitcoin::address::Address::p2tr_tweaked(output_key: bitcoin::key::TweakedPublicKey, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> bitcoin::address::Address
 pub fn bitcoin::address::Address::p2wpkh(pk: bitcoin::CompressedPublicKey, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> Self
-pub fn bitcoin::address::Address::p2wsh(script: &bitcoin::blockdata::script::Script, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> bitcoin::address::Address
+pub fn bitcoin::address::Address::p2wsh(witness_script: &bitcoin::blockdata::script::Script, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> core::result::Result<bitcoin::address::Address, bitcoin::blockdata::script::WitnessScriptSizeError>
+pub fn bitcoin::address::Address::p2wsh_from_hash(hash: bitcoin::blockdata::script::WScriptHash, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> bitcoin::address::Address
 pub fn bitcoin::address::Address::pubkey_hash(&self) -> core::option::Option<bitcoin::PubkeyHash>
 pub fn bitcoin::address::Address::script_hash(&self) -> core::option::Option<bitcoin::blockdata::script::ScriptHash>
 pub fn bitcoin::address::Address::script_pubkey(&self) -> bitcoin::blockdata::script::ScriptBuf
@@ -7194,11 +7213,6 @@ pub fn bitcoin::address::error::LegacyAddressTooLongError::invalid_legcay_addres
 pub fn bitcoin::address::error::NetworkValidationError::clone(&self) -> bitcoin::address::error::NetworkValidationError
 pub fn bitcoin::address::error::NetworkValidationError::eq(&self, other: &bitcoin::address::error::NetworkValidationError) -> bool
 pub fn bitcoin::address::error::NetworkValidationError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-pub fn bitcoin::address::error::P2shError::clone(&self) -> bitcoin::address::error::P2shError
-pub fn bitcoin::address::error::P2shError::eq(&self, other: &bitcoin::address::error::P2shError) -> bool
-pub fn bitcoin::address::error::P2shError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-pub fn bitcoin::address::error::P2shError::from(never: core::convert::Infallible) -> Self
-pub fn bitcoin::address::error::P2shError::source(&self) -> core::option::Option<&(dyn core::error::Error + 'static)>
 pub fn bitcoin::address::error::ParseError::clone(&self) -> bitcoin::address::error::ParseError
 pub fn bitcoin::address::error::ParseError::eq(&self, other: &bitcoin::address::error::ParseError) -> bool
 pub fn bitcoin::address::error::ParseError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
@@ -8143,6 +8157,10 @@ pub fn bitcoin::blockdata::script::PushBytesError::fmt(&self, f: &mut core::fmt:
 pub fn bitcoin::blockdata::script::PushBytesError::input_len(&self) -> usize
 pub fn bitcoin::blockdata::script::PushBytesError::source(&self) -> core::option::Option<&(dyn core::error::Error + 'static)>
 pub fn bitcoin::blockdata::script::PushBytesErrorReport::input_len(&self) -> usize
+pub fn bitcoin::blockdata::script::RedeemScriptSizeError::clone(&self) -> bitcoin::blockdata::script::RedeemScriptSizeError
+pub fn bitcoin::blockdata::script::RedeemScriptSizeError::eq(&self, other: &bitcoin::blockdata::script::RedeemScriptSizeError) -> bool
+pub fn bitcoin::blockdata::script::RedeemScriptSizeError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
+pub fn bitcoin::blockdata::script::RedeemScriptSizeError::from(never: core::convert::Infallible) -> Self
 pub fn bitcoin::blockdata::script::Script::as_bytes(&self) -> &[u8]
 pub fn bitcoin::blockdata::script::Script::as_mut(&mut self) -> &mut [u8]
 pub fn bitcoin::blockdata::script::Script::as_mut(&mut self) -> &mut bitcoin::blockdata::script::Script
@@ -8196,20 +8214,20 @@ pub fn bitcoin::blockdata::script::Script::p2pk_public_key(&self) -> core::optio
 pub fn bitcoin::blockdata::script::Script::p2wpkh_script_code(&self) -> core::option::Option<bitcoin::blockdata::script::ScriptBuf>
 pub fn bitcoin::blockdata::script::Script::partial_cmp(&self, other: &bitcoin::blockdata::script::Script) -> core::option::Option<core::cmp::Ordering>
 pub fn bitcoin::blockdata::script::Script::partial_cmp(&self, other: &bitcoin::blockdata::script::ScriptBuf) -> core::option::Option<core::cmp::Ordering>
-pub fn bitcoin::blockdata::script::Script::script_hash(&self) -> bitcoin::blockdata::script::ScriptHash
+pub fn bitcoin::blockdata::script::Script::script_hash(&self) -> core::result::Result<bitcoin::blockdata::script::ScriptHash, bitcoin::blockdata::script::RedeemScriptSizeError>
 pub fn bitcoin::blockdata::script::Script::serialize<S>(&self, serializer: S) -> core::result::Result<<S as serde::ser::Serializer>::Ok, <S as serde::ser::Serializer>::Error> where S: serde::ser::Serializer
 pub fn bitcoin::blockdata::script::Script::tapscript_leaf_hash(&self) -> bitcoin::taproot::TapLeafHash
 pub fn bitcoin::blockdata::script::Script::to_asm_string(&self) -> alloc::string::String
 pub fn bitcoin::blockdata::script::Script::to_bytes(&self) -> alloc::vec::Vec<u8>
 pub fn bitcoin::blockdata::script::Script::to_hex_string(&self) -> alloc::string::String
 pub fn bitcoin::blockdata::script::Script::to_owned(&self) -> Self::Owned
-pub fn bitcoin::blockdata::script::Script::to_p2sh(&self) -> bitcoin::blockdata::script::ScriptBuf
+pub fn bitcoin::blockdata::script::Script::to_p2sh(&self) -> core::result::Result<bitcoin::blockdata::script::ScriptBuf, bitcoin::blockdata::script::RedeemScriptSizeError>
 pub fn bitcoin::blockdata::script::Script::to_p2tr<C: secp256k1::context::Verification>(&self, secp: &secp256k1::Secp256k1<C>, internal_key: bitcoin::key::UntweakedPublicKey) -> bitcoin::blockdata::script::ScriptBuf
-pub fn bitcoin::blockdata::script::Script::to_p2wsh(&self) -> bitcoin::blockdata::script::ScriptBuf
+pub fn bitcoin::blockdata::script::Script::to_p2wsh(&self) -> core::result::Result<bitcoin::blockdata::script::ScriptBuf, bitcoin::blockdata::script::WitnessScriptSizeError>
 pub fn bitcoin::blockdata::script::Script::verify(&self, index: usize, amount: bitcoin_units::amount::Amount, spending_tx: &[u8]) -> core::result::Result<(), bitcoin::consensus::validation::BitcoinconsensusError>
 pub fn bitcoin::blockdata::script::Script::verify_with_flags<F: core::convert::Into<u32>>(&self, index: usize, amount: bitcoin_units::amount::Amount, spending_tx: &[u8], flags: F) -> core::result::Result<(), bitcoin::consensus::validation::BitcoinconsensusError>
 pub fn bitcoin::blockdata::script::Script::witness_version(&self) -> core::option::Option<bitcoin::blockdata::script::witness_version::WitnessVersion>
-pub fn bitcoin::blockdata::script::Script::wscript_hash(&self) -> bitcoin::blockdata::script::WScriptHash
+pub fn bitcoin::blockdata::script::Script::wscript_hash(&self) -> core::result::Result<bitcoin::blockdata::script::WScriptHash, bitcoin::blockdata::script::WitnessScriptSizeError>
 pub fn bitcoin::blockdata::script::ScriptBuf::as_mut(&mut self) -> &mut [u8]
 pub fn bitcoin::blockdata::script::ScriptBuf::as_mut(&mut self) -> &mut bitcoin::blockdata::script::Script
 pub fn bitcoin::blockdata::script::ScriptBuf::as_mut_script(&mut self) -> &mut bitcoin::blockdata::script::Script
@@ -8277,14 +8295,13 @@ pub fn bitcoin::blockdata::script::ScriptHash::engine() -> <bitcoin_hashes::hash
 pub fn bitcoin::blockdata::script::ScriptHash::eq(&self, other: &bitcoin::blockdata::script::ScriptHash) -> bool
 pub fn bitcoin::blockdata::script::ScriptHash::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
 pub fn bitcoin::blockdata::script::ScriptHash::from(inner: bitcoin_hashes::hash160::Hash) -> bitcoin::blockdata::script::ScriptHash
-pub fn bitcoin::blockdata::script::ScriptHash::from(script: &bitcoin::blockdata::script::Script) -> bitcoin::blockdata::script::ScriptHash
-pub fn bitcoin::blockdata::script::ScriptHash::from(script: &bitcoin::blockdata::script::ScriptBuf) -> bitcoin::blockdata::script::ScriptHash
-pub fn bitcoin::blockdata::script::ScriptHash::from(script: bitcoin::blockdata::script::ScriptBuf) -> bitcoin::blockdata::script::ScriptHash
 pub fn bitcoin::blockdata::script::ScriptHash::from_byte_array(bytes: <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Bytes) -> Self
 pub fn bitcoin::blockdata::script::ScriptHash::from_byte_array(bytes: Self::Bytes) -> Self
 pub fn bitcoin::blockdata::script::ScriptHash::from_engine(e: <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Engine) -> Self
 pub fn bitcoin::blockdata::script::ScriptHash::from_engine(e: <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Engine) -> bitcoin::blockdata::script::ScriptHash
 pub fn bitcoin::blockdata::script::ScriptHash::from_raw_hash(inner: bitcoin_hashes::hash160::Hash) -> bitcoin::blockdata::script::ScriptHash
+pub fn bitcoin::blockdata::script::ScriptHash::from_script(redeem_script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, bitcoin::blockdata::script::RedeemScriptSizeError>
+pub fn bitcoin::blockdata::script::ScriptHash::from_script_unchecked(script: &bitcoin::blockdata::script::Script) -> Self
 pub fn bitcoin::blockdata::script::ScriptHash::from_slice(sl: &[u8]) -> core::result::Result<bitcoin::blockdata::script::ScriptHash, bitcoin_hashes::FromSliceError>
 pub fn bitcoin::blockdata::script::ScriptHash::from_slice_delegated(sl: &[u8]) -> core::result::Result<Self, bitcoin_hashes::FromSliceError>
 pub fn bitcoin::blockdata::script::ScriptHash::from_str(s: &str) -> core::result::Result<bitcoin::blockdata::script::ScriptHash, Self::Err>
@@ -8297,6 +8314,9 @@ pub fn bitcoin::blockdata::script::ScriptHash::serialize<S: serde::ser::Serializ
 pub fn bitcoin::blockdata::script::ScriptHash::to_byte_array(self) -> <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Bytes
 pub fn bitcoin::blockdata::script::ScriptHash::to_byte_array(self) -> Self::Bytes
 pub fn bitcoin::blockdata::script::ScriptHash::to_raw_hash(self) -> bitcoin_hashes::hash160::Hash
+pub fn bitcoin::blockdata::script::ScriptHash::try_from(redeem_script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::ScriptHash::try_from(redeem_script: &bitcoin::blockdata::script::ScriptBuf) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::ScriptHash::try_from(redeem_script: bitcoin::blockdata::script::ScriptBuf) -> core::result::Result<Self, Self::Error>
 pub fn bitcoin::blockdata::script::WScriptHash::all_zeros() -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::as_byte_array(&self) -> &<bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Bytes
 pub fn bitcoin::blockdata::script::WScriptHash::as_byte_array(&self) -> &Self::Bytes
@@ -8312,14 +8332,13 @@ pub fn bitcoin::blockdata::script::WScriptHash::engine() -> <bitcoin_hashes::sha
 pub fn bitcoin::blockdata::script::WScriptHash::eq(&self, other: &bitcoin::blockdata::script::WScriptHash) -> bool
 pub fn bitcoin::blockdata::script::WScriptHash::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
 pub fn bitcoin::blockdata::script::WScriptHash::from(inner: bitcoin_hashes::sha256::Hash) -> bitcoin::blockdata::script::WScriptHash
-pub fn bitcoin::blockdata::script::WScriptHash::from(script: &bitcoin::blockdata::script::Script) -> bitcoin::blockdata::script::WScriptHash
-pub fn bitcoin::blockdata::script::WScriptHash::from(script: &bitcoin::blockdata::script::ScriptBuf) -> bitcoin::blockdata::script::WScriptHash
-pub fn bitcoin::blockdata::script::WScriptHash::from(script: bitcoin::blockdata::script::ScriptBuf) -> bitcoin::blockdata::script::WScriptHash
 pub fn bitcoin::blockdata::script::WScriptHash::from_byte_array(bytes: <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Bytes) -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::from_byte_array(bytes: Self::Bytes) -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::from_engine(e: <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Engine) -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::from_engine(e: <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Engine) -> bitcoin::blockdata::script::WScriptHash
 pub fn bitcoin::blockdata::script::WScriptHash::from_raw_hash(inner: bitcoin_hashes::sha256::Hash) -> bitcoin::blockdata::script::WScriptHash
+pub fn bitcoin::blockdata::script::WScriptHash::from_script(witness_script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, bitcoin::blockdata::script::WitnessScriptSizeError>
+pub fn bitcoin::blockdata::script::WScriptHash::from_script_unchecked(script: &bitcoin::blockdata::script::Script) -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::from_slice(sl: &[u8]) -> core::result::Result<bitcoin::blockdata::script::WScriptHash, bitcoin_hashes::FromSliceError>
 pub fn bitcoin::blockdata::script::WScriptHash::from_slice_delegated(sl: &[u8]) -> core::result::Result<Self, bitcoin_hashes::FromSliceError>
 pub fn bitcoin::blockdata::script::WScriptHash::from_str(s: &str) -> core::result::Result<bitcoin::blockdata::script::WScriptHash, Self::Err>
@@ -8332,6 +8351,13 @@ pub fn bitcoin::blockdata::script::WScriptHash::serialize<S: serde::ser::Seriali
 pub fn bitcoin::blockdata::script::WScriptHash::to_byte_array(self) -> <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Bytes
 pub fn bitcoin::blockdata::script::WScriptHash::to_byte_array(self) -> Self::Bytes
 pub fn bitcoin::blockdata::script::WScriptHash::to_raw_hash(self) -> bitcoin_hashes::sha256::Hash
+pub fn bitcoin::blockdata::script::WScriptHash::try_from(witness_script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::WScriptHash::try_from(witness_script: &bitcoin::blockdata::script::ScriptBuf) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::WScriptHash::try_from(witness_script: bitcoin::blockdata::script::ScriptBuf) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::WitnessScriptSizeError::clone(&self) -> bitcoin::blockdata::script::WitnessScriptSizeError
+pub fn bitcoin::blockdata::script::WitnessScriptSizeError::eq(&self, other: &bitcoin::blockdata::script::WitnessScriptSizeError) -> bool
+pub fn bitcoin::blockdata::script::WitnessScriptSizeError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
+pub fn bitcoin::blockdata::script::WitnessScriptSizeError::from(never: core::convert::Infallible) -> Self
 pub fn bitcoin::blockdata::script::read_scriptbool(v: &[u8]) -> bool
 pub fn bitcoin::blockdata::script::read_scriptint_non_minimal(v: &[u8]) -> core::result::Result<i64, bitcoin::blockdata::script::Error>
 pub fn bitcoin::blockdata::script::witness_program::Error::clone(&self) -> bitcoin::blockdata::script::witness_program::Error
@@ -8351,7 +8377,8 @@ pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::new(version:
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2tr<C: secp256k1::context::Verification>(secp: &secp256k1::Secp256k1<C>, internal_key: bitcoin::key::UntweakedPublicKey, merkle_root: core::option::Option<bitcoin::taproot::TapNodeHash>) -> Self
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2tr_tweaked(output_key: bitcoin::key::TweakedPublicKey) -> Self
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2wpkh(pk: bitcoin::CompressedPublicKey) -> Self
-pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2wsh(script: &bitcoin::blockdata::script::Script) -> Self
+pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2wsh(script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, bitcoin::blockdata::script::WitnessScriptSizeError>
+pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2wsh_from_hash(hash: bitcoin::blockdata::script::WScriptHash) -> Self
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::partial_cmp(&self, other: &bitcoin::blockdata::script::witness_program::WitnessProgram) -> core::option::Option<core::cmp::Ordering>
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::program(&self) -> &bitcoin::blockdata::script::PushBytes
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::version(&self) -> bitcoin::blockdata::script::witness_version::WitnessVersion
@@ -10211,9 +10238,11 @@ pub struct bitcoin::blockdata::script::InstructionIndices<'a>
 pub struct bitcoin::blockdata::script::Instructions<'a>
 pub struct bitcoin::blockdata::script::PushBytesBuf(_)
 pub struct bitcoin::blockdata::script::PushBytesError
+pub struct bitcoin::blockdata::script::RedeemScriptSizeError
 pub struct bitcoin::blockdata::script::ScriptBuf(_)
 pub struct bitcoin::blockdata::script::ScriptHash(_)
 pub struct bitcoin::blockdata::script::WScriptHash(_)
+pub struct bitcoin::blockdata::script::WitnessScriptSizeError
 pub struct bitcoin::blockdata::script::witness_program::WitnessProgram
 pub struct bitcoin::blockdata::script::witness_version::TryFromError
 pub struct bitcoin::blockdata::transaction::InputWeightPrediction
@@ -10302,9 +10331,11 @@ pub struct bitcoin::script::InstructionIndices<'a>
 pub struct bitcoin::script::Instructions<'a>
 pub struct bitcoin::script::PushBytesBuf(_)
 pub struct bitcoin::script::PushBytesError
+pub struct bitcoin::script::RedeemScriptSizeError
 pub struct bitcoin::script::ScriptBuf(_)
 pub struct bitcoin::script::ScriptHash(_)
 pub struct bitcoin::script::WScriptHash(_)
+pub struct bitcoin::script::WitnessScriptSizeError
 pub struct bitcoin::script::witness_program::WitnessProgram
 pub struct bitcoin::script::witness_version::TryFromError
 pub struct bitcoin::sighash::Annex<'a>(_)
@@ -10485,10 +10516,12 @@ pub type bitcoin::blockdata::script::ScriptBuf::Target = bitcoin::blockdata::scr
 pub type bitcoin::blockdata::script::ScriptHash::Bytes = <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Bytes
 pub type bitcoin::blockdata::script::ScriptHash::Engine = <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Engine
 pub type bitcoin::blockdata::script::ScriptHash::Err = hex_conservative::error::HexToArrayError
+pub type bitcoin::blockdata::script::ScriptHash::Error = bitcoin::blockdata::script::RedeemScriptSizeError
 pub type bitcoin::blockdata::script::ScriptHash::Output = <I as core::slice::index::SliceIndex<[u8]>>::Output
 pub type bitcoin::blockdata::script::WScriptHash::Bytes = <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Bytes
 pub type bitcoin::blockdata::script::WScriptHash::Engine = <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Engine
 pub type bitcoin::blockdata::script::WScriptHash::Err = hex_conservative::error::HexToArrayError
+pub type bitcoin::blockdata::script::WScriptHash::Error = bitcoin::blockdata::script::WitnessScriptSizeError
 pub type bitcoin::blockdata::script::WScriptHash::Output = <I as core::slice::index::SliceIndex<[u8]>>::Output
 pub type bitcoin::blockdata::script::witness_version::WitnessVersion::Err = bitcoin::blockdata::script::witness_version::FromStrError
 pub type bitcoin::blockdata::script::witness_version::WitnessVersion::Error = bitcoin::blockdata::script::witness_version::TryFromError

api/bitcoin/default-features.txt

@@ -5,10 +5,8 @@
 #[non_exhaustive] pub enum bitcoin::address::AddressType
 #[non_exhaustive] pub enum bitcoin::address::FromScriptError
 #[non_exhaustive] pub enum bitcoin::address::KnownHrp
-#[non_exhaustive] pub enum bitcoin::address::P2shError
 #[non_exhaustive] pub enum bitcoin::address::ParseError
 #[non_exhaustive] pub enum bitcoin::address::error::FromScriptError
-#[non_exhaustive] pub enum bitcoin::address::error::P2shError
 #[non_exhaustive] pub enum bitcoin::address::error::ParseError
 #[non_exhaustive] pub enum bitcoin::bip152::Error
 #[non_exhaustive] pub enum bitcoin::bip158::Error
@@ -526,7 +524,6 @@ impl core::clone::Clone for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::clone::Clone for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::clone::Clone for bitcoin::address::error::LegacyAddressTooLongError
 impl core::clone::Clone for bitcoin::address::error::NetworkValidationError
-impl core::clone::Clone for bitcoin::address::error::P2shError
 impl core::clone::Clone for bitcoin::address::error::ParseError
 impl core::clone::Clone for bitcoin::address::error::UnknownAddressTypeError
 impl core::clone::Clone for bitcoin::address::error::UnknownHrpError
@@ -571,9 +568,11 @@ impl core::clone::Clone for bitcoin::blockdata::script::Builder
 impl core::clone::Clone for bitcoin::blockdata::script::Error
 impl core::clone::Clone for bitcoin::blockdata::script::PushBytesBuf
 impl core::clone::Clone for bitcoin::blockdata::script::PushBytesError
+impl core::clone::Clone for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::clone::Clone for bitcoin::blockdata::script::ScriptBuf
 impl core::clone::Clone for bitcoin::blockdata::script::ScriptHash
 impl core::clone::Clone for bitcoin::blockdata::script::WScriptHash
+impl core::clone::Clone for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::clone::Clone for bitcoin::blockdata::script::witness_program::Error
 impl core::clone::Clone for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::clone::Clone for bitcoin::blockdata::script::witness_version::FromStrError
@@ -721,7 +720,6 @@ impl core::cmp::Eq for bitcoin::address::error::InvalidBase58PayloadLengthError
 impl core::cmp::Eq for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::cmp::Eq for bitcoin::address::error::LegacyAddressTooLongError
 impl core::cmp::Eq for bitcoin::address::error::NetworkValidationError
-impl core::cmp::Eq for bitcoin::address::error::P2shError
 impl core::cmp::Eq for bitcoin::address::error::ParseError
 impl core::cmp::Eq for bitcoin::address::error::UnknownAddressTypeError
 impl core::cmp::Eq for bitcoin::address::error::UnknownHrpError
@@ -767,10 +765,12 @@ impl core::cmp::Eq for bitcoin::blockdata::script::Error
 impl core::cmp::Eq for bitcoin::blockdata::script::PushBytes
 impl core::cmp::Eq for bitcoin::blockdata::script::PushBytesBuf
 impl core::cmp::Eq for bitcoin::blockdata::script::PushBytesError
+impl core::cmp::Eq for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::cmp::Eq for bitcoin::blockdata::script::Script
 impl core::cmp::Eq for bitcoin::blockdata::script::ScriptBuf
 impl core::cmp::Eq for bitcoin::blockdata::script::ScriptHash
 impl core::cmp::Eq for bitcoin::blockdata::script::WScriptHash
+impl core::cmp::Eq for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::cmp::Eq for bitcoin::blockdata::script::witness_program::Error
 impl core::cmp::Eq for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::cmp::Eq for bitcoin::blockdata::script::witness_version::FromStrError
@@ -1005,7 +1005,6 @@ impl core::cmp::PartialEq for bitcoin::address::error::InvalidBase58PayloadLengt
 impl core::cmp::PartialEq for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::cmp::PartialEq for bitcoin::address::error::LegacyAddressTooLongError
 impl core::cmp::PartialEq for bitcoin::address::error::NetworkValidationError
-impl core::cmp::PartialEq for bitcoin::address::error::P2shError
 impl core::cmp::PartialEq for bitcoin::address::error::ParseError
 impl core::cmp::PartialEq for bitcoin::address::error::UnknownAddressTypeError
 impl core::cmp::PartialEq for bitcoin::address::error::UnknownHrpError
@@ -1051,10 +1050,12 @@ impl core::cmp::PartialEq for bitcoin::blockdata::script::Error
 impl core::cmp::PartialEq for bitcoin::blockdata::script::PushBytes
 impl core::cmp::PartialEq for bitcoin::blockdata::script::PushBytesBuf
 impl core::cmp::PartialEq for bitcoin::blockdata::script::PushBytesError
+impl core::cmp::PartialEq for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::cmp::PartialEq for bitcoin::blockdata::script::Script
 impl core::cmp::PartialEq for bitcoin::blockdata::script::ScriptBuf
 impl core::cmp::PartialEq for bitcoin::blockdata::script::ScriptHash
 impl core::cmp::PartialEq for bitcoin::blockdata::script::WScriptHash
+impl core::cmp::PartialEq for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::cmp::PartialEq for bitcoin::blockdata::script::witness_program::Error
 impl core::cmp::PartialEq for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::cmp::PartialEq for bitcoin::blockdata::script::witness_version::FromStrError
@@ -1521,10 +1522,6 @@ impl core::convert::From<&bitcoin::PublicKey> for bitcoin::PubkeyHash
 impl core::convert::From<&bitcoin::bip32::Xpub> for bitcoin::bip32::XKeyIdentifier
 impl core::convert::From<&bitcoin::blockdata::block::Block> for bitcoin::blockdata::block::BlockHash
 impl core::convert::From<&bitcoin::blockdata::block::Header> for bitcoin::blockdata::block::BlockHash
-impl core::convert::From<&bitcoin::blockdata::script::Script> for bitcoin::blockdata::script::ScriptHash
-impl core::convert::From<&bitcoin::blockdata::script::Script> for bitcoin::blockdata::script::WScriptHash
-impl core::convert::From<&bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::ScriptHash
-impl core::convert::From<&bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::WScriptHash
 impl core::convert::From<&bitcoin::blockdata::transaction::Transaction> for bitcoin::blockdata::transaction::Txid
 impl core::convert::From<&bitcoin::blockdata::transaction::Transaction> for bitcoin::blockdata::transaction::Wtxid
 impl core::convert::From<&bitcoin::network::Network> for &'static bitcoin::consensus::params::Params
@@ -1787,8 +1784,6 @@ impl core::convert::From<bitcoin::blockdata::script::PushBytesBuf> for alloc::ve
 impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for alloc::borrow::Cow<'_, bitcoin::blockdata::script::Script>
 impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for alloc::boxed::Box<bitcoin::blockdata::script::Script>
 impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for alloc::vec::Vec<u8>
-impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::ScriptHash
-impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::WScriptHash
 impl core::convert::From<bitcoin::blockdata::script::ScriptHash> for bitcoin::blockdata::script::PushBytesBuf
 impl core::convert::From<bitcoin::blockdata::script::ScriptHash> for bitcoin_hashes::hash160::Hash
 impl core::convert::From<bitcoin::blockdata::script::WScriptHash> for bitcoin::blockdata::script::PushBytesBuf
@@ -1872,7 +1867,6 @@ impl core::convert::From<bitcoin_units::locktime::relative::Height> for bitcoin:
 impl core::convert::From<bitcoin_units::locktime::relative::Time> for bitcoin::blockdata::locktime::relative::LockTime
 impl core::convert::From<bitcoin_units::parse::ParseIntError> for bitcoin::blockdata::script::witness_version::FromStrError
 impl core::convert::From<core::convert::Infallible> for bitcoin::address::error::FromScriptError
-impl core::convert::From<core::convert::Infallible> for bitcoin::address::error::P2shError
 impl core::convert::From<core::convert::Infallible> for bitcoin::address::error::ParseError
 impl core::convert::From<core::convert::Infallible> for bitcoin::bip152::Error
 impl core::convert::From<core::convert::Infallible> for bitcoin::bip158::Error
@@ -1880,6 +1874,8 @@ impl core::convert::From<core::convert::Infallible> for bitcoin::bip32::Error
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::block::Bip34Error
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::block::ValidationError
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::Error
+impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::RedeemScriptSizeError
+impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::witness_program::Error
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::witness_version::FromStrError
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::witness_version::TryFromInstructionError
@@ -1926,6 +1922,10 @@ impl core::convert::From<u8> for bitcoin::blockdata::opcodes::Opcode
 impl core::convert::From<u8> for bitcoin::consensus::encode::VarInt
 impl core::convert::From<usize> for bitcoin::consensus::encode::VarInt
 impl core::convert::TryFrom<&[bitcoin::taproot::TapNodeHash]> for bitcoin::taproot::merkle_branch::TaprootMerkleBranch
+impl core::convert::TryFrom<&bitcoin::blockdata::script::Script> for bitcoin::blockdata::script::ScriptHash
+impl core::convert::TryFrom<&bitcoin::blockdata::script::Script> for bitcoin::blockdata::script::WScriptHash
+impl core::convert::TryFrom<&bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::ScriptHash
+impl core::convert::TryFrom<&bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::WScriptHash
 impl core::convert::TryFrom<&str> for bitcoin::blockdata::locktime::absolute::LockTime
 impl core::convert::TryFrom<&str> for bitcoin::blockdata::transaction::Sequence
 impl core::convert::TryFrom<alloc::boxed::Box<[bitcoin::taproot::TapNodeHash]>> for bitcoin::taproot::merkle_branch::TaprootMerkleBranch
@@ -1941,6 +1941,8 @@ impl core::convert::TryFrom<bech32::primitives::gf32::Fe32> for bitcoin::blockda
 impl core::convert::TryFrom<bitcoin::PublicKey> for bitcoin::CompressedPublicKey
 impl core::convert::TryFrom<bitcoin::blockdata::constants::ChainHash> for bitcoin::network::Network
 impl core::convert::TryFrom<bitcoin::blockdata::opcodes::Opcode> for bitcoin::blockdata::script::witness_version::WitnessVersion
+impl core::convert::TryFrom<bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::ScriptHash
+impl core::convert::TryFrom<bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::WScriptHash
 impl core::convert::TryFrom<bitcoin::blockdata::transaction::Sequence> for bitcoin::blockdata::locktime::relative::LockTime
 impl core::convert::TryFrom<bitcoin::p2p::Magic> for bitcoin::network::Network
 impl core::convert::TryFrom<bitcoin::taproot::NodeInfo> for bitcoin::taproot::TapTree
@@ -1974,7 +1976,6 @@ impl core::error::Error for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::error::Error for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::error::Error for bitcoin::address::error::LegacyAddressTooLongError
 impl core::error::Error for bitcoin::address::error::NetworkValidationError
-impl core::error::Error for bitcoin::address::error::P2shError
 impl core::error::Error for bitcoin::address::error::ParseError
 impl core::error::Error for bitcoin::address::error::UnknownAddressTypeError
 impl core::error::Error for bitcoin::address::error::UnknownHrpError
@@ -1990,6 +1991,8 @@ impl core::error::Error for bitcoin::blockdata::locktime::relative::Incompatible
 impl core::error::Error for bitcoin::blockdata::locktime::relative::IncompatibleTimeError
 impl core::error::Error for bitcoin::blockdata::script::Error
 impl core::error::Error for bitcoin::blockdata::script::PushBytesError
+impl core::error::Error for bitcoin::blockdata::script::RedeemScriptSizeError
+impl core::error::Error for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::error::Error for bitcoin::blockdata::script::witness_program::Error
 impl core::error::Error for bitcoin::blockdata::script::witness_version::FromStrError
 impl core::error::Error for bitcoin::blockdata::script::witness_version::TryFromError
@@ -2056,7 +2059,6 @@ impl core::fmt::Debug for bitcoin::address::error::InvalidBase58PayloadLengthErr
 impl core::fmt::Debug for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::fmt::Debug for bitcoin::address::error::LegacyAddressTooLongError
 impl core::fmt::Debug for bitcoin::address::error::NetworkValidationError
-impl core::fmt::Debug for bitcoin::address::error::P2shError
 impl core::fmt::Debug for bitcoin::address::error::ParseError
 impl core::fmt::Debug for bitcoin::address::error::UnknownAddressTypeError
 impl core::fmt::Debug for bitcoin::address::error::UnknownHrpError
@@ -2103,10 +2105,12 @@ impl core::fmt::Debug for bitcoin::blockdata::script::Error
 impl core::fmt::Debug for bitcoin::blockdata::script::PushBytes
 impl core::fmt::Debug for bitcoin::blockdata::script::PushBytesBuf
 impl core::fmt::Debug for bitcoin::blockdata::script::PushBytesError
+impl core::fmt::Debug for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::fmt::Debug for bitcoin::blockdata::script::Script
 impl core::fmt::Debug for bitcoin::blockdata::script::ScriptBuf
 impl core::fmt::Debug for bitcoin::blockdata::script::ScriptHash
 impl core::fmt::Debug for bitcoin::blockdata::script::WScriptHash
+impl core::fmt::Debug for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::fmt::Debug for bitcoin::blockdata::script::witness_program::Error
 impl core::fmt::Debug for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::fmt::Debug for bitcoin::blockdata::script::witness_version::FromStrError
@@ -2250,7 +2254,6 @@ impl core::fmt::Display for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::fmt::Display for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::fmt::Display for bitcoin::address::error::LegacyAddressTooLongError
 impl core::fmt::Display for bitcoin::address::error::NetworkValidationError
-impl core::fmt::Display for bitcoin::address::error::P2shError
 impl core::fmt::Display for bitcoin::address::error::ParseError
 impl core::fmt::Display for bitcoin::address::error::UnknownAddressTypeError
 impl core::fmt::Display for bitcoin::address::error::UnknownHrpError
@@ -2285,10 +2288,12 @@ impl core::fmt::Display for bitcoin::blockdata::opcodes::Opcode
 impl core::fmt::Display for bitcoin::blockdata::script::Builder
 impl core::fmt::Display for bitcoin::blockdata::script::Error
 impl core::fmt::Display for bitcoin::blockdata::script::PushBytesError
+impl core::fmt::Display for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::fmt::Display for bitcoin::blockdata::script::Script
 impl core::fmt::Display for bitcoin::blockdata::script::ScriptBuf
 impl core::fmt::Display for bitcoin::blockdata::script::ScriptHash
 impl core::fmt::Display for bitcoin::blockdata::script::WScriptHash
+impl core::fmt::Display for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::fmt::Display for bitcoin::blockdata::script::witness_program::Error
 impl core::fmt::Display for bitcoin::blockdata::script::witness_version::FromStrError
 impl core::fmt::Display for bitcoin::blockdata::script::witness_version::TryFromError
@@ -2639,7 +2644,6 @@ impl core::marker::Freeze for bitcoin::address::error::InvalidBase58PayloadLengt
 impl core::marker::Freeze for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::Freeze for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::Freeze for bitcoin::address::error::NetworkValidationError
-impl core::marker::Freeze for bitcoin::address::error::P2shError
 impl core::marker::Freeze for bitcoin::address::error::ParseError
 impl core::marker::Freeze for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::Freeze for bitcoin::address::error::UnknownHrpError
@@ -2688,10 +2692,12 @@ impl core::marker::Freeze for bitcoin::blockdata::script::Error
 impl core::marker::Freeze for bitcoin::blockdata::script::PushBytes
 impl core::marker::Freeze for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::Freeze for bitcoin::blockdata::script::PushBytesError
+impl core::marker::Freeze for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::Freeze for bitcoin::blockdata::script::Script
 impl core::marker::Freeze for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::Freeze for bitcoin::blockdata::script::ScriptHash
 impl core::marker::Freeze for bitcoin::blockdata::script::WScriptHash
+impl core::marker::Freeze for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::Freeze for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::Freeze for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::Freeze for bitcoin::blockdata::script::witness_version::FromStrError
@@ -2843,7 +2849,6 @@ impl core::marker::Send for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::marker::Send for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::Send for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::Send for bitcoin::address::error::NetworkValidationError
-impl core::marker::Send for bitcoin::address::error::P2shError
 impl core::marker::Send for bitcoin::address::error::ParseError
 impl core::marker::Send for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::Send for bitcoin::address::error::UnknownHrpError
@@ -2892,10 +2897,12 @@ impl core::marker::Send for bitcoin::blockdata::script::Error
 impl core::marker::Send for bitcoin::blockdata::script::PushBytes
 impl core::marker::Send for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::Send for bitcoin::blockdata::script::PushBytesError
+impl core::marker::Send for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::Send for bitcoin::blockdata::script::Script
 impl core::marker::Send for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::Send for bitcoin::blockdata::script::ScriptHash
 impl core::marker::Send for bitcoin::blockdata::script::WScriptHash
+impl core::marker::Send for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::Send for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::Send for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::Send for bitcoin::blockdata::script::witness_version::FromStrError
@@ -3047,7 +3054,6 @@ impl core::marker::StructuralPartialEq for bitcoin::address::error::InvalidBase5
 impl core::marker::StructuralPartialEq for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::NetworkValidationError
-impl core::marker::StructuralPartialEq for bitcoin::address::error::P2shError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::ParseError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::UnknownHrpError
@@ -3093,10 +3099,12 @@ impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::Error
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::PushBytes
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::PushBytesError
+impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::Script
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::ScriptHash
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::WScriptHash
+impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::witness_version::FromStrError
@@ -3238,7 +3246,6 @@ impl core::marker::Sync for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::marker::Sync for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::Sync for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::Sync for bitcoin::address::error::NetworkValidationError
-impl core::marker::Sync for bitcoin::address::error::P2shError
 impl core::marker::Sync for bitcoin::address::error::ParseError
 impl core::marker::Sync for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::Sync for bitcoin::address::error::UnknownHrpError
@@ -3287,10 +3294,12 @@ impl core::marker::Sync for bitcoin::blockdata::script::Error
 impl core::marker::Sync for bitcoin::blockdata::script::PushBytes
 impl core::marker::Sync for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::Sync for bitcoin::blockdata::script::PushBytesError
+impl core::marker::Sync for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::Sync for bitcoin::blockdata::script::Script
 impl core::marker::Sync for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::Sync for bitcoin::blockdata::script::ScriptHash
 impl core::marker::Sync for bitcoin::blockdata::script::WScriptHash
+impl core::marker::Sync for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::Sync for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::Sync for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::Sync for bitcoin::blockdata::script::witness_version::FromStrError
@@ -3442,7 +3451,6 @@ impl core::marker::Unpin for bitcoin::address::error::InvalidBase58PayloadLength
 impl core::marker::Unpin for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::Unpin for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::Unpin for bitcoin::address::error::NetworkValidationError
-impl core::marker::Unpin for bitcoin::address::error::P2shError
 impl core::marker::Unpin for bitcoin::address::error::ParseError
 impl core::marker::Unpin for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::Unpin for bitcoin::address::error::UnknownHrpError
@@ -3491,10 +3499,12 @@ impl core::marker::Unpin for bitcoin::blockdata::script::Error
 impl core::marker::Unpin for bitcoin::blockdata::script::PushBytes
 impl core::marker::Unpin for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::Unpin for bitcoin::blockdata::script::PushBytesError
+impl core::marker::Unpin for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::Unpin for bitcoin::blockdata::script::Script
 impl core::marker::Unpin for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::Unpin for bitcoin::blockdata::script::ScriptHash
 impl core::marker::Unpin for bitcoin::blockdata::script::WScriptHash
+impl core::marker::Unpin for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::Unpin for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::Unpin for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::Unpin for bitcoin::blockdata::script::witness_version::FromStrError
@@ -3678,7 +3688,6 @@ impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::Invali
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::LegacyAddressTooLongError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::NetworkValidationError
-impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::P2shError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::ParseError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::UnknownAddressTypeError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::UnknownHrpError
@@ -3726,10 +3735,12 @@ impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::Err
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::PushBytes
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::PushBytesBuf
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::PushBytesError
+impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::Script
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::ScriptBuf
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::ScriptHash
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::WScriptHash
+impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::witness_program::Error
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::witness_version::FromStrError
@@ -3878,7 +3889,6 @@ impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::InvalidBa
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::LegacyAddressTooLongError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::NetworkValidationError
-impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::P2shError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::ParseError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::UnknownAddressTypeError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::UnknownHrpError
@@ -3926,10 +3936,12 @@ impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::Error
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::PushBytes
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::PushBytesBuf
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::PushBytesError
+impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::Script
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::ScriptBuf
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::ScriptHash
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::WScriptHash
+impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::witness_program::Error
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::witness_version::FromStrError
@@ -4727,7 +4739,6 @@ pub bitcoin::address::FromScriptError::WitnessVersion(bitcoin::blockdata::script
 pub bitcoin::address::KnownHrp::Mainnet
 pub bitcoin::address::KnownHrp::Regtest
 pub bitcoin::address::KnownHrp::Testnets
-pub bitcoin::address::P2shError::ExcessiveScriptSize
 pub bitcoin::address::ParseError::Base58(base58ck::error::Error)
 pub bitcoin::address::ParseError::Bech32(bech32::segwit::DecodeError)
 pub bitcoin::address::ParseError::InvalidBase58PayloadLength(bitcoin::address::error::InvalidBase58PayloadLengthError)
@@ -4740,7 +4751,6 @@ pub bitcoin::address::ParseError::WitnessVersion(bitcoin::blockdata::script::wit
 pub bitcoin::address::error::FromScriptError::UnrecognizedScript
 pub bitcoin::address::error::FromScriptError::WitnessProgram(bitcoin::blockdata::script::witness_program::Error)
 pub bitcoin::address::error::FromScriptError::WitnessVersion(bitcoin::blockdata::script::witness_version::TryFromError)
-pub bitcoin::address::error::P2shError::ExcessiveScriptSize
 pub bitcoin::address::error::ParseError::Base58(base58ck::error::Error)
 pub bitcoin::address::error::ParseError::Bech32(bech32::segwit::DecodeError)
 pub bitcoin::address::error::ParseError::InvalidBase58PayloadLength(bitcoin::address::error::InvalidBase58PayloadLengthError)
@@ -4844,6 +4854,8 @@ pub bitcoin::blockdata::script::Error::Serialization
 pub bitcoin::blockdata::script::Error::UnknownSpentOutput(bitcoin::blockdata::transaction::OutPoint)
 pub bitcoin::blockdata::script::Instruction::Op(bitcoin::blockdata::opcodes::Opcode)
 pub bitcoin::blockdata::script::Instruction::PushBytes(&'a bitcoin::blockdata::script::PushBytes)
+pub bitcoin::blockdata::script::RedeemScriptSizeError::size: usize
+pub bitcoin::blockdata::script::WitnessScriptSizeError::size: usize
 pub bitcoin::blockdata::script::witness_program::Error::InvalidLength(usize)
 pub bitcoin::blockdata::script::witness_program::Error::InvalidSegwitV0Length(usize)
 pub bitcoin::blockdata::script::witness_version::FromStrError::Invalid(bitcoin::blockdata::script::witness_version::TryFromError)
@@ -5259,6 +5271,8 @@ pub bitcoin::script::Error::Serialization
 pub bitcoin::script::Error::UnknownSpentOutput(bitcoin::blockdata::transaction::OutPoint)
 pub bitcoin::script::Instruction::Op(bitcoin::blockdata::opcodes::Opcode)
 pub bitcoin::script::Instruction::PushBytes(&'a bitcoin::blockdata::script::PushBytes)
+pub bitcoin::script::RedeemScriptSizeError::size: usize
+pub bitcoin::script::WitnessScriptSizeError::size: usize
 pub bitcoin::script::witness_program::Error::InvalidLength(usize)
 pub bitcoin::script::witness_program::Error::InvalidSegwitV0Length(usize)
 pub bitcoin::script::witness_version::FromStrError::Invalid(bitcoin::blockdata::script::witness_version::TryFromError)
@@ -5430,8 +5444,10 @@ pub const bitcoin::blockdata::constants::ChainHash::TESTNET: Self
 pub const bitcoin::blockdata::constants::DIFFCHANGE_INTERVAL: u32 = 2_016u32
 pub const bitcoin::blockdata::constants::DIFFCHANGE_TIMESPAN: _
 pub const bitcoin::blockdata::constants::MAX_BLOCK_SIGOPS_COST: i64 = 80_000i64
+pub const bitcoin::blockdata::constants::MAX_REDEEM_SCRIPT_SIZE: usize = 520usize
 pub const bitcoin::blockdata::constants::MAX_SCRIPTNUM_VALUE: u32 = 2_147_483_648u32
-pub const bitcoin::blockdata::constants::MAX_SCRIPT_ELEMENT_SIZE: usize = 520usize
+pub const bitcoin::blockdata::constants::MAX_STACK_ELEMENT_SIZE: usize = 520usize
+pub const bitcoin::blockdata::constants::MAX_WITNESS_SCRIPT_SIZE: usize = 10_000usize
 pub const bitcoin::blockdata::constants::PUBKEY_ADDRESS_PREFIX_MAIN: u8 = 0u8
 pub const bitcoin::blockdata::constants::PUBKEY_ADDRESS_PREFIX_TEST: u8 = 111u8
 pub const bitcoin::blockdata::constants::SCRIPT_ADDRESS_PREFIX_MAIN: u8 = 5u8
@@ -5732,8 +5748,10 @@ pub const bitcoin::constants::COINBASE_MATURITY: u32 = 100u32
 pub const bitcoin::constants::DIFFCHANGE_INTERVAL: u32 = 2_016u32
 pub const bitcoin::constants::DIFFCHANGE_TIMESPAN: _
 pub const bitcoin::constants::MAX_BLOCK_SIGOPS_COST: i64 = 80_000i64
+pub const bitcoin::constants::MAX_REDEEM_SCRIPT_SIZE: usize = 520usize
 pub const bitcoin::constants::MAX_SCRIPTNUM_VALUE: u32 = 2_147_483_648u32
-pub const bitcoin::constants::MAX_SCRIPT_ELEMENT_SIZE: usize = 520usize
+pub const bitcoin::constants::MAX_STACK_ELEMENT_SIZE: usize = 520usize
+pub const bitcoin::constants::MAX_WITNESS_SCRIPT_SIZE: usize = 10_000usize
 pub const bitcoin::constants::PUBKEY_ADDRESS_PREFIX_MAIN: u8 = 0u8
 pub const bitcoin::constants::PUBKEY_ADDRESS_PREFIX_TEST: u8 = 111u8
 pub const bitcoin::constants::SCRIPT_ADDRESS_PREFIX_MAIN: u8 = 5u8
@@ -6780,14 +6798,15 @@ pub fn bitcoin::address::Address::is_related_to_xonly_pubkey(&self, xonly_pubkey
 pub fn bitcoin::address::Address::is_spend_standard(&self) -> bool
 pub fn bitcoin::address::Address::matches_script_pubkey(&self, script: &bitcoin::blockdata::script::Script) -> bool
 pub fn bitcoin::address::Address::p2pkh(pk: impl core::convert::Into<bitcoin::PubkeyHash>, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> bitcoin::address::Address
-pub fn bitcoin::address::Address::p2sh(script: &bitcoin::blockdata::script::Script, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> core::result::Result<bitcoin::address::Address, bitcoin::address::error::P2shError>
+pub fn bitcoin::address::Address::p2sh(redeem_script: &bitcoin::blockdata::script::Script, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> core::result::Result<bitcoin::address::Address, bitcoin::blockdata::script::RedeemScriptSizeError>
 pub fn bitcoin::address::Address::p2sh_from_hash(hash: bitcoin::blockdata::script::ScriptHash, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> bitcoin::address::Address
 pub fn bitcoin::address::Address::p2shwpkh(pk: bitcoin::CompressedPublicKey, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> bitcoin::address::Address
-pub fn bitcoin::address::Address::p2shwsh(script: &bitcoin::blockdata::script::Script, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> bitcoin::address::Address
+pub fn bitcoin::address::Address::p2shwsh(witness_script: &bitcoin::blockdata::script::Script, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> core::result::Result<bitcoin::address::Address, bitcoin::blockdata::script::WitnessScriptSizeError>
 pub fn bitcoin::address::Address::p2tr<C: secp256k1::context::Verification>(secp: &secp256k1::Secp256k1<C>, internal_key: bitcoin::key::UntweakedPublicKey, merkle_root: core::option::Option<bitcoin::taproot::TapNodeHash>, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> bitcoin::address::Address
 pub fn bitcoin::address::Address::p2tr_tweaked(output_key: bitcoin::key::TweakedPublicKey, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> bitcoin::address::Address
 pub fn bitcoin::address::Address::p2wpkh(pk: bitcoin::CompressedPublicKey, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> Self
-pub fn bitcoin::address::Address::p2wsh(script: &bitcoin::blockdata::script::Script, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> bitcoin::address::Address
+pub fn bitcoin::address::Address::p2wsh(witness_script: &bitcoin::blockdata::script::Script, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> core::result::Result<bitcoin::address::Address, bitcoin::blockdata::script::WitnessScriptSizeError>
+pub fn bitcoin::address::Address::p2wsh_from_hash(hash: bitcoin::blockdata::script::WScriptHash, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> bitcoin::address::Address
 pub fn bitcoin::address::Address::pubkey_hash(&self) -> core::option::Option<bitcoin::PubkeyHash>
 pub fn bitcoin::address::Address::script_hash(&self) -> core::option::Option<bitcoin::blockdata::script::ScriptHash>
 pub fn bitcoin::address::Address::script_pubkey(&self) -> bitcoin::blockdata::script::ScriptBuf
@@ -6860,11 +6879,6 @@ pub fn bitcoin::address::error::LegacyAddressTooLongError::invalid_legcay_addres
 pub fn bitcoin::address::error::NetworkValidationError::clone(&self) -> bitcoin::address::error::NetworkValidationError
 pub fn bitcoin::address::error::NetworkValidationError::eq(&self, other: &bitcoin::address::error::NetworkValidationError) -> bool
 pub fn bitcoin::address::error::NetworkValidationError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-pub fn bitcoin::address::error::P2shError::clone(&self) -> bitcoin::address::error::P2shError
-pub fn bitcoin::address::error::P2shError::eq(&self, other: &bitcoin::address::error::P2shError) -> bool
-pub fn bitcoin::address::error::P2shError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-pub fn bitcoin::address::error::P2shError::from(never: core::convert::Infallible) -> Self
-pub fn bitcoin::address::error::P2shError::source(&self) -> core::option::Option<&(dyn core::error::Error + 'static)>
 pub fn bitcoin::address::error::ParseError::clone(&self) -> bitcoin::address::error::ParseError
 pub fn bitcoin::address::error::ParseError::eq(&self, other: &bitcoin::address::error::ParseError) -> bool
 pub fn bitcoin::address::error::ParseError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
@@ -7759,6 +7773,10 @@ pub fn bitcoin::blockdata::script::PushBytesError::fmt(&self, f: &mut core::fmt:
 pub fn bitcoin::blockdata::script::PushBytesError::input_len(&self) -> usize
 pub fn bitcoin::blockdata::script::PushBytesError::source(&self) -> core::option::Option<&(dyn core::error::Error + 'static)>
 pub fn bitcoin::blockdata::script::PushBytesErrorReport::input_len(&self) -> usize
+pub fn bitcoin::blockdata::script::RedeemScriptSizeError::clone(&self) -> bitcoin::blockdata::script::RedeemScriptSizeError
+pub fn bitcoin::blockdata::script::RedeemScriptSizeError::eq(&self, other: &bitcoin::blockdata::script::RedeemScriptSizeError) -> bool
+pub fn bitcoin::blockdata::script::RedeemScriptSizeError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
+pub fn bitcoin::blockdata::script::RedeemScriptSizeError::from(never: core::convert::Infallible) -> Self
 pub fn bitcoin::blockdata::script::Script::as_bytes(&self) -> &[u8]
 pub fn bitcoin::blockdata::script::Script::as_mut(&mut self) -> &mut [u8]
 pub fn bitcoin::blockdata::script::Script::as_mut(&mut self) -> &mut bitcoin::blockdata::script::Script
@@ -7812,17 +7830,17 @@ pub fn bitcoin::blockdata::script::Script::p2pk_public_key(&self) -> core::optio
 pub fn bitcoin::blockdata::script::Script::p2wpkh_script_code(&self) -> core::option::Option<bitcoin::blockdata::script::ScriptBuf>
 pub fn bitcoin::blockdata::script::Script::partial_cmp(&self, other: &bitcoin::blockdata::script::Script) -> core::option::Option<core::cmp::Ordering>
 pub fn bitcoin::blockdata::script::Script::partial_cmp(&self, other: &bitcoin::blockdata::script::ScriptBuf) -> core::option::Option<core::cmp::Ordering>
-pub fn bitcoin::blockdata::script::Script::script_hash(&self) -> bitcoin::blockdata::script::ScriptHash
+pub fn bitcoin::blockdata::script::Script::script_hash(&self) -> core::result::Result<bitcoin::blockdata::script::ScriptHash, bitcoin::blockdata::script::RedeemScriptSizeError>
 pub fn bitcoin::blockdata::script::Script::tapscript_leaf_hash(&self) -> bitcoin::taproot::TapLeafHash
 pub fn bitcoin::blockdata::script::Script::to_asm_string(&self) -> alloc::string::String
 pub fn bitcoin::blockdata::script::Script::to_bytes(&self) -> alloc::vec::Vec<u8>
 pub fn bitcoin::blockdata::script::Script::to_hex_string(&self) -> alloc::string::String
 pub fn bitcoin::blockdata::script::Script::to_owned(&self) -> Self::Owned
-pub fn bitcoin::blockdata::script::Script::to_p2sh(&self) -> bitcoin::blockdata::script::ScriptBuf
+pub fn bitcoin::blockdata::script::Script::to_p2sh(&self) -> core::result::Result<bitcoin::blockdata::script::ScriptBuf, bitcoin::blockdata::script::RedeemScriptSizeError>
 pub fn bitcoin::blockdata::script::Script::to_p2tr<C: secp256k1::context::Verification>(&self, secp: &secp256k1::Secp256k1<C>, internal_key: bitcoin::key::UntweakedPublicKey) -> bitcoin::blockdata::script::ScriptBuf
-pub fn bitcoin::blockdata::script::Script::to_p2wsh(&self) -> bitcoin::blockdata::script::ScriptBuf
+pub fn bitcoin::blockdata::script::Script::to_p2wsh(&self) -> core::result::Result<bitcoin::blockdata::script::ScriptBuf, bitcoin::blockdata::script::WitnessScriptSizeError>
 pub fn bitcoin::blockdata::script::Script::witness_version(&self) -> core::option::Option<bitcoin::blockdata::script::witness_version::WitnessVersion>
-pub fn bitcoin::blockdata::script::Script::wscript_hash(&self) -> bitcoin::blockdata::script::WScriptHash
+pub fn bitcoin::blockdata::script::Script::wscript_hash(&self) -> core::result::Result<bitcoin::blockdata::script::WScriptHash, bitcoin::blockdata::script::WitnessScriptSizeError>
 pub fn bitcoin::blockdata::script::ScriptBuf::as_mut(&mut self) -> &mut [u8]
 pub fn bitcoin::blockdata::script::ScriptBuf::as_mut(&mut self) -> &mut bitcoin::blockdata::script::Script
 pub fn bitcoin::blockdata::script::ScriptBuf::as_mut_script(&mut self) -> &mut bitcoin::blockdata::script::Script
@@ -7887,14 +7905,13 @@ pub fn bitcoin::blockdata::script::ScriptHash::engine() -> <bitcoin_hashes::hash
 pub fn bitcoin::blockdata::script::ScriptHash::eq(&self, other: &bitcoin::blockdata::script::ScriptHash) -> bool
 pub fn bitcoin::blockdata::script::ScriptHash::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
 pub fn bitcoin::blockdata::script::ScriptHash::from(inner: bitcoin_hashes::hash160::Hash) -> bitcoin::blockdata::script::ScriptHash
-pub fn bitcoin::blockdata::script::ScriptHash::from(script: &bitcoin::blockdata::script::Script) -> bitcoin::blockdata::script::ScriptHash
-pub fn bitcoin::blockdata::script::ScriptHash::from(script: &bitcoin::blockdata::script::ScriptBuf) -> bitcoin::blockdata::script::ScriptHash
-pub fn bitcoin::blockdata::script::ScriptHash::from(script: bitcoin::blockdata::script::ScriptBuf) -> bitcoin::blockdata::script::ScriptHash
 pub fn bitcoin::blockdata::script::ScriptHash::from_byte_array(bytes: <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Bytes) -> Self
 pub fn bitcoin::blockdata::script::ScriptHash::from_byte_array(bytes: Self::Bytes) -> Self
 pub fn bitcoin::blockdata::script::ScriptHash::from_engine(e: <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Engine) -> Self
 pub fn bitcoin::blockdata::script::ScriptHash::from_engine(e: <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Engine) -> bitcoin::blockdata::script::ScriptHash
 pub fn bitcoin::blockdata::script::ScriptHash::from_raw_hash(inner: bitcoin_hashes::hash160::Hash) -> bitcoin::blockdata::script::ScriptHash
+pub fn bitcoin::blockdata::script::ScriptHash::from_script(redeem_script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, bitcoin::blockdata::script::RedeemScriptSizeError>
+pub fn bitcoin::blockdata::script::ScriptHash::from_script_unchecked(script: &bitcoin::blockdata::script::Script) -> Self
 pub fn bitcoin::blockdata::script::ScriptHash::from_slice(sl: &[u8]) -> core::result::Result<bitcoin::blockdata::script::ScriptHash, bitcoin_hashes::FromSliceError>
 pub fn bitcoin::blockdata::script::ScriptHash::from_str(s: &str) -> core::result::Result<bitcoin::blockdata::script::ScriptHash, Self::Err>
 pub fn bitcoin::blockdata::script::ScriptHash::hash(data: &[u8]) -> Self
@@ -7905,6 +7922,9 @@ pub fn bitcoin::blockdata::script::ScriptHash::partial_cmp(&self, other: &bitcoi
 pub fn bitcoin::blockdata::script::ScriptHash::to_byte_array(self) -> <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Bytes
 pub fn bitcoin::blockdata::script::ScriptHash::to_byte_array(self) -> Self::Bytes
 pub fn bitcoin::blockdata::script::ScriptHash::to_raw_hash(self) -> bitcoin_hashes::hash160::Hash
+pub fn bitcoin::blockdata::script::ScriptHash::try_from(redeem_script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::ScriptHash::try_from(redeem_script: &bitcoin::blockdata::script::ScriptBuf) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::ScriptHash::try_from(redeem_script: bitcoin::blockdata::script::ScriptBuf) -> core::result::Result<Self, Self::Error>
 pub fn bitcoin::blockdata::script::WScriptHash::all_zeros() -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::as_byte_array(&self) -> &<bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Bytes
 pub fn bitcoin::blockdata::script::WScriptHash::as_byte_array(&self) -> &Self::Bytes
@@ -7919,14 +7939,13 @@ pub fn bitcoin::blockdata::script::WScriptHash::engine() -> <bitcoin_hashes::sha
 pub fn bitcoin::blockdata::script::WScriptHash::eq(&self, other: &bitcoin::blockdata::script::WScriptHash) -> bool
 pub fn bitcoin::blockdata::script::WScriptHash::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
 pub fn bitcoin::blockdata::script::WScriptHash::from(inner: bitcoin_hashes::sha256::Hash) -> bitcoin::blockdata::script::WScriptHash
-pub fn bitcoin::blockdata::script::WScriptHash::from(script: &bitcoin::blockdata::script::Script) -> bitcoin::blockdata::script::WScriptHash
-pub fn bitcoin::blockdata::script::WScriptHash::from(script: &bitcoin::blockdata::script::ScriptBuf) -> bitcoin::blockdata::script::WScriptHash
-pub fn bitcoin::blockdata::script::WScriptHash::from(script: bitcoin::blockdata::script::ScriptBuf) -> bitcoin::blockdata::script::WScriptHash
 pub fn bitcoin::blockdata::script::WScriptHash::from_byte_array(bytes: <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Bytes) -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::from_byte_array(bytes: Self::Bytes) -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::from_engine(e: <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Engine) -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::from_engine(e: <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Engine) -> bitcoin::blockdata::script::WScriptHash
 pub fn bitcoin::blockdata::script::WScriptHash::from_raw_hash(inner: bitcoin_hashes::sha256::Hash) -> bitcoin::blockdata::script::WScriptHash
+pub fn bitcoin::blockdata::script::WScriptHash::from_script(witness_script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, bitcoin::blockdata::script::WitnessScriptSizeError>
+pub fn bitcoin::blockdata::script::WScriptHash::from_script_unchecked(script: &bitcoin::blockdata::script::Script) -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::from_slice(sl: &[u8]) -> core::result::Result<bitcoin::blockdata::script::WScriptHash, bitcoin_hashes::FromSliceError>
 pub fn bitcoin::blockdata::script::WScriptHash::from_str(s: &str) -> core::result::Result<bitcoin::blockdata::script::WScriptHash, Self::Err>
 pub fn bitcoin::blockdata::script::WScriptHash::hash(data: &[u8]) -> Self
@@ -7937,6 +7956,13 @@ pub fn bitcoin::blockdata::script::WScriptHash::partial_cmp(&self, other: &bitco
 pub fn bitcoin::blockdata::script::WScriptHash::to_byte_array(self) -> <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Bytes
 pub fn bitcoin::blockdata::script::WScriptHash::to_byte_array(self) -> Self::Bytes
 pub fn bitcoin::blockdata::script::WScriptHash::to_raw_hash(self) -> bitcoin_hashes::sha256::Hash
+pub fn bitcoin::blockdata::script::WScriptHash::try_from(witness_script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::WScriptHash::try_from(witness_script: &bitcoin::blockdata::script::ScriptBuf) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::WScriptHash::try_from(witness_script: bitcoin::blockdata::script::ScriptBuf) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::WitnessScriptSizeError::clone(&self) -> bitcoin::blockdata::script::WitnessScriptSizeError
+pub fn bitcoin::blockdata::script::WitnessScriptSizeError::eq(&self, other: &bitcoin::blockdata::script::WitnessScriptSizeError) -> bool
+pub fn bitcoin::blockdata::script::WitnessScriptSizeError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
+pub fn bitcoin::blockdata::script::WitnessScriptSizeError::from(never: core::convert::Infallible) -> Self
 pub fn bitcoin::blockdata::script::read_scriptbool(v: &[u8]) -> bool
 pub fn bitcoin::blockdata::script::read_scriptint_non_minimal(v: &[u8]) -> core::result::Result<i64, bitcoin::blockdata::script::Error>
 pub fn bitcoin::blockdata::script::witness_program::Error::clone(&self) -> bitcoin::blockdata::script::witness_program::Error
@@ -7956,7 +7982,8 @@ pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::new(version:
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2tr<C: secp256k1::context::Verification>(secp: &secp256k1::Secp256k1<C>, internal_key: bitcoin::key::UntweakedPublicKey, merkle_root: core::option::Option<bitcoin::taproot::TapNodeHash>) -> Self
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2tr_tweaked(output_key: bitcoin::key::TweakedPublicKey) -> Self
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2wpkh(pk: bitcoin::CompressedPublicKey) -> Self
-pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2wsh(script: &bitcoin::blockdata::script::Script) -> Self
+pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2wsh(script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, bitcoin::blockdata::script::WitnessScriptSizeError>
+pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2wsh_from_hash(hash: bitcoin::blockdata::script::WScriptHash) -> Self
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::partial_cmp(&self, other: &bitcoin::blockdata::script::witness_program::WitnessProgram) -> core::option::Option<core::cmp::Ordering>
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::program(&self) -> &bitcoin::blockdata::script::PushBytes
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::version(&self) -> bitcoin::blockdata::script::witness_version::WitnessVersion
@@ -9691,9 +9718,11 @@ pub struct bitcoin::blockdata::script::InstructionIndices<'a>
 pub struct bitcoin::blockdata::script::Instructions<'a>
 pub struct bitcoin::blockdata::script::PushBytesBuf(_)
 pub struct bitcoin::blockdata::script::PushBytesError
+pub struct bitcoin::blockdata::script::RedeemScriptSizeError
 pub struct bitcoin::blockdata::script::ScriptBuf(_)
 pub struct bitcoin::blockdata::script::ScriptHash(_)
 pub struct bitcoin::blockdata::script::WScriptHash(_)
+pub struct bitcoin::blockdata::script::WitnessScriptSizeError
 pub struct bitcoin::blockdata::script::witness_program::WitnessProgram
 pub struct bitcoin::blockdata::script::witness_version::TryFromError
 pub struct bitcoin::blockdata::transaction::InputWeightPrediction
@@ -9776,9 +9805,11 @@ pub struct bitcoin::script::InstructionIndices<'a>
 pub struct bitcoin::script::Instructions<'a>
 pub struct bitcoin::script::PushBytesBuf(_)
 pub struct bitcoin::script::PushBytesError
+pub struct bitcoin::script::RedeemScriptSizeError
 pub struct bitcoin::script::ScriptBuf(_)
 pub struct bitcoin::script::ScriptHash(_)
 pub struct bitcoin::script::WScriptHash(_)
+pub struct bitcoin::script::WitnessScriptSizeError
 pub struct bitcoin::script::witness_program::WitnessProgram
 pub struct bitcoin::script::witness_version::TryFromError
 pub struct bitcoin::sighash::Annex<'a>(_)
@@ -9954,10 +9985,12 @@ pub type bitcoin::blockdata::script::ScriptBuf::Target = bitcoin::blockdata::scr
 pub type bitcoin::blockdata::script::ScriptHash::Bytes = <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Bytes
 pub type bitcoin::blockdata::script::ScriptHash::Engine = <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Engine
 pub type bitcoin::blockdata::script::ScriptHash::Err = hex_conservative::error::HexToArrayError
+pub type bitcoin::blockdata::script::ScriptHash::Error = bitcoin::blockdata::script::RedeemScriptSizeError
 pub type bitcoin::blockdata::script::ScriptHash::Output = <I as core::slice::index::SliceIndex<[u8]>>::Output
 pub type bitcoin::blockdata::script::WScriptHash::Bytes = <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Bytes
 pub type bitcoin::blockdata::script::WScriptHash::Engine = <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Engine
 pub type bitcoin::blockdata::script::WScriptHash::Err = hex_conservative::error::HexToArrayError
+pub type bitcoin::blockdata::script::WScriptHash::Error = bitcoin::blockdata::script::WitnessScriptSizeError
 pub type bitcoin::blockdata::script::WScriptHash::Output = <I as core::slice::index::SliceIndex<[u8]>>::Output
 pub type bitcoin::blockdata::script::witness_version::WitnessVersion::Err = bitcoin::blockdata::script::witness_version::FromStrError
 pub type bitcoin::blockdata::script::witness_version::WitnessVersion::Error = bitcoin::blockdata::script::witness_version::TryFromError

api/bitcoin/no-features.txt

@@ -5,10 +5,8 @@
 #[non_exhaustive] pub enum bitcoin::address::AddressType
 #[non_exhaustive] pub enum bitcoin::address::FromScriptError
 #[non_exhaustive] pub enum bitcoin::address::KnownHrp
-#[non_exhaustive] pub enum bitcoin::address::P2shError
 #[non_exhaustive] pub enum bitcoin::address::ParseError
 #[non_exhaustive] pub enum bitcoin::address::error::FromScriptError
-#[non_exhaustive] pub enum bitcoin::address::error::P2shError
 #[non_exhaustive] pub enum bitcoin::address::error::ParseError
 #[non_exhaustive] pub enum bitcoin::bip152::Error
 #[non_exhaustive] pub enum bitcoin::bip158::Error
@@ -457,7 +455,6 @@ impl core::clone::Clone for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::clone::Clone for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::clone::Clone for bitcoin::address::error::LegacyAddressTooLongError
 impl core::clone::Clone for bitcoin::address::error::NetworkValidationError
-impl core::clone::Clone for bitcoin::address::error::P2shError
 impl core::clone::Clone for bitcoin::address::error::ParseError
 impl core::clone::Clone for bitcoin::address::error::UnknownAddressTypeError
 impl core::clone::Clone for bitcoin::address::error::UnknownHrpError
@@ -502,9 +499,11 @@ impl core::clone::Clone for bitcoin::blockdata::script::Builder
 impl core::clone::Clone for bitcoin::blockdata::script::Error
 impl core::clone::Clone for bitcoin::blockdata::script::PushBytesBuf
 impl core::clone::Clone for bitcoin::blockdata::script::PushBytesError
+impl core::clone::Clone for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::clone::Clone for bitcoin::blockdata::script::ScriptBuf
 impl core::clone::Clone for bitcoin::blockdata::script::ScriptHash
 impl core::clone::Clone for bitcoin::blockdata::script::WScriptHash
+impl core::clone::Clone for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::clone::Clone for bitcoin::blockdata::script::witness_program::Error
 impl core::clone::Clone for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::clone::Clone for bitcoin::blockdata::script::witness_version::FromStrError
@@ -624,7 +623,6 @@ impl core::cmp::Eq for bitcoin::address::error::InvalidBase58PayloadLengthError
 impl core::cmp::Eq for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::cmp::Eq for bitcoin::address::error::LegacyAddressTooLongError
 impl core::cmp::Eq for bitcoin::address::error::NetworkValidationError
-impl core::cmp::Eq for bitcoin::address::error::P2shError
 impl core::cmp::Eq for bitcoin::address::error::ParseError
 impl core::cmp::Eq for bitcoin::address::error::UnknownAddressTypeError
 impl core::cmp::Eq for bitcoin::address::error::UnknownHrpError
@@ -670,10 +668,12 @@ impl core::cmp::Eq for bitcoin::blockdata::script::Error
 impl core::cmp::Eq for bitcoin::blockdata::script::PushBytes
 impl core::cmp::Eq for bitcoin::blockdata::script::PushBytesBuf
 impl core::cmp::Eq for bitcoin::blockdata::script::PushBytesError
+impl core::cmp::Eq for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::cmp::Eq for bitcoin::blockdata::script::Script
 impl core::cmp::Eq for bitcoin::blockdata::script::ScriptBuf
 impl core::cmp::Eq for bitcoin::blockdata::script::ScriptHash
 impl core::cmp::Eq for bitcoin::blockdata::script::WScriptHash
+impl core::cmp::Eq for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::cmp::Eq for bitcoin::blockdata::script::witness_program::Error
 impl core::cmp::Eq for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::cmp::Eq for bitcoin::blockdata::script::witness_version::FromStrError
@@ -875,7 +875,6 @@ impl core::cmp::PartialEq for bitcoin::address::error::InvalidBase58PayloadLengt
 impl core::cmp::PartialEq for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::cmp::PartialEq for bitcoin::address::error::LegacyAddressTooLongError
 impl core::cmp::PartialEq for bitcoin::address::error::NetworkValidationError
-impl core::cmp::PartialEq for bitcoin::address::error::P2shError
 impl core::cmp::PartialEq for bitcoin::address::error::ParseError
 impl core::cmp::PartialEq for bitcoin::address::error::UnknownAddressTypeError
 impl core::cmp::PartialEq for bitcoin::address::error::UnknownHrpError
@@ -921,10 +920,12 @@ impl core::cmp::PartialEq for bitcoin::blockdata::script::Error
 impl core::cmp::PartialEq for bitcoin::blockdata::script::PushBytes
 impl core::cmp::PartialEq for bitcoin::blockdata::script::PushBytesBuf
 impl core::cmp::PartialEq for bitcoin::blockdata::script::PushBytesError
+impl core::cmp::PartialEq for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::cmp::PartialEq for bitcoin::blockdata::script::Script
 impl core::cmp::PartialEq for bitcoin::blockdata::script::ScriptBuf
 impl core::cmp::PartialEq for bitcoin::blockdata::script::ScriptHash
 impl core::cmp::PartialEq for bitcoin::blockdata::script::WScriptHash
+impl core::cmp::PartialEq for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::cmp::PartialEq for bitcoin::blockdata::script::witness_program::Error
 impl core::cmp::PartialEq for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::cmp::PartialEq for bitcoin::blockdata::script::witness_version::FromStrError
@@ -1357,10 +1358,6 @@ impl core::convert::From<&bitcoin::PublicKey> for bitcoin::PubkeyHash
 impl core::convert::From<&bitcoin::bip32::Xpub> for bitcoin::bip32::XKeyIdentifier
 impl core::convert::From<&bitcoin::blockdata::block::Block> for bitcoin::blockdata::block::BlockHash
 impl core::convert::From<&bitcoin::blockdata::block::Header> for bitcoin::blockdata::block::BlockHash
-impl core::convert::From<&bitcoin::blockdata::script::Script> for bitcoin::blockdata::script::ScriptHash
-impl core::convert::From<&bitcoin::blockdata::script::Script> for bitcoin::blockdata::script::WScriptHash
-impl core::convert::From<&bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::ScriptHash
-impl core::convert::From<&bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::WScriptHash
 impl core::convert::From<&bitcoin::blockdata::transaction::Transaction> for bitcoin::blockdata::transaction::Txid
 impl core::convert::From<&bitcoin::blockdata::transaction::Transaction> for bitcoin::blockdata::transaction::Wtxid
 impl core::convert::From<&bitcoin::network::Network> for &'static bitcoin::consensus::params::Params
@@ -1623,8 +1620,6 @@ impl core::convert::From<bitcoin::blockdata::script::PushBytesBuf> for alloc::ve
 impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for alloc::borrow::Cow<'_, bitcoin::blockdata::script::Script>
 impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for alloc::boxed::Box<bitcoin::blockdata::script::Script>
 impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for alloc::vec::Vec<u8>
-impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::ScriptHash
-impl core::convert::From<bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::WScriptHash
 impl core::convert::From<bitcoin::blockdata::script::ScriptHash> for bitcoin::blockdata::script::PushBytesBuf
 impl core::convert::From<bitcoin::blockdata::script::ScriptHash> for bitcoin_hashes::hash160::Hash
 impl core::convert::From<bitcoin::blockdata::script::WScriptHash> for bitcoin::blockdata::script::PushBytesBuf
@@ -1708,7 +1703,6 @@ impl core::convert::From<bitcoin_units::locktime::relative::Height> for bitcoin:
 impl core::convert::From<bitcoin_units::locktime::relative::Time> for bitcoin::blockdata::locktime::relative::LockTime
 impl core::convert::From<bitcoin_units::parse::ParseIntError> for bitcoin::blockdata::script::witness_version::FromStrError
 impl core::convert::From<core::convert::Infallible> for bitcoin::address::error::FromScriptError
-impl core::convert::From<core::convert::Infallible> for bitcoin::address::error::P2shError
 impl core::convert::From<core::convert::Infallible> for bitcoin::address::error::ParseError
 impl core::convert::From<core::convert::Infallible> for bitcoin::bip152::Error
 impl core::convert::From<core::convert::Infallible> for bitcoin::bip158::Error
@@ -1716,6 +1710,8 @@ impl core::convert::From<core::convert::Infallible> for bitcoin::bip32::Error
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::block::Bip34Error
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::block::ValidationError
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::Error
+impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::RedeemScriptSizeError
+impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::witness_program::Error
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::witness_version::FromStrError
 impl core::convert::From<core::convert::Infallible> for bitcoin::blockdata::script::witness_version::TryFromInstructionError
@@ -1760,6 +1756,10 @@ impl core::convert::From<u8> for bitcoin::blockdata::opcodes::Opcode
 impl core::convert::From<u8> for bitcoin::consensus::encode::VarInt
 impl core::convert::From<usize> for bitcoin::consensus::encode::VarInt
 impl core::convert::TryFrom<&[bitcoin::taproot::TapNodeHash]> for bitcoin::taproot::merkle_branch::TaprootMerkleBranch
+impl core::convert::TryFrom<&bitcoin::blockdata::script::Script> for bitcoin::blockdata::script::ScriptHash
+impl core::convert::TryFrom<&bitcoin::blockdata::script::Script> for bitcoin::blockdata::script::WScriptHash
+impl core::convert::TryFrom<&bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::ScriptHash
+impl core::convert::TryFrom<&bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::WScriptHash
 impl core::convert::TryFrom<alloc::boxed::Box<[bitcoin::taproot::TapNodeHash]>> for bitcoin::taproot::merkle_branch::TaprootMerkleBranch
 impl core::convert::TryFrom<alloc::vec::Vec<bitcoin::taproot::TapNodeHash>> for bitcoin::taproot::merkle_branch::TaprootMerkleBranch
 impl core::convert::TryFrom<alloc::vec::Vec<u8>> for bitcoin::blockdata::script::PushBytesBuf
@@ -1767,6 +1767,8 @@ impl core::convert::TryFrom<bech32::primitives::gf32::Fe32> for bitcoin::blockda
 impl core::convert::TryFrom<bitcoin::PublicKey> for bitcoin::CompressedPublicKey
 impl core::convert::TryFrom<bitcoin::blockdata::constants::ChainHash> for bitcoin::network::Network
 impl core::convert::TryFrom<bitcoin::blockdata::opcodes::Opcode> for bitcoin::blockdata::script::witness_version::WitnessVersion
+impl core::convert::TryFrom<bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::ScriptHash
+impl core::convert::TryFrom<bitcoin::blockdata::script::ScriptBuf> for bitcoin::blockdata::script::WScriptHash
 impl core::convert::TryFrom<bitcoin::blockdata::transaction::Sequence> for bitcoin::blockdata::locktime::relative::LockTime
 impl core::convert::TryFrom<bitcoin::p2p::Magic> for bitcoin::network::Network
 impl core::convert::TryFrom<bitcoin::taproot::NodeInfo> for bitcoin::taproot::TapTree
@@ -1816,7 +1818,6 @@ impl core::fmt::Debug for bitcoin::address::error::InvalidBase58PayloadLengthErr
 impl core::fmt::Debug for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::fmt::Debug for bitcoin::address::error::LegacyAddressTooLongError
 impl core::fmt::Debug for bitcoin::address::error::NetworkValidationError
-impl core::fmt::Debug for bitcoin::address::error::P2shError
 impl core::fmt::Debug for bitcoin::address::error::ParseError
 impl core::fmt::Debug for bitcoin::address::error::UnknownAddressTypeError
 impl core::fmt::Debug for bitcoin::address::error::UnknownHrpError
@@ -1863,10 +1864,12 @@ impl core::fmt::Debug for bitcoin::blockdata::script::Error
 impl core::fmt::Debug for bitcoin::blockdata::script::PushBytes
 impl core::fmt::Debug for bitcoin::blockdata::script::PushBytesBuf
 impl core::fmt::Debug for bitcoin::blockdata::script::PushBytesError
+impl core::fmt::Debug for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::fmt::Debug for bitcoin::blockdata::script::Script
 impl core::fmt::Debug for bitcoin::blockdata::script::ScriptBuf
 impl core::fmt::Debug for bitcoin::blockdata::script::ScriptHash
 impl core::fmt::Debug for bitcoin::blockdata::script::WScriptHash
+impl core::fmt::Debug for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::fmt::Debug for bitcoin::blockdata::script::witness_program::Error
 impl core::fmt::Debug for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::fmt::Debug for bitcoin::blockdata::script::witness_version::FromStrError
@@ -1982,7 +1985,6 @@ impl core::fmt::Display for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::fmt::Display for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::fmt::Display for bitcoin::address::error::LegacyAddressTooLongError
 impl core::fmt::Display for bitcoin::address::error::NetworkValidationError
-impl core::fmt::Display for bitcoin::address::error::P2shError
 impl core::fmt::Display for bitcoin::address::error::ParseError
 impl core::fmt::Display for bitcoin::address::error::UnknownAddressTypeError
 impl core::fmt::Display for bitcoin::address::error::UnknownHrpError
@@ -2017,10 +2019,12 @@ impl core::fmt::Display for bitcoin::blockdata::opcodes::Opcode
 impl core::fmt::Display for bitcoin::blockdata::script::Builder
 impl core::fmt::Display for bitcoin::blockdata::script::Error
 impl core::fmt::Display for bitcoin::blockdata::script::PushBytesError
+impl core::fmt::Display for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::fmt::Display for bitcoin::blockdata::script::Script
 impl core::fmt::Display for bitcoin::blockdata::script::ScriptBuf
 impl core::fmt::Display for bitcoin::blockdata::script::ScriptHash
 impl core::fmt::Display for bitcoin::blockdata::script::WScriptHash
+impl core::fmt::Display for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::fmt::Display for bitcoin::blockdata::script::witness_program::Error
 impl core::fmt::Display for bitcoin::blockdata::script::witness_version::FromStrError
 impl core::fmt::Display for bitcoin::blockdata::script::witness_version::TryFromError
@@ -2355,7 +2359,6 @@ impl core::marker::Freeze for bitcoin::address::error::InvalidBase58PayloadLengt
 impl core::marker::Freeze for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::Freeze for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::Freeze for bitcoin::address::error::NetworkValidationError
-impl core::marker::Freeze for bitcoin::address::error::P2shError
 impl core::marker::Freeze for bitcoin::address::error::ParseError
 impl core::marker::Freeze for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::Freeze for bitcoin::address::error::UnknownHrpError
@@ -2404,10 +2407,12 @@ impl core::marker::Freeze for bitcoin::blockdata::script::Error
 impl core::marker::Freeze for bitcoin::blockdata::script::PushBytes
 impl core::marker::Freeze for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::Freeze for bitcoin::blockdata::script::PushBytesError
+impl core::marker::Freeze for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::Freeze for bitcoin::blockdata::script::Script
 impl core::marker::Freeze for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::Freeze for bitcoin::blockdata::script::ScriptHash
 impl core::marker::Freeze for bitcoin::blockdata::script::WScriptHash
+impl core::marker::Freeze for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::Freeze for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::Freeze for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::Freeze for bitcoin::blockdata::script::witness_version::FromStrError
@@ -2531,7 +2536,6 @@ impl core::marker::Send for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::marker::Send for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::Send for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::Send for bitcoin::address::error::NetworkValidationError
-impl core::marker::Send for bitcoin::address::error::P2shError
 impl core::marker::Send for bitcoin::address::error::ParseError
 impl core::marker::Send for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::Send for bitcoin::address::error::UnknownHrpError
@@ -2580,10 +2584,12 @@ impl core::marker::Send for bitcoin::blockdata::script::Error
 impl core::marker::Send for bitcoin::blockdata::script::PushBytes
 impl core::marker::Send for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::Send for bitcoin::blockdata::script::PushBytesError
+impl core::marker::Send for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::Send for bitcoin::blockdata::script::Script
 impl core::marker::Send for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::Send for bitcoin::blockdata::script::ScriptHash
 impl core::marker::Send for bitcoin::blockdata::script::WScriptHash
+impl core::marker::Send for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::Send for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::Send for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::Send for bitcoin::blockdata::script::witness_version::FromStrError
@@ -2707,7 +2713,6 @@ impl core::marker::StructuralPartialEq for bitcoin::address::error::InvalidBase5
 impl core::marker::StructuralPartialEq for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::NetworkValidationError
-impl core::marker::StructuralPartialEq for bitcoin::address::error::P2shError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::ParseError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::StructuralPartialEq for bitcoin::address::error::UnknownHrpError
@@ -2753,10 +2758,12 @@ impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::Error
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::PushBytes
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::PushBytesError
+impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::Script
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::ScriptHash
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::WScriptHash
+impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::StructuralPartialEq for bitcoin::blockdata::script::witness_version::FromStrError
@@ -2870,7 +2877,6 @@ impl core::marker::Sync for bitcoin::address::error::InvalidBase58PayloadLengthE
 impl core::marker::Sync for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::Sync for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::Sync for bitcoin::address::error::NetworkValidationError
-impl core::marker::Sync for bitcoin::address::error::P2shError
 impl core::marker::Sync for bitcoin::address::error::ParseError
 impl core::marker::Sync for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::Sync for bitcoin::address::error::UnknownHrpError
@@ -2919,10 +2925,12 @@ impl core::marker::Sync for bitcoin::blockdata::script::Error
 impl core::marker::Sync for bitcoin::blockdata::script::PushBytes
 impl core::marker::Sync for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::Sync for bitcoin::blockdata::script::PushBytesError
+impl core::marker::Sync for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::Sync for bitcoin::blockdata::script::Script
 impl core::marker::Sync for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::Sync for bitcoin::blockdata::script::ScriptHash
 impl core::marker::Sync for bitcoin::blockdata::script::WScriptHash
+impl core::marker::Sync for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::Sync for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::Sync for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::Sync for bitcoin::blockdata::script::witness_version::FromStrError
@@ -3046,7 +3054,6 @@ impl core::marker::Unpin for bitcoin::address::error::InvalidBase58PayloadLength
 impl core::marker::Unpin for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::marker::Unpin for bitcoin::address::error::LegacyAddressTooLongError
 impl core::marker::Unpin for bitcoin::address::error::NetworkValidationError
-impl core::marker::Unpin for bitcoin::address::error::P2shError
 impl core::marker::Unpin for bitcoin::address::error::ParseError
 impl core::marker::Unpin for bitcoin::address::error::UnknownAddressTypeError
 impl core::marker::Unpin for bitcoin::address::error::UnknownHrpError
@@ -3095,10 +3102,12 @@ impl core::marker::Unpin for bitcoin::blockdata::script::Error
 impl core::marker::Unpin for bitcoin::blockdata::script::PushBytes
 impl core::marker::Unpin for bitcoin::blockdata::script::PushBytesBuf
 impl core::marker::Unpin for bitcoin::blockdata::script::PushBytesError
+impl core::marker::Unpin for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::marker::Unpin for bitcoin::blockdata::script::Script
 impl core::marker::Unpin for bitcoin::blockdata::script::ScriptBuf
 impl core::marker::Unpin for bitcoin::blockdata::script::ScriptHash
 impl core::marker::Unpin for bitcoin::blockdata::script::WScriptHash
+impl core::marker::Unpin for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::marker::Unpin for bitcoin::blockdata::script::witness_program::Error
 impl core::marker::Unpin for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::marker::Unpin for bitcoin::blockdata::script::witness_version::FromStrError
@@ -3254,7 +3263,6 @@ impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::Invali
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::LegacyAddressTooLongError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::NetworkValidationError
-impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::P2shError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::ParseError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::UnknownAddressTypeError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::address::error::UnknownHrpError
@@ -3302,10 +3310,12 @@ impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::Err
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::PushBytes
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::PushBytesBuf
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::PushBytesError
+impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::Script
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::ScriptBuf
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::ScriptHash
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::WScriptHash
+impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::witness_program::Error
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin::blockdata::script::witness_version::FromStrError
@@ -3426,7 +3436,6 @@ impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::InvalidBa
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::InvalidLegacyPrefixError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::LegacyAddressTooLongError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::NetworkValidationError
-impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::P2shError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::ParseError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::UnknownAddressTypeError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::address::error::UnknownHrpError
@@ -3474,10 +3483,12 @@ impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::Error
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::PushBytes
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::PushBytesBuf
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::PushBytesError
+impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::RedeemScriptSizeError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::Script
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::ScriptBuf
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::ScriptHash
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::WScriptHash
+impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::WitnessScriptSizeError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::witness_program::Error
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::witness_program::WitnessProgram
 impl core::panic::unwind_safe::UnwindSafe for bitcoin::blockdata::script::witness_version::FromStrError
@@ -4241,7 +4252,6 @@ pub bitcoin::address::FromScriptError::WitnessVersion(bitcoin::blockdata::script
 pub bitcoin::address::KnownHrp::Mainnet
 pub bitcoin::address::KnownHrp::Regtest
 pub bitcoin::address::KnownHrp::Testnets
-pub bitcoin::address::P2shError::ExcessiveScriptSize
 pub bitcoin::address::ParseError::Base58(base58ck::error::Error)
 pub bitcoin::address::ParseError::Bech32(bech32::segwit::DecodeError)
 pub bitcoin::address::ParseError::InvalidBase58PayloadLength(bitcoin::address::error::InvalidBase58PayloadLengthError)
@@ -4254,7 +4264,6 @@ pub bitcoin::address::ParseError::WitnessVersion(bitcoin::blockdata::script::wit
 pub bitcoin::address::error::FromScriptError::UnrecognizedScript
 pub bitcoin::address::error::FromScriptError::WitnessProgram(bitcoin::blockdata::script::witness_program::Error)
 pub bitcoin::address::error::FromScriptError::WitnessVersion(bitcoin::blockdata::script::witness_version::TryFromError)
-pub bitcoin::address::error::P2shError::ExcessiveScriptSize
 pub bitcoin::address::error::ParseError::Base58(base58ck::error::Error)
 pub bitcoin::address::error::ParseError::Bech32(bech32::segwit::DecodeError)
 pub bitcoin::address::error::ParseError::InvalidBase58PayloadLength(bitcoin::address::error::InvalidBase58PayloadLengthError)
@@ -4358,6 +4367,8 @@ pub bitcoin::blockdata::script::Error::Serialization
 pub bitcoin::blockdata::script::Error::UnknownSpentOutput(bitcoin::blockdata::transaction::OutPoint)
 pub bitcoin::blockdata::script::Instruction::Op(bitcoin::blockdata::opcodes::Opcode)
 pub bitcoin::blockdata::script::Instruction::PushBytes(&'a bitcoin::blockdata::script::PushBytes)
+pub bitcoin::blockdata::script::RedeemScriptSizeError::size: usize
+pub bitcoin::blockdata::script::WitnessScriptSizeError::size: usize
 pub bitcoin::blockdata::script::witness_program::Error::InvalidLength(usize)
 pub bitcoin::blockdata::script::witness_program::Error::InvalidSegwitV0Length(usize)
 pub bitcoin::blockdata::script::witness_version::FromStrError::Invalid(bitcoin::blockdata::script::witness_version::TryFromError)
@@ -4649,6 +4660,8 @@ pub bitcoin::script::Error::Serialization
 pub bitcoin::script::Error::UnknownSpentOutput(bitcoin::blockdata::transaction::OutPoint)
 pub bitcoin::script::Instruction::Op(bitcoin::blockdata::opcodes::Opcode)
 pub bitcoin::script::Instruction::PushBytes(&'a bitcoin::blockdata::script::PushBytes)
+pub bitcoin::script::RedeemScriptSizeError::size: usize
+pub bitcoin::script::WitnessScriptSizeError::size: usize
 pub bitcoin::script::witness_program::Error::InvalidLength(usize)
 pub bitcoin::script::witness_program::Error::InvalidSegwitV0Length(usize)
 pub bitcoin::script::witness_version::FromStrError::Invalid(bitcoin::blockdata::script::witness_version::TryFromError)
@@ -4814,8 +4827,10 @@ pub const bitcoin::blockdata::constants::ChainHash::TESTNET: Self
 pub const bitcoin::blockdata::constants::DIFFCHANGE_INTERVAL: u32 = 2_016u32
 pub const bitcoin::blockdata::constants::DIFFCHANGE_TIMESPAN: _
 pub const bitcoin::blockdata::constants::MAX_BLOCK_SIGOPS_COST: i64 = 80_000i64
+pub const bitcoin::blockdata::constants::MAX_REDEEM_SCRIPT_SIZE: usize = 520usize
 pub const bitcoin::blockdata::constants::MAX_SCRIPTNUM_VALUE: u32 = 2_147_483_648u32
-pub const bitcoin::blockdata::constants::MAX_SCRIPT_ELEMENT_SIZE: usize = 520usize
+pub const bitcoin::blockdata::constants::MAX_STACK_ELEMENT_SIZE: usize = 520usize
+pub const bitcoin::blockdata::constants::MAX_WITNESS_SCRIPT_SIZE: usize = 10_000usize
 pub const bitcoin::blockdata::constants::PUBKEY_ADDRESS_PREFIX_MAIN: u8 = 0u8
 pub const bitcoin::blockdata::constants::PUBKEY_ADDRESS_PREFIX_TEST: u8 = 111u8
 pub const bitcoin::blockdata::constants::SCRIPT_ADDRESS_PREFIX_MAIN: u8 = 5u8
@@ -5116,8 +5131,10 @@ pub const bitcoin::constants::COINBASE_MATURITY: u32 = 100u32
 pub const bitcoin::constants::DIFFCHANGE_INTERVAL: u32 = 2_016u32
 pub const bitcoin::constants::DIFFCHANGE_TIMESPAN: _
 pub const bitcoin::constants::MAX_BLOCK_SIGOPS_COST: i64 = 80_000i64
+pub const bitcoin::constants::MAX_REDEEM_SCRIPT_SIZE: usize = 520usize
 pub const bitcoin::constants::MAX_SCRIPTNUM_VALUE: u32 = 2_147_483_648u32
-pub const bitcoin::constants::MAX_SCRIPT_ELEMENT_SIZE: usize = 520usize
+pub const bitcoin::constants::MAX_STACK_ELEMENT_SIZE: usize = 520usize
+pub const bitcoin::constants::MAX_WITNESS_SCRIPT_SIZE: usize = 10_000usize
 pub const bitcoin::constants::PUBKEY_ADDRESS_PREFIX_MAIN: u8 = 0u8
 pub const bitcoin::constants::PUBKEY_ADDRESS_PREFIX_TEST: u8 = 111u8
 pub const bitcoin::constants::SCRIPT_ADDRESS_PREFIX_MAIN: u8 = 5u8
@@ -6151,14 +6168,15 @@ pub fn bitcoin::address::Address::is_related_to_xonly_pubkey(&self, xonly_pubkey
 pub fn bitcoin::address::Address::is_spend_standard(&self) -> bool
 pub fn bitcoin::address::Address::matches_script_pubkey(&self, script: &bitcoin::blockdata::script::Script) -> bool
 pub fn bitcoin::address::Address::p2pkh(pk: impl core::convert::Into<bitcoin::PubkeyHash>, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> bitcoin::address::Address
-pub fn bitcoin::address::Address::p2sh(script: &bitcoin::blockdata::script::Script, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> core::result::Result<bitcoin::address::Address, bitcoin::address::error::P2shError>
+pub fn bitcoin::address::Address::p2sh(redeem_script: &bitcoin::blockdata::script::Script, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> core::result::Result<bitcoin::address::Address, bitcoin::blockdata::script::RedeemScriptSizeError>
 pub fn bitcoin::address::Address::p2sh_from_hash(hash: bitcoin::blockdata::script::ScriptHash, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> bitcoin::address::Address
 pub fn bitcoin::address::Address::p2shwpkh(pk: bitcoin::CompressedPublicKey, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> bitcoin::address::Address
-pub fn bitcoin::address::Address::p2shwsh(script: &bitcoin::blockdata::script::Script, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> bitcoin::address::Address
+pub fn bitcoin::address::Address::p2shwsh(witness_script: &bitcoin::blockdata::script::Script, network: impl core::convert::Into<bitcoin::network::NetworkKind>) -> core::result::Result<bitcoin::address::Address, bitcoin::blockdata::script::WitnessScriptSizeError>
 pub fn bitcoin::address::Address::p2tr<C: secp256k1::context::Verification>(secp: &secp256k1::Secp256k1<C>, internal_key: bitcoin::key::UntweakedPublicKey, merkle_root: core::option::Option<bitcoin::taproot::TapNodeHash>, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> bitcoin::address::Address
 pub fn bitcoin::address::Address::p2tr_tweaked(output_key: bitcoin::key::TweakedPublicKey, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> bitcoin::address::Address
 pub fn bitcoin::address::Address::p2wpkh(pk: bitcoin::CompressedPublicKey, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> Self
-pub fn bitcoin::address::Address::p2wsh(script: &bitcoin::blockdata::script::Script, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> bitcoin::address::Address
+pub fn bitcoin::address::Address::p2wsh(witness_script: &bitcoin::blockdata::script::Script, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> core::result::Result<bitcoin::address::Address, bitcoin::blockdata::script::WitnessScriptSizeError>
+pub fn bitcoin::address::Address::p2wsh_from_hash(hash: bitcoin::blockdata::script::WScriptHash, hrp: impl core::convert::Into<bitcoin::address::KnownHrp>) -> bitcoin::address::Address
 pub fn bitcoin::address::Address::pubkey_hash(&self) -> core::option::Option<bitcoin::PubkeyHash>
 pub fn bitcoin::address::Address::script_hash(&self) -> core::option::Option<bitcoin::blockdata::script::ScriptHash>
 pub fn bitcoin::address::Address::script_pubkey(&self) -> bitcoin::blockdata::script::ScriptBuf
@@ -6230,10 +6248,6 @@ pub fn bitcoin::address::error::LegacyAddressTooLongError::invalid_legcay_addres
 pub fn bitcoin::address::error::NetworkValidationError::clone(&self) -> bitcoin::address::error::NetworkValidationError
 pub fn bitcoin::address::error::NetworkValidationError::eq(&self, other: &bitcoin::address::error::NetworkValidationError) -> bool
 pub fn bitcoin::address::error::NetworkValidationError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-pub fn bitcoin::address::error::P2shError::clone(&self) -> bitcoin::address::error::P2shError
-pub fn bitcoin::address::error::P2shError::eq(&self, other: &bitcoin::address::error::P2shError) -> bool
-pub fn bitcoin::address::error::P2shError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-pub fn bitcoin::address::error::P2shError::from(never: core::convert::Infallible) -> Self
 pub fn bitcoin::address::error::ParseError::clone(&self) -> bitcoin::address::error::ParseError
 pub fn bitcoin::address::error::ParseError::eq(&self, other: &bitcoin::address::error::ParseError) -> bool
 pub fn bitcoin::address::error::ParseError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
@@ -7114,6 +7128,10 @@ pub fn bitcoin::blockdata::script::PushBytesError::eq(&self, other: &bitcoin::bl
 pub fn bitcoin::blockdata::script::PushBytesError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
 pub fn bitcoin::blockdata::script::PushBytesError::input_len(&self) -> usize
 pub fn bitcoin::blockdata::script::PushBytesErrorReport::input_len(&self) -> usize
+pub fn bitcoin::blockdata::script::RedeemScriptSizeError::clone(&self) -> bitcoin::blockdata::script::RedeemScriptSizeError
+pub fn bitcoin::blockdata::script::RedeemScriptSizeError::eq(&self, other: &bitcoin::blockdata::script::RedeemScriptSizeError) -> bool
+pub fn bitcoin::blockdata::script::RedeemScriptSizeError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
+pub fn bitcoin::blockdata::script::RedeemScriptSizeError::from(never: core::convert::Infallible) -> Self
 pub fn bitcoin::blockdata::script::Script::as_bytes(&self) -> &[u8]
 pub fn bitcoin::blockdata::script::Script::as_mut(&mut self) -> &mut [u8]
 pub fn bitcoin::blockdata::script::Script::as_mut(&mut self) -> &mut bitcoin::blockdata::script::Script
@@ -7167,17 +7185,17 @@ pub fn bitcoin::blockdata::script::Script::p2pk_public_key(&self) -> core::optio
 pub fn bitcoin::blockdata::script::Script::p2wpkh_script_code(&self) -> core::option::Option<bitcoin::blockdata::script::ScriptBuf>
 pub fn bitcoin::blockdata::script::Script::partial_cmp(&self, other: &bitcoin::blockdata::script::Script) -> core::option::Option<core::cmp::Ordering>
 pub fn bitcoin::blockdata::script::Script::partial_cmp(&self, other: &bitcoin::blockdata::script::ScriptBuf) -> core::option::Option<core::cmp::Ordering>
-pub fn bitcoin::blockdata::script::Script::script_hash(&self) -> bitcoin::blockdata::script::ScriptHash
+pub fn bitcoin::blockdata::script::Script::script_hash(&self) -> core::result::Result<bitcoin::blockdata::script::ScriptHash, bitcoin::blockdata::script::RedeemScriptSizeError>
 pub fn bitcoin::blockdata::script::Script::tapscript_leaf_hash(&self) -> bitcoin::taproot::TapLeafHash
 pub fn bitcoin::blockdata::script::Script::to_asm_string(&self) -> alloc::string::String
 pub fn bitcoin::blockdata::script::Script::to_bytes(&self) -> alloc::vec::Vec<u8>
 pub fn bitcoin::blockdata::script::Script::to_hex_string(&self) -> alloc::string::String
 pub fn bitcoin::blockdata::script::Script::to_owned(&self) -> Self::Owned
-pub fn bitcoin::blockdata::script::Script::to_p2sh(&self) -> bitcoin::blockdata::script::ScriptBuf
+pub fn bitcoin::blockdata::script::Script::to_p2sh(&self) -> core::result::Result<bitcoin::blockdata::script::ScriptBuf, bitcoin::blockdata::script::RedeemScriptSizeError>
 pub fn bitcoin::blockdata::script::Script::to_p2tr<C: secp256k1::context::Verification>(&self, secp: &secp256k1::Secp256k1<C>, internal_key: bitcoin::key::UntweakedPublicKey) -> bitcoin::blockdata::script::ScriptBuf
-pub fn bitcoin::blockdata::script::Script::to_p2wsh(&self) -> bitcoin::blockdata::script::ScriptBuf
+pub fn bitcoin::blockdata::script::Script::to_p2wsh(&self) -> core::result::Result<bitcoin::blockdata::script::ScriptBuf, bitcoin::blockdata::script::WitnessScriptSizeError>
 pub fn bitcoin::blockdata::script::Script::witness_version(&self) -> core::option::Option<bitcoin::blockdata::script::witness_version::WitnessVersion>
-pub fn bitcoin::blockdata::script::Script::wscript_hash(&self) -> bitcoin::blockdata::script::WScriptHash
+pub fn bitcoin::blockdata::script::Script::wscript_hash(&self) -> core::result::Result<bitcoin::blockdata::script::WScriptHash, bitcoin::blockdata::script::WitnessScriptSizeError>
 pub fn bitcoin::blockdata::script::ScriptBuf::as_mut(&mut self) -> &mut [u8]
 pub fn bitcoin::blockdata::script::ScriptBuf::as_mut(&mut self) -> &mut bitcoin::blockdata::script::Script
 pub fn bitcoin::blockdata::script::ScriptBuf::as_mut_script(&mut self) -> &mut bitcoin::blockdata::script::Script
@@ -7242,14 +7260,13 @@ pub fn bitcoin::blockdata::script::ScriptHash::engine() -> <bitcoin_hashes::hash
 pub fn bitcoin::blockdata::script::ScriptHash::eq(&self, other: &bitcoin::blockdata::script::ScriptHash) -> bool
 pub fn bitcoin::blockdata::script::ScriptHash::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
 pub fn bitcoin::blockdata::script::ScriptHash::from(inner: bitcoin_hashes::hash160::Hash) -> bitcoin::blockdata::script::ScriptHash
-pub fn bitcoin::blockdata::script::ScriptHash::from(script: &bitcoin::blockdata::script::Script) -> bitcoin::blockdata::script::ScriptHash
-pub fn bitcoin::blockdata::script::ScriptHash::from(script: &bitcoin::blockdata::script::ScriptBuf) -> bitcoin::blockdata::script::ScriptHash
-pub fn bitcoin::blockdata::script::ScriptHash::from(script: bitcoin::blockdata::script::ScriptBuf) -> bitcoin::blockdata::script::ScriptHash
 pub fn bitcoin::blockdata::script::ScriptHash::from_byte_array(bytes: <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Bytes) -> Self
 pub fn bitcoin::blockdata::script::ScriptHash::from_byte_array(bytes: Self::Bytes) -> Self
 pub fn bitcoin::blockdata::script::ScriptHash::from_engine(e: <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Engine) -> Self
 pub fn bitcoin::blockdata::script::ScriptHash::from_engine(e: <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Engine) -> bitcoin::blockdata::script::ScriptHash
 pub fn bitcoin::blockdata::script::ScriptHash::from_raw_hash(inner: bitcoin_hashes::hash160::Hash) -> bitcoin::blockdata::script::ScriptHash
+pub fn bitcoin::blockdata::script::ScriptHash::from_script(redeem_script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, bitcoin::blockdata::script::RedeemScriptSizeError>
+pub fn bitcoin::blockdata::script::ScriptHash::from_script_unchecked(script: &bitcoin::blockdata::script::Script) -> Self
 pub fn bitcoin::blockdata::script::ScriptHash::from_slice(sl: &[u8]) -> core::result::Result<bitcoin::blockdata::script::ScriptHash, bitcoin_hashes::FromSliceError>
 pub fn bitcoin::blockdata::script::ScriptHash::from_str(s: &str) -> core::result::Result<bitcoin::blockdata::script::ScriptHash, Self::Err>
 pub fn bitcoin::blockdata::script::ScriptHash::hash(data: &[u8]) -> Self
@@ -7260,6 +7277,9 @@ pub fn bitcoin::blockdata::script::ScriptHash::partial_cmp(&self, other: &bitcoi
 pub fn bitcoin::blockdata::script::ScriptHash::to_byte_array(self) -> <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Bytes
 pub fn bitcoin::blockdata::script::ScriptHash::to_byte_array(self) -> Self::Bytes
 pub fn bitcoin::blockdata::script::ScriptHash::to_raw_hash(self) -> bitcoin_hashes::hash160::Hash
+pub fn bitcoin::blockdata::script::ScriptHash::try_from(redeem_script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::ScriptHash::try_from(redeem_script: &bitcoin::blockdata::script::ScriptBuf) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::ScriptHash::try_from(redeem_script: bitcoin::blockdata::script::ScriptBuf) -> core::result::Result<Self, Self::Error>
 pub fn bitcoin::blockdata::script::WScriptHash::all_zeros() -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::as_byte_array(&self) -> &<bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Bytes
 pub fn bitcoin::blockdata::script::WScriptHash::as_byte_array(&self) -> &Self::Bytes
@@ -7274,14 +7294,13 @@ pub fn bitcoin::blockdata::script::WScriptHash::engine() -> <bitcoin_hashes::sha
 pub fn bitcoin::blockdata::script::WScriptHash::eq(&self, other: &bitcoin::blockdata::script::WScriptHash) -> bool
 pub fn bitcoin::blockdata::script::WScriptHash::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
 pub fn bitcoin::blockdata::script::WScriptHash::from(inner: bitcoin_hashes::sha256::Hash) -> bitcoin::blockdata::script::WScriptHash
-pub fn bitcoin::blockdata::script::WScriptHash::from(script: &bitcoin::blockdata::script::Script) -> bitcoin::blockdata::script::WScriptHash
-pub fn bitcoin::blockdata::script::WScriptHash::from(script: &bitcoin::blockdata::script::ScriptBuf) -> bitcoin::blockdata::script::WScriptHash
-pub fn bitcoin::blockdata::script::WScriptHash::from(script: bitcoin::blockdata::script::ScriptBuf) -> bitcoin::blockdata::script::WScriptHash
 pub fn bitcoin::blockdata::script::WScriptHash::from_byte_array(bytes: <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Bytes) -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::from_byte_array(bytes: Self::Bytes) -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::from_engine(e: <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Engine) -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::from_engine(e: <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Engine) -> bitcoin::blockdata::script::WScriptHash
 pub fn bitcoin::blockdata::script::WScriptHash::from_raw_hash(inner: bitcoin_hashes::sha256::Hash) -> bitcoin::blockdata::script::WScriptHash
+pub fn bitcoin::blockdata::script::WScriptHash::from_script(witness_script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, bitcoin::blockdata::script::WitnessScriptSizeError>
+pub fn bitcoin::blockdata::script::WScriptHash::from_script_unchecked(script: &bitcoin::blockdata::script::Script) -> Self
 pub fn bitcoin::blockdata::script::WScriptHash::from_slice(sl: &[u8]) -> core::result::Result<bitcoin::blockdata::script::WScriptHash, bitcoin_hashes::FromSliceError>
 pub fn bitcoin::blockdata::script::WScriptHash::from_str(s: &str) -> core::result::Result<bitcoin::blockdata::script::WScriptHash, Self::Err>
 pub fn bitcoin::blockdata::script::WScriptHash::hash(data: &[u8]) -> Self
@@ -7292,6 +7311,13 @@ pub fn bitcoin::blockdata::script::WScriptHash::partial_cmp(&self, other: &bitco
 pub fn bitcoin::blockdata::script::WScriptHash::to_byte_array(self) -> <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Bytes
 pub fn bitcoin::blockdata::script::WScriptHash::to_byte_array(self) -> Self::Bytes
 pub fn bitcoin::blockdata::script::WScriptHash::to_raw_hash(self) -> bitcoin_hashes::sha256::Hash
+pub fn bitcoin::blockdata::script::WScriptHash::try_from(witness_script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::WScriptHash::try_from(witness_script: &bitcoin::blockdata::script::ScriptBuf) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::WScriptHash::try_from(witness_script: bitcoin::blockdata::script::ScriptBuf) -> core::result::Result<Self, Self::Error>
+pub fn bitcoin::blockdata::script::WitnessScriptSizeError::clone(&self) -> bitcoin::blockdata::script::WitnessScriptSizeError
+pub fn bitcoin::blockdata::script::WitnessScriptSizeError::eq(&self, other: &bitcoin::blockdata::script::WitnessScriptSizeError) -> bool
+pub fn bitcoin::blockdata::script::WitnessScriptSizeError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
+pub fn bitcoin::blockdata::script::WitnessScriptSizeError::from(never: core::convert::Infallible) -> Self
 pub fn bitcoin::blockdata::script::read_scriptbool(v: &[u8]) -> bool
 pub fn bitcoin::blockdata::script::read_scriptint_non_minimal(v: &[u8]) -> core::result::Result<i64, bitcoin::blockdata::script::Error>
 pub fn bitcoin::blockdata::script::witness_program::Error::clone(&self) -> bitcoin::blockdata::script::witness_program::Error
@@ -7310,7 +7336,8 @@ pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::new(version:
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2tr<C: secp256k1::context::Verification>(secp: &secp256k1::Secp256k1<C>, internal_key: bitcoin::key::UntweakedPublicKey, merkle_root: core::option::Option<bitcoin::taproot::TapNodeHash>) -> Self
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2tr_tweaked(output_key: bitcoin::key::TweakedPublicKey) -> Self
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2wpkh(pk: bitcoin::CompressedPublicKey) -> Self
-pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2wsh(script: &bitcoin::blockdata::script::Script) -> Self
+pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2wsh(script: &bitcoin::blockdata::script::Script) -> core::result::Result<Self, bitcoin::blockdata::script::WitnessScriptSizeError>
+pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::p2wsh_from_hash(hash: bitcoin::blockdata::script::WScriptHash) -> Self
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::partial_cmp(&self, other: &bitcoin::blockdata::script::witness_program::WitnessProgram) -> core::option::Option<core::cmp::Ordering>
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::program(&self) -> &bitcoin::blockdata::script::PushBytes
 pub fn bitcoin::blockdata::script::witness_program::WitnessProgram::version(&self) -> bitcoin::blockdata::script::witness_version::WitnessVersion
@@ -8791,9 +8818,11 @@ pub struct bitcoin::blockdata::script::InstructionIndices<'a>
 pub struct bitcoin::blockdata::script::Instructions<'a>
 pub struct bitcoin::blockdata::script::PushBytesBuf(_)
 pub struct bitcoin::blockdata::script::PushBytesError
+pub struct bitcoin::blockdata::script::RedeemScriptSizeError
 pub struct bitcoin::blockdata::script::ScriptBuf(_)
 pub struct bitcoin::blockdata::script::ScriptHash(_)
 pub struct bitcoin::blockdata::script::WScriptHash(_)
+pub struct bitcoin::blockdata::script::WitnessScriptSizeError
 pub struct bitcoin::blockdata::script::witness_program::WitnessProgram
 pub struct bitcoin::blockdata::script::witness_version::TryFromError
 pub struct bitcoin::blockdata::transaction::InputWeightPrediction
@@ -8855,9 +8884,11 @@ pub struct bitcoin::script::InstructionIndices<'a>
 pub struct bitcoin::script::Instructions<'a>
 pub struct bitcoin::script::PushBytesBuf(_)
 pub struct bitcoin::script::PushBytesError
+pub struct bitcoin::script::RedeemScriptSizeError
 pub struct bitcoin::script::ScriptBuf(_)
 pub struct bitcoin::script::ScriptHash(_)
 pub struct bitcoin::script::WScriptHash(_)
+pub struct bitcoin::script::WitnessScriptSizeError
 pub struct bitcoin::script::witness_program::WitnessProgram
 pub struct bitcoin::script::witness_version::TryFromError
 pub struct bitcoin::sighash::Annex<'a>(_)
@@ -9031,10 +9062,12 @@ pub type bitcoin::blockdata::script::ScriptBuf::Target = bitcoin::blockdata::scr
 pub type bitcoin::blockdata::script::ScriptHash::Bytes = <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Bytes
 pub type bitcoin::blockdata::script::ScriptHash::Engine = <bitcoin_hashes::hash160::Hash as bitcoin_hashes::Hash>::Engine
 pub type bitcoin::blockdata::script::ScriptHash::Err = hex_conservative::error::HexToArrayError
+pub type bitcoin::blockdata::script::ScriptHash::Error = bitcoin::blockdata::script::RedeemScriptSizeError
 pub type bitcoin::blockdata::script::ScriptHash::Output = <I as core::slice::index::SliceIndex<[u8]>>::Output
 pub type bitcoin::blockdata::script::WScriptHash::Bytes = <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Bytes
 pub type bitcoin::blockdata::script::WScriptHash::Engine = <bitcoin_hashes::sha256::Hash as bitcoin_hashes::Hash>::Engine
 pub type bitcoin::blockdata::script::WScriptHash::Err = hex_conservative::error::HexToArrayError
+pub type bitcoin::blockdata::script::WScriptHash::Error = bitcoin::blockdata::script::WitnessScriptSizeError
 pub type bitcoin::blockdata::script::WScriptHash::Output = <I as core::slice::index::SliceIndex<[u8]>>::Output
 pub type bitcoin::blockdata::script::witness_version::WitnessVersion::Err = bitcoin::blockdata::script::witness_version::FromStrError
 pub type bitcoin::blockdata::script::witness_version::WitnessVersion::Error = bitcoin::blockdata::script::witness_version::TryFromError

bitcoin/src/address/error.rs

@@ -56,37 +56,6 @@ impl From<witness_version::TryFromError> for FromScriptError {
     fn from(e: witness_version::TryFromError) -> Self { Self::WitnessVersion(e) }
 }
 
-/// Error while generating address from a p2sh script.
-#[derive(Debug, Clone, PartialEq, Eq)]
-#[non_exhaustive]
-pub enum P2shError {
-    /// Address size more than 520 bytes is not allowed.
-    ExcessiveScriptSize,
-}
-
-internals::impl_from_infallible!(P2shError);
-
-impl fmt::Display for P2shError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        use P2shError::*;
-
-        match *self {
-            ExcessiveScriptSize => write!(f, "script size exceed 520 bytes"),
-        }
-    }
-}
-
-#[cfg(feature = "std")]
-impl std::error::Error for P2shError {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        use P2shError::*;
-
-        match self {
-            ExcessiveScriptSize => None,
-        }
-    }
-}
-
 /// Address type is either invalid or not supported in rust-bitcoin.
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[non_exhaustive]

bitcoin/src/address/mod.rs

@@ -37,12 +37,14 @@ use hashes::{sha256, HashEngine};
 use secp256k1::{Secp256k1, Verification, XOnlyPublicKey};
 
 use crate::blockdata::constants::{
-    MAX_SCRIPT_ELEMENT_SIZE, PUBKEY_ADDRESS_PREFIX_MAIN, PUBKEY_ADDRESS_PREFIX_TEST,
+    PUBKEY_ADDRESS_PREFIX_MAIN, PUBKEY_ADDRESS_PREFIX_TEST, SCRIPT_ADDRESS_PREFIX_MAIN,
-    SCRIPT_ADDRESS_PREFIX_MAIN, SCRIPT_ADDRESS_PREFIX_TEST,
+    SCRIPT_ADDRESS_PREFIX_TEST,
 };
 use crate::blockdata::script::witness_program::WitnessProgram;
 use crate::blockdata::script::witness_version::WitnessVersion;
-use crate::blockdata::script::{self, Script, ScriptBuf, ScriptHash};
+use crate::blockdata::script::{
+    self, RedeemScriptSizeError, Script, ScriptBuf, ScriptHash, WScriptHash, WitnessScriptSizeError,
+};
 use crate::consensus::Params;
 use crate::crypto::key::{
     CompressedPublicKey, PubkeyHash, PublicKey, TweakedPublicKey, UntweakedPublicKey,
@@ -56,7 +58,7 @@ use crate::taproot::TapNodeHash;
 pub use self::{
     error::{
         FromScriptError, InvalidBase58PayloadLengthError, InvalidLegacyPrefixError, LegacyAddressTooLongError,
-        NetworkValidationError, ParseError, P2shError, UnknownAddressTypeError, UnknownHrpError
+        NetworkValidationError, ParseError, UnknownAddressTypeError, UnknownHrpError
     },
 };
 
@@ -400,11 +402,11 @@ impl Address {
     /// This address type was introduced with BIP16 and is the popular type to implement multi-sig
     /// these days.
     #[inline]
-    pub fn p2sh(script: &Script, network: impl Into<NetworkKind>) -> Result<Address, P2shError> {
+    pub fn p2sh(
-        if script.len() > MAX_SCRIPT_ELEMENT_SIZE {
+        redeem_script: &Script,
-            return Err(P2shError::ExcessiveScriptSize);
+        network: impl Into<NetworkKind>,
-        }
+    ) -> Result<Address, RedeemScriptSizeError> {
-        let hash = script.script_hash();
+        let hash = redeem_script.script_hash()?;
         Ok(Address::p2sh_from_hash(hash, network))
     }
 
@@ -431,23 +433,36 @@ impl Address {
     /// This is a segwit address type that looks familiar (as p2sh) to legacy clients.
     pub fn p2shwpkh(pk: CompressedPublicKey, network: impl Into<NetworkKind>) -> Address {
         let builder = script::Builder::new().push_int(0).push_slice(pk.wpubkey_hash());
-        let script_hash = builder.as_script().script_hash();
+        let script_hash = builder.as_script().script_hash().expect("script is less than 520 bytes");
         Address::p2sh_from_hash(script_hash, network)
     }
 
     /// Creates a witness pay to script hash address.
-    pub fn p2wsh(script: &Script, hrp: impl Into<KnownHrp>) -> Address {
+    pub fn p2wsh(
-        let program = WitnessProgram::p2wsh(script);
+        witness_script: &Script,
+        hrp: impl Into<KnownHrp>,
+    ) -> Result<Address, WitnessScriptSizeError> {
+        let program = WitnessProgram::p2wsh(witness_script)?;
+        Ok(Address::from_witness_program(program, hrp))
+    }
+
+    /// Creates a witness pay to script hash address.
+    pub fn p2wsh_from_hash(hash: WScriptHash, hrp: impl Into<KnownHrp>) -> Address {
+        let program = WitnessProgram::p2wsh_from_hash(hash);
         Address::from_witness_program(program, hrp)
     }
 
     /// Creates a pay to script address that embeds a witness pay to script hash address.
     ///
     /// This is a segwit address type that looks familiar (as p2sh) to legacy clients.
-    pub fn p2shwsh(script: &Script, network: impl Into<NetworkKind>) -> Address {
+    pub fn p2shwsh(
-        let builder = script::Builder::new().push_int(0).push_slice(script.wscript_hash());
+        witness_script: &Script,
-        let script_hash = builder.as_script().script_hash();
+        network: impl Into<NetworkKind>,
-        Address::p2sh_from_hash(script_hash, network)
+    ) -> Result<Address, WitnessScriptSizeError> {
+        let hash = witness_script.wscript_hash()?;
+        let builder = script::Builder::new().push_int(0).push_slice(&hash);
+        let script_hash = builder.as_script().script_hash().expect("script is less than 520 bytes");
+        Ok(Address::p2sh_from_hash(script_hash, network))
     }
 
     /// Creates a pay to taproot address from an untweaked key.
@@ -957,7 +972,10 @@ mod tests {
     #[test]
     fn test_p2sh_parse_for_large_script() {
         let script = ScriptBuf::from_hex("552103a765fc35b3f210b95223846b36ef62a4e53e34e2925270c2c7906b92c9f718eb2103c327511374246759ec8d0b89fa6c6b23b33e11f92c5bc155409d86de0c79180121038cae7406af1f12f4786d820a1466eec7bc5785a1b5e4a387eca6d797753ef6db2103252bfb9dcaab0cd00353f2ac328954d791270203d66c2be8b430f115f451b8a12103e79412d42372c55dd336f2eb6eb639ef9d74a22041ba79382c74da2338fe58ad21035049459a4ebc00e876a9eef02e72a3e70202d3d1f591fc0dd542f93f642021f82102016f682920d9723c61b27f562eb530c926c00106004798b6471e8c52c60ee02057ae12123122313123123ac1231231231231313123131231231231313212313213123123552103a765fc35b3f210b95223846b36ef62a4e53e34e2925270c2c7906b92c9f718eb2103c327511374246759ec8d0b89fa6c6b23b33e11f92c5bc155409d86de0c79180121038cae7406af1f12f4786d820a1466eec7bc5785a1b5e4a387eca6d797753ef6db2103252bfb9dcaab0cd00353f2ac328954d791270203d66c2be8b430f115f451b8a12103e79412d42372c55dd336f2eb6eb639ef9d74a22041ba79382c74da2338fe58ad21035049459a4ebc00e876a9eef02e72a3e70202d3d1f591fc0dd542f93f642021f82102016f682920d9723c61b27f562eb530c926c00106004798b6471e8c52c60ee02057ae12123122313123123ac1231231231231313123131231231231313212313213123123552103a765fc35b3f210b95223846b36ef62a4e53e34e2925270c2c7906b92c9f718eb2103c327511374246759ec8d0b89fa6c6b23b33e11f92c5bc155409d86de0c79180121038cae7406af1f12f4786d820a1466eec7bc5785a1b5e4a387eca6d797753ef6db2103252bfb9dcaab0cd00353f2ac328954d791270203d66c2be8b430f115f451b8a12103e79412d42372c55dd336f2eb6eb639ef9d74a22041ba79382c74da2338fe58ad21035049459a4ebc00e876a9eef02e72a3e70202d3d1f591fc0dd542f93f642021f82102016f682920d9723c61b27f562eb530c926c00106004798b6471e8c52c60ee02057ae12123122313123123ac1231231231231313123131231231231313212313213123123").unwrap();
-        assert_eq!(Address::p2sh(&script, NetworkKind::Test), Err(P2shError::ExcessiveScriptSize));
+        assert_eq!(
+            Address::p2sh(&script, NetworkKind::Test),
+            Err(RedeemScriptSizeError { size: script.len() })
+        );
     }
 
     #[test]
@@ -976,7 +994,7 @@ mod tests {
     fn test_p2wsh() {
         // stolen from Bitcoin transaction 5df912fda4becb1c29e928bec8d64d93e9ba8efa9b5b405bd683c86fd2c65667
         let script = ScriptBuf::from_hex("52210375e00eb72e29da82b89367947f29ef34afb75e8654f6ea368e0acdfd92976b7c2103a1b26313f430c4b15bb1fdce663207659d8cac749a0e53d70eff01874496feff2103c96d495bfdd5ba4145e3e046fee45e84a8a48ad05bd8dbb395c011a32cf9f88053ae").unwrap();
-        let addr = Address::p2wsh(&script, KnownHrp::Mainnet);
+        let addr = Address::p2wsh(&script, KnownHrp::Mainnet).expect("script is valid");
         assert_eq!(
             &addr.to_string(),
             "bc1qwqdg6squsna38e46795at95yu9atm8azzmyvckulcc7kytlcckxswvvzej"
@@ -1001,7 +1019,7 @@ mod tests {
     fn test_p2shwsh() {
         // stolen from Bitcoin transaction f9ee2be4df05041d0e0a35d7caa3157495ca4f93b233234c9967b6901dacf7a9
         let script = ScriptBuf::from_hex("522103e5529d8eaa3d559903adb2e881eb06c86ac2574ffa503c45f4e942e2a693b33e2102e5f10fcdcdbab211e0af6a481f5532536ec61a5fdbf7183770cf8680fe729d8152ae").unwrap();
-        let addr = Address::p2shwsh(&script, NetworkKind::Main);
+        let addr = Address::p2shwsh(&script, NetworkKind::Main).expect("script is valid");
         assert_eq!(&addr.to_string(), "36EqgNnsWW94SreZgBWc1ANC6wpFZwirHr");
         assert_eq!(addr.address_type(), Some(AddressType::P2sh));
         roundtrips(&addr, Bitcoin);

bitcoin/src/blockdata/constants.rs

@@ -40,8 +40,12 @@ pub const SCRIPT_ADDRESS_PREFIX_MAIN: u8 = 5; // 0x05
 pub const PUBKEY_ADDRESS_PREFIX_TEST: u8 = 111; // 0x6f
 /// Test (tesnet, signet, regtest) script address prefix.
 pub const SCRIPT_ADDRESS_PREFIX_TEST: u8 = 196; // 0xc4
-/// The maximum allowed script size.
+/// The maximum allowed redeem script size for a P2SH output.
-pub const MAX_SCRIPT_ELEMENT_SIZE: usize = 520;
+pub const MAX_REDEEM_SCRIPT_SIZE: usize = 520;
+/// The maximum allowed redeem script size of the witness script.
+pub const MAX_WITNESS_SCRIPT_SIZE: usize = 10_000;
+/// The maximum allowed size of any single witness stack element.
+pub const MAX_STACK_ELEMENT_SIZE: usize = 520;
 /// How may blocks between halvings.
 pub const SUBSIDY_HALVING_INTERVAL: u32 = 210_000;
 /// Maximum allowed value for an integer in Script.

bitcoin/src/blockdata/script/borrowed.rs

@@ -13,8 +13,8 @@ use crate::blockdata::opcodes::all::*;
 use crate::blockdata::opcodes::{self, Opcode};
 use crate::blockdata::script::witness_version::WitnessVersion;
 use crate::blockdata::script::{
-    bytes_to_asm_fmt, Builder, Instruction, InstructionIndices, Instructions, ScriptBuf,
+    bytes_to_asm_fmt, Builder, Instruction, InstructionIndices, Instructions,
-    ScriptHash, WScriptHash,
+    RedeemScriptSizeError, ScriptBuf, ScriptHash, WScriptHash, WitnessScriptSizeError,
 };
 use crate::consensus::Encodable;
 use crate::key::{PublicKey, UntweakedPublicKey, WPubkeyHash};
@@ -115,13 +115,17 @@ impl Script {
     /// Creates a new script builder
     pub fn builder() -> Builder { Builder::new() }
 
-    /// Returns 160-bit hash of the script.
+    /// Returns 160-bit hash of the script for P2SH outputs.
     #[inline]
-    pub fn script_hash(&self) -> ScriptHash { ScriptHash::hash(self.as_bytes()) }
+    pub fn script_hash(&self) -> Result<ScriptHash, RedeemScriptSizeError> {
+        ScriptHash::from_script(self)
+    }
 
     /// Returns 256-bit hash of the script for P2WSH outputs.
     #[inline]
-    pub fn wscript_hash(&self) -> WScriptHash { WScriptHash::hash(self.as_bytes()) }
+    pub fn wscript_hash(&self) -> Result<WScriptHash, WitnessScriptSizeError> {
+        WScriptHash::from_script(self)
+    }
 
     /// Computes leaf hash of tapscript.
     #[inline]
@@ -148,7 +152,9 @@ impl Script {
     /// Computes the P2WSH output corresponding to this witnessScript (aka the "witness redeem
     /// script").
     #[inline]
-    pub fn to_p2wsh(&self) -> ScriptBuf { ScriptBuf::new_p2wsh(&self.wscript_hash()) }
+    pub fn to_p2wsh(&self) -> Result<ScriptBuf, WitnessScriptSizeError> {
+        self.wscript_hash().map(|hash| ScriptBuf::new_p2wsh(&hash))
+    }
 
     /// Computes P2TR output with a given internal key and a single script spending path equal to
     /// the current script, assuming that the script is a Tapscript.
@@ -376,7 +382,9 @@ impl Script {
     }
 
     /// Computes the P2SH output corresponding to this redeem script.
-    pub fn to_p2sh(&self) -> ScriptBuf { ScriptBuf::new_p2sh(&self.script_hash()) }
+    pub fn to_p2sh(&self) -> Result<ScriptBuf, RedeemScriptSizeError> {
+        self.script_hash().map(|hash| ScriptBuf::new_p2sh(&hash))
+    }
 
     /// Returns the script code used for spending a P2WPKH output if this script is a script pubkey
     /// for a P2WPKH output. The `scriptCode` is described in [BIP143].

bitcoin/src/blockdata/script/mod.rs

@@ -67,6 +67,7 @@ use core::ops::{Deref, DerefMut};
 use hashes::{hash160, sha256};
 use io::{BufRead, Write};
 
+use crate::blockdata::constants::{MAX_REDEEM_SCRIPT_SIZE, MAX_WITNESS_SCRIPT_SIZE};
 use crate::blockdata::opcodes::all::*;
 use crate::blockdata::opcodes::{self, Opcode};
 use crate::consensus::{encode, Decodable, Encodable};
@@ -92,28 +93,106 @@ hashes::hash_newtype! {
 }
 impl_asref_push_bytes!(ScriptHash, WScriptHash);
 
-impl From<ScriptBuf> for ScriptHash {
+impl ScriptHash {
-    fn from(script: ScriptBuf) -> ScriptHash { script.script_hash() }
+    /// Creates a `ScriptHash` after first checking the script size.
+    ///
+    /// # 520-byte limitation on serialized script size
+    ///
+    /// > As a consequence of the requirement for backwards compatibility the serialized script is
+    /// > itself subject to the same rules as any other PUSHDATA operation, including the rule that
+    /// > no data greater than 520 bytes may be pushed to the stack. Thus it is not possible to
+    /// > spend a P2SH output if the redemption script it refers to is >520 bytes in length.
+    ///
+    /// ref: [BIP-16](https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki#user-content-520byte_limitation_on_serialized_script_size)
+    pub fn from_script(redeem_script: &Script) -> Result<Self, RedeemScriptSizeError> {
+        if redeem_script.len() > MAX_REDEEM_SCRIPT_SIZE {
+            return Err(RedeemScriptSizeError { size: redeem_script.len() });
+        }
+
+        Ok(ScriptHash::hash(redeem_script.as_bytes()))
+    }
+
+    /// Creates a `ScriptHash` from any script irrespective of script size.
+    ///
+    /// If you hash a script that exceeds 520 bytes in size and use it to create a P2SH output
+    /// then the output will be unspendable (see [BIP-16]).
+    ///
+    /// [BIP-16]: <https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki#user-content-520byte_limitation_on_serialized_script_size>
+    pub fn from_script_unchecked(script: &Script) -> Self { ScriptHash::hash(script.as_bytes()) }
 }
 
-impl From<&ScriptBuf> for ScriptHash {
+impl WScriptHash {
-    fn from(script: &ScriptBuf) -> ScriptHash { script.script_hash() }
+    /// Creates a `WScriptHash` after first checking the script size.
+    ///
+    /// # 10,000-byte limit on the witness script
+    ///
+    /// > The witnessScript (≤ 10,000 bytes) is popped off the initial witness stack. SHA256 of the
+    /// > witnessScript must match the 32-byte witness program.
+    ///
+    /// ref: [BIP-141](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki)
+    pub fn from_script(witness_script: &Script) -> Result<Self, WitnessScriptSizeError> {
+        if witness_script.len() > MAX_WITNESS_SCRIPT_SIZE {
+            return Err(WitnessScriptSizeError { size: witness_script.len() });
+        }
+
+        Ok(WScriptHash::hash(witness_script.as_bytes()))
+    }
+
+    /// Creates a `WScriptHash` from any script irrespective of script size.
+    ///
+    /// If you hash a script that exceeds 10,000 bytes in size and use it to create a Segwit
+    /// output then the output will be unspendable (see [BIP-141]).
+    ///
+    /// ref: [BIP-141](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki)
+    pub fn from_script_unchecked(script: &Script) -> Self { WScriptHash::hash(script.as_bytes()) }
 }
 
-impl From<&Script> for ScriptHash {
+impl TryFrom<ScriptBuf> for ScriptHash {
-    fn from(script: &Script) -> ScriptHash { script.script_hash() }
+    type Error = RedeemScriptSizeError;
+
+    fn try_from(redeem_script: ScriptBuf) -> Result<Self, Self::Error> {
+        Self::from_script(&redeem_script)
+    }
 }
 
-impl From<ScriptBuf> for WScriptHash {
+impl TryFrom<&ScriptBuf> for ScriptHash {
-    fn from(script: ScriptBuf) -> WScriptHash { script.wscript_hash() }
+    type Error = RedeemScriptSizeError;
+
+    fn try_from(redeem_script: &ScriptBuf) -> Result<Self, Self::Error> {
+        Self::from_script(redeem_script)
+    }
 }
 
-impl From<&ScriptBuf> for WScriptHash {
+impl TryFrom<&Script> for ScriptHash {
-    fn from(script: &ScriptBuf) -> WScriptHash { script.wscript_hash() }
+    type Error = RedeemScriptSizeError;
+
+    fn try_from(redeem_script: &Script) -> Result<Self, Self::Error> {
+        Self::from_script(redeem_script)
+    }
 }
 
-impl From<&Script> for WScriptHash {
+impl TryFrom<ScriptBuf> for WScriptHash {
-    fn from(script: &Script) -> WScriptHash { script.wscript_hash() }
+    type Error = WitnessScriptSizeError;
+
+    fn try_from(witness_script: ScriptBuf) -> Result<Self, Self::Error> {
+        Self::from_script(&witness_script)
+    }
+}
+
+impl TryFrom<&ScriptBuf> for WScriptHash {
+    type Error = WitnessScriptSizeError;
+
+    fn try_from(witness_script: &ScriptBuf) -> Result<Self, Self::Error> {
+        Self::from_script(witness_script)
+    }
+}
+
+impl TryFrom<&Script> for WScriptHash {
+    type Error = WitnessScriptSizeError;
+
+    fn try_from(witness_script: &Script) -> Result<Self, Self::Error> {
+        Self::from_script(witness_script)
+    }
 }
 
 /// Encodes an integer in script(minimal CScriptNum) format.
@@ -705,3 +784,39 @@ impl From<UintError> for Error {
         }
     }
 }
+
+/// Error while hashing a redeem script.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct RedeemScriptSizeError {
+    /// Invalid redeem script size (cannot exceed 520 bytes).
+    pub size: usize,
+}
+
+internals::impl_from_infallible!(RedeemScriptSizeError);
+
+impl fmt::Display for RedeemScriptSizeError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "redeem script size exceeds {} bytes: {}", MAX_REDEEM_SCRIPT_SIZE, self.size)
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for RedeemScriptSizeError {}
+
+/// Error while hashing a witness script.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct WitnessScriptSizeError {
+    /// Invalid witness script size (cannot exceed 10,000 bytes).
+    pub size: usize,
+}
+
+internals::impl_from_infallible!(WitnessScriptSizeError);
+
+impl fmt::Display for WitnessScriptSizeError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "witness script size exceeds {} bytes: {}", MAX_WITNESS_SCRIPT_SIZE, self.size)
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for WitnessScriptSizeError {}

bitcoin/src/blockdata/script/tests.rs

@@ -210,15 +210,15 @@ fn script_generators() {
     assert!(ScriptBuf::new_p2wpkh(&wpubkey_hash).is_p2wpkh());
 
     let script = Builder::new().push_opcode(OP_NUMEQUAL).push_verify().into_script();
-    let script_hash = script.script_hash();
+    let script_hash = script.script_hash().expect("script is less than 520 bytes");
     let p2sh = ScriptBuf::new_p2sh(&script_hash);
     assert!(p2sh.is_p2sh());
-    assert_eq!(script.to_p2sh(), p2sh);
+    assert_eq!(script.to_p2sh().unwrap(), p2sh);
 
-    let wscript_hash = script.wscript_hash();
+    let wscript_hash = script.wscript_hash().expect("script is less than 10,000 bytes");
     let p2wsh = ScriptBuf::new_p2wsh(&wscript_hash);
     assert!(p2wsh.is_p2wsh());
-    assert_eq!(script.to_p2wsh(), p2wsh);
+    assert_eq!(script.to_p2wsh().unwrap(), p2wsh);
 
     // Test data are taken from the second output of
     // 2ccb3a1f745eb4eefcf29391460250adda5fab78aaddb902d25d3cd97d9d8e61 transaction
@@ -364,9 +364,12 @@ fn non_minimal_scriptints() {
 #[test]
 fn script_hashes() {
     let script = ScriptBuf::from_hex("410446ef0102d1ec5240f0d061a4246c1bdef63fc3dbab7733052fbbf0ecd8f41fc26bf049ebb4f9527f374280259e7cfa99c48b0e3f39c51347a19a5819651503a5ac").unwrap();
-    assert_eq!(script.script_hash().to_string(), "8292bcfbef1884f73c813dfe9c82fd7e814291ea");
     assert_eq!(
-        script.wscript_hash().to_string(),
+        script.script_hash().unwrap().to_string(),
+        "8292bcfbef1884f73c813dfe9c82fd7e814291ea"
+    );
+    assert_eq!(
+        script.wscript_hash().unwrap().to_string(),
         "3e1525eb183ad4f9b3c5fa3175bdca2a52e947b135bbb90383bf9f6408e2c324"
     );
     assert_eq!(
@@ -548,31 +551,30 @@ fn script_p2pk() {
 fn p2sh_p2wsh_conversion() {
     // Test vectors taken from Core tests/data/script_tests.json
     // bare p2wsh
-    let redeem_script = ScriptBuf::from_hex("410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac").unwrap();
+    let witness_script = ScriptBuf::from_hex("410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac").unwrap();
     let expected_witout =
         ScriptBuf::from_hex("0020b95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64")
             .unwrap();
-    assert!(redeem_script.to_p2wsh().is_p2wsh());
+    assert!(witness_script.to_p2wsh().unwrap().is_p2wsh());
-    assert_eq!(redeem_script.to_p2wsh(), expected_witout);
+    assert_eq!(witness_script.to_p2wsh().unwrap(), expected_witout);
 
     // p2sh
     let redeem_script = ScriptBuf::from_hex("0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8").unwrap();
     let expected_p2shout =
         ScriptBuf::from_hex("a91491b24bf9f5288532960ac687abb035127b1d28a587").unwrap();
-    assert!(redeem_script.to_p2sh().is_p2sh());
+    assert!(redeem_script.to_p2sh().unwrap().is_p2sh());
-    assert_eq!(redeem_script.to_p2sh(), expected_p2shout);
+    assert_eq!(redeem_script.to_p2sh().unwrap(), expected_p2shout);
 
     // p2sh-p2wsh
-    let redeem_script = ScriptBuf::from_hex("410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac").unwrap();
+    let witness_script = ScriptBuf::from_hex("410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac").unwrap();
     let expected_witout =
         ScriptBuf::from_hex("0020b95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64")
             .unwrap();
     let expected_out =
         ScriptBuf::from_hex("a914f386c2ba255cc56d20cfa6ea8b062f8b5994551887").unwrap();
-    assert!(redeem_script.to_p2sh().is_p2sh());
+    assert!(witness_script.to_p2sh().unwrap().is_p2sh());
-    assert!(redeem_script.to_p2sh().to_p2wsh().is_p2wsh());
+    assert_eq!(witness_script.to_p2wsh().unwrap(), expected_witout);
-    assert_eq!(redeem_script.to_p2wsh(), expected_witout);
+    assert_eq!(witness_script.to_p2wsh().unwrap().to_p2sh().unwrap(), expected_out);
-    assert_eq!(redeem_script.to_p2wsh().to_p2sh(), expected_out);
 }
 
 macro_rules! unwrap_all {

bitcoin/src/blockdata/script/witness_program.rs

@@ -13,7 +13,7 @@ use internals::array_vec::ArrayVec;
 use secp256k1::{Secp256k1, Verification};
 
 use crate::blockdata::script::witness_version::WitnessVersion;
-use crate::blockdata::script::{PushBytes, Script};
+use crate::blockdata::script::{PushBytes, Script, WScriptHash, WitnessScriptSizeError};
 use crate::crypto::key::{CompressedPublicKey, TapTweak, TweakedPublicKey, UntweakedPublicKey};
 use crate::taproot::TapNodeHash;
 
@@ -77,8 +77,12 @@ impl WitnessProgram {
     }
 
     /// Creates a [`WitnessProgram`] from `script` for a P2WSH output.
-    pub fn p2wsh(script: &Script) -> Self {
+    pub fn p2wsh(script: &Script) -> Result<Self, WitnessScriptSizeError> {
-        let hash = script.wscript_hash();
+        script.wscript_hash().map(Self::p2wsh_from_hash)
+    }
+
+    /// Creates a [`WitnessProgram`] from `script` for a P2WSH output.
+    pub fn p2wsh_from_hash(hash: WScriptHash) -> Self {
         WitnessProgram::new_p2wsh(hash.to_byte_array())
     }
 

bitcoin/src/psbt/mod.rs

@@ -1757,10 +1757,10 @@ mod tests {
 
             assert!(redeem_script.is_p2wpkh());
             assert_eq!(
-                redeem_script.to_p2sh(),
+                redeem_script.to_p2sh().unwrap(),
                 psbt.inputs[1].witness_utxo.as_ref().unwrap().script_pubkey
             );
-            assert_eq!(redeem_script.to_p2sh(), expected_out);
+            assert_eq!(redeem_script.to_p2sh().unwrap(), expected_out);
 
             for output in psbt.outputs {
                 assert_eq!(output.get_pairs().len(), 0)
@@ -1803,10 +1803,10 @@ mod tests {
 
             assert!(redeem_script.is_p2wpkh());
             assert_eq!(
-                redeem_script.to_p2sh(),
+                redeem_script.to_p2sh().unwrap(),
                 psbt.inputs[1].witness_utxo.as_ref().unwrap().script_pubkey
             );
-            assert_eq!(redeem_script.to_p2sh(), expected_out);
+            assert_eq!(redeem_script.to_p2sh().unwrap(), expected_out);
 
             for output in psbt.outputs {
                 assert!(!output.get_pairs().is_empty())
@@ -1828,11 +1828,11 @@ mod tests {
 
             assert!(redeem_script.is_p2wsh());
             assert_eq!(
-                redeem_script.to_p2sh(),
+                redeem_script.to_p2sh().unwrap(),
                 psbt.inputs[0].witness_utxo.as_ref().unwrap().script_pubkey
             );
 
-            assert_eq!(redeem_script.to_p2sh(), expected_out);
+            assert_eq!(redeem_script.to_p2sh().unwrap(), expected_out);
         }
 
         #[test]