dual-funding, the monster

.gitignore

@@ -30,6 +30,8 @@ config.vars
 external/libbacktrace-build/
 external/libbacktrace.a
 external/libbacktrace.la
+external/libbase58/
+external/libbase58.a
 test/test_protocol
 test/test_sphinx
 tests/.pytest.restart
@@ -44,4 +46,5 @@ contrib/pylightning/pylightning.egg-info/
 contrib/pyln-*/build/
 contrib/pyln-*/dist/
 contrib/pyln-*/pyln_*.egg-info/
-plugins/keysend
+plugins/keysend
+release/

bitcoin/script.c

@@ -369,6 +369,38 @@ u8 *p2wpkh_scriptcode(const tal_t *ctx, const struct pubkey *key)
 	return script;
 }
 
+bool is_p2sh_p2wpkh_redeemscript(const u8 *script)
+{
+	size_t script_len = tal_count(script);
+
+	/* Prefaced by the length */
+	if (script_len != BITCOIN_SCRIPTPUBKEY_P2WPKH_LEN + 1)
+		return false;
+	if (script[0] != OP_PUSHBYTES(22))
+		return false;
+	if (script[1] != OP_0)
+		return false;
+	if (script[2] != OP_PUSHBYTES(20))
+		return false;
+	return true;
+}
+
+bool is_p2sh_p2wsh_redeemscript(const u8 *script)
+{
+	size_t script_len = tal_count(script);
+
+	/* Is prefaced by the length */
+	if (script_len != BITCOIN_SCRIPTPUBKEY_P2WSH_LEN + 1)
+		return false;
+	if (script[0] != OP_PUSHBYTES(34))
+		return false;
+	if (script[1] != OP_0)
+		return false;
+	if (script[2] != OP_PUSHBYTES(32))
+		return false;
+	return true;
+}
+
 bool is_p2pkh(const u8 *script, struct bitcoin_address *addr)
 {
 	size_t script_len = tal_count(script);

bitcoin/script.h

@@ -123,6 +123,12 @@ u8 *bitcoin_wscript_htlc_tx(const tal_t *ctx,
 			    const struct pubkey *revocation_pubkey,
 			    const struct pubkey *local_delayedkey);
 
+/* Is this a P2SH-P2WPKH redeemscript? */
+bool is_p2sh_p2wpkh_redeemscript(const u8 *script);
+
+/* Is this a P2SH-P2WSH redeemscript? */
+bool is_p2sh_p2wsh_redeemscript(const u8 *script);
+
 /* Is this a pay to pubkey hash? (extract addr if not NULL) */
 bool is_p2pkh(const u8 *script, struct bitcoin_address *addr);
 

bitcoin/tx.c

@@ -14,6 +14,16 @@
 
 #define SEGREGATED_WITNESS_FLAG 0x1
 
+struct bitcoin_tx_output *new_tx_output(const tal_t *ctx,
+					struct amount_sat amount,
+					const u8 *script)
+{
+	struct bitcoin_tx_output *output = tal(ctx, struct bitcoin_tx_output);
+	output->amount = amount;
+	output->script = tal_dup_arr(output, u8, script, tal_count(script), 0);
+	return output;
+}
+
 int bitcoin_tx_add_output(struct bitcoin_tx *tx, const u8 *script,
 			  struct amount_sat amount)
 {
@@ -160,9 +170,10 @@ int bitcoin_tx_add_input(struct bitcoin_tx *tx, const struct bitcoin_txid *txid,
 
 	/* Now store the input amount if we know it, so we can sign later */
 	if (tal_count(tx->input_amounts) < tx->wtx->num_inputs)
-		tal_resize(&tx->input_amounts, tx->wtx->num_inputs);
+		tal_resizez(&tx->input_amounts, tx->wtx->num_inputs);
 
-	tx->input_amounts[i] = tal_free(tx->input_amounts[i]);
+	if (tx->input_amounts[i])
+		tx->input_amounts[i] = tal_free(tx->input_amounts[i]);
 	tx->input_amounts[i] = tal_dup(tx, struct amount_sat, &amount);
 
 	return i;
@@ -228,6 +239,12 @@ const u8 *bitcoin_tx_output_get_script(const tal_t *ctx,
 	return res;
 }
 
+void bitcoin_tx_output_get_amount_sat(struct bitcoin_tx *tx, int outnum,
+				      struct amount_sat *amount)
+{
+	amount->satoshis = tx->wtx->outputs[outnum].satoshi;  /* Raw: type conversion */
+}
+
 /* FIXME(cdecker) Make the caller pass in a reference to amount_asset, and
  * return false if unintelligible/encrypted. (WARN UNUSED). */
 struct amount_asset bitcoin_tx_output_get_amount(const struct bitcoin_tx *tx,

bitcoin/tx.h

@@ -11,6 +11,7 @@
 #include <wally_transaction.h>
 
 #define BITCOIN_TX_DEFAULT_SEQUENCE 0xFFFFFFFF
+#define BITCOIN_TX_RBF_SEQUENCE 0xFFFFFFFD
 
 struct witscript {
     u8 *ptr;
@@ -46,10 +47,16 @@ struct bitcoin_tx_input {
 	u8 *script;
 	u32 sequence_number;
 
-	/* Only if BIP141 used. */
+	/* If BIP141 used, or is external input */
 	u8 **witness;
+
+	/* Needed for external inputs */
+	struct amount_sat amount;
 };
 
+struct bitcoin_tx_output *new_tx_output(const tal_t *ctx,
+					struct amount_sat amount,
+					const u8 *script);
 
 /* SHA256^2 the tx: simpler than sha256_tx */
 void bitcoin_txid(const struct bitcoin_tx *tx, struct bitcoin_txid *txid);
@@ -115,6 +122,13 @@ void bitcoin_tx_output_set_amount(struct bitcoin_tx *tx, int outnum,
  */
 const u8 *bitcoin_tx_output_get_script(const tal_t *ctx, const struct bitcoin_tx *tx, int outnum);
 
+/** bitcoin_tx_output_get_amount_sat - Helper to get transaction output's amount
+ *
+ * Internally we use a `wally_tx` to represent the transaction. The
+ * satoshi amount isn't a struct amount_sat, so we need a conversion
+ */
+void bitcoin_tx_output_get_amount_sat(struct bitcoin_tx *tx, int outnum,
+				      struct amount_sat *amount);
 /**
  * Helper to just get an amount_sat for the output amount.
  */

channeld/Makefile

@@ -49,6 +49,7 @@ CHANNELD_COMMON_OBJS :=				\
 	common/ecdh_hsmd.o			\
 	common/features.o			\
 	common/fee_states.o			\
+	common/funding_tx.o			\
 	common/gen_status_wire.o		\
 	common/gen_peer_status_wire.o		\
 	common/gossip_rcvd_filter.o		\

channeld/channel_wire.csv

@@ -24,7 +24,8 @@ msgdata,channel_init,remote_fundingkey,pubkey,
 msgdata,channel_init,remote_basepoints,basepoints,
 msgdata,channel_init,remote_per_commit,pubkey,
 msgdata,channel_init,old_remote_per_commit,pubkey,
-msgdata,channel_init,funder,enum side,
+msgdata,channel_init,opener,enum side,
+msgdata,channel_init,local_funded,bool,
 msgdata,channel_init,fee_base,u32,
 msgdata,channel_init,fee_proportional,u32,
 msgdata,channel_init,local_msatoshi,amount_msat,

channeld/channeld.c

@@ -669,10 +669,10 @@ static void handle_peer_feechange(struct peer *peer, const u8 *msg)
 	 *  - if the sender is not responsible for paying the Bitcoin fee:
 	 *    - MUST fail the channel.
 	 */
-	if (peer->channel->funder != REMOTE)
+	if (peer->channel->opener != REMOTE)
 		peer_failed(peer->pps,
 			    &peer->channel_id,
-			    "update_fee from non-funder?");
+			    "update_fee from non-opener?");
 
 	status_debug("update_fee %u, range %u-%u",
 		     feerate, peer->feerate_min, peer->feerate_max);
@@ -975,7 +975,7 @@ static void send_commit(struct peer *peer)
 	}
 
 	/* If we wanted to update fees, do it now. */
-	if (peer->channel->funder == LOCAL) {
+	if (peer->channel->opener == LOCAL) {
 		u32 feerate, max = approx_max_feerate(peer->channel);
 
 		feerate = peer->desired_feerate;
@@ -1240,11 +1240,11 @@ static void handle_peer_commit_sig(struct peer *peer, const u8 *msg)
 	}
 
 	/* We were supposed to check this was affordable as we go. */
-	if (peer->channel->funder == REMOTE) {
+	if (peer->channel->opener == REMOTE) {
 		status_debug("Feerates are %u/%u",
 			     channel_feerate(peer->channel, LOCAL),
 			     channel_feerate(peer->channel, REMOTE));
-		assert(can_funder_afford_feerate(peer->channel,
+		assert(can_opener_afford_feerate(peer->channel,
 						 channel_feerate(peer->channel,
 								 LOCAL)));
 	}
@@ -1432,7 +1432,7 @@ static void handle_peer_revoke_and_ack(struct peer *peer, const u8 *msg)
 	peer->old_remote_per_commit = peer->remote_per_commit;
 	peer->remote_per_commit = next_per_commit;
 	status_debug("revoke_and_ack %s: remote_per_commit = %s, old_remote_per_commit = %s",
-		     side_to_str(peer->channel->funder),
+		     side_to_str(peer->channel->opener),
 		     type_to_string(tmpctx, struct pubkey,
 				    &peer->remote_per_commit),
 		     type_to_string(tmpctx, struct pubkey,
@@ -1967,6 +1967,17 @@ static void peer_in(struct peer *peer, const u8 *msg)
 	case WIRE_FUNDING_SIGNED:
 	case WIRE_CHANNEL_REESTABLISH:
 	case WIRE_CLOSING_SIGNED:
+#if EXPERIMENTAL_FEATURES
+	case WIRE_TX_ADD_INPUT:
+	case WIRE_TX_ADD_OUTPUT:
+	case WIRE_TX_REMOVE_INPUT:
+	case WIRE_TX_REMOVE_OUTPUT:
+	case WIRE_TX_COMPLETE:
+	case WIRE_TX_SIGNATURES:
+	case WIRE_OPEN_CHANNEL2:
+	case WIRE_ACCEPT_CHANNEL2:
+	case WIRE_INIT_RBF:
+#endif /* EXPERIMENTAL_FEATURES */
 		break;
 
 	/* These are all swallowed by handle_peer_gossip_or_error */
@@ -1981,6 +1992,9 @@ static void peer_in(struct peer *peer, const u8 *msg)
 	case WIRE_PING:
 	case WIRE_PONG:
 	case WIRE_ERROR:
+#if EXPERIMENTAL_FEATURES
+	case WIRE_BLACKLIST_PODLE:
+#endif /* EXPERIMENTAL_FEATURES */
 		abort();
 	}
 
@@ -2107,7 +2121,7 @@ static void resend_commitment(struct peer *peer, const struct changed_htlc *last
 	}
 
 	/* Make sure they have the correct fee. */
-	if (peer->channel->funder == LOCAL) {
+	if (peer->channel->opener == LOCAL) {
 		msg = towire_update_fee(NULL, &peer->channel_id,
 					channel_feerate(peer->channel, REMOTE));
 		sync_crypto_write(peer->pps, take(msg));
@@ -2812,7 +2826,7 @@ static void handle_feerates(struct peer *peer, const u8 *inmsg)
 	 *    sufficient (by a significant margin) for timely processing of the
 	 *     commitment transaction.
 	 */
-	if (peer->channel->funder == LOCAL) {
+	if (peer->channel->opener == LOCAL) {
 		peer->desired_feerate = feerate;
 		/* Don't do this for the first feerate, wait until something else
 		 * happens.  LND seems to get upset in some cases otherwise:
@@ -3067,17 +3081,17 @@ static void init_channel(struct peer *peer)
 	struct pubkey funding_pubkey[NUM_SIDES];
 	struct channel_config conf[NUM_SIDES];
 	struct bitcoin_txid funding_txid;
-	enum side funder;
+	enum side opener;
 	struct existing_htlc **htlcs;
 	bool reconnected;
-	u8 *funding_signed;
+	u8 *sigs_msg;
 	const u8 *msg;
 	struct fee_states *fee_states;
 	u32 minimum_depth;
 	struct secret last_remote_per_commit_secret;
 	secp256k1_ecdsa_signature *remote_ann_node_sig;
 	secp256k1_ecdsa_signature *remote_ann_bitcoin_sig;
-	bool option_static_remotekey;
+	bool option_static_remotekey, local_funded;
 #if !DEVELOPER
 	bool dev_fail_process_onionpacket; /* Ignored */
 #endif
@@ -3102,7 +3116,8 @@ static void init_channel(struct peer *peer)
 				   &points[REMOTE],
 				   &peer->remote_per_commit,
 				   &peer->old_remote_per_commit,
-				   &funder,
+				   &opener,
+				   &local_funded,
 				   &peer->fee_base,
 				   &peer->fee_per_satoshi,
 				   &local_msat,
@@ -3127,7 +3142,7 @@ static void init_channel(struct peer *peer)
 				   &peer->shutdown_sent[REMOTE],
 				   &peer->final_scriptpubkey,
 				   &peer->channel_flags,
-				   &funding_signed,
+				   &sigs_msg,
 				   &peer->announce_depth_reached,
 				   &last_remote_per_commit_secret,
 				   &peer->their_features,
@@ -3148,7 +3163,7 @@ static void init_channel(struct peer *peer)
 		     " next_idx_remote = %"PRIu64
 		     " revocations_received = %"PRIu64
 		     " feerates %s range %u-%u",
-		     side_to_str(funder),
+		     side_to_str(opener),
 		     type_to_string(tmpctx, struct pubkey,
 				    &peer->remote_per_commit),
 		     type_to_string(tmpctx, struct pubkey,
@@ -3197,7 +3212,8 @@ static void init_channel(struct peer *peer)
 					 &funding_pubkey[LOCAL],
 					 &funding_pubkey[REMOTE],
 					 option_static_remotekey,
-					 funder);
+					 local_funded,
+					 opener);
 
 	if (!channel_force_htlcs(peer->channel,
 			 cast_const2(const struct existing_htlc **, htlcs)))
@@ -3211,7 +3227,7 @@ static void init_channel(struct peer *peer)
 					      &peer->node_ids[REMOTE]);
 
 	/* Default desired feerate is the feerate we set for them last. */
-	if (peer->channel->funder == LOCAL)
+	if (peer->channel->opener == LOCAL)
 		peer->desired_feerate = channel_feerate(peer->channel, REMOTE);
 
 	/* from now we need keep watch over WIRE_CHANNEL_FUNDING_DEPTH */
@@ -3221,9 +3237,9 @@ static void init_channel(struct peer *peer)
 	if (reconnected)
 		peer_reconnect(peer, &last_remote_per_commit_secret);
 
-	/* If we have a funding_signed message, send that immediately */
-	if (funding_signed)
-		sync_crypto_write(peer->pps, take(funding_signed));
+	/* If we have a final sigs message, send that immediately */
+	if (sigs_msg)
+		sync_crypto_write(peer->pps, take(sigs_msg));
 
 	/* Reenable channel */
 	channel_announcement_negotiate(peer);

channeld/commit_tx.c

@@ -85,7 +85,7 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
 			     const struct bitcoin_txid *funding_txid,
 			     unsigned int funding_txout,
 			     struct amount_sat funding,
-			     enum side funder,
+			     enum side opener,
 			     u16 to_self_delay,
 			     const struct keyset *keyset,
 			     u32 feerate_per_kw,
@@ -131,7 +131,7 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
 	 * 3. Subtract this base fee from the funder (either `to_local` or
 	 * `to_remote`), with a floor of 0 (see [Fee Payment](#fee-payment)).
 	 */
-	try_subtract_fee(funder, side, base_fee, &self_pay, &other_pay);
+	try_subtract_fee(opener, side, base_fee, &self_pay, &other_pay);
 
 #ifdef PRINT_ACTUAL_FEE
 	{

channeld/commit_tx.h

@@ -28,7 +28,7 @@ size_t commit_tx_num_untrimmed(const struct htlc **htlcs,
  * commit_tx: create (unsigned) commitment tx to spend the funding tx output
  * @ctx: context to allocate transaction and @htlc_map from.
  * @funding_txid, @funding_out, @funding: funding outpoint.
- * @funder: is the LOCAL or REMOTE paying the fee?
+ * @opener: is the LOCAL or REMOTE paying the fee?
  * @keyset: keys derived for this commit tx.
  * @feerate_per_kw: feerate to use
  * @dust_limit: dust limit below which to trim outputs.
@@ -47,7 +47,7 @@ struct bitcoin_tx *commit_tx(const tal_t *ctx,
 			     const struct bitcoin_txid *funding_txid,
 			     unsigned int funding_txout,
 			     struct amount_sat funding,
-			     enum side funder,
+			     enum side opener,
 			     u16 to_self_delay,
 			     const struct keyset *keyset,
 			     u32 feerate_per_kw,