common: fix utxo_spend_weight to understand how cheap P2TR is.

We previously treated it as a P2WPKH, which is wrong.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Fixed: wallet: fees are much closer to target feerate when doing txprepare/fundchannel.

Author: rustyrussell

common/utxo.c

@@ -4,14 +4,52 @@
 
 size_t utxo_spend_weight(const struct utxo *utxo, size_t min_witness_weight)
 {
-	size_t wit_weight = bitcoin_tx_simple_input_witness_weight();
+	size_t witness_weight;
+	bool p2sh;
+
+	switch (utxo->utxotype) {
+	case UTXO_P2SH_P2WPKH:
+		witness_weight = bitcoin_tx_simple_input_witness_weight();
+		p2sh = true;
+		goto have_weight;
+	case UTXO_P2WPKH:
+		witness_weight = bitcoin_tx_simple_input_witness_weight();
+		p2sh = false;
+		goto have_weight;
+	case UTXO_P2WSH_FROM_CLOSE:
+		/* BOLT #3:
+		 * #### `to_remote` Output
+		 *
+		 * If `option_anchors` applies to the commitment
+		 * transaction, the `to_remote` output is encumbered by a one
+		 * block csv lock.
+		 *    <remotepubkey> OP_CHECKSIGVERIFY 1 OP_CHECKSEQUENCEVERIFY
+		 *
+		 * The output is spent by an input with `nSequence` field set
+		 * to `1` and witness: <remote_sig>
+		 * Otherwise, this output is a simple P2WPKH to `remotepubkey`.
+		 */
+		if (utxo->close_info->option_anchors)
+			witness_weight = 1 + 33 + 3 + 1 + 64;
+		else
+			witness_weight = 1 + 64;
+		p2sh = false;
+		goto have_weight;
+	case UTXO_P2TR:
+		witness_weight = 1 + 64;
+		p2sh = false;
+		goto have_weight;
+	}
+	abort();
+
+have_weight:
 	/* If the min is less than what we'd use for a 'normal' tx,
 	 * we return the value with the greater added/calculated */
-	if (wit_weight < min_witness_weight)
-		return bitcoin_tx_input_weight(utxo->utxotype == UTXO_P2SH_P2WPKH,
+	if (witness_weight < min_witness_weight)
+		return bitcoin_tx_input_weight(p2sh,
 					       min_witness_weight);
 
-	return bitcoin_tx_input_weight(utxo->utxotype == UTXO_P2SH_P2WPKH, wit_weight);
+	return bitcoin_tx_input_weight(p2sh, witness_weight);
 }
 
 u32 utxo_is_immature(const struct utxo *utxo, u32 blockheight)

tests/test_closing.py

@@ -4274,7 +4274,7 @@ def censoring_sendrawtx(r):
     height = bitcoind.rpc.getblockchaininfo()['blocks']
     l1.daemon.wait_for_log(r"Low-priority anchorspend aiming for block {} \(feerate 7458\)".format(height + 13))
     # Can be out-by-one (short sig)!
-    l1.daemon.wait_for_log(r"Anchorspend for local commit tx fee 12335sat \(w=714\), commit_tx fee 1735sat \(w=768\): package feerate 9493 perkw")
+    l1.daemon.wait_for_log(r"Anchorspend for local commit tx fee 12022sat \(w=672\), commit_tx fee 1735sat \(w=768\): package feerate 9553 perkw")
     assert not l1.daemon.is_in_log("Low-priority anchorspend aiming for block {}".format(height + 12))
 
     bitcoind.generate_block(1)

tests/test_misc.py

@@ -746,7 +746,7 @@ def dont_spend_outputs(n, txid):
         {'type': 'chain_mvt', 'credit_msat': 2000000000, 'debit_msat': 0, 'tags': ['deposit']},
         {'type': 'chain_mvt', 'credit_msat': 2000000000, 'debit_msat': 0, 'tags': ['deposit']},
         {'type': 'chain_mvt', 'credit_msat': 2000000000, 'debit_msat': 0, 'tags': ['deposit']},
-        {'type': 'chain_mvt', 'credit_msat': 11956163000, 'debit_msat': 0, 'tags': ['deposit']},
+        {'type': 'chain_mvt', 'credit_msat': 11957423000, 'debit_msat': 0, 'tags': ['deposit']},
     ]
 
     check_coin_moves(l1, 'external', external_moves, chainparams)