Skip to content

Commit f200946

Browse files
committed
mod+itest: bump lnd, fix itests in remote-signing mode
1 parent d54b2f7 commit f200946

File tree

5 files changed

+25
-16
lines changed

5 files changed

+25
-16
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ require (
99
github.com/btcsuite/btcd/btcutil/psbt v1.1.10
1010
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
1111
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c
12-
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084
13-
github.com/btcsuite/btcwallet v0.16.14
12+
github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b
13+
github.com/btcsuite/btcwallet v0.16.15-0.20250805011126-a3632ae48ab3
1414
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5
1515
github.com/btcsuite/btcwallet/wtxmgr v1.5.6
1616
github.com/caddyserver/certmagic v0.17.2
@@ -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.2-beta
33+
github.com/lightningnetwork/lnd v0.19.3-beta.rc1
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -666,11 +666,11 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtyd
666666
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
667667
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c h1:4HxD1lBUGUddhzgaNgrCPsFWd7cGYNpeFUgd9ZIgyM0=
668668
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c/go.mod h1:w7xnGOhwT3lmrS4H3b/D1XAXxvh+tbhUm8xeHN2y3TQ=
669-
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084 h1:y3bvkt8ki0KX35eUEU8XShRHusz1S+55QwXUTmxn888=
670-
github.com/btcsuite/btclog/v2 v2.0.1-0.20250602222548-9967d19bb084/go.mod h1:XItGUfVOxotJL8kkuk2Hj3EVow5KCugXl3wWfQ6K0AE=
669+
github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b h1:MQ+Q6sDy37V1wP1Yu79A5KqJutolqUGwA99UZWQDWZM=
670+
github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b/go.mod h1:XItGUfVOxotJL8kkuk2Hj3EVow5KCugXl3wWfQ6K0AE=
671671
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
672-
github.com/btcsuite/btcwallet v0.16.14 h1:CofysgmI1ednkLsXontAdBoXJkbiim7unXnFKhLLjnE=
673-
github.com/btcsuite/btcwallet v0.16.14/go.mod h1:H6dfoZcWPonM2wbVsR2ZBY0PKNZKdQyLAmnX8vL9JFA=
672+
github.com/btcsuite/btcwallet v0.16.15-0.20250805011126-a3632ae48ab3 h1:MAjNRpj3XhCOrhchq4wq0qI34TIBX/DCnT6OLWejx68=
673+
github.com/btcsuite/btcwallet v0.16.15-0.20250805011126-a3632ae48ab3/go.mod h1:H6dfoZcWPonM2wbVsR2ZBY0PKNZKdQyLAmnX8vL9JFA=
674674
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 h1:Rr0njWI3r341nhSPesKQ2JF+ugDSzdPoeckS75SeDZk=
675675
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5/go.mod h1:+tXJ3Ym0nlQc/iHSwW1qzjmPs3ev+UVWMbGgfV1OZqU=
676676
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 h1:YEO+Lx1ZJJAtdRrjuhXjWrYsmAk26wLTlNzxt2q0lhk=
@@ -1137,8 +1137,8 @@ github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3 h1:NuDp6Z+QNM
11371137
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3/go.mod h1:bDnEKRN1u13NFBuy/C+bFLhxA5bfd3clT25y76QY0AM=
11381138
github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1 h1:RWmohykp3n/DTMWY8b18RNTEcLDf+KT/AZHKYdOObkM=
11391139
github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1/go.mod h1:NYtNexZE9gO1eOeegTxmIW9fqanl7eZ9cOrE9yewSAk=
1140-
github.com/lightninglabs/lndclient v0.19.0-9 h1:ell27omDoks79upoAsO/7QY40O93ud4tAtBXXZilqok=
1141-
github.com/lightninglabs/lndclient v0.19.0-9/go.mod h1:35d50tEMFxlJlKTZGYA6EdOllPsbxS4FUmEVbETUx+Q=
1140+
github.com/lightninglabs/lndclient v0.19.0-11 h1:/WwowlNff19lb7DXzq3c6L4nRMvwBZjbjLOy1/u4a5Y=
1141+
github.com/lightninglabs/lndclient v0.19.0-11/go.mod h1:cicoJY1AwZuRVXGD8Knp50TRT7TGBmw1k37uPQsGQiw=
11421142
github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2 h1:eFjp1dIB2BhhQp/THKrjLdlYuPugO9UU4kDqu91OX/Q=
11431143
github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2/go.mod h1:99BKpIi6ruaaXRM1A77eqZ+FWPQ3cfRa+ZVy5bmWMaY=
11441144
github.com/lightninglabs/neutrino v0.16.1 h1:5Kz4ToxncEVkpKC6fwUjXKtFKJhuxlG3sBB3MdJTJjs=
@@ -1149,8 +1149,8 @@ github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9
11491149
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
11501150
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
11511151
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
1152-
github.com/lightningnetwork/lnd v0.19.2-beta h1:3SKVrKYFY4IJLlrMf7cDzZcBeT+MxjI9Xy6YpY+EEX4=
1153-
github.com/lightningnetwork/lnd v0.19.2-beta/go.mod h1:+yKUfIGKKYRHGewgzQ6xi0S26DIfBiMv1zCdB3m6YxA=
1152+
github.com/lightningnetwork/lnd v0.19.3-beta.rc1 h1:UNq7fI2URQmYtVw2ca2T2BB2fWckhLr9DMneMP1oJJU=
1153+
github.com/lightningnetwork/lnd v0.19.3-beta.rc1/go.mod h1:Mf5k8y8ykULxcnS84QGy4wSLRwh4ZqwdV9Rvw68kFC4=
11541154
github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
11551155
github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
11561156
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)