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.

Sign up for GitHub

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

tapchannel: detect asset related custom records correctly #1330

Merged
merged 1 commit into from
Jan 28, 2025
Merged

tapchannel: detect asset related custom records correctly #1330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions tapchannel/commitment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,10 @@ func ComputeView(ourBalance, theirBalance uint64,
entry.ParentIndex)
}

if len(parentEntry.CustomRecords) > 0 {
if rfqmsg.HasAssetHTLCCustomRecords(
parentEntry.CustomRecords,
) {

assetHtlc, err := rfqmsg.HtlcFromCustomRecords(
parentEntry.CustomRecords,
)
Expand Down Expand Up @@ -171,7 +174,10 @@ func ComputeView(ourBalance, theirBalance uint64,
entry.ParentIndex)
}

if len(parentEntry.CustomRecords) > 0 {
if rfqmsg.HasAssetHTLCCustomRecords(
parentEntry.CustomRecords,
) {

assetHtlc, err := rfqmsg.HtlcFromCustomRecords(
parentEntry.CustomRecords,
)
Expand Down Expand Up @@ -209,7 +215,7 @@ func ComputeView(ourBalance, theirBalance uint64,
// when it comes to balance calculations. We still need to keep
// track of them, so we can create non-asset allocations
// correctly.
if len(entry.CustomRecords) == 0 {
if !rfqmsg.HasAssetHTLCCustomRecords(entry.CustomRecords) {
nonAssetView.OurUpdates = append(
nonAssetView.OurUpdates, &DecodedDescriptor{
AuxHtlcDescriptor: entry,
Expand Down Expand Up @@ -251,7 +257,7 @@ func ComputeView(ourBalance, theirBalance uint64,
// when it comes to balance calculations. We still need to keep
// track of them, so we can create non-asset allocations
// correctly.
if len(entry.CustomRecords) == 0 {
if !rfqmsg.HasAssetHTLCCustomRecords(entry.CustomRecords) {
nonAssetView.TheirUpdates = append(
nonAssetView.TheirUpdates, &DecodedDescriptor{
AuxHtlcDescriptor: entry,
Expand Down
Loading