Add model test for decode_script with P2WPKH SegWit output

Author: +Sharon

integration_test/tests/raw_transactions.rs

@@ -214,6 +214,51 @@ fn raw_transactions__decode_script__modelled() {
     }
 }
 
+#[test]
+fn raw_transactions__decode_script_segwit__modelled() {
+    use bitcoin::{Address, Network};
+    use bitcoin::address::NetworkUnchecked;
+    let node = Node::with_wallet(Wallet::Default, &["-txindex"]);
+     // Ensure wallet is loaded (ignore if already loaded)
+    node.client.load_wallet("default").ok();
+    node.fund_wallet();
+    // Get the address from the RPC result
+    let address_unc = node
+        .client
+        .get_new_address(None, None)
+        .expect("getnewaddress")
+        .address()
+        .expect("valid address string");
+    // address_unc is already Address<NetworkUnchecked>
+    // Convert to Address<Network> for script_pubkey
+    let address = address_unc
+        .require_network(Network::Regtest)
+        .expect("must be regtest");
+    let script = address.script_pubkey();
+    let hex = script.to_hex_string();
+    // Decode and model
+    let json = node.client.decode_script(&hex).expect("decodescript");
+    let model: Result<mtype::DecodeScript, DecodeScriptError> = json.into_model();
+    let decoded = model.expect("DecodeScript into model");
+
+    let segwit = decoded
+        .segwit
+        .expect("Expected DecodeScriptSegwit present for P2WPKH");
+    // Assertions
+    assert!(segwit.asm.contains("OP_"));
+    assert_eq!(segwit.hex, script);
+    assert_eq!(segwit.type_, "witness_v0_keyhash");
+    // Convert `Address<Network>` back to unchecked for comparison
+    let address_unc_check = address.into_unchecked();
+
+    assert!(
+        segwit.addresses.iter().any(|a| a == &address_unc_check),
+        "Expected address {:?} in segwit.addresses: {:?}",
+        address_unc_check,
+        segwit.addresses
+    );
+}
+
 // Script builder code copied from rust-bitcoin script unit tests.
 fn arbitrary_p2pkh_script() -> ScriptBuf {
     let pubkey_hash = <[u8; 20]>::from_hex("16e1ae70ff0fa102905d4af297f6912bda6cce19").unwrap();

types/src/v17/raw_transactions/into.rs

@@ -11,11 +11,11 @@ use bitcoin::{
 use super::{
     CombinePsbt, CombineRawTransaction, ConvertToPsbt, CreatePsbt, CreateRawTransaction,
     DecodePsbt, DecodePsbtError, DecodeRawTransaction, DecodeScript, DecodeScriptError,
-    FinalizePsbt, FinalizePsbtError, FundRawTransaction, FundRawTransactionError,
-    GetRawTransaction, GetRawTransactionVerbose, GetRawTransactionVerboseError, MempoolAcceptance,
-    PsbtInput, PsbtInputError, PsbtOutput, PsbtOutputError, SendRawTransaction, SignFail,
-    SignFailError, SignRawTransaction, SignRawTransactionError, TestMempoolAccept,DecodeScriptSegwit,
-    DecodeScriptSegwitError,
+    DecodeScriptSegwit, DecodeScriptSegwitError, FinalizePsbt, FinalizePsbtError,
+    FundRawTransaction, FundRawTransactionError, GetRawTransaction, GetRawTransactionVerbose,
+    GetRawTransactionVerboseError, MempoolAcceptance, PsbtInput, PsbtInputError, PsbtOutput,
+    PsbtOutputError, SendRawTransaction, SignFail, SignFailError, SignRawTransaction,
+    SignRawTransactionError, TestMempoolAccept,
 };
 use crate::model;
 use crate::psbt::RawTransactionError;
@@ -338,7 +338,7 @@ impl DecodeScriptSegwit {
             asm: self.asm,
             hex: self.hex,
             descriptor: None,
-            address:None,
+            address: None,
             type_: self.type_,
             required_signatures,
             addresses,

types/src/v22/mod.rs

@@ -256,7 +256,8 @@ pub use self::{
     control::Logging,
     network::{Banned, GetPeerInfo, ListBanned},
     raw_transactions::{
-        DecodeScript, DecodeScriptError,DecodeScriptSegwit, DecodeScriptSegwitError},
+        DecodeScript, DecodeScriptError, DecodeScriptSegwit, DecodeScriptSegwitError,
+    },
     signer::EnumerateSigners,
     wallet::{ListDescriptors, WalletDisplayAddress},
 };

types/src/v23/mod.rs

@@ -253,7 +253,7 @@ pub use self::{
     network::GetPeerInfo,
     raw_transactions::{
         DecodePsbt, DecodePsbtError, DecodeScript, DecodeScriptError, DecodeScriptSegwit,
-         GlobalXpub, Proprietary, PsbtInput, PsbtOutput,
+        GlobalXpub, Proprietary, PsbtInput, PsbtOutput,
     },
     util::CreateMultisig,
     wallet::{GetTransaction, GetTransactionError, RestoreWallet},

types/src/v23/raw_transactions/error.rs

@@ -299,4 +299,4 @@ impl std::error::Error for DecodeScriptError {
             E::P2sh(ref e) => Some(e),
         }
     }
-}
+}