splice: Script for complex splices

.msggen.json

@@ -3137,6 +3137,7 @@
         },
         "Splice_signedResponse": {
             "Splice_Signed.outnum": 3,
+            "Splice_Signed.psbt": 4,
             "Splice_Signed.tx": 1,
             "Splice_Signed.txid": 2
         },
@@ -3146,7 +3147,8 @@
         },
         "Splice_updateResponse": {
             "Splice_Update.commitments_secured": 2,
-            "Splice_Update.psbt": 1
+            "Splice_Update.psbt": 1,
+            "Splice_Update.signatures_secured": 3
         },
         "StaticbackupResponse": {
             "StaticBackup.scb[]": 1
@@ -10928,6 +10930,10 @@
             "added": "pre-v0.10.1",
             "deprecated": null
         },
+        "Splice_Update.signatures_secured": {
+            "added": "v24.11",
+            "deprecated": null
+        },
         "StaticBackup": {
             "added": "pre-v0.10.1",
             "deprecated": null

bitcoin/psbt.c

@@ -311,6 +311,36 @@ bool psbt_input_have_signature(const struct wally_psbt *psbt,
 	return ok;
 }
 
+bool psbt_input_get_ecdsa_sig(const tal_t *ctx,
+			      const struct wally_psbt *psbt,
+			      size_t in,
+			      const struct pubkey *pubkey,
+			      struct bitcoin_signature **sig)
+{
+	u8 pk_der[PUBKEY_CMPR_LEN];
+	size_t index_plus_one;
+	struct wally_map_item *item;
+	bool ok;
+
+	assert(in < psbt->num_inputs);
+
+	pubkey_to_der(pk_der, pubkey);
+	*sig = NULL;
+
+	ok = wally_psbt_input_find_signature(&psbt->inputs[in], pk_der,
+					     sizeof(pk_der),
+					     &index_plus_one) == WALLY_OK;
+	if (ok) {
+		item = &psbt->inputs[in].signatures.items[index_plus_one - 1];
+		*sig = tal(ctx, struct bitcoin_signature);
+		if (!signature_from_der(item->value, item->value_len, *sig)) {
+			*sig = tal_free(*sig);
+			return false;
+		}
+	}
+	return ok;
+}
+
 void psbt_input_set_wit_utxo(struct wally_psbt *psbt, size_t in,
 			     const u8 *scriptPubkey, struct amount_sat amt)
 {
@@ -611,6 +641,17 @@ void *psbt_get_lightning(const struct wally_map *map,
 	return item->value;
 }
 
+void psbt_set_lightning(const tal_t *ctx,
+			struct wally_map *map,
+			const u8 proprietary_type,
+			const void *value,
+			size_t val_len)
+{
+	u8 *key = psbt_make_key(NULL, proprietary_type, NULL);
+	map_replace(ctx, map, key, value, val_len);
+	tal_free(key);
+}
+
 void psbt_output_set_unknown(const tal_t *ctx,
 			     struct wally_psbt_output *out,
 			     const u8 *key,

bitcoin/psbt.h

@@ -180,12 +180,20 @@ WARN_UNUSED_RESULT bool psbt_input_set_signature(struct wally_psbt *psbt, size_t
 
 /* Returns false on error. On success, *signature_found is set to true if the
  * input has a signature present for `pubkey` and false if if one was not found.
- * Only ignature presence is checked, is not validated. */
+ * Only signature presence is checked, it is not validated. */
 WARN_UNUSED_RESULT bool psbt_input_have_signature(const struct wally_psbt *psbt,
 						  size_t in,
 						  const struct pubkey *pubkey,
 						  bool *signature_found);
 
+/* Returns false on error. On success *sig is set to the signature otherwise
+ * *sig is set to NULL. */
+WARN_UNUSED_RESULT bool psbt_input_get_ecdsa_sig(const tal_t *ctx,
+						 const struct wally_psbt *psbt,
+						 size_t in,
+						 const struct pubkey *pubkey,
+						 struct bitcoin_signature **sig);
+
 void psbt_input_set_witscript(struct wally_psbt *psbt, size_t in, const u8 *wscript);
 
 /* psbt_input_set_unknown - Set the given Key-Value in the psbt's input keymap
@@ -212,6 +220,19 @@ void *psbt_get_lightning(const struct wally_map *map,
 			 const u8 proprietary_type,
 			 size_t *val_len);
 
+/* psbt_set_lightning - Set a propreitary lightning value on the given map
+ *
+ * @map - map of unknowns to set the value
+ * @proprietary_type - type no. to set
+ * @value - the value to be set
+ * @val_len - length of value
+ */
+void psbt_set_lightning(const tal_t *ctx,
+			struct wally_map *map,
+			const u8 proprietary_type,
+			const void *value,
+			size_t val_len);
+
 /* psbt_output_set_unknown - Set the given Key-Value in the psbt's output keymap
  *
  * @ctx - tal context for allocations

bitcoin/test/run-psbt-from-tx.c

@@ -68,6 +68,9 @@ void sha256_double(struct sha256_double *shadouble UNNEEDED, const void *p UNNEE
 /* Generated stub for signature_to_der */
 size_t signature_to_der(u8 der[73] UNNEEDED, const struct bitcoin_signature *sig UNNEEDED)
 { fprintf(stderr, "signature_to_der called!\n"); abort(); }
+/* Generated stub for signature_to_der */
+bool signature_from_der(const u8 *der UNNEEDED, size_t len UNNEEDED, struct bitcoin_signature *sig UNNEEDED)
+{ fprintf(stderr, "signature_from_der called!\n"); abort(); }
 /* Generated stub for towire_sha256_double */
 void towire_sha256_double(u8 **pptr UNNEEDED, const struct sha256_double *sha256d UNNEEDED)
 { fprintf(stderr, "towire_sha256_double called!\n"); abort(); }

ccan/ccan/mem/mem.c

@@ -123,6 +123,6 @@ void memtaint(void *data, size_t len)
 	memcpy(p, tainter, len);
 
 #if HAVE_VALGRIND_MEMCHECK_H
-	VALGRIND_MAKE_MEM_UNDEFINED(data, len);
+	(void)VALGRIND_MAKE_MEM_UNDEFINED(data, len);
 #endif
 }

ccan/ccan/mem/mem.h

@@ -244,7 +244,7 @@ void memswap(void *a, void *b, size_t n);
 #include <valgrind/memcheck.h>
 static inline void *memcheck_(const void *data, size_t len)
 {
-	VALGRIND_CHECK_MEM_IS_DEFINED(data, len);
+	(void)VALGRIND_CHECK_MEM_IS_DEFINED(data, len);
 	return (void *)data;
 }
 #else