Merge #665: trezor: Set multisig change as PAYTOMULTISIG for non-segw…

…it only

7a6fd0e trezor: Set multisig change as PAYTOMULTISIG for non-segwit only (Andrew Chow)

Pull request description:

  `PAYTOMULTISIG` is for P2SH only. For p2sh-segwit and native segwit, the `PAYTOWITNESS` and `PAYTOP2SHWITNESS` that are set earlier are correct.

  Fixes #661

Top commit has no ACKs.

Tree-SHA512: 1ed6cb8c23ab2c225dc033f9b7499687606c498a8684d26c5c63d39db78cb7df22f0ac68063c88697e9a714b296ec82e33d7b48ae2650543fd215a44672d5bab

hwilib/devices/trezor.py

@@ -581,7 +581,8 @@ def ignore_input() -> None:
                         tx.xpub, psbt_out)
                     if is_ms:
                         txoutput.multisig = multisig
-                        txoutput.script_type = messages.OutputScriptType.PAYTOMULTISIG
+                        if not wit:
+                            txoutput.script_type = messages.OutputScriptType.PAYTOMULTISIG
 
                 # append to outputs
                 outputs.append(txoutput)