rust: get_unspent_outputs: add public_key

Needed for single sig to set the script sig and/or witness.

Author: LeoComandini

subprojects/gdk_rust/gdk_common/src/model.rs

@@ -706,6 +706,7 @@ pub struct UnspentOutput {
     pub sequence: Option<u32>,
     #[serde(rename = "prevout_script")]
     pub script_code: String,
+    pub public_key: String,
 }
 
 /// Partially parse the derivation path and return (is_internal, address_pointer)
@@ -837,7 +838,7 @@ mod test {
 
     #[test]
     fn test_unspent() {
-        let json_str = r#"{"btc": [{"address_type": "p2wsh", "block_height": 1806588, "pointer": 3509, "pt_idx": 1, "satoshi": 3650144, "subaccount": 0, "txhash": "08711d45d4867d7834b133a425da065b252eb6a9b206d57e2bbb226a344c5d13", "is_internal": false, "confidential": false, "user_path": [2147483692, 2147483649, 2147483648, 0, 1], "prevout_script": "51", "is_segwit": true}, {"address_type": "p2wsh", "block_height": 1835681, "pointer": 3510, "pt_idx": 0, "satoshi": 5589415, "subaccount": 0, "txhash": "fbd00e5b9e8152c04214c72c791a78a65fdbab68b5c6164ff0d8b22a006c5221", "is_internal": false, "confidential": false, "user_path": [2147483692, 2147483649, 2147483648, 0, 2], "prevout_script": "51", "is_segwit": true}, {"address_type": "p2wsh", "block_height": 1835821, "pointer": 3511, "pt_idx": 0, "satoshi": 568158, "subaccount": 0, "txhash": "e5b358fb8366960130b97794062718d7f4fbe721bf274f47493a19326099b811", "is_internal": false, "confidential": false, "user_path": [2147483692, 2147483649, 2147483648, 0, 3], "prevout_script": "51", "is_segwit": true}]}"#;
+        let json_str = r#"{"btc": [{"address_type": "p2wsh", "block_height": 1806588, "pointer": 3509, "pt_idx": 1, "satoshi": 3650144, "subaccount": 0, "txhash": "08711d45d4867d7834b133a425da065b252eb6a9b206d57e2bbb226a344c5d13", "is_internal": false, "confidential": false, "user_path": [2147483692, 2147483649, 2147483648, 0, 1], "prevout_script": "51", "is_segwit": true, "public_key": "020202020202020202020202020202020202020202020202020202020202020202"}, {"address_type": "p2wsh", "block_height": 1835681, "pointer": 3510, "pt_idx": 0, "satoshi": 5589415, "subaccount": 0, "txhash": "fbd00e5b9e8152c04214c72c791a78a65fdbab68b5c6164ff0d8b22a006c5221", "is_internal": false, "confidential": false, "user_path": [2147483692, 2147483649, 2147483648, 0, 2], "prevout_script": "51", "is_segwit": true, "public_key": "020202020202020202020202020202020202020202020202020202020202020202"}, {"address_type": "p2wsh", "block_height": 1835821, "pointer": 3511, "pt_idx": 0, "satoshi": 568158, "subaccount": 0, "txhash": "e5b358fb8366960130b97794062718d7f4fbe721bf274f47493a19326099b811", "is_internal": false, "confidential": false, "user_path": [2147483692, 2147483649, 2147483648, 0, 3], "prevout_script": "51", "is_segwit": true, "public_key": "020202020202020202020202020202020202020202020202020202020202020202"}]}"#;
         let json: GetUnspentOutputs = serde_json::from_str(json_str).unwrap();
         println!("{:#?}", json);
     }

subprojects/gdk_rust/gdk_electrum/src/account.rs

@@ -300,12 +300,15 @@ impl Account {
         Ok(txs)
     }
 
-    pub fn script_code(&self, path: &DerivationPath) -> BEScript {
-        // FIXME: (leo) is this the correct path?
+    pub fn public_key(&self, path: &DerivationPath) -> PublicKey {
         let xpub = self.xpub.derive_pub(&crate::EC, path).unwrap();
-        let public_key = &xpub.public_key;
+        xpub.public_key
+    }
+
+    pub fn script_code(&self, path: &DerivationPath) -> BEScript {
+        let public_key = self.public_key(path);
         // script code is the same for the currently supported script type
-        p2pkh_script(public_key).into()
+        p2pkh_script(&public_key).into()
     }
 
     pub fn tx_outputs(&self, tx: &BETransaction) -> Result<Vec<TransactionOutput>, Error> {
@@ -385,6 +388,7 @@ impl Account {
             scriptpubkey: tx.output_script(vout),
             sequence: None,
             script_code: self.script_code(&account_path).to_hex(),
+            public_key: self.public_key(&account_path).to_string(),
             user_path: self.get_full_path(&account_path).into(),
         })
     }