From c16e1703380ee3c3ee0eec6f12d1156c206936d2 Mon Sep 17 00:00:00 2001 From: Wilmer Paulino Date: Tue, 25 Jun 2019 14:41:49 -0400 Subject: [PATCH] multi: expose confirmation target for loop out HTLC sweep --- cmd/loop/loopout.go | 12 ++- cmd/loopd/swapclient_server.go | 13 ++- loopout.go | 6 +- looprpc/client.pb.go | 144 ++++++++++++++++++--------------- looprpc/client.proto | 6 ++ looprpc/client.swagger.json | 5 ++ 6 files changed, 116 insertions(+), 70 deletions(-) diff --git a/cmd/loop/loopout.go b/cmd/loop/loopout.go index 38e54e1..97878ad 100644 --- a/cmd/loop/loopout.go +++ b/cmd/loop/loopout.go @@ -36,6 +36,13 @@ var loopOutCommand = cli.Command{ Name: "amt", Usage: "the amount in satoshis to loop out", }, + cli.Uint64Flag{ + Name: "conf_target", + Usage: "the number of blocks from the swap " + + "initiation height that the on-chain HTLC " + + "should be swept within", + Value: uint64(loop.DefaultSweepConfTarget), + }, }, Action: loopOut, } @@ -75,8 +82,10 @@ func loopOut(ctx *cli.Context) error { } defer cleanup() + sweepConfTarget := int32(ctx.Uint64("conf_target")) quoteReq := &looprpc.QuoteRequest{ - Amt: int64(amt), + Amt: int64(amt), + ConfTarget: sweepConfTarget, } quote, err := client.LoopOutQuote(context.Background(), quoteReq) if err != nil { @@ -103,6 +112,7 @@ func loopOut(ctx *cli.Context) error { MaxPrepayRoutingFee: int64(*limits.maxPrepayRoutingFee), MaxSwapRoutingFee: int64(*limits.maxSwapRoutingFee), LoopOutChannel: unchargeChannel, + SweepConfTarget: sweepConfTarget, }) if err != nil { return err diff --git a/cmd/loopd/swapclient_server.go b/cmd/loopd/swapclient_server.go index 0898a73..89cf775 100644 --- a/cmd/loopd/swapclient_server.go +++ b/cmd/loopd/swapclient_server.go @@ -41,6 +41,13 @@ func (s *swapClientServer) LoopOut(ctx context.Context, logger.Infof("Loop out request received") + sweepConfTarget, err := validateConfTarget( + in.SweepConfTarget, loop.DefaultSweepConfTarget, + ) + if err != nil { + return nil, err + } + var sweepAddr btcutil.Address if in.Dest == "" { // Generate sweep address if none specified. @@ -67,7 +74,7 @@ func (s *swapClientServer) LoopOut(ctx context.Context, MaxPrepayRoutingFee: btcutil.Amount(in.MaxPrepayRoutingFee), MaxSwapRoutingFee: btcutil.Amount(in.MaxSwapRoutingFee), MaxSwapFee: btcutil.Amount(in.MaxSwapFee), - SweepConfTarget: defaultConfTarget, + SweepConfTarget: sweepConfTarget, } if in.LoopOutChannel != 0 { req.LoopOutChannel = &in.LoopOutChannel @@ -249,7 +256,9 @@ func (s *swapClientServer) LoopOutTerms(ctx context.Context, func (s *swapClientServer) LoopOutQuote(ctx context.Context, req *looprpc.QuoteRequest) (*looprpc.QuoteResponse, error) { - confTarget, err := validateConfTarget(req.ConfTarget, defaultConfTarget) + confTarget, err := validateConfTarget( + req.ConfTarget, loop.DefaultSweepConfTarget, + ) if err != nil { return nil, err } diff --git a/loopout.go b/loopout.go index f2129c8..aec79c0 100644 --- a/loopout.go +++ b/loopout.go @@ -20,7 +20,11 @@ import ( var ( // MinLoopOutPreimageRevealDelta configures the minimum number of // remaining blocks before htlc expiry required to reveal preimage. - MinLoopOutPreimageRevealDelta = int32(20) + MinLoopOutPreimageRevealDelta int32 = 20 + + // DefaultSweepConfTarget is the default confirmation target we'll use + // when sweeping on-chain HTLCs. + DefaultSweepConfTarget int32 = 6 ) // loopOutSwap contains all the in-memory state related to a pending loop out diff --git a/looprpc/client.pb.go b/looprpc/client.pb.go index cc9a0bc..b031d89 100644 --- a/looprpc/client.pb.go +++ b/looprpc/client.pb.go @@ -154,7 +154,11 @@ type LoopOutRequest struct { //* //The channel to loop out, the channel to loop out is selected based on the //lowest routing fee for the swap payment to the server. - LoopOutChannel uint64 `protobuf:"varint,8,opt,name=loop_out_channel,json=loopOutChannel,proto3" json:"loop_out_channel,omitempty"` + LoopOutChannel uint64 `protobuf:"varint,8,opt,name=loop_out_channel,json=loopOutChannel,proto3" json:"loop_out_channel,omitempty"` + //* + //The number of blocks from the on-chain HTLC's confirmation height that it + //should be swept within. + SweepConfTarget int32 `protobuf:"varint,9,opt,name=sweep_conf_target,json=sweepConfTarget,proto3" json:"sweep_conf_target,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -241,6 +245,13 @@ func (m *LoopOutRequest) GetLoopOutChannel() uint64 { return 0 } +func (m *LoopOutRequest) GetSweepConfTarget() int32 { + if m != nil { + return m.SweepConfTarget + } + return 0 +} + type LoopInRequest struct { //* //Requested swap amount in sat. This does not include the swap and miner @@ -812,71 +823,72 @@ func init() { func init() { proto.RegisterFile("client.proto", fileDescriptor_014de31d7ac8c57c) } var fileDescriptor_014de31d7ac8c57c = []byte{ - // 1009 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcd, 0x6e, 0xdb, 0x46, - 0x18, 0x8c, 0x28, 0xd9, 0x92, 0x3e, 0x53, 0xb4, 0xbc, 0x4e, 0x1c, 0x55, 0x6d, 0x50, 0x97, 0x6d, - 0x52, 0xc3, 0x07, 0xab, 0x75, 0x0e, 0x45, 0x7b, 0x29, 0x14, 0x99, 0x89, 0x09, 0xc8, 0x96, 0x4a, - 0xd1, 0x01, 0x7a, 0x22, 0x36, 0xd2, 0xca, 0x26, 0x40, 0xee, 0x32, 0xe4, 0xd2, 0x91, 0x51, 0xf4, - 0xd2, 0x37, 0x68, 0xfb, 0x26, 0x45, 0xdf, 0xa4, 0xf7, 0x9e, 0xfa, 0x20, 0xc5, 0xfe, 0x88, 0x11, - 0xa5, 0xf8, 0x92, 0x9b, 0x3c, 0x3b, 0x3b, 0xfb, 0xed, 0xf7, 0xcd, 0x2c, 0x0d, 0xe6, 0x34, 0x0a, - 0x09, 0xe5, 0x27, 0x49, 0xca, 0x38, 0x43, 0xf5, 0x88, 0xb1, 0x24, 0x4d, 0xa6, 0xdd, 0xcf, 0xae, - 0x19, 0xbb, 0x8e, 0x48, 0x0f, 0x27, 0x61, 0x0f, 0x53, 0xca, 0x38, 0xe6, 0x21, 0xa3, 0x99, 0xa2, - 0xd9, 0x7f, 0x19, 0x60, 0x0d, 0x19, 0x4b, 0x46, 0x39, 0xf7, 0xc8, 0xdb, 0x9c, 0x64, 0x1c, 0xb5, - 0xa1, 0x8a, 0x63, 0xde, 0xa9, 0x1c, 0x56, 0x8e, 0xaa, 0x9e, 0xf8, 0x89, 0x10, 0xd4, 0x66, 0x24, - 0xe3, 0x1d, 0xe3, 0xb0, 0x72, 0xd4, 0xf4, 0xe4, 0x6f, 0xd4, 0x83, 0x87, 0x31, 0x5e, 0x04, 0xd9, - 0x3b, 0x9c, 0x04, 0x29, 0xcb, 0x79, 0x48, 0xaf, 0x83, 0x39, 0x21, 0x9d, 0xaa, 0xdc, 0xb6, 0x17, - 0xe3, 0xc5, 0xe4, 0x1d, 0x4e, 0x3c, 0xb5, 0xf2, 0x92, 0x10, 0xf4, 0x1c, 0x0e, 0xc4, 0x86, 0x24, - 0x25, 0x09, 0xbe, 0x2b, 0x6d, 0xa9, 0xc9, 0x2d, 0xfb, 0x31, 0x5e, 0x8c, 0xe5, 0xe2, 0xca, 0xa6, - 0x43, 0x30, 0x8b, 0x53, 0x04, 0x75, 0x4b, 0x52, 0x41, 0xab, 0x0b, 0xc6, 0x57, 0x60, 0xad, 0xc8, - 0x8a, 0xc2, 0xb7, 0x25, 0xc7, 0x2c, 0xe4, 0xfa, 0x31, 0x47, 0x36, 0xb4, 0x04, 0x2b, 0x0e, 0x29, - 0x49, 0xa5, 0x50, 0x5d, 0x92, 0x76, 0x62, 0xbc, 0xb8, 0x10, 0x98, 0x50, 0x3a, 0x82, 0xb6, 0xe8, - 0x59, 0xc0, 0x72, 0x1e, 0x4c, 0x6f, 0x30, 0xa5, 0x24, 0xea, 0x34, 0x0e, 0x2b, 0x47, 0x35, 0xcf, - 0x8a, 0x54, 0x87, 0x06, 0x0a, 0xb5, 0xff, 0xae, 0x40, 0x4b, 0x34, 0xcd, 0xa5, 0xf7, 0xf7, 0x6c, - 0xbd, 0x72, 0x63, 0xa3, 0xf2, 0x8d, 0x9a, 0xaa, 0x9b, 0x35, 0x3d, 0x83, 0x5d, 0x59, 0x53, 0x48, - 0x8b, 0x92, 0x6a, 0xb2, 0xa4, 0x56, 0x24, 0xcf, 0xd7, 0x15, 0xa1, 0x2f, 0xa1, 0x45, 0x16, 0x9c, - 0xa4, 0x14, 0x47, 0xc1, 0x0d, 0x8f, 0xa6, 0xb2, 0x51, 0x0d, 0xcf, 0x5c, 0x82, 0xe7, 0x3c, 0x9a, - 0xda, 0x7d, 0x30, 0xe5, 0x4c, 0x48, 0x96, 0x30, 0x9a, 0x11, 0x64, 0x81, 0x11, 0xce, 0x64, 0xcd, - 0x4d, 0xcf, 0x08, 0x67, 0xe8, 0x0b, 0x30, 0xc5, 0xde, 0x00, 0xcf, 0x66, 0x29, 0xc9, 0x32, 0x3d, - 0xee, 0x1d, 0x81, 0xf5, 0x15, 0x64, 0xb7, 0xc1, 0xba, 0x60, 0x34, 0xe4, 0x2c, 0xd5, 0x37, 0xb7, - 0xff, 0x35, 0x00, 0x84, 0xea, 0x84, 0x63, 0x9e, 0x67, 0x1f, 0x68, 0x84, 0x3a, 0xc5, 0x28, 0x4e, - 0x79, 0x0a, 0x35, 0x7e, 0x97, 0xa8, 0xdb, 0x5a, 0xa7, 0x7b, 0x27, 0xda, 0xa7, 0x27, 0x42, 0xc4, - 0xbf, 0x4b, 0x88, 0x27, 0x97, 0xd1, 0x11, 0x6c, 0x65, 0x1c, 0x73, 0xe5, 0x0e, 0xeb, 0x14, 0x95, - 0x78, 0xe2, 0x30, 0xe2, 0x29, 0x02, 0xfa, 0x1a, 0x76, 0x43, 0x1a, 0xf2, 0x50, 0xfa, 0x3a, 0xe0, - 0x61, 0xbc, 0xb4, 0x89, 0xf5, 0x1e, 0xf6, 0xc3, 0x58, 0x0d, 0x18, 0x67, 0x3c, 0xc8, 0x93, 0x19, - 0xe6, 0x44, 0x31, 0x95, 0x59, 0x2c, 0x81, 0x5f, 0x49, 0x58, 0x32, 0xd7, 0x3b, 0x51, 0xdf, 0xe8, - 0x04, 0xfa, 0x1c, 0x76, 0xa6, 0x2c, 0xe3, 0x41, 0x46, 0xd2, 0x5b, 0x92, 0x4a, 0xa3, 0x54, 0x3d, - 0x10, 0xd0, 0x44, 0x22, 0x42, 0x43, 0x12, 0x18, 0x9d, 0xde, 0xe0, 0x90, 0x76, 0x9a, 0x6a, 0xba, - 0x02, 0x1b, 0x29, 0x48, 0x4c, 0x4d, 0x51, 0xe6, 0x73, 0xc5, 0x01, 0x65, 0x5d, 0xc9, 0xd1, 0x98, - 0x6d, 0x81, 0xe9, 0x93, 0x34, 0xce, 0x96, 0x0d, 0xff, 0xdd, 0x80, 0x96, 0x06, 0xf4, 0x1c, 0x8f, - 0x61, 0x4f, 0xda, 0x2c, 0xc1, 0x77, 0x31, 0xa1, 0x3c, 0x90, 0x59, 0x55, 0x63, 0xdd, 0x15, 0x0b, - 0x63, 0x85, 0x9f, 0x09, 0xa3, 0xda, 0xd0, 0x5a, 0x5a, 0x32, 0x78, 0x83, 0xb3, 0xa5, 0x2f, 0x77, - 0x32, 0x65, 0xca, 0x17, 0x38, 0x23, 0x25, 0x4e, 0x2a, 0x46, 0x50, 0x2d, 0x71, 0x3c, 0xd1, 0xf4, - 0x27, 0x00, 0x2b, 0x91, 0x53, 0x09, 0x6e, 0x26, 0x45, 0xde, 0x9e, 0xc1, 0x6e, 0x1c, 0x52, 0xe5, - 0x7e, 0x1c, 0xb3, 0x9c, 0x72, 0x3d, 0x93, 0x56, 0x1c, 0x52, 0x31, 0xc1, 0xbe, 0x04, 0x25, 0x6f, - 0x99, 0x12, 0xcd, 0xdb, 0xd6, 0x3c, 0x15, 0x14, 0xcd, 0x7b, 0x02, 0x30, 0x8d, 0xf8, 0x6d, 0x30, - 0x23, 0x11, 0xc7, 0x72, 0x1c, 0x5b, 0x5e, 0x53, 0x20, 0x67, 0x02, 0x10, 0xce, 0xfe, 0x29, 0x67, - 0x9c, 0xdc, 0x1f, 0x47, 0x39, 0x2e, 0x3a, 0x0f, 0x38, 0x4e, 0xaf, 0x89, 0x7a, 0xc9, 0xb6, 0xc4, - 0xb8, 0xe8, 0xdc, 0x97, 0x88, 0x3d, 0x87, 0x96, 0x96, 0xd0, 0x5d, 0xfd, 0x04, 0x1a, 0x45, 0x78, - 0x95, 0x50, 0x5d, 0x37, 0x60, 0xed, 0xf2, 0xc6, 0xfa, 0xe5, 0x3f, 0x85, 0xe6, 0x7a, 0xa8, 0x1b, - 0xb1, 0x4e, 0xf4, 0xf1, 0x53, 0x68, 0x2c, 0x9d, 0x8e, 0x4c, 0x68, 0x0c, 0x47, 0xa3, 0x71, 0x30, - 0xba, 0xf2, 0xdb, 0x0f, 0xd0, 0x0e, 0xd4, 0xe5, 0x5f, 0xee, 0x65, 0xbb, 0x72, 0x9c, 0x41, 0xb3, - 0x30, 0x3a, 0x6a, 0x41, 0xd3, 0xbd, 0x74, 0x7d, 0xb7, 0xef, 0x3b, 0x67, 0xed, 0x07, 0xe8, 0x11, - 0xec, 0x8d, 0x3d, 0xc7, 0xbd, 0xe8, 0xbf, 0x72, 0x02, 0xcf, 0x79, 0xed, 0xf4, 0x87, 0xce, 0x59, - 0xbb, 0x82, 0x10, 0x58, 0xe7, 0xfe, 0x70, 0x10, 0x8c, 0xaf, 0x5e, 0x0c, 0xdd, 0xc9, 0xb9, 0x73, - 0xd6, 0x36, 0x84, 0xe6, 0xe4, 0x6a, 0x30, 0x70, 0x26, 0x93, 0x76, 0x15, 0x01, 0x6c, 0xbf, 0xec, - 0xbb, 0x82, 0x5c, 0x43, 0xfb, 0xb0, 0xeb, 0x5e, 0xbe, 0x1e, 0xb9, 0x03, 0x27, 0x98, 0x38, 0xbe, - 0x2f, 0xc0, 0xad, 0xd3, 0x3f, 0x6a, 0x2a, 0xcb, 0x03, 0xf9, 0x21, 0x41, 0x1e, 0xd4, 0xf5, 0xa7, - 0x01, 0x3d, 0x2e, 0xe2, 0x57, 0xfe, 0x58, 0x74, 0x1f, 0x95, 0x72, 0xb9, 0x6c, 0x9e, 0xfd, 0xf8, - 0xb7, 0x7f, 0xfe, 0xfb, 0xd3, 0xd8, 0xb3, 0xcd, 0xde, 0xed, 0xb7, 0x3d, 0xc1, 0xe8, 0xb1, 0x9c, - 0xff, 0x50, 0x39, 0x46, 0xdf, 0xc1, 0xb6, 0x7a, 0x39, 0xd1, 0x41, 0x49, 0xb2, 0x78, 0x4a, 0xef, - 0x51, 0x44, 0xdf, 0x43, 0x5d, 0xbf, 0x3c, 0x2b, 0xc5, 0x94, 0xdf, 0xa2, 0xee, 0xfe, 0xc6, 0x23, - 0x91, 0x67, 0xdf, 0x54, 0xd0, 0xcf, 0x60, 0xea, 0xaa, 0x65, 0x6e, 0xd0, 0xfb, 0x13, 0x56, 0x83, - 0xd5, 0x3d, 0x58, 0x87, 0xf5, 0x5d, 0xba, 0xf2, 0x2e, 0x0f, 0x11, 0x5a, 0xbd, 0x4b, 0x8f, 0x4b, - 0xa9, 0xa0, 0x90, 0x96, 0xe6, 0x59, 0x91, 0x5e, 0xf5, 0xe3, 0x8a, 0x74, 0xc9, 0x63, 0xf6, 0xa1, - 0x94, 0xee, 0xa2, 0x4e, 0x49, 0xfa, 0xad, 0xe0, 0xf4, 0x7e, 0xc1, 0x31, 0xff, 0x15, 0xfd, 0x08, - 0xd6, 0x2b, 0xc2, 0x55, 0x87, 0x3e, 0xa6, 0xfa, 0x92, 0xc0, 0xc7, 0xd4, 0xf8, 0x66, 0x5b, 0xfe, - 0xa3, 0xf0, 0xfc, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xec, 0x90, 0x5b, 0x65, 0x5f, 0x08, 0x00, - 0x00, + // 1028 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x5d, 0x73, 0x1a, 0x37, + 0x14, 0x0d, 0x0b, 0x36, 0x70, 0x0d, 0x0b, 0x56, 0x12, 0x87, 0xd2, 0x66, 0x4a, 0x69, 0x93, 0x32, + 0x7e, 0x30, 0xad, 0xf3, 0xd0, 0x69, 0x5f, 0x3a, 0x04, 0x93, 0x98, 0x19, 0xdb, 0xb8, 0x0b, 0xce, + 0x4c, 0x9f, 0x34, 0x0a, 0x08, 0x7b, 0x67, 0x76, 0xa5, 0xcd, 0x4a, 0xf8, 0x63, 0x3a, 0x7d, 0xe9, + 0x3f, 0x68, 0xfb, 0x57, 0xfa, 0x4f, 0xfa, 0xde, 0xa7, 0xfe, 0x90, 0x8e, 0xae, 0x96, 0x35, 0x0b, + 0xf5, 0x4b, 0xde, 0xf0, 0xd1, 0xd1, 0xd1, 0xd5, 0xbd, 0xe7, 0x68, 0x0d, 0x95, 0x69, 0xe0, 0x73, + 0xa1, 0x0f, 0xa2, 0x58, 0x6a, 0x49, 0x8a, 0x81, 0x94, 0x51, 0x1c, 0x4d, 0x9b, 0x9f, 0x5d, 0x4a, + 0x79, 0x19, 0xf0, 0x2e, 0x8b, 0xfc, 0x2e, 0x13, 0x42, 0x6a, 0xa6, 0x7d, 0x29, 0x94, 0xa5, 0xb5, + 0xff, 0x71, 0xc0, 0x3d, 0x91, 0x32, 0x1a, 0x2d, 0xb4, 0xc7, 0x3f, 0x2c, 0xb8, 0xd2, 0xa4, 0x0e, + 0x79, 0x16, 0xea, 0x46, 0xae, 0x95, 0xeb, 0xe4, 0x3d, 0xf3, 0x93, 0x10, 0x28, 0xcc, 0xb8, 0xd2, + 0x0d, 0xa7, 0x95, 0xeb, 0x94, 0x3d, 0xfc, 0x4d, 0xba, 0xf0, 0x24, 0x64, 0xb7, 0x54, 0xdd, 0xb0, + 0x88, 0xc6, 0x72, 0xa1, 0x7d, 0x71, 0x49, 0xe7, 0x9c, 0x37, 0xf2, 0xb8, 0x6d, 0x37, 0x64, 0xb7, + 0xe3, 0x1b, 0x16, 0x79, 0x76, 0xe5, 0x0d, 0xe7, 0xe4, 0x15, 0xec, 0x99, 0x0d, 0x51, 0xcc, 0x23, + 0x76, 0x97, 0xd9, 0x52, 0xc0, 0x2d, 0x8f, 0x43, 0x76, 0x7b, 0x8e, 0x8b, 0x2b, 0x9b, 0x5a, 0x50, + 0x49, 0x4f, 0x31, 0xd4, 0x2d, 0xa4, 0x42, 0xa2, 0x6e, 0x18, 0x5f, 0x81, 0xbb, 0x22, 0x6b, 0x0a, + 0xdf, 0x46, 0x4e, 0x25, 0x95, 0xeb, 0x85, 0x9a, 0xb4, 0xa1, 0x6a, 0x58, 0xa1, 0x2f, 0x78, 0x8c, + 0x42, 0x45, 0x24, 0xed, 0x84, 0xec, 0xf6, 0xd4, 0x60, 0x46, 0xa9, 0x03, 0x75, 0xd3, 0x33, 0x2a, + 0x17, 0x9a, 0x4e, 0xaf, 0x98, 0x10, 0x3c, 0x68, 0x94, 0x5a, 0xb9, 0x4e, 0xc1, 0x73, 0x03, 0xdb, + 0xa1, 0xbe, 0x45, 0xc9, 0x3e, 0xec, 0xaa, 0x1b, 0xce, 0x23, 0x3a, 0x95, 0x62, 0x4e, 0x35, 0x8b, + 0x2f, 0xb9, 0x6e, 0x94, 0x5b, 0xb9, 0xce, 0x96, 0x57, 0xc3, 0x85, 0xbe, 0x14, 0xf3, 0x09, 0xc2, + 0xed, 0xbf, 0x72, 0x50, 0x35, 0x0d, 0x1e, 0x8a, 0x87, 0xfb, 0xbb, 0x7e, 0x4b, 0x67, 0xe3, 0x96, + 0x1b, 0xf5, 0xe7, 0x37, 0xeb, 0x7f, 0x09, 0x35, 0xac, 0xdf, 0x17, 0x69, 0xf9, 0x05, 0x2c, 0xbf, + 0x1a, 0xe0, 0xf9, 0xcb, 0xea, 0xbf, 0x84, 0x2a, 0xbf, 0xd5, 0x3c, 0x16, 0x2c, 0xa0, 0x57, 0x3a, + 0x98, 0x62, 0x53, 0x4b, 0x5e, 0x65, 0x09, 0x1e, 0xeb, 0x60, 0xda, 0xee, 0x41, 0x05, 0xe7, 0xc7, + 0x55, 0x24, 0x85, 0xe2, 0xc4, 0x05, 0xc7, 0x9f, 0x61, 0xcd, 0x65, 0xcf, 0xf1, 0x67, 0xe4, 0x0b, + 0xa8, 0x98, 0xbd, 0x94, 0xcd, 0x66, 0x31, 0x57, 0x2a, 0xb1, 0xc6, 0x8e, 0xc1, 0x7a, 0x16, 0x6a, + 0xd7, 0xc1, 0x3d, 0x95, 0xc2, 0xd7, 0x32, 0x4e, 0x6e, 0x6e, 0xcc, 0x06, 0x46, 0x75, 0xac, 0x99, + 0x5e, 0xa8, 0xff, 0x69, 0x84, 0x3d, 0xc5, 0x49, 0x4f, 0x79, 0x01, 0x05, 0x7d, 0x17, 0xd9, 0xdb, + 0xba, 0x87, 0xbb, 0x07, 0x89, 0xa7, 0x0f, 0x8c, 0xc8, 0xe4, 0x2e, 0xe2, 0x1e, 0x2e, 0x93, 0x0e, + 0x6c, 0x29, 0xcd, 0xb4, 0x75, 0x92, 0x7b, 0x48, 0x32, 0x3c, 0x73, 0x18, 0xf7, 0x2c, 0x81, 0x7c, + 0x0d, 0x35, 0x5f, 0xf8, 0xda, 0xc7, 0x0c, 0x50, 0xed, 0x87, 0x4b, 0x4b, 0xb9, 0xf7, 0xf0, 0xc4, + 0x0f, 0xad, 0x19, 0x98, 0xd2, 0x74, 0x11, 0xcd, 0x98, 0xe6, 0x96, 0x69, 0x8d, 0xe5, 0x1a, 0xfc, + 0x02, 0x61, 0x64, 0xae, 0x77, 0xa2, 0xb8, 0xd1, 0x09, 0xf2, 0x39, 0xec, 0x4c, 0xa5, 0xd2, 0x54, + 0xf1, 0xf8, 0x9a, 0xc7, 0x68, 0xaa, 0xbc, 0x07, 0x06, 0x1a, 0x23, 0x62, 0x34, 0x90, 0x20, 0xc5, + 0xf4, 0x8a, 0xf9, 0x02, 0xbd, 0x94, 0xf7, 0x70, 0xd3, 0xc8, 0x42, 0x66, 0x6a, 0x96, 0x32, 0x9f, + 0x5b, 0x0e, 0x58, 0x9b, 0x23, 0x27, 0xc1, 0xda, 0x2e, 0x54, 0x26, 0x3c, 0x0e, 0xd5, 0xb2, 0xe1, + 0xbf, 0x3b, 0x50, 0x4d, 0x80, 0x64, 0x8e, 0x68, 0x5d, 0x16, 0xd1, 0x88, 0xdd, 0x85, 0x5c, 0x68, + 0x8a, 0xb9, 0xb6, 0x63, 0xad, 0x99, 0x85, 0x73, 0x8b, 0x1f, 0x19, 0xa3, 0xb6, 0xa1, 0xba, 0xb4, + 0x24, 0x7d, 0xcf, 0xd4, 0xd2, 0x97, 0x3b, 0xca, 0x9a, 0xf2, 0x35, 0x53, 0x3c, 0xc3, 0x89, 0xcd, + 0x08, 0xf2, 0x19, 0x8e, 0x67, 0x9a, 0xfe, 0x1c, 0x60, 0x25, 0x9e, 0x36, 0xed, 0xe5, 0x28, 0xcd, + 0xe6, 0x4b, 0xa8, 0x85, 0xbe, 0xb0, 0xee, 0x67, 0xa1, 0x5c, 0x08, 0x9d, 0xcc, 0xa4, 0x1a, 0xfa, + 0xc2, 0x4c, 0xb0, 0x87, 0x20, 0xf2, 0x96, 0x29, 0x49, 0x78, 0xdb, 0x09, 0xcf, 0x06, 0x25, 0xe1, + 0x3d, 0x07, 0x98, 0x06, 0xfa, 0x9a, 0xce, 0x78, 0xa0, 0x19, 0x8e, 0x63, 0xcb, 0x2b, 0x1b, 0xe4, + 0xc8, 0x00, 0xc6, 0xd9, 0x3f, 0x2d, 0xa4, 0xe6, 0x0f, 0xc7, 0x11, 0xc7, 0x75, 0x1f, 0x6c, 0x07, + 0x15, 0x60, 0x7a, 0x9f, 0xe9, 0x39, 0x54, 0x13, 0x89, 0xa4, 0xab, 0x9f, 0x40, 0x29, 0x0d, 0xaf, + 0x15, 0x2a, 0x26, 0x0d, 0x58, 0xbb, 0xbc, 0xb3, 0x7e, 0xf9, 0x4f, 0xa1, 0xbc, 0x1e, 0xea, 0x52, + 0x98, 0x24, 0x7a, 0xff, 0x05, 0x94, 0x96, 0x4e, 0x27, 0x15, 0x28, 0x9d, 0x8c, 0x46, 0xe7, 0x74, + 0x74, 0x31, 0xa9, 0x3f, 0x22, 0x3b, 0x50, 0xc4, 0xbf, 0x86, 0x67, 0xf5, 0xdc, 0xbe, 0x82, 0x72, + 0x6a, 0x74, 0x52, 0x85, 0xf2, 0xf0, 0x6c, 0x38, 0x19, 0xf6, 0x26, 0x83, 0xa3, 0xfa, 0x23, 0xf2, + 0x14, 0x76, 0xcf, 0xbd, 0xc1, 0xf0, 0xb4, 0xf7, 0x76, 0x40, 0xbd, 0xc1, 0xbb, 0x41, 0xef, 0x64, + 0x70, 0x54, 0xcf, 0x11, 0x02, 0xee, 0xf1, 0xe4, 0xa4, 0x4f, 0xcf, 0x2f, 0x5e, 0x9f, 0x0c, 0xc7, + 0xc7, 0x83, 0xa3, 0xba, 0x63, 0x34, 0xc7, 0x17, 0xfd, 0xfe, 0x60, 0x3c, 0xae, 0xe7, 0x09, 0xc0, + 0xf6, 0x9b, 0xde, 0xd0, 0x90, 0x0b, 0xe4, 0x31, 0xd4, 0x86, 0x67, 0xef, 0x46, 0xc3, 0xfe, 0x80, + 0x8e, 0x07, 0x93, 0x89, 0x01, 0xb7, 0x0e, 0xff, 0x28, 0xd8, 0x2c, 0xf7, 0xf1, 0xa3, 0x43, 0x3c, + 0x28, 0x26, 0x9f, 0x11, 0xf2, 0x2c, 0x8d, 0x5f, 0xf6, 0xc3, 0xd2, 0x7c, 0x9a, 0xc9, 0xe5, 0xb2, + 0x79, 0xed, 0x67, 0xbf, 0xfd, 0xfd, 0xef, 0x9f, 0xce, 0x6e, 0xbb, 0xd2, 0xbd, 0xfe, 0xb6, 0x6b, + 0x18, 0x5d, 0xb9, 0xd0, 0x3f, 0xe4, 0xf6, 0xc9, 0x77, 0xb0, 0x6d, 0x5f, 0x4e, 0xb2, 0x97, 0x91, + 0x4c, 0x9f, 0xd2, 0x07, 0x14, 0xc9, 0xf7, 0x50, 0x4c, 0x5e, 0x9e, 0x95, 0x62, 0xb2, 0x6f, 0x51, + 0xf3, 0xf1, 0xc6, 0x23, 0xb1, 0x50, 0xdf, 0xe4, 0xc8, 0xcf, 0x50, 0x49, 0xaa, 0xc6, 0xdc, 0x90, + 0xfb, 0x13, 0x56, 0x83, 0xd5, 0xdc, 0x5b, 0x87, 0x93, 0xbb, 0x34, 0xf1, 0x2e, 0x4f, 0x08, 0x59, + 0xbd, 0x4b, 0x57, 0xa3, 0x14, 0x4d, 0xa5, 0xd1, 0x3c, 0x2b, 0xd2, 0xab, 0x7e, 0x5c, 0x91, 0xce, + 0x78, 0xac, 0xdd, 0x42, 0xe9, 0x26, 0x69, 0x64, 0xa4, 0x3f, 0x18, 0x4e, 0xf7, 0x17, 0x16, 0xea, + 0x5f, 0xc9, 0x8f, 0xe0, 0xbe, 0xe5, 0xda, 0x76, 0xe8, 0x63, 0xaa, 0xcf, 0x08, 0x7c, 0x4c, 0x8d, + 0xef, 0xb7, 0xf1, 0x9f, 0x8a, 0x57, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x09, 0x80, 0x8f, 0x06, + 0x8b, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/looprpc/client.proto b/looprpc/client.proto index 8390167..fc71202 100644 --- a/looprpc/client.proto +++ b/looprpc/client.proto @@ -127,6 +127,12 @@ message LoopOutRequest { lowest routing fee for the swap payment to the server. */ uint64 loop_out_channel = 8; + + /** + The number of blocks from the on-chain HTLC's confirmation height that it + should be swept within. + */ + int32 sweep_conf_target = 9; } message LoopInRequest { diff --git a/looprpc/client.swagger.json b/looprpc/client.swagger.json index eabec20..50d3d92 100644 --- a/looprpc/client.swagger.json +++ b/looprpc/client.swagger.json @@ -136,6 +136,11 @@ "type": "string", "format": "uint64", "description": "*\nThe channel to loop out, the channel to loop out is selected based on the\nlowest routing fee for the swap payment to the server." + }, + "sweep_conf_target": { + "type": "integer", + "format": "int32", + "description": "*\nThe number of blocks from the on-chain HTLC's confirmation height that it\nshould be swept within." } } },