Skip to content

Commit ce81327

Browse files
authored
Merge pull request #8862 from yyforyongyu/fix-publish-err
Fix an error string match between different `btcd` versions
2 parents 6b64703 + 7fd099b commit ce81327

File tree

4 files changed

+108
-59
lines changed

4 files changed

+108
-59
lines changed

docs/release-notes/release-notes-0.18.1.md

Lines changed: 4 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -19,80 +19,31 @@
1919

2020
# Bug Fixes
2121

22-
* `closedchannels` now [successfully reports](https://github.com/lightningnetwork/lnd/pull/8800)
23-
settled balances even if the delivery address is set to an address that
24-
LND does not control.
25-
26-
* [SendPaymentV2](https://github.com/lightningnetwork/lnd/pull/8734) now cancels
27-
the background payment loop if the user cancels the stream context.
28-
29-
* [Fixed a bug](https://github.com/lightningnetwork/lnd/pull/8822) that caused
30-
LND to read the config only partially and continued with the startup.
22+
* [Fixed a bug](https://github.com/lightningnetwork/lnd/pull/8862) in error
23+
matching from publishing transactions that can cause the broadcast process to
24+
fail if `btcd` with an older version (pre-`v0.24.2`) is used.
3125

3226
# New Features
3327
## Functional Enhancements
3428
## RPC Additions
35-
36-
* The [SendPaymentRequest](https://github.com/lightningnetwork/lnd/pull/8734)
37-
message receives a new flag `cancelable` which indicates if the payment loop
38-
is cancelable. The cancellation can either occur manually by cancelling the
39-
send payment stream context, or automatically at the end of the timeout period
40-
if the user provided `timeout_seconds`.
41-
4229
## lncli Additions
4330

44-
* [Added](https://github.com/lightningnetwork/lnd/pull/8491) the `cltv_expiry`
45-
argument to `addinvoice` and `addholdinvoice`, allowing users to set the
46-
`min_final_cltv_expiry_delta`.
47-
48-
* The [`lncli wallet estimatefeerate`](https://github.com/lightningnetwork/lnd/pull/8730)
49-
command returns the fee rate estimate for on-chain transactions in sat/kw and
50-
sat/vb to achieve a given confirmation target.
51-
5231
# Improvements
5332
## Functional Updates
5433
## RPC Updates
55-
56-
* [`xImportMissionControl`](https://github.com/lightningnetwork/lnd/pull/8779)
57-
now accepts `0` failure amounts.
58-
59-
* [`ChanInfoRequest`](https://github.com/lightningnetwork/lnd/pull/8813)
60-
adds support for channel points.
61-
6234
## lncli Updates
63-
64-
* [`importmc`](https://github.com/lightningnetwork/lnd/pull/8779) now accepts
65-
`0` failure amounts.
66-
67-
* [`getchaninfo`](https://github.com/lightningnetwork/lnd/pull/8813) now accepts
68-
a channel outpoint besides a channel id.
69-
70-
* [Fixed](https://github.com/lightningnetwork/lnd/pull/8823) how we parse the
71-
`--amp` flag when sending a payment specifying the payment request.
72-
7335
## Code Health
7436
## Breaking Changes
7537
## Performance Improvements
7638

77-
* Mission Control Store [improved performance during DB
78-
flushing](https://github.com/lightningnetwork/lnd/pull/8549) stage.
79-
8039
# Technical and Architectural Updates
8140
## BOLT Spec Updates
8241

83-
* Start assuming that all hops used during path-finding and route construction
84-
[support the TLV onion
85-
format](https://github.com/lightningnetwork/lnd/pull/8791).
86-
8742
## Testing
8843
## Database
8944
## Code Health
9045
## Tooling and Documentation
9146

9247
# Contributors (Alphabetical Order)
9348

94-
* Andras Banki-Horvath
95-
* Bufo
96-
* Elle Mouton
97-
* Matheus Degiovani
98-
* Slyghtning
49+
* Yyforyongyu
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
# Release Notes
2+
- [Bug Fixes](#bug-fixes)
3+
- [New Features](#new-features)
4+
- [Functional Enhancements](#functional-enhancements)
5+
- [RPC Additions](#rpc-additions)
6+
- [lncli Additions](#lncli-additions)
7+
- [Improvements](#improvements)
8+
- [Functional Updates](#functional-updates)
9+
- [RPC Updates](#rpc-updates)
10+
- [lncli Updates](#lncli-updates)
11+
- [Breaking Changes](#breaking-changes)
12+
- [Performance Improvements](#performance-improvements)
13+
- [Technical and Architectural Updates](#technical-and-architectural-updates)
14+
- [BOLT Spec Updates](#bolt-spec-updates)
15+
- [Testing](#testing)
16+
- [Database](#database)
17+
- [Code Health](#code-health)
18+
- [Tooling and Documentation](#tooling-and-documentation)
19+
20+
# Bug Fixes
21+
22+
* `closedchannels` now [successfully reports](https://github.com/lightningnetwork/lnd/pull/8800)
23+
settled balances even if the delivery address is set to an address that
24+
LND does not control.
25+
26+
* [SendPaymentV2](https://github.com/lightningnetwork/lnd/pull/8734) now cancels
27+
the background payment loop if the user cancels the stream context.
28+
29+
* [Fixed a bug](https://github.com/lightningnetwork/lnd/pull/8822) that caused
30+
LND to read the config only partially and continued with the startup.
31+
32+
# New Features
33+
## Functional Enhancements
34+
## RPC Additions
35+
36+
* The [SendPaymentRequest](https://github.com/lightningnetwork/lnd/pull/8734)
37+
message receives a new flag `cancelable` which indicates if the payment loop
38+
is cancelable. The cancellation can either occur manually by cancelling the
39+
send payment stream context, or automatically at the end of the timeout period
40+
if the user provided `timeout_seconds`.
41+
42+
## lncli Additions
43+
44+
* [Added](https://github.com/lightningnetwork/lnd/pull/8491) the `cltv_expiry`
45+
argument to `addinvoice` and `addholdinvoice`, allowing users to set the
46+
`min_final_cltv_expiry_delta`.
47+
48+
* The [`lncli wallet estimatefeerate`](https://github.com/lightningnetwork/lnd/pull/8730)
49+
command returns the fee rate estimate for on-chain transactions in sat/kw and
50+
sat/vb to achieve a given confirmation target.
51+
52+
# Improvements
53+
## Functional Updates
54+
## RPC Updates
55+
56+
* [`xImportMissionControl`](https://github.com/lightningnetwork/lnd/pull/8779)
57+
now accepts `0` failure amounts.
58+
59+
* [`ChanInfoRequest`](https://github.com/lightningnetwork/lnd/pull/8813)
60+
adds support for channel points.
61+
62+
## lncli Updates
63+
64+
* [`importmc`](https://github.com/lightningnetwork/lnd/pull/8779) now accepts
65+
`0` failure amounts.
66+
67+
* [`getchaninfo`](https://github.com/lightningnetwork/lnd/pull/8813) now accepts
68+
a channel outpoint besides a channel id.
69+
70+
* [Fixed](https://github.com/lightningnetwork/lnd/pull/8823) how we parse the
71+
`--amp` flag when sending a payment specifying the payment request.
72+
73+
## Code Health
74+
## Breaking Changes
75+
## Performance Improvements
76+
77+
* Mission Control Store [improved performance during DB
78+
flushing](https://github.com/lightningnetwork/lnd/pull/8549) stage.
79+
80+
# Technical and Architectural Updates
81+
## BOLT Spec Updates
82+
83+
* Start assuming that all hops used during path-finding and route construction
84+
[support the TLV onion
85+
format](https://github.com/lightningnetwork/lnd/pull/8791).
86+
87+
## Testing
88+
## Database
89+
## Code Health
90+
## Tooling and Documentation
91+
92+
# Contributors (Alphabetical Order)
93+
94+
* Andras Banki-Horvath
95+
* Bufo
96+
* Elle Mouton
97+
* Matheus Degiovani
98+
* Slyghtning

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ require (
44
github.com/NebulousLabs/go-upnp v0.0.0-20180202185039-29b680b06c82
55
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344
66
github.com/andybalholm/brotli v1.0.4
7-
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240403021926-ae5533602c46
7+
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026
88
github.com/btcsuite/btcd/btcec/v2 v2.3.3
99
github.com/btcsuite/btcd/btcutil v1.1.5
1010
github.com/btcsuite/btcd/btcutil/psbt v1.1.8
1111
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
1212
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
13-
github.com/btcsuite/btcwallet v0.16.10-0.20240404104514-b2f31f9045fb
13+
github.com/btcsuite/btcwallet v0.16.10-0.20240625163855-b42ed59f0528
1414
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4
1515
github.com/btcsuite/btcwallet/wallet/txrules v1.2.1
1616
github.com/btcsuite/btcwallet/walletdb v1.4.2

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
7373
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
7474
github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
7575
github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
76-
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240403021926-ae5533602c46 h1:tjpNTdZNQqE14menwDGAxWfzN0DFHVTXFEyEL8yvA/4=
77-
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240403021926-ae5533602c46/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
76+
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026 h1:s8/96vQSj05bqLl9RyM/eMX8gLtiayEj520TVE4YGy0=
77+
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
7878
github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
7979
github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
8080
github.com/btcsuite/btcd/btcec/v2 v2.3.3 h1:6+iXlDKE8RMtKsvK0gshlXIuPbyWM/h84Ensb7o3sC0=
@@ -92,8 +92,8 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtyd
9292
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo=
9393
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
9494
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
95-
github.com/btcsuite/btcwallet v0.16.10-0.20240404104514-b2f31f9045fb h1:qoIOlBPRZWtfpcbQlNFf67Wz8ZlXo+mxQc9Pnbm/iqU=
96-
github.com/btcsuite/btcwallet v0.16.10-0.20240404104514-b2f31f9045fb/go.mod h1:2C3Q/MhYAKmk7F+Tey6LfKtKRTdQsrCf8AAAzzDPmH4=
95+
github.com/btcsuite/btcwallet v0.16.10-0.20240625163855-b42ed59f0528 h1:DZRmr47CdPnNglwEVACPnJnGrfb/GBGyoGs5oqvLFg4=
96+
github.com/btcsuite/btcwallet v0.16.10-0.20240625163855-b42ed59f0528/go.mod h1:SLFUSQbP8ON/wxholYMfVLvGPJyk7boczOW/ob+nww4=
9797
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4 h1:poyHFf7+5+RdxNp5r2T6IBRD7RyraUsYARYbp/7t4D8=
9898
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4/go.mod h1:GETGDQuyq+VFfH1S/+/7slLM/9aNa4l7P4ejX6dJfb0=
9999
github.com/btcsuite/btcwallet/wallet/txrules v1.2.1 h1:UZo7YRzdHbwhK7Rhv3PO9bXgTxiOH45edK5qdsdiatk=

0 commit comments

Comments
 (0)