akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bolt11: handle r field fee spec change

Browse Source 
Updates the way fees are handled for routing payments.
See lightningnetwork/lightning-rfc#317.
This commit is contained in:
Wilmer Paulino 2017-12-26 00:43:26 -05:00 committed by Johan T. Halseth
parent 607b394f38
commit 445e11db5c
2 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zpay32/invoice.go
View File

@ -152,8 +152,13 @@ type ExtraRoutingInfo struct {
// ShortChanID is the channel ID of the channel. // ShortChanID is the channel ID of the channel.
ShortChanID uint64 ShortChanID uint64
// Fee is the fee required for routing along this channel. // FeeBaseMsat is the base fee in millisatoshis required for routing
Fee uint64 // along this channel.
FeeBaseMsat uint32
// FeeProportionalMillionths is the proportional fee in millionths of a
// satoshi required for routing along this channel.
FeeProportionalMillionths uint32
// CltvExpDelta is this channel's cltv expiry delta. // CltvExpDelta is this channel's cltv expiry delta.
CltvExpDelta uint16 CltvExpDelta uint16
@ -780,8 +785,10 @@ func parseTaggedFields(invoice *Invoice, fields []byte, net *chaincfg.Params) er
} }
info.ShortChanID = binary.BigEndian.Uint64( info.ShortChanID = binary.BigEndian.Uint64(
base256Data[33:41]) base256Data[33:41])
info.Fee = binary.BigEndian.Uint64( info.FeeBaseMsat = binary.BigEndian.Uint32(
base256Data[41:49]) base256Data[41:45])
info.FeeProportionalMillionths = binary.BigEndian.Uint32(
base256Data[45:49])
info.CltvExpDelta = binary.BigEndian.Uint16( info.CltvExpDelta = binary.BigEndian.Uint16(
base256Data[49:51]) base256Data[49:51])
invoice.RoutingInfo = append( invoice.RoutingInfo = append(
@ -899,7 +906,8 @@ func writeTaggedFields(bufferBase32 *bytes.Buffer, invoice *Invoice) error {
base256 := make([]byte, 51) base256 := make([]byte, 51)
copy(base256[:33], r.PubKey.SerializeCompressed()) copy(base256[:33], r.PubKey.SerializeCompressed())
binary.BigEndian.PutUint64(base256[33:41], r.ShortChanID) binary.BigEndian.PutUint64(base256[33:41], r.ShortChanID)
binary.BigEndian.PutUint64(base256[41:49], r.Fee) binary.BigEndian.PutUint32(base256[41:45], r.FeeBaseMsat)
binary.BigEndian.PutUint32(base256[45:49], r.FeeProportionalMillionths)
binary.BigEndian.PutUint16(base256[49:51], r.CltvExpDelta) binary.BigEndian.PutUint16(base256[49:51], r.CltvExpDelta)
routingDataBase256 = append(routingDataBase256, base256...) routingDataBase256 = append(routingDataBase256, base256...)
} }

60
zpay32/invoice_test.go
View File

@ -315,10 +315,11 @@ func TestDecodeEncode(t *testing.T) {
FallbackAddr: testRustyAddr, FallbackAddr: testRustyAddr,
RoutingInfo: []zpay32.ExtraRoutingInfo{ RoutingInfo: []zpay32.ExtraRoutingInfo{
{ {
PubKey: testRoutingInfoPubkey, PubKey: testRoutingInfoPubkey,
ShortChanID: 0x0102030405060708, ShortChanID: 0x0102030405060708,
Fee: 20, FeeBaseMsat: 0,
CltvExpDelta: 3, FeeProportionalMillionths: 20,
CltvExpDelta: 3,
}, },
}, },
} }
@ -332,7 +333,7 @@ func TestDecodeEncode(t *testing.T) {
}, },
{ {
// On mainnet, with fallback address 1RustyRX2oai4EYYDpQGWvEL62BBGqN9T with extra routing info to go via nodes 029e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255 then 039e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255 // On mainnet, with fallback address 1RustyRX2oai4EYYDpQGWvEL62BBGqN9T with extra routing info to go via nodes 029e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255 then 039e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255
encodedInvoice: "lnbc20m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqhp58yjmdan79s6qqdhdzgynm4zwqd5d7xmw5fk98klysy043l2ahrqsfpp3qjmp7lwpagxun9pygexvgpjdc4jdj85fr9yq20q82gphp2nflc7jtzrcazrra7wwgzxqc8u7754cdlpfrmccae92qgzqvzq2ps8pqqqqqqqqqqqq9qqqvpeuqafqxu92d8lr6fvg0r5gv0heeeqgcrqlnm6jhphu9y00rrhy4grqszsvpcgpy9qqqqqqqqqqqq7qqzqfnlkwydm8rg30gjku7wmxmk06sevjp53fmvrcfegvwy7d5443jvyhxsel0hulkstws7vqv400q4j3wgpk4crg49682hr4scqvmad43cqd5m7tf", encodedInvoice: "lnbc20m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqhp58yjmdan79s6qqdhdzgynm4zwqd5d7xmw5fk98klysy043l2ahrqsfpp3qjmp7lwpagxun9pygexvgpjdc4jdj85fr9yq20q82gphp2nflc7jtzrcazrra7wwgzxqc8u7754cdlpfrmccae92qgzqvzq2ps8pqqqqqqpqqqqq9qqqvpeuqafqxu92d8lr6fvg0r5gv0heeeqgcrqlnm6jhphu9y00rrhy4grqszsvpcgpy9qqqqqqgqqqqq7qqzqj9n4evl6mr5aj9f58zp6fyjzup6ywn3x6sk8akg5v4tgn2q8g4fhx05wf6juaxu9760yp46454gpg5mtzgerlzezqcqvjnhjh8z3g2qqdhhwkj",
valid: true, valid: true,
decodedInvoice: func() *zpay32.Invoice { decodedInvoice: func() *zpay32.Invoice {
return &zpay32.Invoice{ return &zpay32.Invoice{
@ -345,16 +346,18 @@ func TestDecodeEncode(t *testing.T) {
FallbackAddr: testRustyAddr, FallbackAddr: testRustyAddr,
RoutingInfo: []zpay32.ExtraRoutingInfo{ RoutingInfo: []zpay32.ExtraRoutingInfo{
{ {
PubKey: testRoutingInfoPubkey, PubKey: testRoutingInfoPubkey,
ShortChanID: 0x0102030405060708, ShortChanID: 0x0102030405060708,
Fee: 20, FeeBaseMsat: 1,
CltvExpDelta: 3, FeeProportionalMillionths: 20,
CltvExpDelta: 3,
}, },
{ {
PubKey: testRoutingInfoPubkey2, PubKey: testRoutingInfoPubkey2,
ShortChanID: 0x030405060708090a, ShortChanID: 0x030405060708090a,
Fee: 30, FeeBaseMsat: 2,
CltvExpDelta: 4, FeeProportionalMillionths: 30,
CltvExpDelta: 4,
}, },
}, },
} }
@ -541,23 +544,25 @@ func TestNewInvoice(t *testing.T) {
zpay32.RoutingInfo( zpay32.RoutingInfo(
[]zpay32.ExtraRoutingInfo{ []zpay32.ExtraRoutingInfo{
{ {
PubKey: testRoutingInfoPubkey, PubKey: testRoutingInfoPubkey,
ShortChanID: 0x0102030405060708, ShortChanID: 0x0102030405060708,
Fee: 20, FeeBaseMsat: 1,
CltvExpDelta: 3, FeeProportionalMillionths: 20,
CltvExpDelta: 3,
}, },
{ {
PubKey: testRoutingInfoPubkey2, PubKey: testRoutingInfoPubkey2,
ShortChanID: 0x030405060708090a, ShortChanID: 0x030405060708090a,
Fee: 30, FeeBaseMsat: 2,
CltvExpDelta: 4, FeeProportionalMillionths: 30,
CltvExpDelta: 4,
}, },
}, },
), ),
) )
}, },
valid: true, valid: true,
encodedInvoice: "lnbc20m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqhp58yjmdan79s6qqdhdzgynm4zwqd5d7xmw5fk98klysy043l2ahrqsfpp3qjmp7lwpagxun9pygexvgpjdc4jdj85fr9yq20q82gphp2nflc7jtzrcazrra7wwgzxqc8u7754cdlpfrmccae92qgzqvzq2ps8pqqqqqqqqqqqq9qqqvpeuqafqxu92d8lr6fvg0r5gv0heeeqgcrqlnm6jhphu9y00rrhy4grqszsvpcgpy9qqqqqqqqqqqq7qqzqfnlkwydm8rg30gjku7wmxmk06sevjp53fmvrcfegvwy7d5443jvyhxsel0hulkstws7vqv400q4j3wgpk4crg49682hr4scqvmad43cqd5m7tf", encodedInvoice: "lnbc20m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqhp58yjmdan79s6qqdhdzgynm4zwqd5d7xmw5fk98klysy043l2ahrqsfpp3qjmp7lwpagxun9pygexvgpjdc4jdj85fr9yq20q82gphp2nflc7jtzrcazrra7wwgzxqc8u7754cdlpfrmccae92qgzqvzq2ps8pqqqqqqpqqqqq9qqqvpeuqafqxu92d8lr6fvg0r5gv0heeeqgcrqlnm6jhphu9y00rrhy4grqszsvpcgpy9qqqqqqgqqqqq7qqzqj9n4evl6mr5aj9f58zp6fyjzup6ywn3x6sk8akg5v4tgn2q8g4fhx05wf6juaxu9760yp46454gpg5mtzgerlzezqcqvjnhjh8z3g2qqdhhwkj",
}, },
} }
@ -645,9 +650,14 @@ func compareInvoices(expected, actual *zpay32.Invoice) error {
"%d, got %d", a.ShortChanID, b.ShortChanID) "%d, got %d", a.ShortChanID, b.ShortChanID)
} }
if a.Fee != b.Fee { if a.FeeBaseMsat != b.FeeBaseMsat {
return fmt.Errorf("expected routingInfo fee %d, got %d", return fmt.Errorf("expected routingInfo feeBaseMsat %d, got %d",
a.Fee, b.Fee) a.FeeBaseMsat, b.FeeBaseMsat)
}
if a.FeeProportionalMillionths != b.FeeProportionalMillionths {
return fmt.Errorf("expected routingInfo feeProportionalMillionths %d, got %d",
a.FeeProportionalMillionths, b.FeeProportionalMillionths)
} }
if a.CltvExpDelta != b.CltvExpDelta { if a.CltvExpDelta != b.CltvExpDelta {