build: update to latest version of btcutil+btcwallet

lntest/itest/lnd_recovery_test.go

@@ -261,10 +261,10 @@ func testOnchainFundRecovery(ht *lntemp.HarnessTest) {
 	restoreCheckBalance(finalBalance, 9, 20, promptChangeAddr)
 
 	// We should expect a static fee of 36400 satoshis for spending 9
-	// inputs (3 P2WPKH, 3 NP2WPKH, 3 P2TR) to two P2WPKH outputs. Carol
+	// inputs (3 P2WPKH, 3 NP2WPKH, 3 P2TR) to two P2TR outputs. Carol
 	// should therefore only have one UTXO present (the change output) of
 	// 9 - 8 - fee BTC.
-	const fee = 36400
+	const fee = 37000
 	restoreCheckBalance(finalBalance-minerAmt-fee, 1, 21, nil)
 
 	// Last of all, make sure we can also restore a node from the extended

lntest/itest/lnd_wallet_import_test.go

@@ -276,8 +276,14 @@ func psbtSendFromImportedAccount(t *harnessTest, srcNode, destNode,
 	)
 	switch accountAddrType {
 	case walletrpc.AddressType_WITNESS_PUBKEY_HASH:
-		expTxFee = 141
-		expChangeScriptType = txscript.WitnessV0PubKeyHashTy
+		if account != defaultImportedAccount {
+			expTxFee = 141
+			expChangeScriptType = txscript.WitnessV0PubKeyHashTy
+			break
+		}
+
+		expTxFee = 153
+		expChangeScriptType = txscript.WitnessV1TaprootTy
 
 	case walletrpc.AddressType_NESTED_WITNESS_PUBKEY_HASH:
 		if account != defaultImportedAccount {
@@ -286,26 +292,16 @@ func psbtSendFromImportedAccount(t *harnessTest, srcNode, destNode,
 			break
 		}
 
-		// Spends from the default NP2WKH imported account have the same
-		// fee rate as the hybrid address type since a NP2WKH input is
-		// spent and a P2WKH change output is created.
-		fallthrough
+		expTxFee = 176
+		expChangeScriptType = txscript.WitnessV1TaprootTy
 
 	case walletrpc.AddressType_HYBRID_NESTED_WITNESS_PUBKEY_HASH:
 		expTxFee = 164
 		expChangeScriptType = txscript.WitnessV0PubKeyHashTy
 
 	case walletrpc.AddressType_TAPROOT_PUBKEY:
-		if account != defaultImportedAccount {
-			expTxFee = 143
-			expChangeScriptType = txscript.WitnessV1TaprootTy
-			break
-		}
-
-		// Spends from the default imported account fall back to a P2WKH
-		// change. We'll want to change that, but in a separate PR.
-		expTxFee = 131
-		expChangeScriptType = txscript.WitnessV0PubKeyHashTy
+		expTxFee = 143
+		expChangeScriptType = txscript.WitnessV1TaprootTy
 
 	default:
 		t.Fatalf("unsupported addr type %v", accountAddrType)
@@ -443,8 +439,14 @@ func fundChanAndCloseFromImportedAccount(t *harnessTest, srcNode, destNode,
 	)
 	switch accountAddrType {
 	case walletrpc.AddressType_WITNESS_PUBKEY_HASH:
-		expChanTxFee = 153
-		expChangeScriptType = txscript.WitnessV0PubKeyHashTy
+		if account != defaultImportedAccount {
+			expChanTxFee = 153
+			expChangeScriptType = txscript.WitnessV0PubKeyHashTy
+			break
+		}
+
+		expChanTxFee = 165
+		expChangeScriptType = txscript.WitnessV1TaprootTy
 
 	case walletrpc.AddressType_NESTED_WITNESS_PUBKEY_HASH:
 		if account != defaultImportedAccount {
@@ -453,26 +455,16 @@ func fundChanAndCloseFromImportedAccount(t *harnessTest, srcNode, destNode,
 			break
 		}
 
-		// Spends from the default NP2WKH imported account have the same
-		// fee rate as the hybrid address type since a NP2WKH input is
-		// spent and a P2WKH change output is created.
-		fallthrough
+		expChanTxFee = 188
+		expChangeScriptType = txscript.WitnessV1TaprootTy
 
 	case walletrpc.AddressType_HYBRID_NESTED_WITNESS_PUBKEY_HASH:
 		expChanTxFee = 176
 		expChangeScriptType = txscript.WitnessV0PubKeyHashTy
 
 	case walletrpc.AddressType_TAPROOT_PUBKEY:
-		if account != defaultImportedAccount {
-			expChanTxFee = 155
-			expChangeScriptType = txscript.WitnessV1TaprootTy
-			break
-		}
-
-		// Spends from the default imported account fall back to a P2WKH
-		// change. We'll want to change that, but in a separate PR.
-		expChanTxFee = 143
-		expChangeScriptType = txscript.WitnessV0PubKeyHashTy
+		expChanTxFee = 155
+		expChangeScriptType = txscript.WitnessV1TaprootTy
 
 	default:
 		t.Fatalf("unsupported addr type %v", accountAddrType)