Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check and return commit tx number #10

Merged
merged 2 commits into from
Nov 1, 2023

Conversation

Tibo-lg
Copy link

@Tibo-lg Tibo-lg commented Sep 25, 2023

This PR enables returning commitment transaction numbers and checking providing it to the with_useable_channel_lock to ensure we are processing up to date data.

Copy link
Collaborator

@luckysori luckysori left a comment

Choose a reason for hiding this comment

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

LGTM.

lightning/src/ln/channelmanager.rs Show resolved Hide resolved
@luckysori
Copy link
Collaborator

Should we get this in, @Tibo-lg?

@Tibo-lg Tibo-lg merged commit db8bc0d into split-channel-experiment-116 Nov 1, 2023
2 of 28 checks passed
@Tibo-lg
Copy link
Author

Tibo-lg commented Nov 1, 2023

This is actually what the current rust-dlc/ln-dlc-channel branch is using. Unfortunately because github doesn't do rebase merge we need to update the commit reference, can you take care of it @luckysori?

@luckysori
Copy link
Collaborator

This is actually what the current rust-dlc/ln-dlc-channel branch is using. Unfortunately because github doesn't do rebase merge we need to update the commit reference,

Doesn't "rebase and merge" do the trick?

image

can you take care of it @luckysori?

Sure, I think I have now.

@luckysori
Copy link
Collaborator

Doesn't "rebase and merge" do the trick?

We avoid the ugly merge commits, but the commit hash does change regardless D:

@Tibo-lg
Copy link
Author

Tibo-lg commented Nov 1, 2023

Doesn't "rebase and merge" do the trick?

We avoid the ugly merge commits, but the commit hash does change regardless D:

Yeah it's really weird they don't support proper rebase merge, gitlab does.

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

Successfully merging this pull request may close these issues.

2 participants