Merge rust-bitcoin/rust-miniscript#310: Fix finalizer check for sh(wpkh)

983b889a1f2349ddfe78236dd6f6778d4634b332 Fix finalizer check for sh(wpkh) (sanket1729)

Pull request description:

  We should check the witness script hashes to the redeem script in the
  nested sh wsh case. Not the script pubkey

  Caught up integration tests

ACKs for top commit:
  apoelstra:
    ACK 983b889a1f2349ddfe78236dd6f6778d4634b332

Tree-SHA512: 0c774eae86b05eae07137a47bc8ae71e252a118aeaf3b5ffb7eac547da1bbe147856af392c995cf1f5dae1d65f4d27fb64ad20eea48d2de454e01f48ed968e64

Author: heap-coder

src/psbt/finalizer.rs

@@ -236,7 +236,7 @@ fn get_descriptor(psbt: &Psbt, index: usize) -> Result<Descriptor<PublicKey>, In
                             let pk = bitcoin::PublicKey::new(pk);
                             let addr = bitcoin::Address::p2wpkh(&pk, bitcoin::Network::Bitcoin)
                                 .expect("Address corresponding to valid pubkey");
-                            *script_pubkey == addr.script_pubkey()
+                            *redeem_script == addr.script_pubkey()
                         })
                         .next();
                     match partial_sig_contains_pk {