Skip to content

Commit 60a2b65

Browse files
guggeroguggero
authored
Merge pull request #1115 from lightninglabs/lnd-19-2-tapd-0-6-1
Prepare for release of v0.15.1-alpha final
2 parents a0915a3 + b21046f commit 60a2b65

File tree

9 files changed

+206
-131
lines changed

9 files changed

+206
-131
lines changed

‎README.md

Lines changed: 114 additions & 114 deletions
Large diffs are not rendered by default.

‎app/src/types/generated/lnd_pb.d.ts

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/types/generated/lnd_pb.js

Lines changed: 56 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/util/tests/sampleData.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,11 @@ export const lndChannelEvent: Required<LND.ChannelEventUpdate.AsObject> = {
281281
fundingTxidStr: '',
282282
outputIndex: outIndex,
283283
},
284+
channelFundingTimeout: {
285+
fundingTxidBytes: txIdBytes,
286+
fundingTxidStr: '',
287+
outputIndex: outIndex,
288+
},
284289
};
285290

286291
export const lndTransaction: LND.Transaction.AsObject = {

‎docs/release-notes/release-notes-0.15.1.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
### LND
2727

2828
* Updated [`lnd` to
29-
`v0.19.2-beta.rc2`](https://github.com/lightninglabs/lightning-terminal/pull/1111).
29+
`v0.19.2-beta`](https://github.com/lightninglabs/lightning-terminal/pull/1115).
3030

3131
### Loop
3232

@@ -36,6 +36,9 @@
3636

3737
### Taproot Assets
3838

39+
* Updated [`tapd` to
40+
`v0.6.1-alpha`](https://github.com/lightninglabs/lightning-terminal/pull/1115).
41+
3942
# Contributors (Alphabetical Order)
4043

4144
* Oliver Gugger

‎go.mod

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ require (
2525
github.com/lightninglabs/lightning-terminal/autopilotserverrpc v0.0.3
2626
github.com/lightninglabs/lightning-terminal/litrpc v1.0.2
2727
github.com/lightninglabs/lightning-terminal/perms v1.0.1
28-
github.com/lightninglabs/lndclient v0.19.0-9
28+
github.com/lightninglabs/lndclient v0.19.0-12
2929
github.com/lightninglabs/loop v0.31.2-beta
3030
github.com/lightninglabs/loop/looprpc v1.0.8
3131
github.com/lightninglabs/loop/swapserverrpc v1.0.15
3232
github.com/lightninglabs/pool v0.6.6-beta
3333
github.com/lightninglabs/pool/auctioneerrpc v1.1.3
3434
github.com/lightninglabs/pool/poolrpc v1.0.1
35-
github.com/lightninglabs/taproot-assets v0.6.1-0.20250711162444-8d28f0bceebe
36-
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250711162444-8d28f0bceebe
37-
github.com/lightningnetwork/lnd v0.19.2-beta.rc2
35+
github.com/lightninglabs/taproot-assets v0.6.1
36+
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250716163904-2ef55ba74036
37+
github.com/lightningnetwork/lnd v0.19.2-beta
3838
github.com/lightningnetwork/lnd/cert v1.2.2
3939
github.com/lightningnetwork/lnd/clock v1.1.1
4040
github.com/lightningnetwork/lnd/fn v1.2.3
@@ -247,3 +247,7 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d
247247
// it is a replace in the tapd repository, it doesn't get propagated here
248248
// automatically, so we need to add it manually.
249249
replace github.com/golang-migrate/migrate/v4 => github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2
250+
251+
// tapd wants v0.19.0-12, but loop can't handle that yet. So we'll just use the
252+
// previous version for now.
253+
replace github.com/lightninglabs/lndclient => github.com/lightninglabs/lndclient v0.19.0-11

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,8 +1150,8 @@ github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3 h1:NuDp6Z+QNM
11501150
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3/go.mod h1:bDnEKRN1u13NFBuy/C+bFLhxA5bfd3clT25y76QY0AM=
11511151
github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1 h1:RWmohykp3n/DTMWY8b18RNTEcLDf+KT/AZHKYdOObkM=
11521152
github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1/go.mod h1:NYtNexZE9gO1eOeegTxmIW9fqanl7eZ9cOrE9yewSAk=
1153-
github.com/lightninglabs/lndclient v0.19.0-9 h1:ell27omDoks79upoAsO/7QY40O93ud4tAtBXXZilqok=
1154-
github.com/lightninglabs/lndclient v0.19.0-9/go.mod h1:35d50tEMFxlJlKTZGYA6EdOllPsbxS4FUmEVbETUx+Q=
1153+
github.com/lightninglabs/lndclient v0.19.0-11 h1:/WwowlNff19lb7DXzq3c6L4nRMvwBZjbjLOy1/u4a5Y=
1154+
github.com/lightninglabs/lndclient v0.19.0-11/go.mod h1:cicoJY1AwZuRVXGD8Knp50TRT7TGBmw1k37uPQsGQiw=
11551155
github.com/lightninglabs/loop v0.31.2-beta h1:lm5t5FqDpSfQCxoz/vTvXpylxSgU+gvJJIbfJiKeyUk=
11561156
github.com/lightninglabs/loop v0.31.2-beta/go.mod h1:xnPKuZmLusNERwzz15RZ7mpQ8xuSqqh3g8Qw/PRyiRE=
11571157
github.com/lightninglabs/loop/looprpc v1.0.8 h1:OFmJNLjem6fLuH1YUO+3G6QA1wmjAd0zyhvdHONOBDs=
@@ -1172,14 +1172,14 @@ github.com/lightninglabs/pool/poolrpc v1.0.1 h1:XbNx28TYwEj/PVsnnF9TnveVCMCYfS1v
11721172
github.com/lightninglabs/pool/poolrpc v1.0.1/go.mod h1:836icifg/SBnZbiae0v3jeRRzCrT6LWo32SqCS/JiGk=
11731173
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9Z6CpKxl13mS48idsu6F+cEZf0lkyiV+Dq9g=
11741174
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
1175-
github.com/lightninglabs/taproot-assets v0.6.1-0.20250711162444-8d28f0bceebe h1:I6pr3cdCxnuZnPs/r2ZnbUdY5t0/mOrN84JzOhwWMms=
1176-
github.com/lightninglabs/taproot-assets v0.6.1-0.20250711162444-8d28f0bceebe/go.mod h1:kslGzv7djJwiVkCFpwjBW130CS6N6UUdxwLeKjSthK8=
1177-
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250711162444-8d28f0bceebe h1:3dw9TOBp2xgIK26oJ9I8qJtbopJUy7pCApFyqQclhUI=
1178-
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250711162444-8d28f0bceebe/go.mod h1:vOM2Ap2wYhEZjiJU7bNNg+e5tDxkvRAuyXwf/KQ4tgo=
1175+
github.com/lightninglabs/taproot-assets v0.6.1 h1:98XCk7nvAridyE67uct0NDVpyY1evpIdvPQpeNElskM=
1176+
github.com/lightninglabs/taproot-assets v0.6.1/go.mod h1:rF+GwuUVuDVUejAHsUCml4Nru9xnl7A4YZQfR4qLMzY=
1177+
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250716163904-2ef55ba74036 h1:ZUQrEmdZa72RieBKI/NiUQJGAnh6R6Pq6FoXh+VCOJQ=
1178+
github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250716163904-2ef55ba74036/go.mod h1:vOM2Ap2wYhEZjiJU7bNNg+e5tDxkvRAuyXwf/KQ4tgo=
11791179
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
11801180
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
1181-
github.com/lightningnetwork/lnd v0.19.2-beta.rc2 h1:vPIMjQr8SWZJHn/j3QSFct4AbCVa0WA7k0j0lHqFDAA=
1182-
github.com/lightningnetwork/lnd v0.19.2-beta.rc2/go.mod h1:+yKUfIGKKYRHGewgzQ6xi0S26DIfBiMv1zCdB3m6YxA=
1181+
github.com/lightningnetwork/lnd v0.19.2-beta h1:3SKVrKYFY4IJLlrMf7cDzZcBeT+MxjI9Xy6YpY+EEX4=
1182+
github.com/lightningnetwork/lnd v0.19.2-beta/go.mod h1:+yKUfIGKKYRHGewgzQ6xi0S26DIfBiMv1zCdB3m6YxA=
11831183
github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
11841184
github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
11851185
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=

‎proto/lnd.proto

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2980,6 +2980,7 @@ message ChannelEventUpdate {
29802980
ChannelPoint inactive_channel = 4;
29812981
PendingUpdate pending_open_channel = 6;
29822982
ChannelPoint fully_resolved_channel = 7;
2983+
ChannelPoint channel_funding_timeout = 8;
29832984
}
29842985

29852986
enum UpdateType {
@@ -2989,6 +2990,7 @@ message ChannelEventUpdate {
29892990
INACTIVE_CHANNEL = 3;
29902991
PENDING_OPEN_CHANNEL = 4;
29912992
FULLY_RESOLVED_CHANNEL = 5;
2993+
CHANNEL_FUNDING_TIMEOUT = 6;
29922994
}
29932995

29942996
UpdateType type = 5;

‎version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const (
3838

3939
// appPreRelease MUST only contain characters from semanticAlphabet per
4040
// the semantic versioning spec.
41-
appPreRelease = "alpha.rc1"
41+
appPreRelease = "alpha"
4242
)
4343

4444
// Version returns the application version as a properly formed string per the

0 commit comments

Comments
 (0)