fix utxo witness_utxo

Author: rage-proof

electrum/gui/qt/main_window.py

@@ -1733,7 +1733,7 @@ def broadcast_done(result):
 
     def exchange_psbt_http(self, payjoin):
         """ """
-        import requests, copy
+        import requests
         assert payjoin.is_complete()
 
         print(payjoin.to_json())
@@ -1742,23 +1742,34 @@ def exchange_psbt_http(self, payjoin):
         for txin in payjoin.inputs():
             print(txin)
             print(txin.utxo)
-            print(txin.utxo.outputs())
-            print(txin.utxo.outputs()[txin.prevout.out_idx])
-            print('\n',txin.to_json())
-            print('\n',txin.to_json())
-            
+            print('\n',txin.witness_utxo)
+            print('\n', txin.to_json())
+
+            if txin.utxo:
+                print(txin.utxo.outputs())
+                print(txin.prevout.out_idx)
+                print(txin.utxo.outputs()[txin.prevout.out_idx])
+
+                print()
+
+
+            print('\n',txin.utxo)
+            txin.convert_utxo_to_witness_utxo()
+            print('\n', txin.witness_utxo)
+            print('\n', txin.to_json())
+        print()
+        payjoin.convert_all_utxos_to_witness_utxos()
+        print(payjoin.serialize_as_base64())
+        print(payjoin.to_json())
 
-        
 
         url = 'https://testnet.demo.btcpayserver.org/BTC/pj'
         payload = payjoin.serialize_as_base64()
         headers = {'content-type': 'text/plain',
                    'content-length': str(len(payload))
                    }
-        #print(headers)
+        print(headers)
 
-        
-        """
         try:
             r = requests.post(url, data=payload, headers=headers)
         except:
@@ -1768,7 +1779,7 @@ def exchange_psbt_http(self, payjoin):
         print(r.status_code)
         print(r.headers)
         print(r.text)
-        """
+        
 
 
     def mktx_for_open_channel(self, funding_sat):

electrum/tests/test_payjoin.py

@@ -12,8 +12,7 @@ def main():
     psbt_test02 = 'cHNidP8BAHMCAAAAAY8nutGgJdyYGXWiBEb45Hoe9lWGbkxh/6bNiOJdCDuDAAAAAAD+////AtyVuAUAAAAAF6kUHehJ8GnSdBUOOv6ujXLrWmsJRDCHgIQeAAAAAAAXqRR3QJbbz0hnQ8IvQ0fptGn+votneofTAAAAAAEBIKgb1wUAAAAAF6kU3k4ekGHKWRNbA1rV5tR5kEVDVNCHAQcXFgAUx4pFclNVgo1WWAdN1SYNX8tphTABCGsCRzBEAiB8Q+A6dep+Rz92vhy26lT0AjZn4PRLi8Bf9qoB/CMk0wIgP/Rj2PWZ3gEjUkTlhDRNAQ0gXwTO7t9n+V14pZ6oljUBIQMVmsAaoNWHVMS02LfTSe0e388LNitPa1UQZyOihY+FFgABABYAFEb2Giu6c4KO5YW0pfw3lGp9jMUUAAA='
     psbt_test03 = 'cHNidP8BAJwCAAAAAo8nutGgJdyYGXWiBEb45Hoe9lWGbkxh/6bNiOJdCDuDAAAAAAD+////jye60aAl3JgZdaIERvjkeh72VYZuTGH/ps2I4l0IO4MBAAAAAP7///8CJpW4BQAAAAAXqRQd6EnwadJ0FQ46/q6NcutaawlEMIcACT0AAAAAABepFHdAltvPSGdDwi9DR+m0af6+i2d6h9MAAAAAAAEBIICEHgAAAAAAF6kUyPLL+cphRyyI5GTUazV0hF2R2NWHAQcXFgAUX4BmVeWSTJIEwtUb5TlPS/ntohABCGsCRzBEAiBnu3tA3yWlT0WBClsXXS9j69Bt+waCs9JcjWtNjtv7VgIge2VYAaBeLPDB6HGFlpqOENXMldsJezF9Gs5amvDQRDQBIQJl1jz1tBt8hNx2owTm+4Du4isx0pmdKNMNIjjaMHFfrQAAAA=='
     psbt_test04 = 'cHNidP8BAJwCAAAAAo8nutGgJdyYGXWiBEb45Hoe9lWGbkxh/6bNiOJdCDuDAAAAAAD+////jye60aAl3JgZdaIERvjkeh72VYZuTGH/ps2I4l0IO4MBAAAAAP7///8CJpW4BQAAAAAXqRQd6EnwadJ0FQ46/q6NcutaawlEMIcACT0AAAAAABepFHdAltvPSGdDwi9DR+m0af6+i2d6h9MAAAAAAQEgqBvXBQAAAAAXqRTeTh6QYcpZE1sDWtXm1HmQRUNU0IcBBBYAFMeKRXJTVYKNVlgHTdUmDV/LaYUwIgYDFZrAGqDVh1TEtNi300ntHt/PCzYrT2tVEGcjooWPhRYYSFzWUDEAAIABAACAAAAAgAEAAAAAAAAAAAEBIICEHgAAAAAAF6kUyPLL+cphRyyI5GTUazV0hF2R2NWHAQcXFgAUX4BmVeWSTJIEwtUb5TlPS/ntohABCGsCRzBEAiBnu3tA3yWlT0WBClsXXS9j69Bt+waCs9JcjWtNjtv7VgIge2VYAaBeLPDB6HGFlpqOENXMldsJezF9Gs5amvDQRDQBIQJl1jz1tBt8hNx2owTm+4Du4isx0pmdKNMNIjjaMHFfrQABABYAFEb2Giu6c4KO5YW0pfw3lGp9jMUUIgICygvBWB5prpfx61y1HDAwo37kYP3YRJBvAjtunBAur3wYSFzWUDEAAIABAACAAAAAgAEAAAABAAAAAAA='
-    psbt_test05 = 'cHNidP8BAJoCAAAAApmUy3Oa6MdcM+j5cM1w7BIxlGz2D8GN2nK9tsbHmESKAQAAAAD+////BMkXzO/XlgaOAExsQbP9mumAyAslUiwThX1+gqF3Z6MBAAAAAP7///8CrUsAAAAAAAAWABSy6G0APFIK1Mygn/X1It3Sp7sjBpBfAQAAAAAAFgAU2nAe+KqvbhU63rT052pJUslTN3Ml/hsAAAEBH35MAAAAAAAAFgAU5vIbmekoqCDiLHT+jNPVowJ7t3giAgL2ZUi4zj2sIpPU0rQQvA98/9dUOMFyP/y2qhVwbj1zlUcwRAIgDF00uFWZ2c3F1IBiCaKxphKIlSv+ht1Lch8F++B3CAICIA0k1vhC6J6bkHC6jvhl4pYBYQ7TfoClydnLmeTG8Qs8ASIGAvZlSLjOPawik9TStBC8D3z/11Q4wXI//LaqFXBuPXOVGPdYxlpUAACAAQAAgAAAAIABAAAAAQAAAAABAR+QXwEAAAAAABYAFLdBo8LVBUf5Rg1DFUz1o6QjzUv6IgIDgKPoOPCNL7i4H37KFgY6750XHdQps/yQKbpkEO5dCalHMEQCIDdUvZLe4G+sZDPaY02Smner6TrpjWVofMcKCQfeTpHpAiBHAwHEgBGXEYq8O3rDoSFpJgE7B6nWhQGRCixOzxpJHQEiBgOAo+g48I0vuLgffsoWBjrvnRcd1Cmz/JApumQQ7l0JqRj3WMZaVAAAgAEAAIAAAACAAAAAAAgAAAAAIgIDhgLfaU5ScNGBBRX33y/qp7PgZFHQZSGO1qHmIfNtNlAY91jGWlQAAIABAACAAAAAgAEAAAACAAAAACICA5XOZXvPEUSTRt2Nf1qlYDp9Iq1Shm0sxKO7QD39ZWw/GPdYxlpUAACAAQAAgAAAAIAAAAAACQAAAAA='
-
+    psbt_test05 = 'cHNidP8BAHECAAAAAVwGnoRUshzXZF7tNBNS1fKIelmiyTKwAsJBh+XIWpw+AAAAAAD+////AnARAQAAAAAAFgAUzvW2236QIPmn3lWUMnuBS1sBlJCTTQAAAAAAABYAFLLobQA8UgrUzKCf9fUi3dKnuyMGaP8bAAABAR+QXwEAAAAAABYAFI1G8mbEyNem7WV7SWRGunhPzzcMIgICfWZ87vV+i25qubq9AqHcaEXNKTMCtYhGdKiYayd4a/JHMEQCIDpRqqM7uIWEXrLcv9f/L/WEHuZarYRgSo2M3eXA0IpzAiAKn1nbiXSVFbdPna7rKENT6PHmvn7HFPE3Wd7lM+NdYgEiBgJ9Znzu9X6Lbmq5ur0CodxoRc0pMwK1iEZ0qJhrJ3hr8hj3WMZaVAAAgAEAAIAAAACAAAAAAAwAAAAAIgIDqpXL2t/kOlPve86KzKVRHKM1ZqhugNaHZ6U3uHBIAtAY91jGWlQAAIABAACAAAAAgAAAAAAPAAAAACICA4YC32lOUnDRgQUV998v6qez4GRR0GUhjtah5iHzbTZQGPdYxlpUAACAAQAAgAAAAIABAAAAAgAAAAA='
 
     tx = tx_from_any(psbt_test05)
     print('TX')

electrum/transaction.py

@@ -1151,19 +1151,23 @@ def utxo(self):
 
     @utxo.setter
     def utxo(self, value: Optional[Transaction]):
-        self._utxo = value
-        self.validate_data()
-        self.ensure_there_is_only_one_utxo()
+        if value:
+            self._utxo = value
+            self.validate_data()
+            self._witness_utxo = None
+            self.ensure_there_is_only_one_utxo()
 
     @property
     def witness_utxo(self):
         return self._witness_utxo
 
     @witness_utxo.setter
     def witness_utxo(self, value: Optional[TxOutput]):
-        self._witness_utxo = value
-        self.validate_data()
-        self.ensure_there_is_only_one_utxo()
+        if value:
+            self._witness_utxo = value
+            self.validate_data()
+            self._utxo = None
+            self.ensure_there_is_only_one_utxo()
 
     def to_json(self):
         d = super().to_json()