Skip to content

Conversation

ziggie1984
Copy link
Collaborator

@ziggie1984 ziggie1984 commented Sep 2, 2025

Depends on:

btcsuite/btcwallet#1053

Fixes:

lightninglabs/taproot-assets#1770

and

lightninglabs/lightning-terminal#1139 (which needs to bump the corresponding LND version if this is merged.)

!!!ATTENTION!!! First 9 commits belong to #10209 !!!ATTENTION!!!

@ziggie1984 ziggie1984 self-assigned this Sep 2, 2025
@ziggie1984 ziggie1984 marked this pull request as ready for review September 2, 2025 08:09
Copy link
Collaborator

@ViktorTigerstrom ViktorTigerstrom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome catch and investigation 🚀!

Leaving a few comments on top of the failing lint issue :)

go.mod Outdated

retract v0.0.2

replace github.com/btcsuite/btcwallet => github.com/ziggie1984/btcwallet v0.16.10-0.20250902074924-f9f0dabe6fbd
Copy link
Collaborator

@ViktorTigerstrom ViktorTigerstrom Sep 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I lack experience with this in lnd, but are we ok with merging replaces to local forks to lnd master?

Copy link
Collaborator

@ViktorTigerstrom ViktorTigerstrom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks for the changes 🎉! LGTM, though I'm lacking the context of @Roasbeef, so not sure if #10189 (comment) should be addressed.

@ziggie1984 ziggie1984 force-pushed the fix-fee-estimation branch 2 times, most recently from 0b7074c to 5661ca3 Compare September 5, 2025 10:04
@ziggie1984
Copy link
Collaborator Author

Verified on LITD and this approach fixes the bug !

@saubyk saubyk added this to lnd v0.20 Sep 9, 2025
@saubyk saubyk moved this to In review in lnd v0.20 Sep 9, 2025
@saubyk saubyk added this to the v0.20.0 milestone Sep 9, 2025
@ziggie1984
Copy link
Collaborator Author

Because of the new btcwallet grpc dependency 1.73 I also had to update the gprc lib for LND, that's why so many files are changed, all of them are auto-generated.

@ziggie1984 ziggie1984 force-pushed the fix-fee-estimation branch 2 times, most recently from 5a3da30 to 28f81c3 Compare September 10, 2025 07:17
@ziggie1984 ziggie1984 removed the request for review from yyforyongyu September 11, 2025 05:52
We can now handle tool dependencies directly with the go tool
directive rather than using the extra tools.go pattern.
The previous update of the go tool increase dependencies so
that the kvdb module with the kvdb_etcd flag set was not able
to build. We update the etcd dependant libraries so that the
build succeeds.

Update dependencies so that we can build the kvdb module with the
kvdb_etcd build tag which becomes important when upgrading to the
new v2 golangci-lint linter.
run make rpc and update all the autogenerated gprc golang files.
We update the hash to the most recent master hash because the
new v2 linter reports legacy issues and changed its behaviour
and we want to avoid fixing older issues.
Because of the previous update of etcd dependant libraries we
also need to make sure we update the etcd libraries in the
main module as well otherwise the cross compiling will fail.
@Roasbeef
Copy link
Member

Linter failing after update:

Error: config_builder.go:1814:1: unnecessary whitespace (leading-whitespace) (wsl_v5)

^
Error: lnwallet/btcwallet/btcwallet.go:1138:1: unnecessary whitespace (leading-whitespace) (wsl_v5)

^
Error: sweep/fee_bumper_test.go:2276:4: missing whitespace above this line (invalid statement above if) (wsl_v5)
			if tc.checkResults != nil {
			^
Error: sweep/fee_bumper_test.go:2287:1: unnecessary whitespace (leading-whitespace) (wsl_v5)

Copy link
Member

@Roasbeef Roasbeef left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be good to land after we get in the dep update PR.

},
1, // heightHint
0, // csvDelay (no CSV requirement)
locktime, // cltvExpiry
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can remove these inline comments.

t.Run(tc.name, func(t *testing.T) {
t.Parallel()

// Call the function under test.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Superflous comments here in the test body.

// user can intervene and increase the size of his mempool or increase
// his min relay fee configuration.
case errors.Is(err, chain.ErrMempoolMinFeeNotMet),
errors.Is(err, chain.ErrMinRelayFeeNotMet):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: In review
Development

Successfully merging this pull request may close these issues.

4 participants