Merge pull request #153 from lightninglabs/update-lnd-18-4

multi: update to lnd v0.18.4-beta release branch

aperture.go

@@ -627,7 +627,7 @@ func setupLogging(cfg *Config, interceptor signal.Interceptor) error {
 	}
 
 	err := logWriter.InitLogRotator(
-		logFile, build.Gzip, defaultMaxLogFileSize, defaultMaxLogFiles,
+		logFile, defaultMaxLogFileSize, defaultMaxLogFiles,
 	)
 	if err != nil {
 		return err

go.mod

@@ -5,8 +5,8 @@ go 1.22.6
 toolchain go1.22.7
 
 require (
-	github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026
-	github.com/btcsuite/btcd/btcec/v2 v2.3.3
+	github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53
+	github.com/btcsuite/btcd/btcec/v2 v2.3.4
 	github.com/btcsuite/btcd/btcutil v1.1.5
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
@@ -21,8 +21,8 @@ require (
 	github.com/lib/pq v1.10.9
 	github.com/lightninglabs/lightning-node-connect v0.2.5-alpha
 	github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2
-	github.com/lightninglabs/lndclient v0.17.4-4
-	github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240918100428-838a32d13ca5
+	github.com/lightninglabs/lndclient v0.18.4-0
+	github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241011124628-ca3bde901eb8
 	github.com/lightningnetwork/lnd/cert v1.2.2
 	github.com/lightningnetwork/lnd/clock v1.1.1
 	github.com/lightningnetwork/lnd/tlv v1.2.6

go.sum

@@ -71,12 +71,12 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
 github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
-github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026 h1:s8/96vQSj05bqLl9RyM/eMX8gLtiayEj520TVE4YGy0=
-github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
+github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53 h1:XOZ/wRGHkKv0AqxfDks5IkzaQ1Ge6fq322ZOOG5VIkU=
+github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53/go.mod h1:zHK7t7sw8XbsCkD64WePHE3r3k9/XoGAcf6mXV14c64=
 github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
 github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
-github.com/btcsuite/btcd/btcec/v2 v2.3.3 h1:6+iXlDKE8RMtKsvK0gshlXIuPbyWM/h84Ensb7o3sC0=
-github.com/btcsuite/btcd/btcec/v2 v2.3.3/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
+github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ=
+github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
 github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
 github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
 github.com/btcsuite/btcd/btcutil v1.1.5 h1:+wER79R5670vs/ZusMTF1yTcRYE5GUsFbdjdisflzM8=
@@ -474,8 +474,8 @@ github.com/lightninglabs/lightning-node-connect v0.2.5-alpha h1:ZRVChwczFXK0CEbx
 github.com/lightninglabs/lightning-node-connect v0.2.5-alpha/go.mod h1:A9Pof9fETkH+F67BnOmrBDThPKstqp73wlImWOZvTXQ=
 github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 h1:Er1miPZD2XZwcfE4xoS5AILqP1mj7kqnhbBSxW9BDxY=
 github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2/go.mod h1:antQGRDRJiuyQF6l+k6NECCSImgCpwaZapATth2Chv4=
-github.com/lightninglabs/lndclient v0.17.4-4 h1:Us+ZGSAtsM0zGajfXXL8MhnmcqBWimFGnbVVgtbY6Ws=
-github.com/lightninglabs/lndclient v0.17.4-4/go.mod h1:XAhBTLYLB6mkp9yqYXombokwzzSrwU7fNINL4+gU2rM=
+github.com/lightninglabs/lndclient v0.18.4-0 h1:TdorvV9UIw3fjZrNpVKn3fpsOdw2KWF2Eqdx7+++lcY=
+github.com/lightninglabs/lndclient v0.18.4-0/go.mod h1:LbINSPfKEdZuTGqqJ+ZmUxXWNvUCaDqrZeJ7/Al0Z3Y=
 github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd h1:D8aRocHpoCv43hL8egXEMYyPmyOiefFHZ66338KQB2s=
 github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd/go.mod h1:x3OmY2wsA18+Kc3TSV2QpSUewOCiscw2mKpXgZv2kZk=
 github.com/lightninglabs/neutrino/cache v1.1.2 h1:C9DY/DAPaPxbFC+xNNEI/z1SJY9GS3shmlu5hIQ798g=
@@ -484,8 +484,8 @@ github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display h1:pRdza2wl
 github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
 github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
-github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240918100428-838a32d13ca5 h1:7VMrvBGUb88Wiud9VcBrcvPkXKbdCa5w//6riKwyvj4=
-github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240918100428-838a32d13ca5/go.mod h1:XUzNYzWDwaZ0/NrtP8hm82hjU1HhncndQ2yN3uDT/jk=
+github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241011124628-ca3bde901eb8 h1:+z0s8M0QItH51qMPgFGlRvi6uBltbURQj6u1srTyRb4=
+github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241011124628-ca3bde901eb8/go.mod h1:gzVQkOCZxTLzlUPqnI6t68FVGLbiO6Jj+TcLb4b78n0=
 github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
 github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
 github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=

internal/test/chainnotifier_mock.go

@@ -9,6 +9,7 @@ import (
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/chainntnfs"
+	"github.com/lightningnetwork/lnd/lnrpc/chainrpc"
 	"golang.org/x/net/context"
 )
 
@@ -19,6 +20,13 @@ type mockChainNotifier struct {
 	wg                sync.WaitGroup
 }
 
+func (c *mockChainNotifier) RawClientWithMacAuth(
+	ctx context.Context) (context.Context, time.Duration,
+	chainrpc.ChainNotifierClient) {
+
+	return ctx, 0, nil
+}
+
 // SpendRegistration contains registration details.
 type SpendRegistration struct {
 	Outpoint   *wire.OutPoint

internal/test/invoices_mock.go

@@ -2,7 +2,6 @@ package test
 
 import (
 	"context"
-	"fmt"
 	"sync"
 	"time"
 
@@ -19,6 +18,19 @@ type mockInvoices struct {
 	wg  sync.WaitGroup
 }
 
+func (s *mockInvoices) RawClientWithMacAuth(
+	ctx context.Context) (context.Context, time.Duration,
+	invoicesrpc.InvoicesClient) {
+
+	return ctx, 0, nil
+}
+
+func (s *mockInvoices) HtlcModifier(context.Context,
+	lndclient.InvoiceHtlcModifyHandler) error {
+
+	return nil
+}
+
 func (s *mockInvoices) SettleInvoice(ctx context.Context,
 	preimage lntypes.Preimage) error {
 
@@ -93,13 +105,7 @@ func (s *mockInvoices) AddHoldInvoice(ctx context.Context,
 			SignCompact: func(hash []byte) ([]byte, error) {
 				// ecdsa.SignCompact returns a
 				// pubkey-recoverable signature.
-				sig, err := ecdsa.SignCompact(
-					privKey, hash, true,
-				)
-				if err != nil {
-					return nil, fmt.Errorf("can't sign "+
-						"the hash: %v", err)
-				}
+				sig := ecdsa.SignCompact(privKey, hash, true)
 
 				return sig, nil
 			},

internal/test/lightning_client_mock.go

@@ -117,13 +117,7 @@ func (h *mockLightningClient) AddInvoice(ctx context.Context,
 			SignCompact: func(hash []byte) ([]byte, error) {
 				// ecdsa.SignCompact returns a
 				// pubkey-recoverable signature.
-				sig, err := ecdsa.SignCompact(
-					privKey, hash, true,
-				)
-				if err != nil {
-					return nil, fmt.Errorf("can't sign "+
-						"the hash: %v", err)
-				}
+				sig := ecdsa.SignCompact(privKey, hash, true)
 
 				return sig, nil
 			},

internal/test/signer_mock.go

@@ -4,18 +4,27 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/keychain"
+	"github.com/lightningnetwork/lnd/lnrpc/signrpc"
 )
 
 type mockSigner struct {
 	lnd *LndMockServices
 }
 
+func (s *mockSigner) RawClientWithMacAuth(
+	ctx context.Context) (context.Context, time.Duration,
+	signrpc.SignerClient) {
+
+	return ctx, 0, nil
+}
+
 func (s *mockSigner) SignOutputRaw(ctx context.Context, tx *wire.MsgTx,
 	signDescriptors []*lndclient.SignDescriptor,
 	prevOutputs []*wire.TxOut) ([][]byte, error) {

internal/test/testutils.go

@@ -2,7 +2,6 @@ package test
 
 import (
 	"errors"
-	"fmt"
 	"os"
 	"runtime/pprof"
 	"testing"
@@ -46,13 +45,9 @@ func EncodePayReq(payReq *zpay32.Invoice) (string, error) {
 			SignCompact: func(hash []byte) ([]byte, error) {
 				// ecdsa.SignCompact returns a
 				// pubkey-recoverable signature
-				sig, err := ecdsa.SignCompact(
+				sig := ecdsa.SignCompact(
 					privKey, payReq.PaymentHash[:], true,
 				)
-				if err != nil {
-					return nil, fmt.Errorf("can't sign "+
-						"the hash: %v", err)
-				}
 
 				return sig, nil
 			},

internal/test/versioner_mock.go

@@ -2,6 +2,7 @@ package test
 
 import (
 	"context"
+	"time"
 
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/lnrpc/verrpc"
@@ -30,6 +31,13 @@ type mockVersioner struct {
 
 var _ lndclient.VersionerClient = (*mockVersioner)(nil)
 
+func (v *mockVersioner) RawClientWithMacAuth(
+	ctx context.Context) (context.Context, time.Duration,
+	verrpc.VersionerClient) {
+
+	return ctx, 0, nil
+}
+
 func newMockVersioner() *mockVersioner {
 	return &mockVersioner{
 		version: &verrpc.Version{