diff --git a/intercept.go b/intercept.go index 0fd5b92..53e960c 100644 --- a/intercept.go +++ b/intercept.go @@ -25,10 +25,7 @@ import ( ) func checkPayment(incomingAmountMsat, outgoingAmountMsat int64) error { - var fees int64 = 0 - if incomingAmountMsat > channelFeeStartAmount { - fees += (incomingAmountMsat - channelFeeStartAmount) * channelFeeAmountNumerator / channelFeeAmountDenominator - } + fees := incomingAmountMsat * channelFeePermyriad / 10_000 / 1_000 * 1_000 if incomingAmountMsat-outgoingAmountMsat < fees { return fmt.Errorf("not enough fees") } @@ -36,7 +33,7 @@ func checkPayment(incomingAmountMsat, outgoingAmountMsat int64) error { } func openChannel(ctx context.Context, client lnrpc.LightningClient, paymentHash, destination []byte, incomingAmountMsat int64) ([]byte, uint32, error) { - capacity := incomingAmountMsat/1000 + channelFeeStartAmount + capacity := incomingAmountMsat/1000 + additionalChannelCapacity channelPoint, err := client.OpenChannelSync(ctx, &lnrpc.OpenChannelRequest{ NodePubkey: destination, LocalFundingAmount: capacity, diff --git a/rpc/lspd.pb.go b/rpc/lspd.pb.go index 8b351ea..fe84bee 100644 --- a/rpc/lspd.pb.go +++ b/rpc/lspd.pb.go @@ -86,13 +86,12 @@ type ChannelInformationReply struct { TimeLockDelta uint32 `protobuf:"varint,8,opt,name=time_lock_delta,proto3" json:"time_lock_delta,omitempty"` /// The minimum value in millisatoshi we will require for incoming HTLCs on /// the channel. - MinHtlcMsat int64 `protobuf:"varint,9,opt,name=min_htlc_msat,proto3" json:"min_htlc_msat,omitempty"` - ChannelFeeStartAmount int64 `protobuf:"varint,10,opt,name=channel_fee_start_amount,json=channelFeeStartAmount,proto3" json:"channel_fee_start_amount,omitempty"` - ChannelFeeRate float32 `protobuf:"fixed32,11,opt,name=channel_fee_rate,json=channelFeeRate,proto3" json:"channel_fee_rate,omitempty"` - LspPubkey []byte `protobuf:"bytes,12,opt,name=lsp_pubkey,json=lspPubkey,proto3" json:"lsp_pubkey,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + MinHtlcMsat int64 `protobuf:"varint,9,opt,name=min_htlc_msat,proto3" json:"min_htlc_msat,omitempty"` + ChannelFeePermyriad int64 `protobuf:"varint,10,opt,name=channel_fee_permyriad,json=channelFeePermyriad,proto3" json:"channel_fee_permyriad,omitempty"` + LspPubkey []byte `protobuf:"bytes,11,opt,name=lsp_pubkey,json=lspPubkey,proto3" json:"lsp_pubkey,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ChannelInformationReply) Reset() { *m = ChannelInformationReply{} } @@ -183,16 +182,9 @@ func (m *ChannelInformationReply) GetMinHtlcMsat() int64 { return 0 } -func (m *ChannelInformationReply) GetChannelFeeStartAmount() int64 { +func (m *ChannelInformationReply) GetChannelFeePermyriad() int64 { if m != nil { - return m.ChannelFeeStartAmount - } - return 0 -} - -func (m *ChannelInformationReply) GetChannelFeeRate() float32 { - if m != nil { - return m.ChannelFeeRate + return m.ChannelFeePermyriad } return 0 } @@ -449,44 +441,43 @@ func init() { } var fileDescriptor_c69a0f5a734bca26 = []byte{ - // 586 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xdd, 0x6e, 0xd3, 0x4c, - 0x10, 0xfd, 0xdc, 0xa6, 0x3f, 0x99, 0x38, 0x6d, 0x35, 0xca, 0x17, 0x4c, 0x44, 0x85, 0x09, 0x20, - 0x59, 0xa8, 0xaa, 0x2a, 0x7a, 0xc1, 0x75, 0x8b, 0x84, 0x40, 0xa2, 0x22, 0xda, 0x4a, 0xdc, 0x5a, - 0x1b, 0x67, 0x9a, 0x58, 0xb5, 0x77, 0x8d, 0x77, 0x83, 0x9a, 0x67, 0xe3, 0x75, 0x78, 0x09, 0xee, - 0xd0, 0xfe, 0xa4, 0x71, 0x9a, 0x56, 0xdc, 0xcd, 0x9e, 0x39, 0x33, 0x7b, 0x3c, 0x67, 0xd6, 0x00, - 0x85, 0xaa, 0x26, 0xa7, 0x55, 0x2d, 0xb5, 0xc4, 0x96, 0x89, 0x87, 0xe7, 0xf0, 0xfc, 0xe3, 0x8c, - 0x0b, 0x41, 0xc5, 0x17, 0x71, 0x23, 0xeb, 0x92, 0xeb, 0x5c, 0x0a, 0x46, 0x3f, 0xe6, 0xa4, 0x34, - 0xf6, 0x61, 0xb7, 0x9a, 0x8f, 0x6f, 0x69, 0x11, 0x05, 0x71, 0x90, 0xb4, 0x99, 0x3f, 0x0d, 0x7f, - 0x6d, 0xc3, 0xb3, 0xc7, 0xaa, 0xaa, 0x62, 0x81, 0x08, 0x2d, 0xc1, 0x4b, 0xf2, 0x15, 0x36, 0x6e, - 0xf4, 0xd9, 0x6a, 0xf6, 0x31, 0xdc, 0x99, 0x54, 0x3a, 0xda, 0x76, 0x5c, 0x13, 0xe3, 0x3b, 0x38, - 0xca, 0x5c, 0xeb, 0x34, 0xe3, 0x15, 0xcf, 0x72, 0xbd, 0x88, 0x5a, 0x71, 0x90, 0x6c, 0xb3, 0x0d, - 0x1c, 0x63, 0xe8, 0x68, 0x5e, 0x4f, 0x49, 0xa7, 0x99, 0x14, 0x37, 0xd1, 0x4e, 0x1c, 0x24, 0x3b, - 0xac, 0x09, 0xe1, 0x1b, 0xe8, 0x8e, 0xb9, 0xa2, 0xf4, 0x86, 0x28, 0x2d, 0x15, 0xd7, 0xd1, 0xae, - 0x6d, 0xb5, 0x0e, 0xe2, 0x00, 0xf6, 0x4d, 0x5c, 0x73, 0x4d, 0xd1, 0x5e, 0x1c, 0x24, 0x01, 0xbb, - 0x3f, 0x63, 0x02, 0x87, 0x3a, 0x2f, 0x29, 0x2d, 0x64, 0x76, 0x9b, 0x4e, 0xa8, 0xd0, 0x3c, 0xda, - 0x8f, 0x83, 0xa4, 0xcb, 0x1e, 0xc2, 0xe6, 0xae, 0x32, 0x17, 0xe9, 0x4c, 0x17, 0x99, 0xbb, 0xab, - 0xed, 0xee, 0x5a, 0x03, 0xf1, 0x03, 0x44, 0xcb, 0xef, 0x30, 0x77, 0x28, 0xcd, 0x6b, 0x9d, 0xf2, - 0x52, 0xce, 0x85, 0x8e, 0xc0, 0x16, 0xfc, 0xef, 0xf3, 0x9f, 0x88, 0xae, 0x4d, 0xf6, 0xc2, 0x26, - 0x31, 0x59, 0x0d, 0xe6, 0x5e, 0x6c, 0x27, 0x0e, 0x92, 0x2d, 0x76, 0xb0, 0x2a, 0x60, 0x46, 0xf2, - 0xb1, 0xf5, 0x39, 0xf5, 0x23, 0x0f, 0xe3, 0x20, 0x09, 0x59, 0xbb, 0x50, 0xd5, 0xc8, 0xb9, 0x77, - 0x02, 0xf8, 0xad, 0x22, 0xe1, 0x0d, 0xfc, 0x97, 0xd7, 0x23, 0x38, 0x5a, 0x63, 0x1b, 0x8f, 0x23, - 0xd8, 0xd3, 0x77, 0xe9, 0x8c, 0xab, 0x99, 0x27, 0x2f, 0x8f, 0x38, 0x84, 0x50, 0xce, 0x75, 0x35, - 0xd7, 0x69, 0x2e, 0x26, 0x74, 0x67, 0xfd, 0xee, 0xb2, 0x35, 0x6c, 0x78, 0x02, 0x7d, 0x46, 0xd3, - 0x5c, 0x69, 0xaa, 0x47, 0x7c, 0x51, 0x92, 0xd0, 0x4b, 0x0d, 0x08, 0xad, 0x71, 0x21, 0xc7, 0x76, - 0x1f, 0x42, 0x66, 0xe3, 0x61, 0x1f, 0x7a, 0x1b, 0xec, 0xaa, 0x58, 0x0c, 0x7f, 0x07, 0x80, 0x1e, - 0x68, 0xec, 0x20, 0xbe, 0x82, 0xb0, 0x72, 0xe8, 0x4a, 0x5f, 0xc8, 0x3a, 0x1e, 0xfb, 0x6c, 0x34, - 0xbe, 0x85, 0x83, 0x25, 0x45, 0x51, 0x56, 0x93, 0xb6, 0x2a, 0x43, 0xd6, 0xf5, 0xe8, 0xb5, 0x05, - 0xcd, 0x72, 0x4d, 0x48, 0xe9, 0x5c, 0xd8, 0xc6, 0x5e, 0x53, 0x13, 0xc2, 0x33, 0xe8, 0xe5, 0x22, - 0x93, 0x65, 0x2e, 0xa6, 0xde, 0x41, 0xe7, 0xbb, 0x5b, 0x57, 0x5c, 0xe6, 0x9c, 0x7f, 0x57, 0xc6, - 0xfc, 0x33, 0xe8, 0xc9, 0xb9, 0x9e, 0xca, 0x87, 0x15, 0x3b, 0xae, 0x62, 0x99, 0x5b, 0x55, 0xbc, - 0xff, 0x13, 0x40, 0xd7, 0xcf, 0xde, 0xd8, 0x40, 0x35, 0x7e, 0x07, 0xdc, 0x7c, 0x7b, 0xf8, 0xf2, - 0xd4, 0x3e, 0xed, 0x27, 0xdf, 0xf2, 0xe0, 0xf8, 0x69, 0x82, 0x19, 0xe7, 0x7f, 0x78, 0x01, 0x9d, - 0x86, 0xd1, 0x18, 0x39, 0xfe, 0xe6, 0xa6, 0x0c, 0xfa, 0x8f, 0x64, 0x5c, 0x8b, 0x2b, 0x38, 0x7c, - 0xe0, 0x15, 0xbe, 0x70, 0xe4, 0xc7, 0x0d, 0x1f, 0x0c, 0x9e, 0xc8, 0xda, 0x76, 0x97, 0xaf, 0xa1, - 0x97, 0xcb, 0xd3, 0x69, 0x5d, 0x65, 0x8e, 0xa6, 0xa8, 0xfe, 0x99, 0x67, 0x74, 0xd9, 0xfe, 0xaa, - 0xaa, 0xc9, 0xc8, 0xfc, 0xc4, 0x46, 0xc1, 0x78, 0xd7, 0xfe, 0xcd, 0xce, 0xff, 0x06, 0x00, 0x00, - 0xff, 0xff, 0xd7, 0x15, 0xf2, 0x09, 0xdb, 0x04, 0x00, 0x00, + // 568 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xff, 0x6e, 0xd3, 0x30, + 0x10, 0x26, 0xac, 0xfb, 0xd1, 0x6b, 0xcb, 0xa6, 0xa3, 0x94, 0x50, 0x31, 0x11, 0x0a, 0x48, 0x11, + 0x9a, 0xa6, 0x69, 0x7b, 0x82, 0x0d, 0x09, 0x81, 0xc4, 0x44, 0x65, 0x24, 0xfe, 0x8d, 0xdc, 0xf4, + 0xd6, 0x5a, 0x4b, 0x6c, 0x13, 0xbb, 0x68, 0x7d, 0x07, 0x1e, 0x93, 0x97, 0xe0, 0x3f, 0x64, 0x3b, + 0x61, 0xed, 0xba, 0x89, 0xff, 0xce, 0xdf, 0x7d, 0xf7, 0xdd, 0xc5, 0xdf, 0x39, 0x00, 0x85, 0xd1, + 0xd3, 0x63, 0x5d, 0x29, 0xab, 0xb0, 0xe5, 0xe2, 0xd1, 0x19, 0xbc, 0xf8, 0x30, 0xe7, 0x52, 0x52, + 0xf1, 0x59, 0x5e, 0xa9, 0xaa, 0xe4, 0x56, 0x28, 0xc9, 0xe8, 0xc7, 0x82, 0x8c, 0xc5, 0x01, 0xec, + 0xe8, 0xc5, 0xe4, 0x9a, 0x96, 0x71, 0x94, 0x44, 0x69, 0x9b, 0xd5, 0xa7, 0xd1, 0xaf, 0x2d, 0x78, + 0x7e, 0x5f, 0x95, 0x2e, 0x96, 0x88, 0xd0, 0x92, 0xbc, 0xa4, 0xba, 0xc2, 0xc7, 0x2b, 0x3a, 0x8f, + 0x57, 0x75, 0x1c, 0x77, 0xae, 0x8c, 0x8d, 0xb7, 0x02, 0xd7, 0xc5, 0xf8, 0x1e, 0x0e, 0xf2, 0x20, + 0x9d, 0xe5, 0x5c, 0xf3, 0x5c, 0xd8, 0x65, 0xdc, 0x4a, 0xa2, 0x74, 0x8b, 0x6d, 0xe0, 0x98, 0x40, + 0xc7, 0xf2, 0x6a, 0x46, 0x36, 0xcb, 0x95, 0xbc, 0x8a, 0xb7, 0x93, 0x28, 0xdd, 0x66, 0xab, 0x10, + 0xbe, 0x85, 0xde, 0x84, 0x1b, 0xca, 0xae, 0x88, 0xb2, 0xd2, 0x70, 0x1b, 0xef, 0x78, 0xa9, 0x75, + 0x10, 0x87, 0xb0, 0xe7, 0xe2, 0x8a, 0x5b, 0x8a, 0x77, 0x93, 0x28, 0x8d, 0xd8, 0xbf, 0x33, 0xa6, + 0xb0, 0x6f, 0x45, 0x49, 0x59, 0xa1, 0xf2, 0xeb, 0x6c, 0x4a, 0x85, 0xe5, 0xf1, 0x5e, 0x12, 0xa5, + 0x3d, 0x76, 0x17, 0x76, 0xbd, 0x4a, 0x21, 0xb3, 0xb9, 0x2d, 0xf2, 0xd0, 0xab, 0x1d, 0x7a, 0xad, + 0x81, 0x78, 0x0a, 0xcf, 0x9a, 0xef, 0x70, 0x3d, 0x34, 0x55, 0xe5, 0xb2, 0x12, 0x7c, 0x1a, 0x83, + 0x67, 0x3f, 0xad, 0x93, 0x1f, 0x89, 0xc6, 0x4d, 0x0a, 0x0f, 0xbd, 0x71, 0x59, 0x7d, 0x87, 0x9d, + 0x24, 0x4a, 0xbb, 0xac, 0x5d, 0x18, 0x3d, 0x0e, 0x76, 0x1c, 0x01, 0x7e, 0xd5, 0x24, 0x6b, 0x47, + 0xfe, 0x67, 0xde, 0x18, 0x0e, 0xd6, 0xd8, 0xce, 0xb4, 0x18, 0x76, 0xed, 0x4d, 0x36, 0xe7, 0x66, + 0x5e, 0x93, 0x9b, 0x23, 0x8e, 0xa0, 0xab, 0x16, 0x56, 0x2f, 0x6c, 0x26, 0xe4, 0x94, 0x6e, 0xbc, + 0x81, 0x3d, 0xb6, 0x86, 0x8d, 0x8e, 0x60, 0xc0, 0x68, 0x26, 0x8c, 0xa5, 0x6a, 0xcc, 0x97, 0x25, + 0x49, 0xdb, 0xcc, 0x80, 0xd0, 0x9a, 0x14, 0x6a, 0xe2, 0x0d, 0xee, 0x32, 0x1f, 0x8f, 0x06, 0xd0, + 0xdf, 0x60, 0xeb, 0x62, 0x39, 0xfa, 0x1d, 0x01, 0xd6, 0xc0, 0xca, 0x52, 0xe1, 0x6b, 0xe8, 0xea, + 0x80, 0xde, 0xce, 0xd7, 0x65, 0x9d, 0x1a, 0xfb, 0xe4, 0x66, 0x7c, 0x07, 0x4f, 0x1a, 0x8a, 0xa1, + 0xbc, 0x22, 0xeb, 0xa7, 0xec, 0xb2, 0x5e, 0x8d, 0x7e, 0xf3, 0xa0, 0xdb, 0x96, 0x29, 0x19, 0x2b, + 0xa4, 0x17, 0xae, 0x67, 0x5a, 0x85, 0xf0, 0x04, 0xfa, 0x42, 0xe6, 0xaa, 0x14, 0x72, 0x96, 0xf1, + 0x52, 0x2d, 0xa4, 0x0d, 0x46, 0x86, 0xfd, 0xc3, 0x26, 0x77, 0xee, 0x53, 0x97, 0xce, 0xcd, 0x13, + 0xe8, 0xab, 0x85, 0x9d, 0xa9, 0xbb, 0x15, 0xdb, 0xa1, 0xa2, 0xc9, 0xdd, 0x56, 0x9c, 0xfe, 0x89, + 0xa0, 0x57, 0xdf, 0xbd, 0xb3, 0x81, 0x2a, 0xfc, 0x0e, 0xb8, 0xf9, 0x98, 0xf0, 0xd5, 0xb1, 0x7f, + 0xab, 0x0f, 0x3e, 0xce, 0xe1, 0xe1, 0xc3, 0x04, 0x77, 0x9d, 0x8f, 0xf0, 0x1c, 0x3a, 0x2b, 0x46, + 0x63, 0x1c, 0xf8, 0x9b, 0x9b, 0x32, 0x1c, 0xdc, 0x93, 0x09, 0x12, 0x97, 0xb0, 0x7f, 0xc7, 0x2b, + 0x7c, 0x19, 0xc8, 0xf7, 0x1b, 0x3e, 0x1c, 0x3e, 0x90, 0xf5, 0x72, 0x17, 0x6f, 0xa0, 0x2f, 0xd4, + 0xf1, 0xac, 0xd2, 0x79, 0xa0, 0x19, 0xaa, 0x7e, 0x8a, 0x9c, 0x2e, 0xda, 0x5f, 0x8c, 0x9e, 0x8e, + 0xdd, 0x5f, 0x69, 0x1c, 0x4d, 0x76, 0xfc, 0xef, 0xe9, 0xec, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x41, 0x89, 0xc1, 0x2c, 0xac, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/rpc/lspd.proto b/rpc/lspd.proto index e0792c5..44f7b2f 100644 --- a/rpc/lspd.proto +++ b/rpc/lspd.proto @@ -45,10 +45,9 @@ message ChannelInformationReply { /// the channel. int64 min_htlc_msat = 9 [ json_name = "min_htlc_msat" ]; - int64 channel_fee_start_amount = 10; - float channel_fee_rate = 11; + int64 channel_fee_permyriad = 10; - bytes lsp_pubkey = 12; + bytes lsp_pubkey = 11; } message OpenChannelRequest { diff --git a/server.go b/server.go index 868ae8d..08f41e5 100644 --- a/server.go +++ b/server.go @@ -29,15 +29,14 @@ import ( ) const ( - channelAmount = 1_000_000 - targetConf = 1 - minHtlcMsat = 600 - baseFeeMsat = 1000 - feeRate = 0.000001 - timeLockDelta = 144 - channelFeeStartAmount = 100_000 - channelFeeAmountNumerator = 1 - channelFeeAmountDenominator = 1000 + channelAmount = 1_000_000 + targetConf = 1 + minHtlcMsat = 600 + baseFeeMsat = 1000 + feeRate = 0.000001 + timeLockDelta = 144 + channelFeePermyriad = 10 + additionalChannelCapacity = 100_000 ) type server struct{} @@ -54,18 +53,17 @@ var ( func (s *server) ChannelInformation(ctx context.Context, in *lspdrpc.ChannelInformationRequest) (*lspdrpc.ChannelInformationReply, error) { return &lspdrpc.ChannelInformationReply{ - Name: nodeName, - Pubkey: nodePubkey, - Host: os.Getenv("NODE_HOST"), - ChannelCapacity: channelAmount, - TargetConf: targetConf, - MinHtlcMsat: minHtlcMsat, - BaseFeeMsat: baseFeeMsat, - FeeRate: feeRate, - TimeLockDelta: timeLockDelta, - ChannelFeeStartAmount: channelFeeStartAmount, - ChannelFeeRate: 1.0 * channelFeeAmountNumerator / channelFeeAmountDenominator, - LspPubkey: publicKey.SerializeCompressed(), + Name: nodeName, + Pubkey: nodePubkey, + Host: os.Getenv("NODE_HOST"), + ChannelCapacity: channelAmount, + TargetConf: targetConf, + MinHtlcMsat: minHtlcMsat, + BaseFeeMsat: baseFeeMsat, + FeeRate: feeRate, + TimeLockDelta: timeLockDelta, + ChannelFeePermyriad: channelFeePermyriad, + LspPubkey: publicKey.SerializeCompressed(), }, nil }