diff --git a/channeldb/migration_01_to_11/route.go b/channeldb/migration_01_to_11/route.go index 530cdba74..b4cb03849 100644 --- a/channeldb/migration_01_to_11/route.go +++ b/channeldb/migration_01_to_11/route.go @@ -277,7 +277,7 @@ func (r *Route) ToSphinxPath() (*sphinx.PaymentPath, error) { hopData.NextAddress[:], nextHop, ) - payload, err = sphinx.NewHopPayload(&hopData, nil) + payload, err = sphinx.NewLegacyHopPayload(&hopData) if err != nil { return nil, err } @@ -294,8 +294,7 @@ func (r *Route) ToSphinxPath() (*sphinx.PaymentPath, error) { return nil, err } - // TODO(roasbeef): make better API for NewHopPayload? - payload, err = sphinx.NewHopPayload(nil, b.Bytes()) + payload, err = sphinx.NewTLVHopPayload(b.Bytes()) if err != nil { return nil, err } diff --git a/docs/release-notes/release-notes-0.17.0.md b/docs/release-notes/release-notes-0.17.0.md index f01dc18ce..1523280f1 100644 --- a/docs/release-notes/release-notes-0.17.0.md +++ b/docs/release-notes/release-notes-0.17.0.md @@ -161,6 +161,10 @@ * [Fixed a validation bug](https://github.com/lightningnetwork/lnd/pull/7177) in `channel_type` negotiation. +* [The `lightning-onion` repo version was + updated](https://github.com/lightningnetwork/lnd/pull/7877) in preparation for + work to be done on route blinding in LND. + ## Code Health * Updated [our fork for serializing protobuf as JSON to be based on the diff --git a/go.mod b/go.mod index 1f509c19a..38c171cad 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,6 @@ require ( github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 github.com/go-errors/errors v1.0.1 github.com/golang-migrate/migrate/v4 v4.16.1 - github.com/golang/protobuf v1.5.2 github.com/gorilla/websocket v1.4.2 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 @@ -36,7 +35,7 @@ require ( github.com/lib/pq v1.10.3 github.com/lightninglabs/neutrino v0.16.0 github.com/lightninglabs/neutrino/cache v1.1.1 - github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1 + github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f github.com/lightningnetwork/lnd/cert v1.2.1 github.com/lightningnetwork/lnd/clock v1.1.0 github.com/lightningnetwork/lnd/healthcheck v1.2.2 @@ -49,7 +48,7 @@ require ( github.com/miekg/dns v1.1.43 github.com/ory/dockertest/v3 v3.10.0 github.com/prometheus/client_golang v1.11.1 - github.com/stretchr/testify v1.8.1 + github.com/stretchr/testify v1.8.2 github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02 github.com/urfave/cli v1.22.9 go.etcd.io/etcd/client/pkg/v3 v3.5.7 @@ -98,6 +97,7 @@ require ( github.com/fergusstrange/embedded-postgres v1.10.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.4.2 // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.0.1 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect diff --git a/go.sum b/go.sum index 7bfe269ac..bdfc66fac 100644 --- a/go.sum +++ b/go.sum @@ -440,8 +440,8 @@ github.com/lightninglabs/neutrino/cache v1.1.1 h1:TllWOSlkABhpgbWJfzsrdUaDH2fBy/ github.com/lightninglabs/neutrino/cache v1.1.1/go.mod h1:XJNcgdOw1LQnanGjw8Vj44CvguYA25IMKjWFZczwZuo= github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display h1:pRdza2wleRN1L2fJXd6ZoQ9ZegVFTAb2bOQfruJPKcY= github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1 h1:Wm0g70gkcAu2pGpNZwfWPSVOY21j8IyYsNewwK4OkT4= -github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1/go.mod h1:7dDx73ApjEZA0kcknI799m2O5kkpfg4/gr7N092ojNo= +github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f h1:Pua7+5TcFEJXIIZ1I2YAUapmbcttmLj4TTi786bIi3s= +github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI= github.com/lightningnetwork/lnd/cert v1.2.1 h1:CTrTcU0L66J73oqdRLVfNylZyp1Fh97ZezX6IuzkrqE= github.com/lightningnetwork/lnd/cert v1.2.1/go.mod h1:04JhIEodoR6usBN5+XBRtLEEmEHsclLi0tEyxZQNP+w= github.com/lightningnetwork/lnd/clock v1.0.1/go.mod h1:KnQudQ6w0IAMZi1SgvecLZQZ43ra2vpDNj7H/aasemg= @@ -598,8 +598,9 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= diff --git a/routing/route/route.go b/routing/route/route.go index 5992bd404..cac90c097 100644 --- a/routing/route/route.go +++ b/routing/route/route.go @@ -451,7 +451,7 @@ func (r *Route) ToSphinxPath() (*sphinx.PaymentPath, error) { hopData.NextAddress[:], nextHop, ) - payload, err = sphinx.NewHopPayload(&hopData, nil) + payload, err = sphinx.NewLegacyHopPayload(&hopData) if err != nil { return nil, err } @@ -468,8 +468,7 @@ func (r *Route) ToSphinxPath() (*sphinx.PaymentPath, error) { return nil, err } - // TODO(roasbeef): make better API for NewHopPayload? - payload, err = sphinx.NewHopPayload(nil, b.Bytes()) + payload, err = sphinx.NewTLVHopPayload(b.Bytes()) if err != nil { return nil, err }