listfunds: add "redeemscript" field.

You'd need this if you ever wanted to make your own PSBT. Signed-off-by: Rusty Russell <[email protected]> Changelog-Added: `listfunds` now has a `redeemscript` field for p2sh-wrapped outputs.
ElementsProject · Jul 17, 2020 · 9d47b7b · 9d47b7b
1 parent 455d5df
commit 9d47b7b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/doc/lightning-listfunds.7 b/doc/lightning-listfunds.7
diff --git a/doc/lightning-listfunds.7.md b/doc/lightning-listfunds.7.md
@@ -28,6 +28,7 @@ Each entry in *outputs* will include:
     appended)
 -   *address*
 -   *scriptpubkey* (the ScriptPubkey of the output, in hex)
+-   *redeemscript* (the redeemscript of the output, in hex, only if it's p2sh-wrapped)
 -   *status* (whether *unconfirmed*, *confirmed*, or *spent*)
 -   *reserved* (whether this is UTXO is currently reserved for an in-flight tx)
 

diff --git a/wallet/walletrpc.c b/wallet/walletrpc.c
@@ -868,6 +868,14 @@ static void json_add_utxo(struct json_stream *response,
 	json_add_amount_sat_compat(response, utxo->amount,
 				   "value", "amount_msat");
 
+	if (utxo->is_p2sh) {
+		struct pubkey key;
+		bip32_pubkey(wallet->bip32_base, &key, utxo->keyindex);
+
+		json_add_hex_talarr(response, "redeemscript",
+				    bitcoin_redeem_p2sh_p2wpkh(tmpctx, &key));
+	}
+
 	if (utxo->scriptPubkey != NULL) {
 		json_add_hex_talarr(response, "scriptpubkey", utxo->scriptPubkey);
 		out = encode_scriptpubkey_to_addr(