Merge rust-bitcoin#4668: Inline script_pubkey extension traits

25e1d8d Inline script_pubkey ScriptBuf extension trait (Tobin C. Harding)
afd3607 Inline script_pubkey Script extension traits (Tobin C. Harding)
f8823f5 Remove BuilderExt trait (Tobin C. Harding)

Pull request description:

  The separation of extension traits into the `script_pubkey` module does not assist clarity and makes it less ergonomic for users having to import traits from different locations. 
  
  Inline and move all the logic from `address::script_pubkey` and remove the module. Excuse the code churn, this is 100% my fault.


ACKs for top commit:
  apoelstra:
    ACK 25e1d8d; successfully ran local tests


Tree-SHA512: 0796f1e8b7b04db41185ee39e0c7cad9c97221346d47913250eab69aa408fcdca52ed6757a27c2b1e314495373a15420c01e403d5dd0061212163882ee80749d

Author: apoelstra

bitcoin/examples/ecdsa-psbt-simple.rs

@@ -24,11 +24,11 @@
 //! The miner's fee will be 10,000 satoshis.
 use std::collections::BTreeMap;
 
-use bitcoin::address::script_pubkey::ScriptBufExt as _;
 use bitcoin::bip32::{ChildNumber, DerivationPath, Fingerprint, IntoDerivationPath, Xpriv, Xpub};
 use bitcoin::key::WPubkeyHash;
 use bitcoin::locktime::absolute;
 use bitcoin::psbt::Input;
+use bitcoin::script::ScriptBufExt as _;
 use bitcoin::secp256k1::{Secp256k1, Signing};
 use bitcoin::witness::WitnessExt as _;
 use bitcoin::{

bitcoin/examples/ecdsa-psbt.rs

@@ -31,7 +31,6 @@
 use std::collections::BTreeMap;
 use std::fmt;
 
-use bitcoin::address::script_pubkey::ScriptBufExt as _;
 use bitcoin::bip32::{ChildNumber, DerivationPath, Fingerprint, IntoDerivationPath, Xpriv, Xpub};
 use bitcoin::consensus::encode;
 use bitcoin::consensus_validation::TransactionExt as _;

bitcoin/examples/sighash.rs

@@ -1,5 +1,4 @@
-use bitcoin::address::script_pubkey::ScriptBufExt as _;
-use bitcoin::script::ScriptExt as _;
+use bitcoin::script::{ScriptBufExt as _, ScriptExt as _};
 use bitcoin::{
     consensus, ecdsa, sighash, Amount, CompressedPublicKey, Script, ScriptBuf, Transaction,
 };

bitcoin/examples/sign-tx-segwit-v0.rs

@@ -2,9 +2,9 @@
 
 //! Demonstrate creating a transaction that spends to and from p2wpkh outputs.
 
-use bitcoin::address::script_pubkey::ScriptBufExt as _;
 use bitcoin::key::WPubkeyHash;
 use bitcoin::locktime::absolute;
+use bitcoin::script::ScriptBufExt as _;
 use bitcoin::secp256k1::{rand, Message, Secp256k1, SecretKey, Signing};
 use bitcoin::sighash::{EcdsaSighashType, SighashCache};
 use bitcoin::witness::WitnessExt as _;

bitcoin/examples/sign-tx-taproot.rs

@@ -2,9 +2,9 @@
 
 //! Demonstrate creating a transaction that spends to and from p2tr outputs.
 
-use bitcoin::address::script_pubkey::ScriptBufExt as _;
 use bitcoin::key::{Keypair, TapTweak, TweakedKeypair, UntweakedPublicKey};
 use bitcoin::locktime::absolute;
+use bitcoin::script::ScriptBufExt as _;
 use bitcoin::secp256k1::{rand, Message, Secp256k1, SecretKey, Signing, Verification};
 use bitcoin::sighash::{Prevouts, SighashCache, TapSighashType};
 use bitcoin::witness::WitnessExt as _;

bitcoin/examples/taproot-psbt-simple.rs

@@ -22,11 +22,11 @@
 //! The miner's fee will be 10,000 satoshis.
 use std::collections::BTreeMap;
 
-use bitcoin::address::script_pubkey::ScriptBufExt as _;
 use bitcoin::bip32::{ChildNumber, DerivationPath, Fingerprint, IntoDerivationPath, Xpriv, Xpub};
 use bitcoin::key::UntweakedPublicKey;
 use bitcoin::locktime::absolute;
 use bitcoin::psbt::Input;
+use bitcoin::script::ScriptBufExt as _;
 use bitcoin::secp256k1::{Secp256k1, Signing};
 use bitcoin::witness::WitnessExt as _;
 use bitcoin::{

bitcoin/examples/taproot-psbt.rs

@@ -77,7 +77,6 @@ const UTXO_3: P2trUtxo = P2trUtxo {
 
 use std::collections::BTreeMap;
 
-use bitcoin::address::script_pubkey::{BuilderExt as _, ScriptBufExt as _};
 use bitcoin::bip32::{ChildNumber, DerivationPath, Fingerprint, Xpriv, Xpub};
 use bitcoin::consensus::encode;
 use bitcoin::consensus_validation::TransactionExt as _;

bitcoin/src/address/mod.rs

@@ -40,7 +40,6 @@
 //! ```
 
 pub mod error;
-pub mod script_pubkey;
 
 use core::fmt;
 use core::marker::PhantomData;
@@ -52,7 +51,6 @@ use hashes::{hash160, HashEngine};
 use internals::array::ArrayExt;
 use secp256k1::{Secp256k1, Verification};
 
-use crate::address::script_pubkey::ScriptBufExt as _;
 use crate::constants::{
     PUBKEY_ADDRESS_PREFIX_MAIN, PUBKEY_ADDRESS_PREFIX_TEST, SCRIPT_ADDRESS_PREFIX_MAIN,
     SCRIPT_ADDRESS_PREFIX_TEST,
@@ -66,8 +64,8 @@ use crate::prelude::{String, ToOwned};
 use crate::script::witness_program::WitnessProgram;
 use crate::script::witness_version::WitnessVersion;
 use crate::script::{
-    self, RedeemScriptSizeError, Script, ScriptBuf, ScriptExt as _, ScriptHash, WScriptHash,
-    WitnessScriptSizeError,
+    self, RedeemScriptSizeError, Script, ScriptBuf, ScriptBufExt as _, ScriptExt as _, ScriptHash,
+    WScriptHash, WitnessScriptSizeError,
 };
 use crate::taproot::TapNodeHash;
 
@@ -714,7 +712,7 @@ impl Address {
             Segwit { ref program, hrp: _ } => {
                 let prog = program.program();
                 let version = program.version();
-                script_pubkey::new_witness_program_unchecked(version, prog)
+                script::new_witness_program_unchecked(version, prog)
             }
         }
     }
@@ -1022,7 +1020,6 @@ mod tests {
     use super::*;
     use crate::network::Network::{Bitcoin, Testnet};
     use crate::network::{params, TestnetVersion};
-    use crate::script::ScriptBufExt as _;
 
     fn roundtrips(addr: &Address, network: Network) {
         assert_eq!(