Skip to content

Commit 9eb6a5e

Browse files
committed
mod+itest: bump lnd, fix itests in remote-signing mode
1 parent 75c999f commit 9eb6a5e

File tree

5 files changed

+19
-10
lines changed

5 files changed

+19
-10
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ require (
2727
github.com/lib/pq v1.10.9
2828
github.com/lightninglabs/aperture v0.3.13-beta
2929
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3
30-
github.com/lightninglabs/lndclient v0.19.0-9
30+
github.com/lightninglabs/lndclient v0.19.0-11
3131
github.com/lightninglabs/neutrino/cache v1.1.2
3232
github.com/lightninglabs/taproot-assets/taprpc v1.0.9
33-
github.com/lightningnetwork/lnd v0.19.3-beta.rc1.0.20250812194315-c3226e8c2223
33+
github.com/lightningnetwork/lnd v0.19.3-beta
3434
github.com/lightningnetwork/lnd/cert v1.2.2
3535
github.com/lightningnetwork/lnd/clock v1.1.1
3636
github.com/lightningnetwork/lnd/fn/v2 v2.0.8

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,8 +1140,8 @@ github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3 h1:NuDp6Z+QNM
11401140
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3/go.mod h1:bDnEKRN1u13NFBuy/C+bFLhxA5bfd3clT25y76QY0AM=
11411141
github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1 h1:RWmohykp3n/DTMWY8b18RNTEcLDf+KT/AZHKYdOObkM=
11421142
github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1/go.mod h1:NYtNexZE9gO1eOeegTxmIW9fqanl7eZ9cOrE9yewSAk=
1143-
github.com/lightninglabs/lndclient v0.19.0-9 h1:ell27omDoks79upoAsO/7QY40O93ud4tAtBXXZilqok=
1144-
github.com/lightninglabs/lndclient v0.19.0-9/go.mod h1:35d50tEMFxlJlKTZGYA6EdOllPsbxS4FUmEVbETUx+Q=
1143+
github.com/lightninglabs/lndclient v0.19.0-11 h1:/WwowlNff19lb7DXzq3c6L4nRMvwBZjbjLOy1/u4a5Y=
1144+
github.com/lightninglabs/lndclient v0.19.0-11/go.mod h1:cicoJY1AwZuRVXGD8Knp50TRT7TGBmw1k37uPQsGQiw=
11451145
github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2 h1:eFjp1dIB2BhhQp/THKrjLdlYuPugO9UU4kDqu91OX/Q=
11461146
github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2/go.mod h1:99BKpIi6ruaaXRM1A77eqZ+FWPQ3cfRa+ZVy5bmWMaY=
11471147
github.com/lightninglabs/neutrino v0.16.1 h1:5Kz4ToxncEVkpKC6fwUjXKtFKJhuxlG3sBB3MdJTJjs=
@@ -1152,8 +1152,8 @@ github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9
11521152
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
11531153
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
11541154
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
1155-
github.com/lightningnetwork/lnd v0.19.3-beta.rc1.0.20250812194315-c3226e8c2223 h1:CBN1ju+LQL+jTfneGabUTFoHYuAnFeHv3j5+09wtOCo=
1156-
github.com/lightningnetwork/lnd v0.19.3-beta.rc1.0.20250812194315-c3226e8c2223/go.mod h1:MNRzea8Yrgk+ohyUhK7JSpoigE4T9JgerMQQUxMbl9I=
1155+
github.com/lightningnetwork/lnd v0.19.3-beta h1:sBOIn+0ZIkvEJh05VPJRSOOhWbJn2EoGtyUAaq/Fgk8=
1156+
github.com/lightningnetwork/lnd v0.19.3-beta/go.mod h1:MNRzea8Yrgk+ohyUhK7JSpoigE4T9JgerMQQUxMbl9I=
11571157
github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
11581158
github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
11591159
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=

itest/mint_fund_seal_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,15 +597,15 @@ func deriveRandomKey(t *testing.T, ctxt context.Context,
597597
keyRing *lndservices.LndRpcKeyRing) keychain.KeyDescriptor {
598598

599599
var (
600-
randFam = test.RandInt31n(math.MaxInt32)
600+
randFam = test.RandInt31n(math.MaxInt8)
601601
randInd = test.RandInt31n(255)
602602
desc keychain.KeyDescriptor
603603
err error
604604
)
605605

606606
// Ensure that we use a different key family from tapd.
607607
for randFam == asset.TaprootAssetsKeyFamily {
608-
randFam = test.RandInt31n(math.MaxInt32)
608+
randFam = test.RandInt31n(math.MaxInt8)
609609
}
610610

611611
desc, err = keyRing.DeriveNextKey(

itest/multisig.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,15 @@ func FinalizePacket(t *testing.T, lnd *rpc.HarnessRPC,
489489
return signedPacket
490490
}
491491

492+
// FinalizeFullySigned is a helper function that finalizes a PSBT packet
493+
// that is already fully signed. It will return the finalized packet.
494+
func FinalizeFullySigned(t *testing.T, pkt *psbt.Packet) *psbt.Packet {
495+
err := psbt.MaybeFinalizeAll(pkt)
496+
require.NoError(t, err)
497+
498+
return pkt
499+
}
500+
492501
// PublishAndLogTransferOption defines a functional option for
493502
// PublishAndLogTransfer.
494503
type PublishAndLogTransferOption func(*publishAndLogTransferOptions)

itest/psbt_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ func testPsbtInteractiveAltLeafAnchoring(t *harnessTest) {
11491149
require.NoError(t.t, err)
11501150

11511151
commitPacket = signPacket(t.t, senderLnd, commitPacket)
1152-
commitPacket = FinalizePacket(t.t, senderLnd.RPC, commitPacket)
1152+
commitPacket = FinalizeFullySigned(t.t, commitPacket)
11531153
publishResp := PublishAndLogTransfer(
11541154
t.t, sender, commitPacket, []*tappsbt.VPacket{activePacket},
11551155
[]*tappsbt.VPacket{passivePacket}, commitResp,
@@ -2795,7 +2795,7 @@ func testPsbtExternalCommit(t *harnessTest) {
27952795
t.Logf("Committed transaction: %v", toJSON(t.t, commitResp))
27962796

27972797
btcPacket = signPacket(t.t, aliceLnd, btcPacket)
2798-
btcPacket = FinalizePacket(t.t, aliceLnd.RPC, btcPacket)
2798+
btcPacket = FinalizeFullySigned(t.t, btcPacket)
27992799

28002800
transferLabel := "itest-psbt-external-commit"
28012801

0 commit comments

Comments
 (0)