Investigate the splice reestablish branch

.dir-locals.el

@@ -4,4 +4,10 @@
             (c-basic-offset . 8)
             (tab-width . 8)
             ))
-)
+
+ (c++-mode . ((c-file-style . "linux")
+            (indent-tabs-mode . t)
+            (show-trailing-whitespace . t)
+            (c-basic-offset . 8)
+            (tab-width . 8)
+            )))

.github/scripts/setup.sh

@@ -15,6 +15,7 @@ sudo apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \
      build-essential \
      clang \
      cppcheck \
+     curl \
      docbook-xml \
      eatmydata \
      gcc-aarch64-linux-gnu \

.msggen.json

@@ -334,6 +334,16 @@
             "complete": 1,
             "pending": 0
         },
+        "WaitIndexname": {
+            "created": 0,
+            "deleted": 2,
+            "updated": 1
+        },
+        "WaitSubsystem": {
+            "forwards": 1,
+            "invoices": 0,
+            "sendpays": 2
+        },
         "WaitanyinvoiceStatus": {
             "expired": 1,
             "paid": 0
@@ -697,6 +707,35 @@
             "Feerates.perkw": 3,
             "Feerates.warning_missing_feerates": 1
         },
+        "FetchinvoiceChanges": {
+            "FetchInvoice.changes.amount_msat": 5,
+            "FetchInvoice.changes.description": 2,
+            "FetchInvoice.changes.description_appended": 1,
+            "FetchInvoice.changes.vendor": 4,
+            "FetchInvoice.changes.vendor_removed": 3
+        },
+        "FetchinvoiceNext_period": {
+            "FetchInvoice.next_period.counter": 1,
+            "FetchInvoice.next_period.endtime": 3,
+            "FetchInvoice.next_period.paywindow_end": 5,
+            "FetchInvoice.next_period.paywindow_start": 4,
+            "FetchInvoice.next_period.starttime": 2
+        },
+        "FetchinvoiceRequest": {
+            "FetchInvoice.amount_msat": 2,
+            "FetchInvoice.offer": 1,
+            "FetchInvoice.payer_note": 8,
+            "FetchInvoice.quantity": 3,
+            "FetchInvoice.recurrence_counter": 4,
+            "FetchInvoice.recurrence_label": 6,
+            "FetchInvoice.recurrence_start": 5,
+            "FetchInvoice.timeout": 7
+        },
+        "FetchinvoiceResponse": {
+            "FetchInvoice.changes": 2,
+            "FetchInvoice.invoice": 1,
+            "FetchInvoice.next_period": 3
+        },
         "FundchannelRequest": {
             "FundChannel.amount": 1,
             "FundChannel.announce": 3,
@@ -1603,6 +1642,17 @@
             "UtxoPsbt.psbt": 1,
             "UtxoPsbt.reservations[]": 6
         },
+        "WaitRequest": {
+            "Wait.indexname": 2,
+            "Wait.nextvalue": 3,
+            "Wait.subsystem": 1
+        },
+        "WaitResponse": {
+            "Wait.created": 2,
+            "Wait.deleted": 4,
+            "Wait.subsystem": 1,
+            "Wait.updated": 3
+        },
         "WaitanyinvoicePaid_outpoint": {
             "WaitAnyInvoice.paid_outpoint.outnum": 2,
             "WaitAnyInvoice.paid_outpoint.txid": 1
@@ -2853,6 +2903,94 @@
             "added": "pre-v0.10.1",
             "deprecated": false
         },
+        "FetchInvoice": {
+            "added": "pre-v0.10.1",
+            "deprecated": null
+        },
+        "FetchInvoice.amount_msat": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.changes": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.changes.amount_msat": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.changes.description": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.changes.description_appended": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.changes.vendor": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.changes.vendor_removed": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.invoice": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.next_period": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.next_period.counter": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.next_period.endtime": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.next_period.paywindow_end": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.next_period.paywindow_start": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.next_period.starttime": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.offer": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.payer_note": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.quantity": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.recurrence_counter": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.recurrence_label": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.recurrence_start": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "FetchInvoice.timeout": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
         "FundChannel": {
             "added": "pre-v0.10.1",
             "deprecated": null
@@ -5613,6 +5751,34 @@
             "added": "pre-v0.10.1",
             "deprecated": false
         },
+        "Wait": {
+            "added": "v23.08",
+            "deprecated": null
+        },
+        "Wait.created": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "Wait.deleted": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "Wait.indexname": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "Wait.nextvalue": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "Wait.subsystem": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
+        "Wait.updated": {
+            "added": "pre-v0.10.1",
+            "deprecated": false
+        },
         "WaitAnyInvoice": {
             "added": "pre-v0.10.1",
             "deprecated": null

Makefile

@@ -68,7 +68,7 @@ COMPAT_CFLAGS=-DCOMPAT_V052=1 -DCOMPAT_V060=1 -DCOMPAT_V061=1 -DCOMPAT_V062=1 -D
 endif
 
 # (method=thread to support xdist)
-PYTEST_OPTS := -v -p no:logging $(PYTEST_OPTS)
+PYTEST_OPTS := -v -p no:logging $(PYTEST_OPTS) $(PYTEST_MOREOPTS)
 MY_CHECK_PYTHONPATH=$${PYTHONPATH}$${PYTHONPATH:+:}$(shell pwd)/contrib/pyln-client:$(shell pwd)/contrib/pyln-testing:$(shell pwd)/contrib/pyln-proto/:$(shell pwd)/external/lnprototest:$(shell pwd)/contrib/pyln-spec/bolt1:$(shell pwd)/contrib/pyln-spec/bolt2:$(shell pwd)/contrib/pyln-spec/bolt4:$(shell pwd)/contrib/pyln-spec/bolt7
 # Collect generated python files to be excluded from lint checks
 PYTHON_GENERATED= \
@@ -718,7 +718,9 @@ clean: obsclean
 
 
 PYLNS=client proto testing
-# See doc/MAKING-RELEASES.md
+# See doc/contribute-to-core-lightning/contributor-workflow.md
+update-py-versions: update-pyln-versions update-clnrest-version update-poetry-lock
+
 update-pyln-versions: $(PYLNS:%=update-pyln-version-%)
 
 update-pyln-version-%:
@@ -730,6 +732,13 @@ pyln-release:  $(PYLNS:%=pyln-release-%)
 pyln-release-%:
 	cd contrib/pyln-$* && $(MAKE) prod-release
 
+update-clnrest-version:
+	@if [ -z "$(NEW_VERSION)" ]; then echo "Set NEW_VERSION!" >&2; exit 1; fi
+	cd plugins/clnrest && $(MAKE) upgrade-version
+
+update-poetry-lock:
+	poetry update clnrest pyln-client pyln-proto pyln-testing
+
 update-mocks: $(ALL_TEST_PROGRAMS:%=update-mocks/%.c)
 
 $(ALL_TEST_PROGRAMS:%=update-mocks/%.c): $(ALL_GEN_HEADERS) $(EXTERNAL_LIBS) libccan.a ccan/ccan/cdump/tools/cdump-enumstr config.vars

bitcoin/psbt.c

@@ -290,6 +290,27 @@ bool psbt_input_set_signature(struct wally_psbt *psbt, size_t in,
 	return ok;
 }
 
+bool psbt_input_have_signature(const struct wally_psbt *psbt,
+			       size_t in,
+			       const struct pubkey *pubkey,
+			       bool *signature_found)
+{
+	u8 pk_der[PUBKEY_CMPR_LEN];
+	size_t index_plus_one;
+	bool ok;
+
+	assert(in < psbt->num_inputs);
+
+	pubkey_to_der(pk_der, pubkey);
+
+	ok = wally_psbt_input_find_signature(&psbt->inputs[in], pk_der,
+					     sizeof(pk_der),
+					     &index_plus_one) == WALLY_OK;
+	if (ok)
+		*signature_found = index_plus_one > 0;
+	return ok;
+}
+
 void psbt_input_set_wit_utxo(struct wally_psbt *psbt, size_t in,
 			     const u8 *scriptPubkey, struct amount_sat amt)
 {

bitcoin/psbt.h

@@ -178,6 +178,14 @@ WARN_UNUSED_RESULT bool psbt_input_set_signature(struct wally_psbt *psbt, size_t
 						 const struct pubkey *pubkey,
 						 const struct bitcoin_signature *sig);
 
+/* 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. */
+WARN_UNUSED_RESULT bool psbt_input_have_signature(const struct wally_psbt *psbt,
+						  size_t in,
+						  const struct pubkey *pubkey,
+						  bool *signature_found);
+
 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