Browse Source

looprpc+cmd: deprecate dynamic terms

We move destination and cltv to QuoteResponse, and deprecate the
non-static fields.

Terms will now only show max/min swap sizes.
pull/88/head
Johan T. Halseth 1 year ago
parent
commit
0cff92d265
No known key found for this signature in database GPG Key ID: 15BAADA29DA20D26
5 changed files with 114 additions and 184 deletions
  1. +0
    -8
      cmd/loop/terms.go
  2. +1
    -7
      cmd/loopd/swapclient_server.go
  3. +91
    -121
      looprpc/client.pb.go
  4. +12
    -24
      looprpc/client.proto
  5. +10
    -24
      looprpc/client.swagger.json

+ 0
- 8
cmd/loop/terms.go View File

@ -8,7 +8,6 @@ import (
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/loop/looprpc"
"github.com/lightninglabs/loop/swap"
)
var termsCommand = cli.Command{
@ -29,13 +28,6 @@ func terms(ctx *cli.Context) error {
btcutil.Amount(terms.MinSwapAmount),
btcutil.Amount(terms.MaxSwapAmount),
)
fmt.Printf("Fee: %d + %.4f %% (%d prepaid)\n",
btcutil.Amount(terms.SwapFeeBase),
swap.FeeRateAsPercentage(terms.SwapFeeRate),
btcutil.Amount(terms.PrepayAmt),
)
fmt.Printf("Cltv delta: %v blocks\n", terms.CltvDelta)
}
fmt.Println("Loop Out")

+ 1
- 7
cmd/loopd/swapclient_server.go View File

@ -244,10 +244,6 @@ func (s *swapClientServer) LoopOutTerms(ctx context.Context,
return &looprpc.TermsResponse{
MinSwapAmount: int64(terms.MinSwapAmount),
MaxSwapAmount: int64(terms.MaxSwapAmount),
PrepayAmt: int64(terms.PrepayAmt),
SwapFeeBase: int64(terms.SwapFeeBase),
SwapFeeRate: int64(terms.SwapFeeRate),
CltvDelta: int32(terms.CltvDelta),
}, nil
}
@ -269,6 +265,7 @@ func (s *swapClientServer) LoopOutQuote(ctx context.Context,
if err != nil {
return nil, err
}
return &looprpc.QuoteResponse{
MinerFee: int64(quote.MinerFee),
PrepayAmt: int64(quote.PrepayAmount),
@ -291,9 +288,6 @@ func (s *swapClientServer) GetLoopInTerms(ctx context.Context, req *looprpc.Term
return &looprpc.TermsResponse{
MinSwapAmount: int64(terms.MinSwapAmount),
MaxSwapAmount: int64(terms.MaxSwapAmount),
SwapFeeBase: int64(terms.SwapFeeBase),
SwapFeeRate: int64(terms.SwapFeeRate),
CltvDelta: int32(terms.CltvDelta),
}, nil
}

+ 91
- 121
looprpc/client.pb.go View File

@ -590,28 +590,12 @@ func (m *TermsRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_TermsRequest proto.InternalMessageInfo
type TermsResponse struct {
//*
//The node pubkey where the swap payment needs to be paid
//to. This can be used to test connectivity before initiating the swap.
SwapPaymentDest string `protobuf:"bytes,1,opt,name=swap_payment_dest,json=swapPaymentDest,proto3" json:"swap_payment_dest,omitempty"`
//*
//The base fee for a swap (sat)
SwapFeeBase int64 `protobuf:"varint,2,opt,name=swap_fee_base,json=swapFeeBase,proto3" json:"swap_fee_base,omitempty"`
//*
//The fee rate for a swap (parts per million)
SwapFeeRate int64 `protobuf:"varint,3,opt,name=swap_fee_rate,json=swapFeeRate,proto3" json:"swap_fee_rate,omitempty"`
//*
//Required prepay amount
PrepayAmt int64 `protobuf:"varint,4,opt,name=prepay_amt,json=prepayAmt,proto3" json:"prepay_amt,omitempty"`
//*
//Minimum swap amount (sat)
MinSwapAmount int64 `protobuf:"varint,5,opt,name=min_swap_amount,json=minSwapAmount,proto3" json:"min_swap_amount,omitempty"`
//*
//Maximum swap amount (sat)
MaxSwapAmount int64 `protobuf:"varint,6,opt,name=max_swap_amount,json=maxSwapAmount,proto3" json:"max_swap_amount,omitempty"`
//*
//On-chain cltv expiry delta
CltvDelta int32 `protobuf:"varint,7,opt,name=cltv_delta,json=cltvDelta,proto3" json:"cltv_delta,omitempty"`
MaxSwapAmount int64 `protobuf:"varint,6,opt,name=max_swap_amount,json=maxSwapAmount,proto3" json:"max_swap_amount,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -642,34 +626,6 @@ func (m *TermsResponse) XXX_DiscardUnknown() {
var xxx_messageInfo_TermsResponse proto.InternalMessageInfo
func (m *TermsResponse) GetSwapPaymentDest() string {
if m != nil {
return m.SwapPaymentDest
}
return ""
}
func (m *TermsResponse) GetSwapFeeBase() int64 {
if m != nil {
return m.SwapFeeBase
}
return 0
}
func (m *TermsResponse) GetSwapFeeRate() int64 {
if m != nil {
return m.SwapFeeRate
}
return 0
}
func (m *TermsResponse) GetPrepayAmt() int64 {
if m != nil {
return m.PrepayAmt
}
return 0
}
func (m *TermsResponse) GetMinSwapAmount() int64 {
if m != nil {
return m.MinSwapAmount
@ -684,13 +640,6 @@ func (m *TermsResponse) GetMaxSwapAmount() int64 {
return 0
}
func (m *TermsResponse) GetCltvDelta() int32 {
if m != nil {
return m.CltvDelta
}
return 0
}
type QuoteRequest struct {
//*
//The amount to swap in satoshis.
@ -765,7 +714,14 @@ type QuoteResponse struct {
PrepayAmt int64 `protobuf:"varint,2,opt,name=prepay_amt,json=prepayAmt,proto3" json:"prepay_amt,omitempty"`
//*
//An estimate of the on-chain fee that needs to be paid to sweep the HTLC.
MinerFee int64 `protobuf:"varint,3,opt,name=miner_fee,json=minerFee,proto3" json:"miner_fee,omitempty"`
MinerFee int64 `protobuf:"varint,3,opt,name=miner_fee,json=minerFee,proto3" json:"miner_fee,omitempty"`
//*
//The node pubkey where the swap payment needs to be paid
//to. This can be used to test connectivity before initiating the swap.
SwapPaymentDest []byte `protobuf:"bytes,4,opt,name=swap_payment_dest,json=swapPaymentDest,proto3" json:"swap_payment_dest,omitempty"`
//*
//On-chain cltv expiry delta
CltvDelta int32 `protobuf:"varint,5,opt,name=cltv_delta,json=cltvDelta,proto3" json:"cltv_delta,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -817,6 +773,20 @@ func (m *QuoteResponse) GetMinerFee() int64 {
return 0
}
func (m *QuoteResponse) GetSwapPaymentDest() []byte {
if m != nil {
return m.SwapPaymentDest
}
return nil
}
func (m *QuoteResponse) GetCltvDelta() int32 {
if m != nil {
return m.CltvDelta
}
return 0
}
func init() {
proto.RegisterEnum("looprpc.SwapType", SwapType_name, SwapType_value)
proto.RegisterEnum("looprpc.SwapState", SwapState_name, SwapState_value)
@ -834,74 +804,74 @@ func init() {
func init() { proto.RegisterFile("client.proto", fileDescriptor_014de31d7ac8c57c) }
var fileDescriptor_014de31d7ac8c57c = []byte{
// 1065 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x5f, 0x73, 0xda, 0xc6,
0x17, 0x0d, 0x02, 0x1b, 0xb8, 0x08, 0x01, 0xeb, 0xc4, 0xc6, 0xfc, 0x7e, 0x99, 0x50, 0xb5, 0x49,
0x19, 0x3f, 0x98, 0xd6, 0x79, 0x6a, 0xdf, 0x08, 0x26, 0x31, 0x33, 0xb6, 0x71, 0x05, 0xce, 0x4c,
0xfb, 0xa2, 0x6e, 0x60, 0xb1, 0x35, 0x23, 0xed, 0x2a, 0xd2, 0xe2, 0x3f, 0xd3, 0xe9, 0x4b, 0xbf,
0x41, 0xa7, 0x5f, 0xa5, 0xdf, 0xa4, 0xef, 0x7d, 0xea, 0xf4, 0x73, 0x74, 0xf6, 0xae, 0x90, 0x05,
0xc4, 0x2f, 0x79, 0xc3, 0x67, 0xcf, 0x9e, 0xbd, 0x7b, 0xef, 0x39, 0x2b, 0x83, 0x39, 0xf5, 0x3d,
0xc6, 0xe5, 0x61, 0x18, 0x09, 0x29, 0x48, 0xd1, 0x17, 0x22, 0x8c, 0xc2, 0x69, 0xeb, 0xff, 0x57,
0x42, 0x5c, 0xf9, 0xac, 0x4b, 0x43, 0xaf, 0x4b, 0x39, 0x17, 0x92, 0x4a, 0x4f, 0xf0, 0x58, 0xd3,
0xec, 0xbf, 0x0d, 0xb0, 0x4e, 0x85, 0x08, 0x47, 0x0b, 0xe9, 0xb0, 0x8f, 0x0b, 0x16, 0x4b, 0x52,
0x87, 0x3c, 0x0d, 0x64, 0x33, 0xd7, 0xce, 0x75, 0xf2, 0x8e, 0xfa, 0x49, 0x08, 0x14, 0x66, 0x2c,
0x96, 0x4d, 0xa3, 0x9d, 0xeb, 0x94, 0x1d, 0xfc, 0x4d, 0xba, 0xf0, 0x34, 0xa0, 0x77, 0x6e, 0x7c,
0x4b, 0x43, 0x37, 0x12, 0x0b, 0xe9, 0xf1, 0x2b, 0x77, 0xce, 0x58, 0x33, 0x8f, 0xdb, 0x1a, 0x01,
0xbd, 0x1b, 0xdf, 0xd2, 0xd0, 0xd1, 0x2b, 0x6f, 0x19, 0x23, 0xaf, 0x61, 0x57, 0x6d, 0x08, 0x23,
0x16, 0xd2, 0xfb, 0x95, 0x2d, 0x05, 0xdc, 0xb2, 0x13, 0xd0, 0xbb, 0x0b, 0x5c, 0xcc, 0x6c, 0x6a,
0x83, 0x99, 0x9e, 0xa2, 0xa8, 0x5b, 0x48, 0x85, 0x44, 0x5d, 0x31, 0xbe, 0x02, 0x2b, 0x23, 0xab,
0x0a, 0xdf, 0x46, 0x8e, 0x99, 0xca, 0xf5, 0x02, 0x49, 0x6c, 0xa8, 0x2a, 0x56, 0xe0, 0x71, 0x16,
0xa1, 0x50, 0x11, 0x49, 0x95, 0x80, 0xde, 0x9d, 0x29, 0x4c, 0x29, 0x75, 0xa0, 0xae, 0x7a, 0xe6,
0x8a, 0x85, 0x74, 0xa7, 0xd7, 0x94, 0x73, 0xe6, 0x37, 0x4b, 0xed, 0x5c, 0xa7, 0xe0, 0x58, 0xbe,
0xee, 0x50, 0x5f, 0xa3, 0xe4, 0x00, 0x1a, 0xf1, 0x2d, 0x63, 0xa1, 0x3b, 0x15, 0x7c, 0xee, 0x4a,
0x1a, 0x5d, 0x31, 0xd9, 0x2c, 0xb7, 0x73, 0x9d, 0x2d, 0xa7, 0x86, 0x0b, 0x7d, 0xc1, 0xe7, 0x13,
0x84, 0xed, 0x3f, 0x73, 0x50, 0x55, 0x0d, 0x1e, 0xf2, 0xc7, 0xfb, 0xbb, 0x7e, 0x4b, 0x63, 0xe3,
0x96, 0x1b, 0xf5, 0xe7, 0x37, 0xeb, 0x7f, 0x05, 0x35, 0xac, 0xdf, 0xe3, 0x69, 0xf9, 0x05, 0x2c,
0xbf, 0xea, 0xe3, 0xf9, 0xcb, 0xea, 0xbf, 0x84, 0x2a, 0xbb, 0x93, 0x2c, 0xe2, 0xd4, 0x77, 0xaf,
0xa5, 0x3f, 0xc5, 0xa6, 0x96, 0x1c, 0x73, 0x09, 0x9e, 0x48, 0x7f, 0x6a, 0xf7, 0xc0, 0xc4, 0xf9,
0xb1, 0x38, 0x14, 0x3c, 0x66, 0xc4, 0x02, 0xc3, 0x9b, 0x61, 0xcd, 0x65, 0xc7, 0xf0, 0x66, 0xe4,
0x0b, 0x30, 0xd5, 0x5e, 0x97, 0xce, 0x66, 0x11, 0x8b, 0xe3, 0xc4, 0x1a, 0x15, 0x85, 0xf5, 0x34,
0x64, 0xd7, 0xc1, 0x3a, 0x13, 0xdc, 0x93, 0x22, 0x4a, 0x6e, 0xae, 0xcc, 0x06, 0x4a, 0x75, 0x2c,
0xa9, 0x5c, 0xc4, 0x9f, 0x68, 0x84, 0x3e, 0xc5, 0x48, 0x4f, 0x79, 0x09, 0x05, 0x79, 0x1f, 0xea,
0xdb, 0x5a, 0x47, 0x8d, 0xc3, 0xc4, 0xd3, 0x87, 0x4a, 0x64, 0x72, 0x1f, 0x32, 0x07, 0x97, 0x49,
0x07, 0xb6, 0x62, 0x49, 0xa5, 0x76, 0x92, 0x75, 0x44, 0x56, 0x78, 0xea, 0x30, 0xe6, 0x68, 0x02,
0xf9, 0x1a, 0x6a, 0x1e, 0xf7, 0xa4, 0x87, 0x19, 0x70, 0xa5, 0x17, 0x2c, 0x2d, 0x65, 0x3d, 0xc0,
0x13, 0x2f, 0xd0, 0x66, 0xa0, 0xb1, 0x74, 0x17, 0xe1, 0x8c, 0x4a, 0xa6, 0x99, 0xda, 0x58, 0x96,
0xc2, 0x2f, 0x11, 0x46, 0xe6, 0x7a, 0x27, 0x8a, 0x1b, 0x9d, 0x20, 0x2f, 0xa0, 0x32, 0x15, 0xb1,
0x74, 0x63, 0x16, 0xdd, 0xb0, 0x08, 0x4d, 0x95, 0x77, 0x40, 0x41, 0x63, 0x44, 0x94, 0x06, 0x12,
0x04, 0x9f, 0x5e, 0x53, 0x8f, 0xa3, 0x97, 0xf2, 0x0e, 0x6e, 0x1a, 0x69, 0x48, 0x4d, 0x4d, 0x53,
0xe6, 0x73, 0xcd, 0x01, 0x6d, 0x73, 0xe4, 0x24, 0x98, 0x6d, 0x81, 0x39, 0x61, 0x51, 0x10, 0x2f,
0x1b, 0xfe, 0xbb, 0x01, 0xd5, 0x04, 0x48, 0xe6, 0x88, 0xd6, 0xa5, 0xa1, 0x1b, 0xd2, 0xfb, 0x80,
0x71, 0xe9, 0x62, 0xae, 0xf5, 0x58, 0x6b, 0x6a, 0xe1, 0x42, 0xe3, 0xc7, 0xca, 0xa8, 0x36, 0x54,
0x97, 0x96, 0x74, 0x3f, 0xd0, 0x78, 0xe9, 0xcb, 0x4a, 0xac, 0x4d, 0xf9, 0x86, 0xc6, 0x6c, 0x85,
0x13, 0xa9, 0x11, 0xe4, 0x57, 0x38, 0x8e, 0x6a, 0xfa, 0x73, 0x80, 0x4c, 0x3c, 0x75, 0xda, 0xcb,
0x61, 0x9a, 0xcd, 0x57, 0x50, 0x0b, 0x3c, 0xae, 0xdd, 0x4f, 0x03, 0xb1, 0xe0, 0x32, 0x99, 0x49,
0x35, 0xf0, 0xb8, 0x9a, 0x60, 0x0f, 0x41, 0xe4, 0x2d, 0x53, 0x92, 0xf0, 0xb6, 0x13, 0x9e, 0x0e,
0x4a, 0xc2, 0x7b, 0x0e, 0x30, 0xf5, 0xe5, 0x8d, 0x3b, 0x63, 0xbe, 0xa4, 0x38, 0x8e, 0x2d, 0xa7,
0xac, 0x90, 0x63, 0x05, 0xd8, 0x73, 0x30, 0x7f, 0x58, 0x08, 0xc9, 0x1e, 0x8f, 0x23, 0x8e, 0xeb,
0x21, 0xd8, 0x06, 0x2a, 0xc0, 0x34, 0xcd, 0xf4, 0x66, 0x82, 0xf2, 0x9f, 0x48, 0xd0, 0x1c, 0xaa,
0xc9, 0x39, 0x49, 0xeb, 0xf7, 0xa1, 0x94, 0x26, 0x5c, 0x9f, 0x56, 0x4c, 0xba, 0xb4, 0xd6, 0x21,
0x63, 0xbd, 0x43, 0xff, 0x83, 0xf2, 0x7a, 0xf2, 0x4b, 0x41, 0x12, 0xfb, 0x83, 0x97, 0x50, 0x5a,
0xc6, 0x81, 0x98, 0x50, 0x3a, 0x1d, 0x8d, 0x2e, 0xdc, 0xd1, 0xe5, 0xa4, 0xfe, 0x84, 0x54, 0xa0,
0x88, 0x7f, 0x0d, 0xcf, 0xeb, 0xb9, 0x83, 0x18, 0xca, 0x69, 0x1a, 0x48, 0x15, 0xca, 0xc3, 0xf3,
0xe1, 0x64, 0xd8, 0x9b, 0x0c, 0x8e, 0xeb, 0x4f, 0xc8, 0x33, 0x68, 0x5c, 0x38, 0x83, 0xe1, 0x59,
0xef, 0xdd, 0xc0, 0x75, 0x06, 0xef, 0x07, 0xbd, 0xd3, 0xc1, 0x71, 0x3d, 0x47, 0x08, 0x58, 0x27,
0x93, 0xd3, 0xbe, 0x7b, 0x71, 0xf9, 0xe6, 0x74, 0x38, 0x3e, 0x19, 0x1c, 0xd7, 0x0d, 0xa5, 0x39,
0xbe, 0xec, 0xf7, 0x07, 0xe3, 0x71, 0x3d, 0x4f, 0x00, 0xb6, 0xdf, 0xf6, 0x86, 0x8a, 0x5c, 0x20,
0x3b, 0x50, 0x1b, 0x9e, 0xbf, 0x1f, 0x0d, 0xfb, 0x03, 0x77, 0x3c, 0x98, 0x4c, 0x14, 0xb8, 0x75,
0xf4, 0x6f, 0x41, 0x07, 0xbe, 0x8f, 0x5f, 0x26, 0xe2, 0x40, 0x31, 0xf9, 0xd6, 0x90, 0xbd, 0x34,
0xa3, 0xab, 0x5f, 0x9f, 0xd6, 0xb3, 0x95, 0xf0, 0x2e, 0x9b, 0x67, 0xef, 0xfd, 0xf6, 0xd7, 0x3f,
0x7f, 0x18, 0x0d, 0xdb, 0xec, 0xde, 0x7c, 0xdb, 0x55, 0x8c, 0xae, 0x58, 0xc8, 0xef, 0x73, 0x07,
0x64, 0x04, 0xdb, 0xfa, 0x79, 0x25, 0xbb, 0x2b, 0x92, 0xe9, 0x7b, 0xfb, 0x98, 0xe2, 0x2e, 0x2a,
0xd6, 0xed, 0x4a, 0xaa, 0xe8, 0x71, 0x25, 0xf8, 0x1d, 0x14, 0x93, 0x67, 0x2b, 0x53, 0xe4, 0xea,
0x43, 0xd6, 0xda, 0xd9, 0x78, 0x61, 0x16, 0xf1, 0x37, 0x39, 0xf2, 0x23, 0x98, 0xc9, 0x6d, 0x30,
0x74, 0xe4, 0xe1, 0xe4, 0x6c, 0x2a, 0x5b, 0xbb, 0xeb, 0x70, 0x52, 0x51, 0x0b, 0x2b, 0x7a, 0x4a,
0x48, 0xf6, 0x8e, 0x5d, 0x89, 0x52, 0x6e, 0x2a, 0x8d, 0xa6, 0xca, 0x48, 0x67, 0xcd, 0x9c, 0x91,
0x5e, 0xf1, 0x9e, 0xdd, 0x46, 0xe9, 0x16, 0x69, 0xae, 0x48, 0x7f, 0x54, 0x9c, 0xee, 0x2f, 0x34,
0x90, 0xbf, 0x92, 0x9f, 0xc0, 0x7a, 0xc7, 0xa4, 0xee, 0xdc, 0x67, 0x55, 0xbf, 0x8f, 0x47, 0xec,
0x90, 0x46, 0xa6, 0x9f, 0x49, 0xf1, 0x3f, 0x67, 0xb4, 0x3f, 0xab, 0xfc, 0x17, 0xa8, 0xbd, 0x4f,
0xf6, 0xb2, 0xda, 0x99, 0xea, 0x3f, 0x6c, 0xe3, 0x7f, 0x33, 0xaf, 0xff, 0x0b, 0x00, 0x00, 0xff,
0xff, 0x71, 0xf8, 0xf7, 0x7c, 0x04, 0x09, 0x00, 0x00,
// 1061 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x73, 0xda, 0x46,
0x1c, 0x8d, 0x40, 0x18, 0xf1, 0xb3, 0x90, 0xc5, 0x3a, 0x71, 0x08, 0x6d, 0x26, 0x94, 0x36, 0x29,
0xe3, 0x83, 0x69, 0x9d, 0x53, 0x7b, 0xa3, 0x98, 0xc4, 0x78, 0x6c, 0xe3, 0x0a, 0x9c, 0x99, 0xf6,
0xa2, 0x6e, 0x61, 0xb1, 0x35, 0x83, 0x76, 0x15, 0x69, 0xf1, 0x9f, 0xe9, 0xe4, 0xd2, 0xaf, 0xd0,
0x4f, 0xd2, 0x99, 0x7e, 0x93, 0xde, 0x7b, 0xea, 0xf4, 0x73, 0x74, 0xf6, 0xb7, 0x42, 0x16, 0x26,
0xbe, 0xe4, 0x66, 0x9e, 0xde, 0xbe, 0xdf, 0x1f, 0xbd, 0xb7, 0x32, 0xd8, 0x93, 0x79, 0xc0, 0xb8,
0xdc, 0x8b, 0x62, 0x21, 0x05, 0x29, 0xcf, 0x85, 0x88, 0xe2, 0x68, 0xd2, 0xf8, 0xfc, 0x42, 0x88,
0x8b, 0x39, 0xeb, 0xd0, 0x28, 0xe8, 0x50, 0xce, 0x85, 0xa4, 0x32, 0x10, 0x3c, 0xd1, 0xb4, 0xd6,
0x3f, 0x05, 0x70, 0x8e, 0x85, 0x88, 0x86, 0x0b, 0xe9, 0xb1, 0xf7, 0x0b, 0x96, 0x48, 0xe2, 0x42,
0x91, 0x86, 0xb2, 0x6e, 0x34, 0x8d, 0x76, 0xd1, 0x53, 0x7f, 0x12, 0x02, 0xe6, 0x94, 0x25, 0xb2,
0x5e, 0x68, 0x1a, 0xed, 0x8a, 0x87, 0x7f, 0x93, 0x0e, 0x3c, 0x0e, 0xe9, 0x8d, 0x9f, 0x5c, 0xd3,
0xc8, 0x8f, 0xc5, 0x42, 0x06, 0xfc, 0xc2, 0x9f, 0x31, 0x56, 0x2f, 0xe2, 0xb1, 0x5a, 0x48, 0x6f,
0x46, 0xd7, 0x34, 0xf2, 0xf4, 0x93, 0x37, 0x8c, 0x91, 0xd7, 0xb0, 0xa3, 0x0e, 0x44, 0x31, 0x8b,
0xe8, 0xed, 0xca, 0x11, 0x13, 0x8f, 0x6c, 0x87, 0xf4, 0xe6, 0x0c, 0x1f, 0xe6, 0x0e, 0x35, 0xc1,
0xce, 0xaa, 0x28, 0x6a, 0x09, 0xa9, 0x90, 0xaa, 0x2b, 0xc6, 0x57, 0xe0, 0xe4, 0x64, 0x55, 0xe3,
0x1b, 0xc8, 0xb1, 0x33, 0xb9, 0x6e, 0x28, 0x49, 0x0b, 0xaa, 0x8a, 0x15, 0x06, 0x9c, 0xc5, 0x28,
0x54, 0x46, 0xd2, 0x66, 0x48, 0x6f, 0x4e, 0x14, 0xa6, 0x94, 0xda, 0xe0, 0xaa, 0x9d, 0xf9, 0x62,
0x21, 0xfd, 0xc9, 0x25, 0xe5, 0x9c, 0xcd, 0xeb, 0x56, 0xd3, 0x68, 0x9b, 0x9e, 0x33, 0xd7, 0x1b,
0xea, 0x69, 0x94, 0xec, 0x42, 0x2d, 0xb9, 0x66, 0x2c, 0xf2, 0x27, 0x82, 0xcf, 0x7c, 0x49, 0xe3,
0x0b, 0x26, 0xeb, 0x95, 0xa6, 0xd1, 0x2e, 0x79, 0x5b, 0xf8, 0xa0, 0x27, 0xf8, 0x6c, 0x8c, 0x70,
0xeb, 0x2f, 0x03, 0xaa, 0x6a, 0xc1, 0x03, 0xfe, 0xf0, 0x7e, 0xef, 0x4f, 0x59, 0x58, 0x9b, 0x72,
0xad, 0xff, 0xe2, 0x7a, 0xff, 0xaf, 0x60, 0x0b, 0xfb, 0x0f, 0x78, 0xd6, 0xbe, 0x89, 0xed, 0x57,
0xe7, 0x58, 0x7f, 0xd9, 0xfd, 0x97, 0x50, 0x65, 0x37, 0x92, 0xc5, 0x9c, 0xce, 0xfd, 0x4b, 0x39,
0x9f, 0xe0, 0x52, 0x2d, 0xcf, 0x5e, 0x82, 0x87, 0x72, 0x3e, 0x69, 0x75, 0xc1, 0xc6, 0xf7, 0xc7,
0x92, 0x48, 0xf0, 0x84, 0x11, 0x07, 0x0a, 0xc1, 0x14, 0x7b, 0xae, 0x78, 0x85, 0x60, 0x4a, 0xbe,
0x00, 0x5b, 0x9d, 0xf5, 0xe9, 0x74, 0x1a, 0xb3, 0x24, 0x49, 0xad, 0xb1, 0xa9, 0xb0, 0xae, 0x86,
0x5a, 0x2e, 0x38, 0x27, 0x82, 0x07, 0x52, 0xc4, 0xe9, 0xe4, 0xca, 0x6c, 0xa0, 0x54, 0x47, 0x92,
0xca, 0x45, 0xf2, 0x91, 0x45, 0xe8, 0x2a, 0x85, 0xac, 0xca, 0x4b, 0x30, 0xe5, 0x6d, 0xa4, 0xa7,
0x75, 0xf6, 0x6b, 0x7b, 0xa9, 0xa7, 0xf7, 0x94, 0xc8, 0xf8, 0x36, 0x62, 0x1e, 0x3e, 0x26, 0x6d,
0x28, 0x25, 0x92, 0x4a, 0xed, 0x24, 0x67, 0x9f, 0xac, 0xf0, 0x54, 0x31, 0xe6, 0x69, 0x02, 0xf9,
0x1a, 0xb6, 0x02, 0x1e, 0xc8, 0x00, 0x33, 0xe0, 0xcb, 0x20, 0x5c, 0x5a, 0xca, 0xb9, 0x83, 0xc7,
0x41, 0xa8, 0xcd, 0x40, 0x13, 0xe9, 0x2f, 0xa2, 0x29, 0x95, 0x4c, 0x33, 0xb5, 0xb1, 0x1c, 0x85,
0x9f, 0x23, 0x8c, 0xcc, 0xfb, 0x9b, 0x28, 0xaf, 0x6d, 0x82, 0xbc, 0x80, 0xcd, 0x89, 0x48, 0xa4,
0x9f, 0xb0, 0xf8, 0x8a, 0xc5, 0x68, 0xaa, 0xa2, 0x07, 0x0a, 0x1a, 0x21, 0xa2, 0x34, 0x90, 0x20,
0xf8, 0xe4, 0x92, 0x06, 0x1c, 0xbd, 0x54, 0xf4, 0xf0, 0xd0, 0x50, 0x43, 0xea, 0xad, 0x69, 0xca,
0x6c, 0xa6, 0x39, 0xa0, 0x6d, 0x8e, 0x9c, 0x14, 0x6b, 0x39, 0x60, 0x8f, 0x59, 0x1c, 0x26, 0xcb,
0x85, 0x7f, 0x80, 0x6a, 0xfa, 0x3b, 0x7d, 0x8d, 0xaf, 0x60, 0x2b, 0x0c, 0xb8, 0x76, 0x1a, 0x0d,
0xc5, 0x82, 0xcb, 0x74, 0xfe, 0x6a, 0x18, 0x70, 0xb5, 0xad, 0x2e, 0x82, 0xc8, 0x5b, 0x3a, 0x32,
0xe5, 0x6d, 0xa4, 0x3c, 0x6d, 0x4a, 0xcd, 0x3b, 0x32, 0x2d, 0xc3, 0x2d, 0x1c, 0x99, 0x56, 0xc1,
0x2d, 0x1e, 0x99, 0x56, 0xd1, 0x35, 0x8f, 0x4c, 0xcb, 0x74, 0x4b, 0x47, 0xa6, 0x55, 0x76, 0xad,
0xd6, 0x0c, 0xec, 0x1f, 0x17, 0x42, 0xb2, 0x87, 0x9d, 0x8f, 0x9b, 0xb9, 0xcb, 0x50, 0x01, 0x33,
0x04, 0x93, 0x2c, 0x3e, 0xeb, 0x66, 0x2d, 0x7e, 0xc4, 0xac, 0x7f, 0x1a, 0x50, 0x4d, 0x0b, 0xa5,
0x73, 0x3e, 0x03, 0x2b, 0x4b, 0x93, 0x2e, 0x57, 0x4e, 0xd2, 0x28, 0x3d, 0x07, 0xc8, 0x5d, 0x16,
0x3a, 0x6a, 0x95, 0x28, 0xbb, 0x29, 0x3e, 0x83, 0xca, 0xfd, 0x94, 0x59, 0xe1, 0x32, 0x62, 0x18,
0x7c, 0x1a, 0xf9, 0x11, 0xbd, 0x0d, 0x19, 0x97, 0x3e, 0xde, 0x8a, 0xca, 0x74, 0xb6, 0x0a, 0x3e,
0x8d, 0xce, 0x34, 0x7e, 0xa0, 0x86, 0x7d, 0x0e, 0x30, 0x99, 0xcb, 0x2b, 0x7f, 0xca, 0xe6, 0x92,
0xe2, 0x96, 0x4b, 0x5e, 0x45, 0x21, 0x07, 0x0a, 0xd8, 0x7d, 0x09, 0xd6, 0xd2, 0xc5, 0xc4, 0x06,
0xeb, 0x78, 0x38, 0x3c, 0xf3, 0x87, 0xe7, 0x63, 0xf7, 0x11, 0xd9, 0x84, 0x32, 0xfe, 0x1a, 0x9c,
0xba, 0xc6, 0x6e, 0x02, 0x95, 0xcc, 0xc4, 0xa4, 0x0a, 0x95, 0xc1, 0xe9, 0x60, 0x3c, 0xe8, 0x8e,
0xfb, 0x07, 0xee, 0x23, 0xf2, 0x04, 0x6a, 0x67, 0x5e, 0x7f, 0x70, 0xd2, 0x7d, 0xdb, 0xf7, 0xbd,
0xfe, 0xbb, 0x7e, 0xf7, 0xb8, 0x7f, 0xe0, 0x1a, 0x84, 0x80, 0x73, 0x38, 0x3e, 0xee, 0xf9, 0x67,
0xe7, 0x3f, 0x1c, 0x0f, 0x46, 0x87, 0xfd, 0x03, 0xb7, 0xa0, 0x34, 0x47, 0xe7, 0xbd, 0x5e, 0x7f,
0x34, 0x72, 0x8b, 0x04, 0x60, 0xe3, 0x4d, 0x77, 0xa0, 0xc8, 0x26, 0xd9, 0x86, 0xad, 0xc1, 0xe9,
0xbb, 0xe1, 0xa0, 0xd7, 0xf7, 0x47, 0xfd, 0xf1, 0x58, 0x81, 0xa5, 0xfd, 0xff, 0x4c, 0x9d, 0xd3,
0x1e, 0x7e, 0x50, 0x88, 0x07, 0xe5, 0xf4, 0x13, 0x41, 0x9e, 0x66, 0xd1, 0x5a, 0xfd, 0x68, 0x34,
0x9e, 0xac, 0x64, 0x6e, 0xf9, 0x1e, 0x5a, 0x4f, 0x7f, 0xff, 0xfb, 0xdf, 0x3f, 0x0a, 0xb5, 0x96,
0xdd, 0xb9, 0xfa, 0xb6, 0xa3, 0x18, 0x1d, 0xb1, 0x90, 0xdf, 0x1b, 0xbb, 0x64, 0x08, 0x1b, 0xfa,
0x56, 0x24, 0x3b, 0x2b, 0x92, 0xd9, 0x35, 0xf9, 0x90, 0xe2, 0x0e, 0x2a, 0xba, 0xad, 0xcd, 0x4c,
0x31, 0xe0, 0x4a, 0xf0, 0x3b, 0x28, 0xa7, 0xb7, 0x4d, 0xae, 0xc9, 0xd5, 0xfb, 0xa7, 0xb1, 0xbd,
0x76, 0x31, 0x2c, 0x92, 0x6f, 0x0c, 0xf2, 0x13, 0xd8, 0xe9, 0x34, 0x18, 0x16, 0x72, 0x57, 0x39,
0x1f, 0xa6, 0xc6, 0xce, 0x7d, 0x38, 0xed, 0xa8, 0x81, 0x1d, 0x3d, 0x26, 0x24, 0x3f, 0x63, 0x47,
0xa2, 0x94, 0x9f, 0x49, 0xa3, 0x3f, 0x73, 0xd2, 0xf9, 0x60, 0xe4, 0xa4, 0x57, 0x6c, 0xdc, 0x6a,
0xa2, 0x74, 0x83, 0xd4, 0x57, 0xa4, 0xdf, 0x2b, 0x4e, 0xe7, 0x37, 0x1a, 0xca, 0x0f, 0xe4, 0x67,
0x70, 0xde, 0x32, 0xa9, 0x37, 0xf7, 0x49, 0xdd, 0x3f, 0xc3, 0x12, 0xdb, 0xa4, 0x96, 0xdb, 0x67,
0xda, 0xfc, 0x2f, 0x39, 0xed, 0x4f, 0x6a, 0xff, 0x05, 0x6a, 0x3f, 0x23, 0x4f, 0xf3, 0xda, 0xb9,
0xee, 0x7f, 0xdd, 0xc0, 0x7f, 0x42, 0x5e, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x26, 0x06, 0x26,
0x30, 0xbb, 0x08, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.

+ 12
- 24
looprpc/client.proto View File

@ -305,26 +305,8 @@ message TermsRequest {
}
message TermsResponse {
/**
The node pubkey where the swap payment needs to be paid
to. This can be used to test connectivity before initiating the swap.
*/
string swap_payment_dest = 1;
/**
The base fee for a swap (sat)
*/
int64 swap_fee_base = 2;
/**
The fee rate for a swap (parts per million)
*/
int64 swap_fee_rate = 3;
/**
Required prepay amount
*/
int64 prepay_amt = 4;
reserved 1,2,3,4,7;
/**
Minimum swap amount (sat)
@ -335,11 +317,6 @@ message TermsResponse {
Maximum swap amount (sat)
*/
int64 max_swap_amount = 6;
/**
On-chain cltv expiry delta
*/
int32 cltv_delta = 7;
}
message QuoteRequest {
@ -378,4 +355,15 @@ message QuoteResponse {
An estimate of the on-chain fee that needs to be paid to sweep the HTLC.
*/
int64 miner_fee = 3;
/**
The node pubkey where the swap payment needs to be paid
to. This can be used to test connectivity before initiating the swap.
*/
bytes swap_payment_dest = 4;
/**
On-chain cltv expiry delta
*/
int32 cltv_delta = 5;
}

+ 10
- 24
looprpc/client.swagger.json View File

@ -285,6 +285,16 @@
"type": "string",
"format": "int64",
"description": "*\nAn estimate of the on-chain fee that needs to be paid to sweep the HTLC."
},
"swap_payment_dest": {
"type": "string",
"format": "byte",
"description": "*\nThe node pubkey where the swap payment needs to be paid\nto. This can be used to test connectivity before initiating the swap."
},
"cltv_delta": {
"type": "integer",
"format": "int32",
"title": "*\nOn-chain cltv expiry delta"
}
}
},
@ -377,25 +387,6 @@
"looprpcTermsResponse": {
"type": "object",
"properties": {
"swap_payment_dest": {
"type": "string",
"description": "*\nThe node pubkey where the swap payment needs to be paid\nto. This can be used to test connectivity before initiating the swap."
},
"swap_fee_base": {
"type": "string",
"format": "int64",
"title": "*\nThe base fee for a swap (sat)"
},
"swap_fee_rate": {
"type": "string",
"format": "int64",
"title": "*\nThe fee rate for a swap (parts per million)"
},
"prepay_amt": {
"type": "string",
"format": "int64",
"title": "*\nRequired prepay amount"
},
"min_swap_amount": {
"type": "string",
"format": "int64",
@ -405,11 +396,6 @@
"type": "string",
"format": "int64",
"title": "*\nMaximum swap amount (sat)"
},
"cltv_delta": {
"type": "integer",
"format": "int32",
"title": "*\nOn-chain cltv expiry delta"
}
}
}

Loading…
Cancel
Save