Merge pull request #8664 from Roasbeef/v0-17-5-branch

release: create v0.17.5 release branch

.github/workflows/main.yml

@@ -21,7 +21,7 @@ defaults:
     shell: bash
 
 env:
-  BITCOIN_VERSION: "23.0"
+  BITCOIN_VERSION: "27"
 
   # If you change this value, please change it in the following files as well:
   # /.travis.yml

build/version.go

@@ -43,7 +43,7 @@ const (
 	AppMinor uint = 17
 
 	// AppPatch defines the application patch for this binary.
-	AppPatch uint = 4
+	AppPatch uint = 5
 
 	// AppPreRelease MUST only contain characters from semanticAlphabet per
 	// the semantic versioning spec.

chainntnfs/test_utils.go

@@ -205,8 +205,8 @@ func NewBitcoindBackend(t *testing.T, minerAddr string, txindex,
 	require.NoError(t, err, "unable to create temp dir")
 
 	rpcPort := rand.Intn(65536-1024) + 1024
-	zmqBlockHost := "ipc:///" + tempBitcoindDir + "/blocks.socket"
-	zmqTxHost := "ipc:///" + tempBitcoindDir + "/tx.socket"
+	zmqBlockHost := fmt.Sprintf("tcp://localhost:%d", rpcPort+1)
+	zmqTxHost := fmt.Sprintf("tcp://localhost:%d", rpcPort+2)
 
 	args := []string{
 		"-connect=" + minerAddr,

docs/release-notes/release-notes-0.17.5.md

@@ -0,0 +1,33 @@
+# Release Notes
+- [Release Notes](#release-notes)
+- [Bug Fixes](#bug-fixes)
+- [New Features](#new-features)
+  - [Functional Enhancements](#functional-enhancements)
+  - [RPC Additions](#rpc-additions)
+  - [lncli Additions](#lncli-additions)
+- [Improvements](#improvements)
+  - [Functional Updates](#functional-updates)
+    - [Tlv](#tlv)
+  - [Misc](#misc)
+    - [Logging](#logging)
+  - [RPC Updates](#rpc-updates)
+  - [lncli Updates](#lncli-updates)
+  - [Code Health](#code-health)
+  - [Breaking Changes](#breaking-changes)
+  - [Performance Improvements](#performance-improvements)
+- [Technical and Architectural Updates](#technical-and-architectural-updates)
+  - [BOLT Spec Updates](#bolt-spec-updates)
+  - [Testing](#testing)
+  - [Database](#database)
+  - [Code Health](#code-health-1)
+  - [Tooling and Documentation](#tooling-and-documentation)
+- [Contributors (Alphabetical Order)](#contributors-alphabetical-order)
+
+# Bug Fixes
+
+* [Fixed a bug in `btcd` that caused an incompatibility with
+  `bitcoind v27.0`](https://github.com/lightningnetwork/lnd/pull/8573).
+
+# Contributors (Alphabetical Order)
+
+* Oliver Gugger

go.mod

@@ -3,7 +3,7 @@ module github.com/lightningnetwork/lnd
 require (
 	github.com/NebulousLabs/go-upnp v0.0.0-20180202185039-29b680b06c82
 	github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344
-	github.com/btcsuite/btcd v0.24.1-0.20240123000108-62e6af035ec5
+	github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240403021926-ae5533602c46
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2
 	github.com/btcsuite/btcd/btcutil v1.1.5
 	github.com/btcsuite/btcd/btcutil/psbt v1.1.8

go.sum

@@ -74,8 +74,8 @@ github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tj
 github.com/btcsuite/btcd v0.22.0-beta.0.20220204213055-eaf0459ff879/go.mod h1:osu7EoKiL36UThEgzYPqdRaxeo0NU8VoXqgcnwpey0g=
 github.com/btcsuite/btcd v0.23.1/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
 github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
-github.com/btcsuite/btcd v0.24.1-0.20240123000108-62e6af035ec5 h1:8BHBWvtP6kkzvmCpyWEznq4eS0gfLOSVuXLesv413Xs=
-github.com/btcsuite/btcd v0.24.1-0.20240123000108-62e6af035ec5/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
+github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240403021926-ae5533602c46 h1:tjpNTdZNQqE14menwDGAxWfzN0DFHVTXFEyEL8yvA/4=
+github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240403021926-ae5533602c46/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
 github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
 github.com/btcsuite/btcd/btcec/v2 v2.1.1/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
 github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=

lnwallet/test/test_interface.go

@@ -1468,15 +1468,20 @@ func testTransactionSubscriptions(miner *rpctest.Harness,
 	// We'll also ensure that the client is able to send our new
 	// notifications when we _create_ transactions ourselves that spend our
 	// own outputs.
-	b := txscript.NewScriptBuilder()
-	b.AddOp(txscript.OP_RETURN)
-	outputScript, err := b.Script()
-	require.NoError(t, err, "unable to make output script")
+	addr, err := alice.NewAddress(
+		lnwallet.WitnessPubKey, false,
+		lnwallet.DefaultAccountName,
+	)
+	require.NoError(t, err)
+
+	outputScript, err := txscript.PayToAddrScript(addr)
+	require.NoError(t, err)
+
 	burnOutput := wire.NewTxOut(outputAmt, outputScript)
 	tx, err := alice.SendOutputs(
 		[]*wire.TxOut{burnOutput}, 2500, 1, labels.External,
 	)
-	require.NoError(t, err, "unable to create burn tx")
+	require.NoError(t, err, "unable to create tx")
 	txid := tx.TxHash()
 	err = waitForMempoolTx(miner, &txid)
 	require.NoError(t, err, "tx not relayed to miner")
@@ -3213,8 +3218,10 @@ func runTests(t *testing.T, walletDriver *lnwallet.WalletDriver,
 		case "bitcoind":
 			// Start a bitcoind instance.
 			tempBitcoindDir := t.TempDir()
-			zmqBlockHost := "ipc:///" + tempBitcoindDir + "/blocks.socket"
-			zmqTxHost := "ipc:///" + tempBitcoindDir + "/tx.socket"
+			zmqBlockHost := fmt.Sprintf("tcp://localhost:%d",
+				getFreePort())
+			zmqTxHost := fmt.Sprintf("tcp://localhost:%d",
+				getFreePort())
 			rpcPort := getFreePort()
 			bitcoind := exec.Command(
 				"bitcoind",

routing/chainview/interface_test.go

@@ -713,8 +713,10 @@ var interfaceImpls = []struct {
 
 			// Start a bitcoind instance.
 			tempBitcoindDir := t.TempDir()
-			zmqBlockHost := "ipc:///" + tempBitcoindDir + "/blocks.socket"
-			zmqTxHost := "ipc:///" + tempBitcoindDir + "/tx.socket"
+			zmqBlockHost := fmt.Sprintf("tcp://localhost:%d",
+				getFreePort())
+			zmqTxHost := fmt.Sprintf("tcp://localhost:%d",
+				getFreePort())
 
 			rpcPort := getFreePort()
 			bitcoind := exec.Command(

scripts/install_bitcoind.sh

@@ -4,7 +4,7 @@ set -ev
 
 BITCOIND_VERSION=${BITCOIN_VERSION:-23.0}
 
-docker pull lightninglabs/bitcoin-core:$BITCOIND_VERSION
-CONTAINER_ID=$(docker create lightninglabs/bitcoin-core:$BITCOIND_VERSION)
-sudo docker cp $CONTAINER_ID:/opt/bitcoin-$BITCOIND_VERSION/bin/bitcoind /usr/local/bin/bitcoind
+docker pull lightninglabs/bitcoin-core:${BITCOIND_VERSION}
+CONTAINER_ID=$(docker create lightninglabs/bitcoin-core:${BITCOIND_VERSION})
+sudo docker cp $CONTAINER_ID:/opt/bitcoin-${BITCOIND_VERSION}.0/bin/bitcoind /usr/local/bin/bitcoind
 docker rm $CONTAINER_ID