ln-symmetry with BIP448

.gitmodules

@@ -6,8 +6,9 @@
 	url = https://github.com/ianlancetaylor/libbacktrace.git
 [submodule "external/libwally-core"]
 	path = external/libwally-core
-	url = https://github.com/ElementsProject/libwally-core.git
+	url = https://github.com/instagibbs/libwally-core.git
 	ignore = dirty
+	branch = bip118fix
 [submodule "external/gheap"]
 	path = external/gheap
 	url = https://github.com/valyala/gheap

.msggen.json

@@ -2928,8 +2928,13 @@
             "ListPeerChannels.channels[].inflight[]": 16,
             "ListPeerChannels.channels[].initial_feerate": 12,
             "ListPeerChannels.channels[].last_feerate": 13,
+            "ListPeerChannels.channels[].last_settle_tx": 65,
+            "ListPeerChannels.channels[].last_settle_tx_unbound": 67,
             "ListPeerChannels.channels[].last_stable_connection": 56,
+            "ListPeerChannels.channels[].last_tx": 63,
             "ListPeerChannels.channels[].last_tx_fee_msat": 59,
+            "ListPeerChannels.channels[].last_update_tx": 64,
+            "ListPeerChannels.channels[].last_update_tx_unbound": 66,
             "ListPeerChannels.channels[].lost_state": 57,
             "ListPeerChannels.channels[].max_accepted_htlcs": 40,
             "ListPeerChannels.channels[].max_to_us_msat": 25,
@@ -3070,7 +3075,10 @@
             "ListPeers.peers[].channels[].in_payments_offered": 38,
             "ListPeers.peers[].channels[].inflight[]": 13,
             "ListPeers.peers[].channels[].initial_feerate": 9,
+            "ListPeers.peers[].channels[].last_committed_settle_tx": 54,
             "ListPeers.peers[].channels[].last_feerate": 10,
+            "ListPeers.peers[].channels[].last_settle_tx": 51,
+            "ListPeers.peers[].channels[].last_update_tx": 50,
             "ListPeers.peers[].channels[].max_accepted_htlcs": 35,
             "ListPeers.peers[].channels[].max_to_us_msat": 22,
             "ListPeers.peers[].channels[].max_total_htlc_in_msat": 27,
@@ -3099,7 +3107,9 @@
             "ListPeers.peers[].channels[].their_reserve_msat": 28,
             "ListPeers.peers[].channels[].their_to_self_delay": 33,
             "ListPeers.peers[].channels[].to_us_msat": 20,
-            "ListPeers.peers[].channels[].total_msat": 23
+            "ListPeers.peers[].channels[].total_msat": 23,
+            "ListPeers.peers[].channels[].unbound_settle_tx": 53,
+            "ListPeers.peers[].channels[].unbound_update_tx": 52
         },
         "ListpeersPeersChannelsAlias": {
             "ListPeers.peers[].channels[].alias.local": 1,
@@ -10920,14 +10930,34 @@
             "added": "v23.02",
             "deprecated": null
         },
+        "ListPeerChannels.channels[].last_settle_tx": {
+            "added": "pre-v0.10.1",
+            "deprecated": null
+        },
+        "ListPeerChannels.channels[].last_settle_tx_unbound": {
+            "added": "pre-v0.10.1",
+            "deprecated": null
+        },
         "ListPeerChannels.channels[].last_stable_connection": {
             "added": "v24.02",
             "deprecated": null
         },
+        "ListPeerChannels.channels[].last_tx": {
+            "added": "pre-v0.10.1",
+            "deprecated": null
+        },
         "ListPeerChannels.channels[].last_tx_fee_msat": {
             "added": "pre-v0.10.1",
             "deprecated": null
         },
+        "ListPeerChannels.channels[].last_update_tx": {
+            "added": "pre-v0.10.1",
+            "deprecated": null
+        },
+        "ListPeerChannels.channels[].last_update_tx_unbound": {
+            "added": "pre-v0.10.1",
+            "deprecated": null
+        },
         "ListPeerChannels.channels[].lost_state": {
             "added": "v24.02",
             "deprecated": null

Makefile

@@ -467,6 +467,7 @@ PKGLIBEXEC_PROGRAMS = \
 	       lightningd/lightning_hsmd \
 	       lightningd/lightning_onchaind \
 	       lightningd/lightning_openingd \
+	       lightningd/lightning_eltoo_openingd \
 	       lightningd/lightning_websocketd
 
 mkdocs.yml: $(MANPAGES:=.md)

bitcoin/psbt.c

@@ -613,6 +613,18 @@ size_t psbt_input_get_weight(const struct wally_psbt *psbt,
 	return weight;
 }
 
+const unsigned char *psbt_input_get_scriptpubkey(const struct wally_psbt *psbt,
+                    size_t in)
+{
+    if (psbt->inputs[in].witness_utxo) {
+        return psbt->inputs[in].witness_utxo->script;
+    } else if (psbt->inputs[in].utxo) {
+        /* PSBTv2: index is stored directly in the input, not in psbt->tx */
+        return psbt->inputs[in].utxo->outputs[psbt->inputs[in].index].script;
+    } else {
+        abort();
+    }
+}
 struct amount_sat psbt_output_get_amount(const struct wally_psbt *psbt,
 					 size_t out)
 {
@@ -845,11 +857,9 @@ struct wally_psbt *psbt_from_b64(const tal_t *ctx,
 char *fmt_wally_psbt(const tal_t *ctx, const struct wally_psbt *psbt)
 {
 	char *serialized_psbt;
-	int ret;
 
 	tal_wally_start();
-	ret = wally_psbt_to_base64(psbt, 0, &serialized_psbt);
-	assert(ret == WALLY_OK);
+	assert(wally_psbt_to_base64(psbt, 0, &serialized_psbt) == WALLY_OK);
 	tal_wally_end_onto(ctx, serialized_psbt, char);
 
 	return serialized_psbt;

bitcoin/psbt.h

@@ -269,6 +269,14 @@ struct amount_sat psbt_input_get_amount(const struct wally_psbt *psbt,
 size_t psbt_input_get_weight(const struct wally_psbt *psbt,
 			     size_t in);
 
+/* psbt_input_get_scriptpubkey - Returns pointer to the input's scriptPubKey
+ *
+ * @psbt - psbt
+ * in - index of input whose value script returning
+ */
+const unsigned char *psbt_input_get_scriptpubkey(const struct wally_psbt *psbt,
+                    size_t in);
+
 /* psbt_output_get_amount - Returns the value of this output
  *
  * @psbt - psbt

bitcoin/pubkey.c

@@ -123,3 +123,83 @@ void towire_pubkey(u8 **pptr, const struct pubkey *pubkey)
 
 	towire(pptr, output, outputlen);
 }
+
+void fromwire_point32(const u8 **cursor, size_t *max, struct point32 *point32)
+{
+	u8 raw[32];
+
+	if (!fromwire(cursor, max, raw, sizeof(raw)))
+		return;
+
+	if (secp256k1_xonly_pubkey_parse(secp256k1_ctx,
+					 &point32->pubkey,
+					 raw) != 1) {
+		SUPERVERBOSE("not a valid point");
+		fromwire_fail(cursor, max);
+	}
+}
+
+void towire_point32(u8 **pptr, const struct point32 *point32)
+{
+	u8 output[32];
+
+	secp256k1_xonly_pubkey_serialize(secp256k1_ctx, output,
+					 &point32->pubkey);
+	towire(pptr, output, sizeof(output));
+}
+
+void fromwire_nonce(const u8 **cursor, size_t *max, struct nonce *nonce)
+{
+    u8 raw[66];
+
+    if (!fromwire(cursor, max, raw, sizeof(raw)))
+        return;
+
+    if (!secp256k1_musig_pubnonce_parse(secp256k1_ctx,
+            &nonce->nonce,
+            raw)) {
+        SUPERVERBOSE("not a valid musig nonce");
+        fromwire_fail(cursor, max);
+    }
+}
+
+void towire_nonce(u8 **pptr, const struct nonce *nonce)
+{
+    u8 nonce_output[66];
+
+    secp256k1_musig_pubnonce_serialize(secp256k1_ctx,
+        nonce_output,
+        &nonce->nonce);
+
+	towire(pptr, nonce_output, sizeof(nonce_output));
+}
+
+static char *point32_to_hexstr(const tal_t *ctx, const struct point32 *point32)
+{
+	u8 output[32];
+
+	secp256k1_xonly_pubkey_serialize(secp256k1_ctx, output,
+					 &point32->pubkey);
+	return tal_hexstr(ctx, output, sizeof(output));
+}
+
+char *fmt_point32(const tal_t *ctx, const struct point32 *point32)
+{
+	return point32_to_hexstr(ctx, point32);
+}
+
+static char *nonce_to_hexstr(const tal_t *ctx, const struct nonce *nonce)
+{
+    u8 nonce_output[66];
+
+    secp256k1_musig_pubnonce_serialize(secp256k1_ctx,
+        nonce_output,
+        &nonce->nonce);
+
+    return tal_hexstr(ctx, nonce_output, sizeof(nonce_output));
+}
+
+char *fmt_nonce(const tal_t *ctx, const struct nonce *nonce)
+{
+	return nonce_to_hexstr(ctx, nonce);
+}

bitcoin/pubkey.h

@@ -6,6 +6,7 @@
 #include <ccan/structeq/structeq.h>
 #include <ccan/tal/tal.h>
 #include <secp256k1_extrakeys.h>
+#include <secp256k1_musig.h>
 
 struct privkey;
 struct secret;
@@ -19,6 +20,18 @@ struct pubkey {
 /* Define pubkey_eq (no padding) */
 STRUCTEQ_DEF(pubkey, 0, pubkey.data);
 
+struct point32 {
+	/* Unpacked pubkey (as used by libsecp256k1 internally) */
+	secp256k1_xonly_pubkey pubkey;
+};
+/* Define pubkey_eq (no padding) */
+STRUCTEQ_DEF(point32, 0, pubkey.data);
+
+struct nonce {
+    /* Un-aggregated public nonce for MuSig2 */
+    secp256k1_musig_pubnonce nonce;
+};
+
 /* Convert from hex string of DER (scriptPubKey from validateaddress) */
 bool pubkey_from_hexstr(const char *derstr, size_t derlen, struct pubkey *key);
 
@@ -57,4 +70,20 @@ void pubkey_to_hash160(const struct pubkey *pk, struct ripemd160 *hash);
 void towire_pubkey(u8 **pptr, const struct pubkey *pubkey);
 void fromwire_pubkey(const u8 **cursor, size_t *max, struct pubkey *pubkey);
 
+/* FIXME: Old spec uses pubkey32 */
+#define pubkey32 point32
+#define towire_pubkey32 towire_point32
+#define fromwire_pubkey32 fromwire_point32
+
+/* marshal/unmarshal functions */
+void towire_point32(u8 **pptr, const struct point32 *pubkey);
+void fromwire_point32(const u8 **cursor, size_t *max, struct point32 *pubkey);
+
+void towire_nonce(u8 **pptr, const struct nonce *nonce);
+void fromwire_nonce(const u8 **cursor, size_t *max, struct nonce *nonce);
+
+/* Formatting functions */
+char *fmt_point32(const tal_t *ctx, const struct point32 *point32);
+char *fmt_nonce(const tal_t *ctx, const struct nonce *nonce);
+
 #endif /* LIGHTNING_BITCOIN_PUBKEY_H */