lightningd: return addrtype when asking wallet_can_spend.

Not just the key index.

Also, remove FIXME: wallet_can_spend is no longer slow with lots of inputs!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Author: rustyrussell

lightningd/closing_control.c

@@ -485,7 +485,7 @@ void peer_start_closingd(struct channel *channel, struct peer_fd *peer_fd)
 		    ld->wallet,
 		    channel->shutdown_scriptpubkey[LOCAL],
 		    tal_bytelen(channel->shutdown_scriptpubkey[LOCAL]),
-		    &index_val)) {
+		    &index_val, NULL)) {
 		if (bip32_key_from_parent(
 			    ld->bip32_base,
 			    index_val,
@@ -744,7 +744,7 @@ static struct command_result *json_close(struct command *cmd,
 
 		/* If they give a local address, adjust final_key_idx. */
 		if (!wallet_can_spend(cmd->ld->wallet, close_to_script, tal_bytelen(close_to_script),
-				      &final_key_idx)) {
+				      &final_key_idx, NULL)) {
 			final_key_idx = channel->final_key_idx;
 		}
 	} else {

lightningd/dual_open_control.c

@@ -696,7 +696,7 @@ openchannel2_hook_cb(struct openchannel2_payload *payload STEALS)
 	if (wallet_can_spend(dualopend->ld->wallet,
 			     payload->our_shutdown_scriptpubkey,
 			     tal_bytelen(payload->our_shutdown_scriptpubkey),
-			     &found_wallet_index)) {
+			     &found_wallet_index, NULL)) {
 		our_shutdown_script_wallet_index = tal(tmpctx, u32);
 		*our_shutdown_script_wallet_index = found_wallet_index;
 	} else
@@ -3092,7 +3092,7 @@ static struct command_result *openchannel_init(struct command *cmd,
 	if (wallet_can_spend(cmd->ld->wallet,
 			     oa->our_upfront_shutdown_script,
 			     tal_bytelen(oa->our_upfront_shutdown_script),
-			     &found_wallet_index)) {
+			     &found_wallet_index, NULL)) {
 		our_upfront_shutdown_script_wallet_index = &found_wallet_index;
 	} else
 		our_upfront_shutdown_script_wallet_index = NULL;
@@ -3861,7 +3861,7 @@ static struct command_result *json_queryrates(struct command *cmd,
 	if (wallet_can_spend(cmd->ld->wallet,
 			     oa->our_upfront_shutdown_script,
 			     tal_bytelen(oa->our_upfront_shutdown_script),
-			     &found_wallet_index)) {
+			     &found_wallet_index, NULL)) {
 		our_upfront_shutdown_script_wallet_index = tal(tmpctx, u32);
 		*our_upfront_shutdown_script_wallet_index = found_wallet_index;
 	} else
@@ -4209,7 +4209,7 @@ bool peer_restart_dualopend(struct peer *peer,
 	if (wallet_can_spend(peer->ld->wallet,
 			     channel->shutdown_scriptpubkey[LOCAL],
 			     tal_bytelen(channel->shutdown_scriptpubkey[LOCAL]),
-			     &found_wallet_index)) {
+			     &found_wallet_index, NULL)) {
 		local_shutdown_script_wallet_index = tal(tmpctx, u32);
 		*local_shutdown_script_wallet_index = found_wallet_index;
 	} else

lightningd/opening_control.c

@@ -717,7 +717,7 @@ openchannel_hook_final(struct openchannel_hook_payload *payload STEALS)
 	if (wallet_can_spend(payload->openingd->ld->wallet,
 			     our_upfront_shutdown_script,
 			     tal_bytelen(our_upfront_shutdown_script),
-			     &found_wallet_index)) {
+			     &found_wallet_index, NULL)) {
 		upfront_shutdown_script_wallet_index = tal(tmpctx, u32);
 		*upfront_shutdown_script_wallet_index = found_wallet_index;
 	} else
@@ -1408,7 +1408,7 @@ static struct command_result *json_fundchannel_start(struct command *cmd,
 	if (wallet_can_spend(fc->cmd->ld->wallet,
 			     fc->our_upfront_shutdown_script,
 			     tal_bytelen(fc->our_upfront_shutdown_script),
-			     &found_wallet_index)) {
+			     &found_wallet_index, NULL)) {
 		upfront_shutdown_script_wallet_index = tal(tmpctx, u32);
 		*upfront_shutdown_script_wallet_index = found_wallet_index;
 	} else

wallet/wallet.c

@@ -910,7 +910,7 @@ bool wallet_add_onchaind_utxo(struct wallet *w,
 }
 
 bool wallet_can_spend(struct wallet *w, const u8 *script, size_t script_len,
-		      u32 *index)
+		      u32 *index, enum addrtype *addrtype)
 {
 	u64 bip32_max_index;
 	const struct wallet_address *waddr;
@@ -931,6 +931,8 @@ bool wallet_can_spend(struct wallet *w, const u8 *script, size_t script_len,
 		db_set_intvar(w->db, "bip32_max_index", waddr->index);
 
 	*index = waddr->index;
+	if (addrtype)
+		*addrtype = waddr->addrtype;
 	return true;
 }
 
@@ -3014,6 +3016,7 @@ void wallet_confirm_tx(struct wallet *w,
 
 static void got_utxo(struct wallet *w,
 		     u64 keyindex,
+		     enum addrtype addrtype,
 		     const struct wally_tx *wtx,
 		     size_t outnum,
 		     bool is_coinbase,
@@ -3025,7 +3028,7 @@ static void got_utxo(struct wallet *w,
 	struct amount_asset asset = wally_tx_output_get_amount(txout);
 
 	utxo->keyindex = keyindex;
-	utxo->is_p2sh = is_p2sh(txout->script, txout->script_len, NULL);
+	utxo->is_p2sh = (addrtype == ADDR_P2SH_SEGWIT);
 	utxo->amount = amount_asset_to_sat(&asset);
 	utxo->status = OUTPUT_STATE_AVAILABLE;
 	wally_txid(wtx, &utxo->outpoint.txid);
@@ -3087,14 +3090,15 @@ int wallet_extract_owned_outputs(struct wallet *w, const struct wally_tx *wtx,
 		const struct wally_tx_output *txout = &wtx->outputs[i];
 		u32 keyindex;
 		struct amount_asset asset = wally_tx_output_get_amount(txout);
+		enum addrtype addrtype;
 
 		if (!amount_asset_is_main(&asset))
 			continue;
 
-		if (!wallet_can_spend(w, txout->script, txout->script_len, &keyindex))
+		if (!wallet_can_spend(w, txout->script, txout->script_len, &keyindex, &addrtype))
 			continue;
 
-		got_utxo(w, keyindex, wtx, i, is_coinbase, blockheight, NULL);
+		got_utxo(w, keyindex, addrtype, wtx, i, is_coinbase, blockheight, NULL);
 		num_utxos++;
 	}
 	return num_utxos;
@@ -6751,7 +6755,7 @@ static void mutual_close_p2pkh_catch(struct bitcoind *bitcoind,
 					   missing->addrs[n].scriptpubkey,
 					   tal_bytelen(missing->addrs[n].scriptpubkey)))
 					continue;
-				got_utxo(w, missing->addrs[n].keyidx,
+				got_utxo(w, missing->addrs[n].keyidx, ADDR_BECH32,
 					 wtx, outnum, i == 0, &height, &outp);
 				log_broken(bitcoind->ld->log, "Rescan found %s!",
 					   fmt_bitcoin_outpoint(tmpctx, &outp));

wallet/wallet.h

@@ -588,17 +588,17 @@ struct utxo **wallet_utxo_boost(const tal_t *ctx,
 /**
  * wallet_can_spend - Do we have the private key matching this scriptpubkey?
  *
- * FIXME: This is very slow with lots of inputs!
- *
  * @w: (in) wallet holding the pubkeys to check against (privkeys are on HSM)
  * @script: (in) the script to check
  * @script_len: (in) the length of @script
  * @index: (out) the bip32 derivation index that matched the script
+ * @addrtype: (out) if non-NULL, set to address type of script.
  */
 bool wallet_can_spend(struct wallet *w,
 		      const u8 *script,
 		      size_t script_len,
-		      u32 *index);
+		      u32 *index,
+		      enum addrtype *addrtype);
 
 /**
  * wallet_get_newindex - get a new index from the wallet.

wallet/walletrpc.c

@@ -729,7 +729,7 @@ static void match_psbt_outputs_to_wallet(struct wally_psbt *psbt,
 		const size_t script_len = psbt->outputs[outndx].script_len;
 		u32 index;
 
-		if (!wallet_can_spend(w, script, script_len, &index))
+		if (!wallet_can_spend(w, script, script_len, &index, NULL))
 			continue;
 
 		if (bip32_key_from_parent(
@@ -936,7 +936,7 @@ static void maybe_notify_new_external_send(struct lightningd *ld,
 	/* If it's going to our wallet, ignore */
 	script = wally_psbt_output_get_script(tmpctx,
 					      &psbt->outputs[outnum]);
-	if (wallet_can_spend(ld->wallet, script, tal_bytelen(script), &index))
+	if (wallet_can_spend(ld->wallet, script, tal_bytelen(script), &index, NULL))
 		return;
 
 	outpoint.txid = *txid;