Skip to content

Commit 320a76c

Browse files
yyforyongyuguggero
authored andcommitted
lndclient: add CloseTxid for WaitingCloseChannel
1 parent 6af629f commit 320a76c

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The current compatibility matrix reads as follows:
2626

2727
| `lndclient` git tag | `lnd` version in `go.mod` | minimum required `lnd` version |
2828
| ---------------------------- | ------------------------- | ------------------------------ |
29-
| [`v0.14.2-0`](https://github.com/lightninglabs/lndclient/blob/v0.14.2-0) | `lnd @ 4a62b7cf8c69` | `v0.14.0-beta` |
29+
| [`v0.14.2-1`](https://github.com/lightninglabs/lndclient/blob/v0.14.2-1) | `v0.14.2-beta` | `v0.14.2-beta` |
3030
| [`v0.13.0-10`](https://github.com/lightninglabs/lndclient/blob/v0.13.0-10) | `lnd @ d9f0f07142ea` | `v0.13.0-beta` |
3131
| `master` / [`v0.12.0-13`](https://github.com/lightninglabs/lndclient/blob/v0.12.0-13) | `v0.12.0-beta` | `v0.12.0-beta` |
3232

lightning_client.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1778,6 +1778,9 @@ type WaitingCloseChannel struct {
17781778
// - ChanStatusCoopBroadcasted|ChanStatusLocalCloseInitiator
17791779
// - ChanStatusCoopBroadcasted|ChanStatusRemoteCloseInitiator
17801780
ChanStatusFlags string
1781+
1782+
// CloseTxid is the close transaction that's broadcast.
1783+
CloseTxid chainhash.Hash
17811784
}
17821785

17831786
// PendingChannels returns a list of lnd's pending channels.
@@ -1845,12 +1848,18 @@ func (s *lightningClient) PendingChannels(ctx context.Context) (*PendingChannels
18451848
return nil, err
18461849
}
18471850

1851+
hash, err := chainhash.NewHashFromStr(waiting.ClosingTxid)
1852+
if err != nil {
1853+
return nil, err
1854+
}
1855+
18481856
closing := WaitingCloseChannel{
18491857
PendingChannel: *channel,
18501858
LocalTxid: *local,
18511859
RemoteTxid: *remote,
18521860
RemotePending: *remotePending,
18531861
ChanStatusFlags: waiting.Channel.ChanStatusFlags,
1862+
CloseTxid: *hash,
18541863
}
18551864
pending.WaitingClose[i] = closing
18561865
}

lnd_services.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var (
4242
minimalCompatibleVersion = &verrpc.Version{
4343
AppMajor: 0,
4444
AppMinor: 14,
45-
AppPatch: 0,
45+
AppPatch: 2,
4646
BuildTags: DefaultBuildTags,
4747
}
4848

0 commit comments

Comments
 (0)