Fixed redeemscript confusion. (#11)

Author: ksedgwic

contrib/remote_hsmd/proxy.cc

@@ -138,7 +138,6 @@ void marshal_utxo(struct utxo const *up, InputDescriptor *idesc)
 {
 	idesc->mutable_key_loc()->set_key_index(up->keyindex);
 	idesc->mutable_prev_output()->set_value_sat(up->amount.satoshis);
-	/* FIXME - where does pk_script come from? */
 	idesc->set_spend_type(up->is_p2sh
 			      ? SpendType::P2SH_P2WPKH
 			      : SpendType::P2WPKH);
@@ -177,46 +176,28 @@ void marshal_basepoints(struct basepoints const *bps,
 }
 
 void marshal_single_input_tx(struct bitcoin_tx const *tx,
-			     u8 const *output_witscript,
-			     bool use_tx_psbt,
+			     u8 const *redeem_script,
 			     Transaction *o_tp)
 {
-	if (output_witscript) {
-		/* Called with a single witscript. */
-		assert(tx->wtx->num_outputs == 1);
-	} else if (use_tx_psbt) {
-		/* Called with an array of witscripts. */
-		assert(tx->psbt->num_outputs == tx->wtx->num_outputs);
-	}
+	assert(tx->psbt->num_outputs == tx->wtx->num_outputs);
 
 	o_tp->set_raw_tx_bytes(serialized_tx(tx, true));
 
 	assert(tx->wtx->num_inputs == 1);
 	assert(tx->psbt->num_inputs == 1);
 	InputDescriptor *idesc = o_tp->add_input_descs();
 	idesc->mutable_prev_output()->set_value_sat(psbt_input_get_amount(tx->psbt, 0).satoshis);
-	/* FIXME - What else needs to be set? */
+	if (redeem_script)
+		idesc->set_redeem_script((const char *) redeem_script,
+					 tal_count(redeem_script));
 
 	for (size_t ii = 0; ii < tx->wtx->num_outputs; ii++) {
 		OutputDescriptor *odesc = o_tp->add_output_descs();
-		if (output_witscript) {
-			/* We have a single witscript. */
-			odesc->set_witscript((const char *) output_witscript,
-					     tal_count(output_witscript));
-		} else if (use_tx_psbt) {
-			/* We have an array of witscripts. */
-			if (tx->psbt->outputs[ii].witness_script_len)
-				odesc->set_witscript(
-					(const char *)
-					tx->psbt->outputs[ii].witness_script,
-					tx->psbt->outputs[ii].witness_script_len);
-			else
-				odesc->set_witscript("");
-		} else {
-			/* Called w/ no witscripts. */
-			odesc->set_witscript("");
-		}
-
+		if (tx->psbt->outputs[ii].witness_script_len)
+			odesc->set_witscript(
+				(const char *)
+				tx->psbt->outputs[ii].witness_script,
+				tx->psbt->outputs[ii].witness_script_len);
 	}
 }
 
@@ -707,7 +688,7 @@ proxy_stat proxy_handle_sign_remote_commitment_tx(
 	marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
 	marshal_pubkey(remote_per_commit,
 		       req.mutable_remote_per_commit_point());
-	marshal_single_input_tx(tx, NULL, true, req.mutable_tx());
+	marshal_single_input_tx(tx, NULL, req.mutable_tx());
 
 	ClientContext context;
 	SignatureReply rsp;
@@ -974,7 +955,7 @@ proxy_stat proxy_handle_sign_mutual_close_tx(
 	SignMutualCloseTxRequest req;
 	marshal_node_id(&self_id, req.mutable_node_id());
 	marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
-	marshal_single_input_tx(tx, NULL, false, req.mutable_tx());
+	marshal_single_input_tx(tx, NULL, req.mutable_tx());
 
 	ClientContext context;
 	SignatureReply rsp;
@@ -1019,7 +1000,7 @@ proxy_stat proxy_handle_sign_commitment_tx(
 	SignCommitmentTxRequest req;
 	marshal_node_id(&self_id, req.mutable_node_id());
 	marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
-	marshal_single_input_tx(tx, NULL, false, req.mutable_tx());
+	marshal_single_input_tx(tx, NULL, req.mutable_tx());
 
 	ClientContext context;
 	SignatureReply rsp;
@@ -1120,7 +1101,7 @@ proxy_stat proxy_handle_sign_local_htlc_tx(
 	marshal_node_id(&self_id, req.mutable_node_id());
 	marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
 	req.set_n(commit_num);
-	marshal_single_input_tx(tx, wscript, false, req.mutable_tx());
+	marshal_single_input_tx(tx, wscript, req.mutable_tx());
 
 	ClientContext context;
 	SignatureReply rsp;
@@ -1169,7 +1150,7 @@ proxy_stat proxy_handle_sign_remote_htlc_tx(
 	marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
 	marshal_pubkey(remote_per_commit_point,
 		       req.mutable_remote_per_commit_point());
-	marshal_single_input_tx(tx, wscript, false, req.mutable_tx());
+	marshal_single_input_tx(tx, wscript, req.mutable_tx());
 
 	ClientContext context;
 	SignatureReply rsp;
@@ -1219,7 +1200,7 @@ proxy_stat proxy_handle_sign_delayed_payment_to_us(
 	marshal_node_id(&self_id, req.mutable_node_id());
 	marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
 	req.set_n(commit_num);
-	marshal_single_input_tx(tx, wscript, false, req.mutable_tx());
+	marshal_single_input_tx(tx, wscript, req.mutable_tx());
 
 	ClientContext context;
 	SignatureReply rsp;
@@ -1267,7 +1248,7 @@ proxy_stat proxy_handle_sign_remote_htlc_to_us(
 	marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
 	marshal_pubkey(remote_per_commit_point,
 		       req.mutable_remote_per_commit_point());
-	marshal_single_input_tx(tx, wscript, false, req.mutable_tx());
+	marshal_single_input_tx(tx, wscript, req.mutable_tx());
 
 	ClientContext context;
 	SignatureReply rsp;
@@ -1318,7 +1299,7 @@ proxy_stat proxy_handle_sign_penalty_to_us(
 	marshal_node_id(&self_id, req.mutable_node_id());
 	marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
 	marshal_secret(revocation_secret, req.mutable_revocation_secret());
-	marshal_single_input_tx(tx, wscript, false, req.mutable_tx());
+	marshal_single_input_tx(tx, wscript, req.mutable_tx());
 
 	ClientContext context;
 	SignatureReply rsp;