Skip to content

Commit 0a29002

Browse files
guggeroguggero
authored
Merge pull request lightninglabs#153 from lightninglabs/update-lnd-18-4
multi: update to lnd v0.18.4-beta release branch
2 parents e5cae83 + 795949f commit 0a29002

File tree

9 files changed

+54
-34
lines changed

9 files changed

+54
-34
lines changed

‎aperture.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ func setupLogging(cfg *Config, interceptor signal.Interceptor) error {
627627
}
628628

629629
err := logWriter.InitLogRotator(
630-
logFile, build.Gzip, defaultMaxLogFileSize, defaultMaxLogFiles,
630+
logFile, defaultMaxLogFileSize, defaultMaxLogFiles,
631631
)
632632
if err != nil {
633633
return err

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.22.6
55
toolchain go1.22.7
66

77
require (
8-
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026
9-
github.com/btcsuite/btcd/btcec/v2 v2.3.3
8+
github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53
9+
github.com/btcsuite/btcd/btcec/v2 v2.3.4
1010
github.com/btcsuite/btcd/btcutil v1.1.5
1111
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
1212
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
@@ -21,8 +21,8 @@ require (
2121
github.com/lib/pq v1.10.9
2222
github.com/lightninglabs/lightning-node-connect v0.2.5-alpha
2323
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2
24-
github.com/lightninglabs/lndclient v0.17.4-4
25-
github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240918100428-838a32d13ca5
24+
github.com/lightninglabs/lndclient v0.18.4-0
25+
github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241011124628-ca3bde901eb8
2626
github.com/lightningnetwork/lnd/cert v1.2.2
2727
github.com/lightningnetwork/lnd/clock v1.1.1
2828
github.com/lightningnetwork/lnd/tlv v1.2.6

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
7171
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
7272
github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
7373
github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
74-
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026 h1:s8/96vQSj05bqLl9RyM/eMX8gLtiayEj520TVE4YGy0=
75-
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
74+
github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53 h1:XOZ/wRGHkKv0AqxfDks5IkzaQ1Ge6fq322ZOOG5VIkU=
75+
github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53/go.mod h1:zHK7t7sw8XbsCkD64WePHE3r3k9/XoGAcf6mXV14c64=
7676
github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
7777
github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
78-
github.com/btcsuite/btcd/btcec/v2 v2.3.3 h1:6+iXlDKE8RMtKsvK0gshlXIuPbyWM/h84Ensb7o3sC0=
79-
github.com/btcsuite/btcd/btcec/v2 v2.3.3/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
78+
github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ=
79+
github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
8080
github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
8181
github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
8282
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
474474
github.com/lightninglabs/lightning-node-connect v0.2.5-alpha/go.mod h1:A9Pof9fETkH+F67BnOmrBDThPKstqp73wlImWOZvTXQ=
475475
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 h1:Er1miPZD2XZwcfE4xoS5AILqP1mj7kqnhbBSxW9BDxY=
476476
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2/go.mod h1:antQGRDRJiuyQF6l+k6NECCSImgCpwaZapATth2Chv4=
477-
github.com/lightninglabs/lndclient v0.17.4-4 h1:Us+ZGSAtsM0zGajfXXL8MhnmcqBWimFGnbVVgtbY6Ws=
478-
github.com/lightninglabs/lndclient v0.17.4-4/go.mod h1:XAhBTLYLB6mkp9yqYXombokwzzSrwU7fNINL4+gU2rM=
477+
github.com/lightninglabs/lndclient v0.18.4-0 h1:TdorvV9UIw3fjZrNpVKn3fpsOdw2KWF2Eqdx7+++lcY=
478+
github.com/lightninglabs/lndclient v0.18.4-0/go.mod h1:LbINSPfKEdZuTGqqJ+ZmUxXWNvUCaDqrZeJ7/Al0Z3Y=
479479
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd h1:D8aRocHpoCv43hL8egXEMYyPmyOiefFHZ66338KQB2s=
480480
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd/go.mod h1:x3OmY2wsA18+Kc3TSV2QpSUewOCiscw2mKpXgZv2kZk=
481481
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
484484
github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
485485
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
486486
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
487-
github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240918100428-838a32d13ca5 h1:7VMrvBGUb88Wiud9VcBrcvPkXKbdCa5w//6riKwyvj4=
488-
github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240918100428-838a32d13ca5/go.mod h1:XUzNYzWDwaZ0/NrtP8hm82hjU1HhncndQ2yN3uDT/jk=
487+
github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241011124628-ca3bde901eb8 h1:+z0s8M0QItH51qMPgFGlRvi6uBltbURQj6u1srTyRb4=
488+
github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241011124628-ca3bde901eb8/go.mod h1:gzVQkOCZxTLzlUPqnI6t68FVGLbiO6Jj+TcLb4b78n0=
489489
github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
490490
github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
491491
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=

‎internal/test/chainnotifier_mock.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/btcsuite/btcd/wire"
1010
"github.com/lightninglabs/lndclient"
1111
"github.com/lightningnetwork/lnd/chainntnfs"
12+
"github.com/lightningnetwork/lnd/lnrpc/chainrpc"
1213
"golang.org/x/net/context"
1314
)
1415

@@ -19,6 +20,13 @@ type mockChainNotifier struct {
1920
wg sync.WaitGroup
2021
}
2122

23+
func (c *mockChainNotifier) RawClientWithMacAuth(
24+
ctx context.Context) (context.Context, time.Duration,
25+
chainrpc.ChainNotifierClient) {
26+
27+
return ctx, 0, nil
28+
}
29+
2230
// SpendRegistration contains registration details.
2331
type SpendRegistration struct {
2432
Outpoint *wire.OutPoint

‎internal/test/invoices_mock.go‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package test
22

33
import (
44
"context"
5-
"fmt"
65
"sync"
76
"time"
87

@@ -19,6 +18,19 @@ type mockInvoices struct {
1918
wg sync.WaitGroup
2019
}
2120

21+
func (s *mockInvoices) RawClientWithMacAuth(
22+
ctx context.Context) (context.Context, time.Duration,
23+
invoicesrpc.InvoicesClient) {
24+
25+
return ctx, 0, nil
26+
}
27+
28+
func (s *mockInvoices) HtlcModifier(context.Context,
29+
lndclient.InvoiceHtlcModifyHandler) error {
30+
31+
return nil
32+
}
33+
2234
func (s *mockInvoices) SettleInvoice(ctx context.Context,
2335
preimage lntypes.Preimage) error {
2436

@@ -93,13 +105,7 @@ func (s *mockInvoices) AddHoldInvoice(ctx context.Context,
93105
SignCompact: func(hash []byte) ([]byte, error) {
94106
// ecdsa.SignCompact returns a
95107
// pubkey-recoverable signature.
96-
sig, err := ecdsa.SignCompact(
97-
privKey, hash, true,
98-
)
99-
if err != nil {
100-
return nil, fmt.Errorf("can't sign "+
101-
"the hash: %v", err)
102-
}
108+
sig := ecdsa.SignCompact(privKey, hash, true)
103109

104110
return sig, nil
105111
},

‎internal/test/lightning_client_mock.go‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,7 @@ func (h *mockLightningClient) AddInvoice(ctx context.Context,
117117
SignCompact: func(hash []byte) ([]byte, error) {
118118
// ecdsa.SignCompact returns a
119119
// pubkey-recoverable signature.
120-
sig, err := ecdsa.SignCompact(
121-
privKey, hash, true,
122-
)
123-
if err != nil {
124-
return nil, fmt.Errorf("can't sign "+
125-
"the hash: %v", err)
126-
}
120+
sig := ecdsa.SignCompact(privKey, hash, true)
127121

128122
return sig, nil
129123
},

‎internal/test/signer_mock.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,27 @@ import (
44
"bytes"
55
"context"
66
"fmt"
7+
"time"
78

89
"github.com/btcsuite/btcd/btcec/v2"
910
"github.com/btcsuite/btcd/wire"
1011
"github.com/lightninglabs/lndclient"
1112
"github.com/lightningnetwork/lnd/input"
1213
"github.com/lightningnetwork/lnd/keychain"
14+
"github.com/lightningnetwork/lnd/lnrpc/signrpc"
1315
)
1416

1517
type mockSigner struct {
1618
lnd *LndMockServices
1719
}
1820

21+
func (s *mockSigner) RawClientWithMacAuth(
22+
ctx context.Context) (context.Context, time.Duration,
23+
signrpc.SignerClient) {
24+
25+
return ctx, 0, nil
26+
}
27+
1928
func (s *mockSigner) SignOutputRaw(ctx context.Context, tx *wire.MsgTx,
2029
signDescriptors []*lndclient.SignDescriptor,
2130
prevOutputs []*wire.TxOut) ([][]byte, error) {

‎internal/test/testutils.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package test
22

33
import (
44
"errors"
5-
"fmt"
65
"os"
76
"runtime/pprof"
87
"testing"
@@ -46,13 +45,9 @@ func EncodePayReq(payReq *zpay32.Invoice) (string, error) {
4645
SignCompact: func(hash []byte) ([]byte, error) {
4746
// ecdsa.SignCompact returns a
4847
// pubkey-recoverable signature
49-
sig, err := ecdsa.SignCompact(
48+
sig := ecdsa.SignCompact(
5049
privKey, payReq.PaymentHash[:], true,
5150
)
52-
if err != nil {
53-
return nil, fmt.Errorf("can't sign "+
54-
"the hash: %v", err)
55-
}
5651

5752
return sig, nil
5853
},

‎internal/test/versioner_mock.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package test
22

33
import (
44
"context"
5+
"time"
56

67
"github.com/lightninglabs/lndclient"
78
"github.com/lightningnetwork/lnd/lnrpc/verrpc"
@@ -30,6 +31,13 @@ type mockVersioner struct {
3031

3132
var _ lndclient.VersionerClient = (*mockVersioner)(nil)
3233

34+
func (v *mockVersioner) RawClientWithMacAuth(
35+
ctx context.Context) (context.Context, time.Duration,
36+
verrpc.VersionerClient) {
37+
38+
return ctx, 0, nil
39+
}
40+
3341
func newMockVersioner() *mockVersioner {
3442
return &mockVersioner{
3543
version: &verrpc.Version{

0 commit comments

Comments
 (0)