mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2024-11-19 01:43:16 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9240 from carlaKC/9166-mergeonly

Browse Source 
htlcswitch: merge htlc custom records on modify
This commit is contained in:
Elle 2024-11-08 08:38:00 +02:00 committed by GitHub
commit 4430687076
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/release-notes/release-notes-0.19.0.md
View File

@ -105,6 +105,10 @@
* `lncli abandonchannel` (`Lightning.AbandonChannel` RPC) * `lncli abandonchannel` (`Lightning.AbandonChannel` RPC)
* `lncli restorechanbackup` (`Lightning.RestoreChannelBackups` RPC) * `lncli restorechanbackup` (`Lightning.RestoreChannelBackups` RPC)
* `lncli verifychanbackup` (`Lightning.VerifyChanBackup` RPC) * `lncli verifychanbackup` (`Lightning.VerifyChanBackup` RPC)
* The `ForwardInterceptor`'s `MODIFY` option will
[merge](https://github.com/lightningnetwork/lnd/pull/9240) any custom
range TLVs provided with the existing set of records on the HTLC,
overwriting any conflicting values with those supplied by the API.
## lncli Updates ## lncli Updates

9
htlcswitch/interceptable_switch.go
View File

@ -715,9 +715,12 @@ func (f *interceptedForward) ResumeModified(
htlc.Amount = amount htlc.Amount = amount
}) })
if len(validatedRecords) > 0 { // Merge custom records with any validated records that were
htlc.CustomRecords = validatedRecords // added in the modify request, overwriting any existing values
} // with those supplied in the modifier API.
htlc.CustomRecords = htlc.CustomRecords.MergedCopy(
validatedRecords,
)
case *lnwire.UpdateFulfillHTLC: case *lnwire.UpdateFulfillHTLC:
if len(validatedRecords) > 0 { if len(validatedRecords) > 0 {

10
lnrpc/routerrpc/router.pb.go
View File

@ -3254,13 +3254,9 @@ type ForwardHtlcInterceptResponse struct {
// the resumed HTLC. This field is ignored if the action is not // the resumed HTLC. This field is ignored if the action is not
// RESUME_MODIFIED. // RESUME_MODIFIED.
// //
// If this map is populated, it will overwrite any of the wire custom // This map will merge with the existing set of custom records (if any),
// records set by LND. It is the caller's responsibility to copy any desired // replacing any conflicting types. Note that there currently is no support
// records across. If the map is empty, no action will be taken and existing // for deleting existing custom records (they can only be replaced).
// custom records will be propagated.
//
// The API does not currently support deleting custom records, unless they
// are overwritten by a new set.
OutWireCustomRecords map[uint64][]byte `protobuf:"bytes,8,rep,name=out_wire_custom_records,json=outWireCustomRecords,proto3" json:"out_wire_custom_records,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` OutWireCustomRecords map[uint64][]byte `protobuf:"bytes,8,rep,name=out_wire_custom_records,json=outWireCustomRecords,proto3" json:"out_wire_custom_records,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
} }

10
lnrpc/routerrpc/router.proto
View File

@ -1064,13 +1064,9 @@ message ForwardHtlcInterceptResponse {
// the resumed HTLC. This field is ignored if the action is not // the resumed HTLC. This field is ignored if the action is not
// RESUME_MODIFIED. // RESUME_MODIFIED.
// //
// If this map is populated, it will overwrite any of the wire custom // This map will merge with the existing set of custom records (if any),
// records set by LND. It is the caller's responsibility to copy any desired // replacing any conflicting types. Note that there currently is no support
// records across. If the map is empty, no action will be taken and existing // for deleting existing custom records (they can only be replaced).
// custom records will be propagated.
//
// The API does not currently support deleting custom records, unless they
// are overwritten by a new set.
map<uint64, bytes> out_wire_custom_records = 8; map<uint64, bytes> out_wire_custom_records = 8;
} }

2
lnrpc/routerrpc/router.swagger.json
View File

@ -1525,7 +1525,7 @@
"type": "string", "type": "string",
"format": "byte" "format": "byte"
}, },
"description": "Any custom records that should be set on the p2p wire message message of\nthe resumed HTLC. This field is ignored if the action is not\nRESUME_MODIFIED.\n\nIf this map is populated, it will overwrite any of the wire custom\nrecords set by LND. It is the caller's responsibility to copy any desired\nrecords across. If the map is empty, no action will be taken and existing\ncustom records will be propagated.\n\nThe API does not currently support deleting custom records, unless they\nare overwritten by a new set." "description": "Any custom records that should be set on the p2p wire message message of\nthe resumed HTLC. This field is ignored if the action is not\nRESUME_MODIFIED.\n\nThis map will merge with the existing set of custom records (if any),\nreplacing any conflicting types. Note that there currently is no support\nfor deleting existing custom records (they can only be replaced)."
} }
}, },
"description": "*\nForwardHtlcInterceptResponse enables the caller to resolve a previously hold\nforward. The caller can choose either to:\n- `Resume`: Execute the default behavior (usually forward).\n- `ResumeModified`: Execute the default behavior (usually forward) with HTLC\nfield modifications.\n- `Reject`: Fail the htlc backwards.\n- `Settle`: Settle this htlc with a given preimage." "description": "*\nForwardHtlcInterceptResponse enables the caller to resolve a previously hold\nforward. The caller can choose either to:\n- `Resume`: Execute the default behavior (usually forward).\n- `ResumeModified`: Execute the default behavior (usually forward) with HTLC\nfield modifications.\n- `Reject`: Fail the htlc backwards.\n- `Settle`: Settle this htlc with a given preimage."