Changes from nonce musig eltoo branch to taproot wallet branch

.gitmodules

@@ -9,8 +9,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 = taproot
 [submodule "external/gheap"]
 	path = external/gheap
 	url = https://github.com/valyala/gheap

.msggen.json

@@ -684,7 +684,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,
@@ -713,7 +716,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
         },
         "ListpeersPeersChannelsFeerate": {
             "ListPeers.peers[].channels[].feerate.perkb": 2,

Makefile

@@ -392,6 +392,7 @@ PKGLIBEXEC_PROGRAMS = \
 	       lightningd/lightning_hsmd \
 	       lightningd/lightning_onchaind \
 	       lightningd/lightning_openingd \
+	       lightningd/lightning_eltoo_openingd \
 	       lightningd/lightning_websocketd
 
 # Don't delete these intermediaries.

bitcoin/psbt.c

@@ -450,6 +450,18 @@ struct amount_sat psbt_input_get_amount(const struct wally_psbt *psbt,
 	return val;
 }
 
+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) {
+        return psbt->inputs[in].utxo->outputs[psbt->tx->inputs[in].index].script;
+    } else {
+        abort();
+    }
+}
+
 struct amount_sat psbt_output_get_amount(const struct wally_psbt *psbt,
 					 size_t out)
 {

bitcoin/psbt.h

@@ -206,6 +206,14 @@ void psbt_output_set_unknown(const tal_t *ctx,
 struct amount_sat psbt_input_get_amount(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

@@ -150,6 +150,32 @@ void towire_point32(u8 **pptr, const struct point32 *point32)
 	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];
@@ -159,3 +185,15 @@ static char *point32_to_hexstr(const tal_t *ctx, const struct point32 *point32)
 	return tal_hexstr(ctx, output, sizeof(output));
 }
 REGISTER_TYPE_TO_STRING(point32, point32_to_hexstr);
+
+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));
+}
+REGISTER_TYPE_TO_STRING(nonce, nonce_to_hexstr);

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;
@@ -26,6 +27,11 @@ struct point32 {
 /* 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);
 
@@ -72,4 +78,7 @@ void fromwire_pubkey(const u8 **cursor, size_t *max, struct pubkey *pubkey);
 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);
+
 #endif /* LIGHTNING_BITCOIN_PUBKEY_H */