bolt11: handle r field fee spec change
Updates the way fees are handled for routing payments. See lightningnetwork/lightning-rfc#317.
This commit is contained in:
parent
607b394f38
commit
445e11db5c
@ -152,8 +152,13 @@ type ExtraRoutingInfo struct {
|
||||
// ShortChanID is the channel ID of the channel.
|
||||
ShortChanID uint64
|
||||
|
||||
// Fee is the fee required for routing along this channel.
|
||||
Fee uint64
|
||||
// FeeBaseMsat is the base fee in millisatoshis required for routing
|
||||
// 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 uint16
|
||||
@ -780,8 +785,10 @@ func parseTaggedFields(invoice *Invoice, fields []byte, net *chaincfg.Params) er
|
||||
}
|
||||
info.ShortChanID = binary.BigEndian.Uint64(
|
||||
base256Data[33:41])
|
||||
info.Fee = binary.BigEndian.Uint64(
|
||||
base256Data[41:49])
|
||||
info.FeeBaseMsat = binary.BigEndian.Uint32(
|
||||
base256Data[41:45])
|
||||
info.FeeProportionalMillionths = binary.BigEndian.Uint32(
|
||||
base256Data[45:49])
|
||||
info.CltvExpDelta = binary.BigEndian.Uint16(
|
||||
base256Data[49:51])
|
||||
invoice.RoutingInfo = append(
|
||||
@ -899,7 +906,8 @@ func writeTaggedFields(bufferBase32 *bytes.Buffer, invoice *Invoice) error {
|
||||
base256 := make([]byte, 51)
|
||||
copy(base256[:33], r.PubKey.SerializeCompressed())
|
||||
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)
|
||||
routingDataBase256 = append(routingDataBase256, base256...)
|
||||
}
|
||||
|
@ -317,7 +317,8 @@ func TestDecodeEncode(t *testing.T) {
|
||||
{
|
||||
PubKey: testRoutingInfoPubkey,
|
||||
ShortChanID: 0x0102030405060708,
|
||||
Fee: 20,
|
||||
FeeBaseMsat: 0,
|
||||
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
|
||||
encodedInvoice: "lnbc20m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqhp58yjmdan79s6qqdhdzgynm4zwqd5d7xmw5fk98klysy043l2ahrqsfpp3qjmp7lwpagxun9pygexvgpjdc4jdj85fr9yq20q82gphp2nflc7jtzrcazrra7wwgzxqc8u7754cdlpfrmccae92qgzqvzq2ps8pqqqqqqqqqqqq9qqqvpeuqafqxu92d8lr6fvg0r5gv0heeeqgcrqlnm6jhphu9y00rrhy4grqszsvpcgpy9qqqqqqqqqqqq7qqzqfnlkwydm8rg30gjku7wmxmk06sevjp53fmvrcfegvwy7d5443jvyhxsel0hulkstws7vqv400q4j3wgpk4crg49682hr4scqvmad43cqd5m7tf",
|
||||
encodedInvoice: "lnbc20m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqhp58yjmdan79s6qqdhdzgynm4zwqd5d7xmw5fk98klysy043l2ahrqsfpp3qjmp7lwpagxun9pygexvgpjdc4jdj85fr9yq20q82gphp2nflc7jtzrcazrra7wwgzxqc8u7754cdlpfrmccae92qgzqvzq2ps8pqqqqqqpqqqqq9qqqvpeuqafqxu92d8lr6fvg0r5gv0heeeqgcrqlnm6jhphu9y00rrhy4grqszsvpcgpy9qqqqqqgqqqqq7qqzqj9n4evl6mr5aj9f58zp6fyjzup6ywn3x6sk8akg5v4tgn2q8g4fhx05wf6juaxu9760yp46454gpg5mtzgerlzezqcqvjnhjh8z3g2qqdhhwkj",
|
||||
valid: true,
|
||||
decodedInvoice: func() *zpay32.Invoice {
|
||||
return &zpay32.Invoice{
|
||||
@ -347,13 +348,15 @@ func TestDecodeEncode(t *testing.T) {
|
||||
{
|
||||
PubKey: testRoutingInfoPubkey,
|
||||
ShortChanID: 0x0102030405060708,
|
||||
Fee: 20,
|
||||
FeeBaseMsat: 1,
|
||||
FeeProportionalMillionths: 20,
|
||||
CltvExpDelta: 3,
|
||||
},
|
||||
{
|
||||
PubKey: testRoutingInfoPubkey2,
|
||||
ShortChanID: 0x030405060708090a,
|
||||
Fee: 30,
|
||||
FeeBaseMsat: 2,
|
||||
FeeProportionalMillionths: 30,
|
||||
CltvExpDelta: 4,
|
||||
},
|
||||
},
|
||||
@ -543,13 +546,15 @@ func TestNewInvoice(t *testing.T) {
|
||||
{
|
||||
PubKey: testRoutingInfoPubkey,
|
||||
ShortChanID: 0x0102030405060708,
|
||||
Fee: 20,
|
||||
FeeBaseMsat: 1,
|
||||
FeeProportionalMillionths: 20,
|
||||
CltvExpDelta: 3,
|
||||
},
|
||||
{
|
||||
PubKey: testRoutingInfoPubkey2,
|
||||
ShortChanID: 0x030405060708090a,
|
||||
Fee: 30,
|
||||
FeeBaseMsat: 2,
|
||||
FeeProportionalMillionths: 30,
|
||||
CltvExpDelta: 4,
|
||||
},
|
||||
},
|
||||
@ -557,7 +562,7 @@ func TestNewInvoice(t *testing.T) {
|
||||
)
|
||||
},
|
||||
valid: true,
|
||||
encodedInvoice: "lnbc20m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqhp58yjmdan79s6qqdhdzgynm4zwqd5d7xmw5fk98klysy043l2ahrqsfpp3qjmp7lwpagxun9pygexvgpjdc4jdj85fr9yq20q82gphp2nflc7jtzrcazrra7wwgzxqc8u7754cdlpfrmccae92qgzqvzq2ps8pqqqqqqqqqqqq9qqqvpeuqafqxu92d8lr6fvg0r5gv0heeeqgcrqlnm6jhphu9y00rrhy4grqszsvpcgpy9qqqqqqqqqqqq7qqzqfnlkwydm8rg30gjku7wmxmk06sevjp53fmvrcfegvwy7d5443jvyhxsel0hulkstws7vqv400q4j3wgpk4crg49682hr4scqvmad43cqd5m7tf",
|
||||
encodedInvoice: "lnbc20m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqhp58yjmdan79s6qqdhdzgynm4zwqd5d7xmw5fk98klysy043l2ahrqsfpp3qjmp7lwpagxun9pygexvgpjdc4jdj85fr9yq20q82gphp2nflc7jtzrcazrra7wwgzxqc8u7754cdlpfrmccae92qgzqvzq2ps8pqqqqqqpqqqqq9qqqvpeuqafqxu92d8lr6fvg0r5gv0heeeqgcrqlnm6jhphu9y00rrhy4grqszsvpcgpy9qqqqqqgqqqqq7qqzqj9n4evl6mr5aj9f58zp6fyjzup6ywn3x6sk8akg5v4tgn2q8g4fhx05wf6juaxu9760yp46454gpg5mtzgerlzezqcqvjnhjh8z3g2qqdhhwkj",
|
||||
},
|
||||
}
|
||||
|
||||
@ -645,9 +650,14 @@ func compareInvoices(expected, actual *zpay32.Invoice) error {
|
||||
"%d, got %d", a.ShortChanID, b.ShortChanID)
|
||||
}
|
||||
|
||||
if a.Fee != b.Fee {
|
||||
return fmt.Errorf("expected routingInfo fee %d, got %d",
|
||||
a.Fee, b.Fee)
|
||||
if a.FeeBaseMsat != b.FeeBaseMsat {
|
||||
return fmt.Errorf("expected routingInfo feeBaseMsat %d, got %d",
|
||||
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 {
|
||||
|
Loading…
Reference in New Issue
Block a user