highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-03-30 12:36:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from LN-Zap/feat/spend-unconfirmed-estimate

Browse Source 
Support spend_unconfirmed in EstimateFee and FundPsbt
This commit is contained in:
Olaoluwa Osuntokun 2021-04-26 15:48:11 -07:00 committed by GitHub
commit bfcaf02f04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 1068 additions and 906 deletions

1433
lnrpc/rpc.pb.go

File diff suppressed because it is too large Load Diff

7
lnrpc/rpc.proto

@ -899,6 +899,13 @@ message EstimateFeeRequest {
// The target number of blocks that this transaction should be confirmed
// by.
int32 target_conf = 2;
// The minimum number of confirmations each one of your outputs used for
// the transaction must satisfy.
int32 min_confs = 3;
// Whether unconfirmed outputs should be used as inputs for the transaction.
bool spend_unconfirmed = 4;
}
message EstimateFeeResponse {

16
lnrpc/rpc.swagger.json

@ -2034,6 +2034,22 @@
"required": false,
"type": "integer",
"format": "int32"
},
{
"name": "min_confs",
"description": "The minimum number of confirmations each one of your outputs used for\nthe transaction must satisfy.",
"in": "query",
"required": false,
"type": "integer",
"format": "int32"
},
{
"name": "spend_unconfirmed",
"description": "Whether unconfirmed outputs should be used as inputs for the transaction.",
"in": "query",
"required": false,
"type": "boolean",
"format": "boolean"
}
],
"tags": [

1
lnrpc/walletrpc/psbt.go

@ -14,7 +14,6 @@ import (
)
const (
defaultMinConf = 1
defaultMaxConf = math.MaxInt32
)

306
lnrpc/walletrpc/walletkit.pb.go

@ -1879,7 +1879,12 @@ type FundPsbtRequest struct {
//
//The name of the account to fund the PSBT with. If empty, the default wallet
//account is used.
Account string `protobuf:"bytes,5,opt,name=account,proto3" json:"account,omitempty"`
Account string `protobuf:"bytes,5,opt,name=account,proto3" json:"account,omitempty"`
// The minimum number of confirmations each one of your outputs used for
// the transaction must satisfy.
MinConfs int32 `protobuf:"varint,6,opt,name=min_confs,json=minConfs,proto3" json:"min_confs,omitempty"`
// Whether unconfirmed outputs should be used as inputs for the transaction.
SpendUnconfirmed bool `protobuf:"varint,7,opt,name=spend_unconfirmed,json=spendUnconfirmed,proto3" json:"spend_unconfirmed,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -1991,6 +1996,20 @@ func (m *FundPsbtRequest) GetAccount() string {
return ""
}
func (m *FundPsbtRequest) GetMinConfs() int32 {
if m != nil {
return m.MinConfs
}
return 0
}
func (m *FundPsbtRequest) GetSpendUnconfirmed() bool {
if m != nil {
return m.SpendUnconfirmed
}
return false
}
// XXX_OneofWrappers is for the internal use of the proto package.
func (*FundPsbtRequest) XXX_OneofWrappers() []interface{} {
return []interface{}{
@ -2403,148 +2422,149 @@ func init() {
func init() { proto.RegisterFile("walletrpc/walletkit.proto", fileDescriptor_6cc6942ac78249e5) }
var fileDescriptor_6cc6942ac78249e5 = []byte{
// 2249 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0x5f, 0x73, 0xe2, 0xc8,
0x11, 0x5f, 0x01, 0xb6, 0xa1, 0x01, 0x1b, 0x0f, 0xf8, 0xcf, 0xb2, 0xde, 0xb3, 0x57, 0x97, 0x64,
0x9d, 0xbb, 0x3d, 0x5c, 0xd9, 0xcb, 0xe6, 0x76, 0x37, 0xa9, 0x54, 0x6c, 0x8c, 0x0b, 0x17, 0xd8,
0x38, 0x02, 0xaf, 0xb3, 0xc9, 0x83, 0x4a, 0x46, 0x63, 0xa3, 0x32, 0x48, 0x3a, 0x69, 0x30, 0x70,
0x4f, 0xf7, 0x35, 0x52, 0x95, 0xef, 0x90, 0xaa, 0x3c, 0xa7, 0xf2, 0x9e, 0xca, 0xb7, 0xc8, 0xe7,
0xc8, 0x43, 0x6a, 0xfe, 0x48, 0x1a, 0x09, 0xec, 0xbb, 0xab, 0xbb, 0x27, 0xa3, 0xfe, 0xf5, 0xf4,
0xf4, 0xf4, 0x9f, 0xe9, 0xee, 0x31, 0x3c, 0x9d, 0x18, 0xc3, 0x21, 0x26, 0x9e, 0xdb, 0x3f, 0xe0,
0xbf, 0xee, 0x2c, 0x52, 0x73, 0x3d, 0x87, 0x38, 0x28, 0x17, 0x42, 0xd5, 0x9c, 0xe7, 0xf6, 0x39,
0xb5, 0x5a, 0xf1, 0xad, 0x5b, 0x9b, 0xb2, 0xd3, 0xbf, 0xd8, 0xe3, 0x54, 0x75, 0x00, 0xa8, 0x6d,
0xf9, 0xe4, 0xd2, 0xf6, 0x5d, 0x6c, 0x13, 0x0d, 0x7f, 0x3d, 0xc6, 0x3e, 0x41, 0xcf, 0x20, 0x37,
0xb2, 0x6c, 0xbd, 0xef, 0xd8, 0x37, 0xfe, 0xb6, 0xb2, 0xa7, 0xec, 0x2f, 0x69, 0xd9, 0x91, 0x65,
0xd7, 0xe9, 0x37, 0x03, 0x8d, 0xa9, 0x00, 0x53, 0x02, 0x34, 0xa6, 0x1c, 0xdc, 0x86, 0x15, 0xa3,
0xdf, 0x77, 0xc6, 0x36, 0xd9, 0x4e, 0xef, 0x29, 0xfb, 0x39, 0x2d, 0xf8, 0x54, 0xdf, 0x42, 0x39,
0xb6, 0x93, 0xef, 0x3a, 0xb6, 0x8f, 0xd1, 0x0b, 0x58, 0x1a, 0x93, 0xa9, 0x43, 0xb7, 0x49, 0xef,
0xe7, 0x5f, 0xe7, 0x6b, 0x43, 0xaa, 0x64, 0xed, 0x92, 0x4c, 0x1d, 0x8d, 0x23, 0xea, 0xb7, 0x0a,
0xa0, 0x36, 0x36, 0x7c, 0xdc, 0x19, 0x13, 0x77, 0x1c, 0x2a, 0xb9, 0x0a, 0x29, 0xcb, 0x64, 0xda,
0x15, 0xb4, 0x94, 0x65, 0xa2, 0xcf, 0x21, 0xeb, 0x8c, 0x89, 0xeb, 0x58, 0x36, 0x61, 0x6a, 0xe5,
0x5f, 0xaf, 0x09, 0x61, 0x9d, 0x31, 0xb9, 0xa0, 0x64, 0x2d, 0x64, 0x40, 0x5f, 0x00, 0xc2, 0x53,
0xd7, 0xf2, 0x0c, 0x62, 0x39, 0xb6, 0xee, 0xe3, 0xbe, 0x63, 0x9b, 0x3e, 0x53, 0x39, 0xa3, 0xad,
0x47, 0x48, 0x97, 0x03, 0xea, 0x1b, 0x28, 0xc7, 0x34, 0x10, 0xca, 0x7f, 0x02, 0x10, 0xf1, 0x32,
0x55, 0x32, 0x9a, 0x44, 0x51, 0xbb, 0x50, 0xd1, 0xf0, 0xf0, 0xa7, 0x55, 0x5d, 0xdd, 0x82, 0x8d,
0x84, 0x50, 0xae, 0x8d, 0xfa, 0x47, 0x58, 0x6e, 0xe1, 0x99, 0x86, 0xbf, 0x46, 0xfb, 0x50, 0xba,
0xc3, 0x33, 0xfd, 0xc6, 0xb2, 0x6f, 0xb1, 0xa7, 0xbb, 0x1e, 0x95, 0xcb, 0xdd, 0xb8, 0x7a, 0x87,
0x67, 0x27, 0x8c, 0x7c, 0x41, 0xa9, 0xe8, 0x39, 0x00, 0xe3, 0x34, 0x46, 0xd6, 0x70, 0x26, 0xbc,
0x99, 0xa3, 0x3c, 0x8c, 0xa0, 0xbe, 0x84, 0xfc, 0xa1, 0x69, 0x7a, 0x81, 0xde, 0x92, 0x77, 0x95,
0xb8, 0x77, 0x55, 0x28, 0x70, 0x46, 0x61, 0x19, 0x04, 0x19, 0xc3, 0x34, 0x3d, 0xc1, 0xc6, 0x7e,
0xab, 0xff, 0x4d, 0xc1, 0xca, 0x21, 0xe7, 0xa7, 0xb8, 0x6d, 0x8c, 0x70, 0x80, 0xd3, 0xdf, 0xe8,
0x1d, 0x14, 0x28, 0x1f, 0xf6, 0x7d, 0x9d, 0xcc, 0x5c, 0xcc, 0xb4, 0x59, 0x7d, 0xbd, 0x59, 0x0b,
0xc3, 0xb9, 0x76, 0xc8, 0xe1, 0xde, 0xcc, 0xc5, 0x5a, 0xde, 0x88, 0x3e, 0x50, 0x0d, 0xca, 0x78,
0x4a, 0xb0, 0x6d, 0x62, 0x53, 0x77, 0xc7, 0xd7, 0x43, 0xab, 0xaf, 0xdf, 0xe1, 0x99, 0x08, 0xc1,
0xf5, 0x00, 0xba, 0x60, 0x48, 0x0b, 0xcf, 0xd0, 0xaf, 0x61, 0x73, 0x64, 0xf8, 0x04, 0x7b, 0x7a,
0x64, 0x27, 0x6e, 0xa6, 0xcc, 0x9e, 0xb2, 0x5f, 0xd4, 0x2a, 0x1c, 0x6d, 0x05, 0xc6, 0x62, 0x18,
0x7a, 0x09, 0x6b, 0x26, 0xf6, 0xac, 0x7b, 0x1e, 0x34, 0xae, 0x41, 0x06, 0xdb, 0x4b, 0x6c, 0x87,
0xd5, 0x88, 0x7c, 0x61, 0x90, 0x01, 0x7a, 0x45, 0xa3, 0x8b, 0x60, 0xcf, 0x36, 0x86, 0x6c, 0x03,
0x6e, 0xb2, 0x65, 0x26, 0xba, 0x14, 0x20, 0x2d, 0x3c, 0xab, 0x33, 0x5b, 0xbc, 0x02, 0x64, 0xd9,
0x73, 0xdc, 0x2b, 0x9c, 0x3b, 0x40, 0x42, 0xee, 0xe7, 0x00, 0x13, 0x83, 0xf4, 0x07, 0xba, 0x63,
0x0f, 0x67, 0xdb, 0xd9, 0x3d, 0x65, 0x3f, 0xab, 0xe5, 0x18, 0xa5, 0x63, 0x0f, 0x67, 0xaa, 0xc9,
0xd3, 0x4c, 0xd8, 0xd9, 0x0f, 0x3c, 0xf7, 0xd3, 0xda, 0x5b, 0x3d, 0x81, 0x4a, 0x7c, 0x17, 0xe1,
0xf6, 0x1a, 0x64, 0x45, 0x44, 0x04, 0x09, 0x8d, 0x64, 0x71, 0x1c, 0xd2, 0x42, 0x1e, 0xf5, 0x3f,
0x0a, 0x54, 0x4e, 0x47, 0xae, 0xe3, 0x05, 0xa2, 0x1e, 0xd3, 0xf7, 0x01, 0x27, 0xa7, 0x7e, 0xb8,
0x93, 0xd3, 0x8f, 0x38, 0x39, 0x69, 0x95, 0xcc, 0xf7, 0xb7, 0xca, 0x16, 0x6c, 0x24, 0x0e, 0x23,
0x32, 0xd3, 0x83, 0x4d, 0x0e, 0x84, 0xca, 0x05, 0xe7, 0x7c, 0x0e, 0x20, 0x1d, 0x85, 0xdf, 0x08,
0x39, 0x37, 0x3c, 0xc2, 0x8f, 0x70, 0xd1, 0x53, 0xd8, 0x9a, 0xdb, 0x53, 0xa8, 0xf3, 0x1e, 0xf2,
0x3d, 0xcf, 0xb0, 0x7d, 0xa3, 0x4f, 0x23, 0x16, 0x6d, 0xc0, 0x32, 0x99, 0xea, 0x03, 0x3c, 0x15,
0xfb, 0x2f, 0x91, 0x69, 0x13, 0x4f, 0x51, 0x05, 0x96, 0x86, 0xc6, 0x35, 0x1e, 0x0a, 0x03, 0xf3,
0x0f, 0xf5, 0x37, 0xb0, 0xc6, 0x04, 0xfa, 0x83, 0xd0, 0xe9, 0x9f, 0x42, 0xd1, 0xe5, 0x24, 0x1d,
0x7b, 0x9e, 0x13, 0x24, 0x7d, 0x41, 0x10, 0x1b, 0x94, 0xa6, 0xfe, 0x53, 0x01, 0xd4, 0xc5, 0xb6,
0xc9, 0xef, 0xac, 0x30, 0x2e, 0x77, 0x00, 0x7c, 0x83, 0xe8, 0x2e, 0x75, 0xd2, 0x84, 0x2d, 0x4c,
0x6b, 0x59, 0xdf, 0x20, 0x17, 0xd8, 0x6b, 0x4d, 0xd0, 0x3e, 0xac, 0x38, 0x9c, 0x7f, 0x3b, 0xc5,
0xa2, 0x69, 0xb5, 0x26, 0xaa, 0x58, 0xad, 0x37, 0xed, 0x8c, 0x89, 0x16, 0xc0, 0x91, 0xb2, 0x69,
0x49, 0xd9, 0x78, 0x1d, 0xcb, 0x24, 0xea, 0xd8, 0xe7, 0xb0, 0x4e, 0x4b, 0x91, 0xa9, 0x8f, 0x6d,
0xca, 0x60, 0x79, 0x23, 0x6c, 0xb2, 0x7c, 0xce, 0x6a, 0x25, 0x06, 0x5c, 0x46, 0x74, 0xf5, 0x15,
0x94, 0x63, 0xda, 0x8b, 0xa3, 0x6f, 0xc0, 0xb2, 0x67, 0x4c, 0x74, 0x12, 0x9a, 0xce, 0x33, 0x26,
0xbd, 0xa9, 0xfa, 0x06, 0x50, 0xc3, 0x27, 0xd6, 0xc8, 0x20, 0xf8, 0x04, 0xe3, 0xe0, 0xac, 0xbb,
0x90, 0xa7, 0x02, 0x75, 0x62, 0x78, 0xb7, 0x38, 0xb8, 0x90, 0x81, 0x92, 0x7a, 0x8c, 0xa2, 0x7e,
0x09, 0xe5, 0xd8, 0x32, 0xb1, 0xc9, 0xa3, 0x36, 0x52, 0xff, 0x97, 0x86, 0xc2, 0x05, 0xb6, 0x4d,
0xcb, 0xbe, 0xed, 0x4e, 0x30, 0x76, 0x63, 0xc5, 0x44, 0xf9, 0xae, 0x3a, 0xf8, 0x0e, 0x0a, 0x13,
0x8b, 0xd8, 0x8f, 0x04, 0xd8, 0x15, 0x87, 0x79, 0x80, 0x4d, 0xa2, 0x0f, 0x1a, 0xba, 0xc6, 0x88,
0x86, 0xb9, 0xee, 0x1b, 0x41, 0x4a, 0xe5, 0x38, 0xa5, 0x6b, 0x10, 0xf4, 0x33, 0x28, 0x04, 0x5a,
0x5f, 0xcf, 0x08, 0xcf, 0xa3, 0xe2, 0x51, 0x6a, 0x5b, 0xd1, 0x80, 0xeb, 0x7e, 0x34, 0x23, 0x98,
0xd6, 0xe1, 0x6b, 0xcf, 0x31, 0xcc, 0xbe, 0xe1, 0x13, 0xdd, 0x20, 0x04, 0x8f, 0x5c, 0xe2, 0x33,
0x2f, 0x14, 0xb5, 0xf5, 0x10, 0x39, 0x14, 0x00, 0x7a, 0x0d, 0x1b, 0x36, 0x9e, 0x12, 0x3d, 0x5a,
0x33, 0xc0, 0xd6, 0xed, 0x20, 0xb8, 0x5b, 0xcb, 0x14, 0x3c, 0x0a, 0xb0, 0x26, 0x83, 0xe8, 0x1a,
0x8f, 0x7b, 0x00, 0x9b, 0xba, 0xec, 0x80, 0x2c, 0x5f, 0x13, 0x82, 0xf5, 0xd0, 0x13, 0xe8, 0x2b,
0xd8, 0x8c, 0xd6, 0xc4, 0x8e, 0x91, 0x0b, 0x8f, 0x11, 0x2d, 0xec, 0x46, 0xe7, 0x51, 0xa1, 0x18,
0xb0, 0xdf, 0x33, 0x7e, 0x60, 0x4d, 0x41, 0x9e, 0x1f, 0xf9, 0x03, 0x25, 0xa1, 0x37, 0xb0, 0x35,
0x2f, 0x9c, 0x73, 0xe7, 0x19, 0x77, 0x25, 0x21, 0x99, 0x2f, 0xab, 0xc0, 0xd2, 0x8d, 0xe3, 0xf5,
0x31, 0xab, 0x0c, 0x59, 0x8d, 0x7f, 0xa8, 0x9b, 0x50, 0x91, 0xbd, 0x1f, 0x24, 0x96, 0x7a, 0x05,
0x1b, 0x09, 0xba, 0x88, 0xa6, 0xdf, 0xc3, 0xaa, 0xcb, 0x01, 0xdd, 0x67, 0x88, 0xb8, 0xa8, 0xb7,
0x24, 0x9f, 0xcb, 0x2b, 0xb5, 0xa2, 0x2b, 0xcb, 0x51, 0xff, 0xa5, 0xc0, 0xea, 0xd1, 0x78, 0xe4,
0x4a, 0x81, 0xfd, 0x83, 0x22, 0x6e, 0x17, 0xf2, 0xdc, 0xfe, 0xcc, 0x17, 0x2c, 0xe0, 0x8a, 0x1a,
0x70, 0x12, 0xf5, 0xc0, 0x5c, 0xe0, 0xa4, 0x17, 0x06, 0x4e, 0x68, 0x8d, 0x8c, 0x64, 0x8d, 0x79,
0xf3, 0x2f, 0xcd, 0x99, 0x5f, 0x5d, 0x87, 0xb5, 0x50, 0x7f, 0x71, 0x21, 0x7e, 0x01, 0xeb, 0xb4,
0x9c, 0xc5, 0x2c, 0x48, 0x9b, 0x9d, 0x7b, 0xec, 0x5d, 0x3b, 0x3e, 0xaf, 0x42, 0x59, 0x2d, 0xf8,
0x54, 0xbf, 0x4d, 0xf1, 0xae, 0x39, 0x61, 0xd9, 0x36, 0x94, 0x49, 0x74, 0xad, 0xea, 0x26, 0x26,
0x86, 0x35, 0xf4, 0x85, 0x45, 0x9e, 0x0a, 0x8b, 0x48, 0x17, 0xef, 0x31, 0x67, 0x68, 0x3e, 0xd1,
0x10, 0x99, 0xa3, 0xa2, 0x2b, 0x58, 0x93, 0xa5, 0x59, 0xa6, 0x2f, 0x5a, 0xc3, 0x57, 0x92, 0xa3,
0xe6, 0xb5, 0x90, 0x37, 0x38, 0x3d, 0xa6, 0xc2, 0x57, 0x25, 0x31, 0xa7, 0xa6, 0x5f, 0x7d, 0x07,
0xab, 0x71, 0x1e, 0xda, 0xd7, 0x24, 0xb7, 0xa2, 0x31, 0x91, 0x4b, 0x2e, 0x3d, 0xca, 0xc2, 0x32,
0x8f, 0x19, 0xd5, 0x80, 0xad, 0x36, 0xbd, 0x62, 0x25, 0x49, 0x52, 0xe9, 0x26, 0xd3, 0xb0, 0xbd,
0x65, 0xbf, 0x17, 0xd7, 0x12, 0xb4, 0x03, 0x39, 0xe7, 0x1e, 0x7b, 0x13, 0xcf, 0x12, 0x6e, 0xce,
0x6a, 0x11, 0x41, 0xad, 0xc2, 0xf6, 0xfc, 0x16, 0xc2, 0x61, 0xff, 0x56, 0x60, 0xed, 0x64, 0x6c,
0x9b, 0x17, 0xfe, 0x75, 0xd8, 0x32, 0x54, 0x20, 0xe3, 0xfa, 0xd7, 0x3c, 0x02, 0x0b, 0xcd, 0x27,
0x1a, 0xfb, 0x42, 0xbf, 0x84, 0xb4, 0x67, 0x4c, 0x84, 0xe9, 0x36, 0x24, 0xd3, 0xf5, 0xa6, 0x3d,
0x3c, 0x72, 0x87, 0x06, 0xc1, 0xcd, 0x27, 0x1a, 0xe5, 0x41, 0x2f, 0xe2, 0x91, 0xc9, 0xe2, 0xae,
0xa9, 0x24, 0x62, 0x33, 0x11, 0x5f, 0x34, 0xfa, 0x32, 0x4d, 0x25, 0x9e, 0xe0, 0x52, 0x9b, 0xbc,
0x14, 0x6b, 0x93, 0x8f, 0x00, 0xb2, 0x44, 0xec, 0x7a, 0xb4, 0x0c, 0x99, 0x1b, 0x8c, 0x7d, 0xf5,
0x6f, 0x0a, 0x94, 0xa2, 0xb3, 0x88, 0x58, 0xda, 0x85, 0xfc, 0xcd, 0x98, 0x77, 0x3a, 0xe1, 0x99,
0x34, 0xe0, 0x24, 0xca, 0x48, 0x9b, 0xa1, 0xfe, 0xc0, 0xb0, 0x6f, 0xb1, 0xce, 0x4b, 0xa0, 0x6e,
0xd9, 0x26, 0x9e, 0x8a, 0x0e, 0x7e, 0x9d, 0x43, 0xbc, 0x5a, 0x9d, 0x52, 0x00, 0x7d, 0x05, 0x85,
0xa1, 0xd3, 0xbf, 0xc3, 0xa6, 0xce, 0xc7, 0xad, 0x34, 0x4b, 0xfa, 0x8a, 0x64, 0x10, 0x3a, 0x72,
0xb1, 0x21, 0x47, 0xcb, 0x73, 0xce, 0x4b, 0x36, 0x7d, 0xfd, 0x5d, 0x01, 0x88, 0x6c, 0x85, 0x5e,
0xc2, 0xb2, 0x65, 0xb3, 0x8a, 0xcc, 0xaf, 0x8d, 0xb9, 0x4c, 0x17, 0x30, 0xfa, 0x5d, 0xb2, 0x76,
0xab, 0x0b, 0x8d, 0x5f, 0x13, 0x25, 0xb5, 0x61, 0x13, 0x6f, 0x16, 0xd6, 0xf3, 0xea, 0x7b, 0x28,
0xc8, 0x00, 0x2a, 0x41, 0x3a, 0x68, 0x90, 0x72, 0x1a, 0xfd, 0x49, 0x43, 0xea, 0xde, 0x18, 0x8e,
0x79, 0xc9, 0xca, 0x68, 0xfc, 0xe3, 0x7d, 0xea, 0xad, 0xa2, 0x0e, 0x20, 0x17, 0x9e, 0xe5, 0xc7,
0x4d, 0x89, 0xf1, 0xf9, 0x2e, 0x3d, 0x37, 0xdf, 0x5d, 0x40, 0xf9, 0xc4, 0xb2, 0x8d, 0xa1, 0xf5,
0x0d, 0x96, 0x23, 0xf1, 0x3b, 0x9d, 0xf7, 0x60, 0x80, 0xa8, 0x1f, 0xa1, 0x12, 0x97, 0x18, 0xc5,
0x03, 0x9b, 0xdb, 0xe3, 0x22, 0x39, 0x89, 0x89, 0xdc, 0x83, 0x02, 0xed, 0x44, 0x6e, 0xe8, 0x62,
0xda, 0x8f, 0xa4, 0x38, 0x87, 0x67, 0x4c, 0x98, 0xbc, 0xde, 0x54, 0x2d, 0xf3, 0x4b, 0x8e, 0x99,
0x25, 0x2c, 0x13, 0x67, 0xfc, 0x26, 0x0b, 0x88, 0x62, 0xb7, 0x64, 0xb0, 0x28, 0xdf, 0x33, 0x58,
0x3e, 0xfb, 0x86, 0xcf, 0x8b, 0x41, 0x8b, 0x90, 0x87, 0x95, 0xcb, 0xf3, 0xd6, 0x79, 0xe7, 0xea,
0xbc, 0xf4, 0x04, 0x6d, 0x41, 0xf9, 0xea, 0xb4, 0x77, 0xde, 0xe8, 0x76, 0xf5, 0x8b, 0xcb, 0xa3,
0x56, 0xe3, 0xa3, 0xde, 0x3c, 0xec, 0x36, 0x4b, 0x0a, 0xfa, 0x04, 0xaa, 0xe7, 0x8d, 0x6e, 0xaf,
0x71, 0xac, 0x2f, 0xc2, 0x53, 0xe8, 0xe7, 0xf0, 0xa2, 0xf9, 0xf1, 0x48, 0x3b, 0x3d, 0xd6, 0x1f,
0x61, 0x4b, 0x7f, 0xf6, 0xd7, 0x34, 0xe4, 0xa5, 0x66, 0x05, 0x95, 0x61, 0x4d, 0x6c, 0x1e, 0x2c,
0x28, 0x3d, 0x41, 0xdb, 0x50, 0xa9, 0x77, 0xce, 0xce, 0x4e, 0x7b, 0x67, 0x8d, 0xf3, 0x9e, 0xde,
0x3b, 0x3d, 0x6b, 0xe8, 0xed, 0x4e, 0xbd, 0x55, 0x52, 0xa8, 0x7a, 0x12, 0x72, 0xde, 0xd1, 0x8f,
0x1b, 0xed, 0xc3, 0x8f, 0xa5, 0x14, 0xda, 0x80, 0x75, 0x09, 0xd0, 0x1a, 0x1f, 0x3a, 0xad, 0x46,
0x29, 0x4d, 0xf9, 0x9b, 0xbd, 0x76, 0x5d, 0xef, 0x9c, 0x9c, 0x34, 0xb4, 0xc6, 0x71, 0x00, 0x64,
0xe8, 0x16, 0x0c, 0x38, 0xac, 0xd7, 0x1b, 0x17, 0xbd, 0x08, 0x59, 0x62, 0x07, 0x91, 0x97, 0xd0,
0xed, 0x3b, 0x97, 0x3d, 0xbd, 0xdb, 0xa8, 0x77, 0xce, 0x8f, 0xf5, 0x76, 0xe3, 0x43, 0xa3, 0x5d,
0x5a, 0x46, 0xbf, 0x00, 0x35, 0x2e, 0xa0, 0x7b, 0x59, 0xaf, 0xd3, 0xf3, 0xc6, 0xf8, 0x56, 0xd0,
0x2e, 0x3c, 0x4b, 0x68, 0x70, 0xd6, 0xe9, 0x35, 0x02, 0xa9, 0xa5, 0x2c, 0xda, 0x83, 0x9d, 0xa4,
0x26, 0x8c, 0x43, 0xc8, 0x2b, 0xe5, 0xd0, 0x0e, 0x6c, 0x33, 0x0e, 0x59, 0x72, 0xa0, 0x2f, 0xa0,
0x0a, 0x94, 0x02, 0x53, 0x87, 0x76, 0xce, 0xa3, 0x67, 0xb0, 0x95, 0xf0, 0x43, 0x08, 0x16, 0x12,
0xc6, 0x3a, 0x3c, 0xaf, 0x37, 0x3b, 0x5a, 0xa9, 0xf8, 0xfa, 0x1f, 0x79, 0xc8, 0x5d, 0xb1, 0xe0,
0x69, 0x59, 0x04, 0xb5, 0x21, 0x2f, 0x3d, 0x05, 0xa1, 0xe7, 0x89, 0x82, 0x16, 0x7f, 0x8c, 0xaa,
0x7e, 0xf2, 0x10, 0x1c, 0x96, 0xdd, 0xbc, 0xf4, 0x36, 0x13, 0x97, 0x36, 0xf7, 0xf4, 0x12, 0x97,
0xb6, 0xe0, 0x49, 0x47, 0x83, 0x62, 0xec, 0x75, 0x05, 0xed, 0x4a, 0x0b, 0x16, 0x3d, 0xe6, 0x54,
0xf7, 0x1e, 0x66, 0x10, 0x32, 0x4f, 0x01, 0xa2, 0x24, 0x43, 0x3b, 0x89, 0xf3, 0xc4, 0x12, 0xb2,
0xfa, 0xfc, 0x01, 0x54, 0x88, 0x7a, 0x0f, 0xc5, 0x63, 0xec, 0x59, 0xf7, 0xf8, 0x1c, 0x4f, 0x09,
0x9d, 0x10, 0xd7, 0x25, 0x7e, 0x3e, 0x57, 0x56, 0x37, 0xc3, 0x21, 0xa9, 0x85, 0x67, 0xc7, 0xd8,
0xef, 0x7b, 0x96, 0x4b, 0x1c, 0x0f, 0xbd, 0x85, 0x1c, 0x5f, 0x4b, 0xd7, 0x95, 0x65, 0xa6, 0xb6,
0xd3, 0x37, 0x88, 0xe3, 0x3d, 0xb8, 0xf2, 0xb7, 0x90, 0xa5, 0xfb, 0xd1, 0xd4, 0x46, 0xc9, 0xe1,
0x33, 0x50, 0x7c, 0x6b, 0x8e, 0x2e, 0x54, 0xee, 0x40, 0x41, 0x7e, 0x2b, 0x40, 0x49, 0x7f, 0x26,
0x9e, 0x2a, 0xaa, 0xbb, 0x0f, 0xe2, 0x91, 0x8b, 0x62, 0x63, 0x76, 0xcc, 0x45, 0x8b, 0x5e, 0x13,
0x62, 0x2e, 0x5a, 0x38, 0xa1, 0xa3, 0x3f, 0xc1, 0x5a, 0x62, 0x5a, 0x46, 0x2f, 0xe6, 0x16, 0x25,
0xa7, 0xf7, 0xaa, 0xfa, 0x18, 0x8b, 0x90, 0xdc, 0x04, 0x24, 0x06, 0x66, 0x79, 0xe6, 0x96, 0xad,
0x28, 0xd1, 0xab, 0x55, 0xb9, 0x0b, 0x4f, 0xcc, 0xd9, 0x6d, 0xc8, 0x4b, 0x33, 0x68, 0x2c, 0xd0,
0xe7, 0x27, 0xeb, 0x58, 0xa0, 0x2f, 0x1a, 0x5d, 0xdb, 0x90, 0x97, 0x86, 0xcd, 0x98, 0xb4, 0xf9,
0xd9, 0x35, 0x26, 0x6d, 0xd1, 0x8c, 0xaa, 0x41, 0x31, 0x36, 0x6e, 0xc4, 0x7c, 0xb2, 0x68, 0x40,
0x89, 0xf9, 0x64, 0xf1, 0xa4, 0xf2, 0x07, 0x58, 0x11, 0x8d, 0x3a, 0x7a, 0x2a, 0x31, 0xc7, 0x87,
0x8f, 0x98, 0xc5, 0x12, 0x7d, 0x7d, 0x90, 0x78, 0x42, 0xa5, 0x9d, 0x07, 0x1a, 0xe7, 0xc5, 0x89,
0x97, 0x50, 0xe6, 0x2f, 0x50, 0x4a, 0x76, 0xa3, 0x48, 0x76, 0xff, 0x03, 0xdd, 0x70, 0xf5, 0xd3,
0x47, 0x79, 0x84, 0xf0, 0x3a, 0x64, 0x83, 0x0e, 0x10, 0xc9, 0xe7, 0x49, 0xb4, 0xb8, 0xd5, 0x67,
0x0b, 0xb1, 0x28, 0xcf, 0xe4, 0xd6, 0x21, 0x96, 0x67, 0x0b, 0xba, 0x94, 0x58, 0x9e, 0x2d, 0xea,
0x39, 0x8e, 0x7e, 0xf5, 0xe7, 0x83, 0x5b, 0x8b, 0x0c, 0xc6, 0xd7, 0xb5, 0xbe, 0x33, 0x3a, 0x18,
0xd2, 0x61, 0xda, 0xb6, 0xec, 0x5b, 0x1b, 0x93, 0x89, 0xe3, 0xdd, 0x1d, 0x0c, 0x6d, 0xf3, 0x80,
0x75, 0x4e, 0x07, 0xa1, 0x9c, 0xeb, 0x65, 0xf6, 0x5f, 0x85, 0x2f, 0xff, 0x1f, 0x00, 0x00, 0xff,
0xff, 0x0a, 0xc3, 0xd3, 0xee, 0x9e, 0x18, 0x00, 0x00,
// 2262 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0x5f, 0x53, 0xe3, 0xc8,
0x11, 0x5f, 0xff, 0x01, 0xec, 0xb6, 0x0d, 0x66, 0x6c, 0xfe, 0xac, 0x97, 0x5d, 0x58, 0x5d, 0x92,
0x25, 0x77, 0x7b, 0xa6, 0xc2, 0x65, 0x73, 0xbb, 0x9b, 0x54, 0x2a, 0x60, 0x4c, 0x99, 0xb2, 0xc1,
0x8e, 0x6c, 0x96, 0x6c, 0xf2, 0xa0, 0x12, 0xd6, 0x80, 0x55, 0xd8, 0x92, 0x4e, 0x1a, 0x63, 0xfb,
0x9e, 0xee, 0x3b, 0xe4, 0x29, 0x55, 0xf9, 0x0e, 0xa9, 0xca, 0x73, 0x2a, 0x5f, 0x20, 0xdf, 0x22,
0x9f, 0x23, 0x0f, 0xa9, 0xf9, 0x23, 0x69, 0x24, 0x1b, 0x6e, 0xaf, 0xee, 0x9e, 0xb0, 0xfa, 0xd7,
0xdd, 0xd3, 0xd3, 0xdd, 0x33, 0xdd, 0x3d, 0xc0, 0xd3, 0x89, 0x3e, 0x1c, 0x62, 0xe2, 0x3a, 0xfd,
0x03, 0xfe, 0xeb, 0xce, 0x24, 0x55, 0xc7, 0xb5, 0x89, 0x8d, 0xb2, 0x01, 0x54, 0xc9, 0xba, 0x4e,
0x9f, 0x53, 0x2b, 0x65, 0xcf, 0xbc, 0xb5, 0x28, 0x3b, 0xfd, 0x8b, 0x5d, 0x4e, 0x55, 0x06, 0x80,
0x5a, 0xa6, 0x47, 0x2e, 0x2d, 0xcf, 0xc1, 0x16, 0x51, 0xf1, 0x37, 0x63, 0xec, 0x11, 0xf4, 0x0c,
0xb2, 0x23, 0xd3, 0xd2, 0xfa, 0xb6, 0x75, 0xe3, 0x6d, 0x27, 0xf6, 0x12, 0xfb, 0x4b, 0x6a, 0x66,
0x64, 0x5a, 0x35, 0xfa, 0xcd, 0x40, 0x7d, 0x2a, 0xc0, 0xa4, 0x00, 0xf5, 0x29, 0x07, 0xb7, 0x61,
0x45, 0xef, 0xf7, 0xed, 0xb1, 0x45, 0xb6, 0x53, 0x7b, 0x89, 0xfd, 0xac, 0xea, 0x7f, 0x2a, 0x6f,
0xa1, 0x14, 0x59, 0xc9, 0x73, 0x6c, 0xcb, 0xc3, 0xe8, 0x25, 0x2c, 0x8d, 0xc9, 0xd4, 0xa6, 0xcb,
0xa4, 0xf6, 0x73, 0x87, 0xb9, 0xea, 0x90, 0x1a, 0x59, 0xbd, 0x24, 0x53, 0x5b, 0xe5, 0x88, 0xf2,
0x5d, 0x02, 0x50, 0x0b, 0xeb, 0x1e, 0x6e, 0x8f, 0x89, 0x33, 0x0e, 0x8c, 0x5c, 0x85, 0xa4, 0x69,
0x30, 0xeb, 0xf2, 0x6a, 0xd2, 0x34, 0xd0, 0x17, 0x90, 0xb1, 0xc7, 0xc4, 0xb1, 0x4d, 0x8b, 0x30,
0xb3, 0x72, 0x87, 0x6b, 0x42, 0x59, 0x7b, 0x4c, 0x3a, 0x94, 0xac, 0x06, 0x0c, 0xe8, 0x4b, 0x40,
0x78, 0xea, 0x98, 0xae, 0x4e, 0x4c, 0xdb, 0xd2, 0x3c, 0xdc, 0xb7, 0x2d, 0xc3, 0x63, 0x26, 0xa7,
0xd5, 0xf5, 0x10, 0xe9, 0x72, 0x40, 0x79, 0x03, 0xa5, 0x88, 0x05, 0xc2, 0xf8, 0x17, 0x00, 0x21,
0x2f, 0x33, 0x25, 0xad, 0x4a, 0x14, 0xa5, 0x0b, 0x65, 0x15, 0x0f, 0x7f, 0x5a, 0xd3, 0x95, 0x2d,
0xd8, 0x88, 0x29, 0xe5, 0xd6, 0x28, 0x7f, 0x84, 0xe5, 0x26, 0x9e, 0xa9, 0xf8, 0x1b, 0xb4, 0x0f,
0xc5, 0x3b, 0x3c, 0xd3, 0x6e, 0x4c, 0xeb, 0x16, 0xbb, 0x9a, 0xe3, 0x52, 0xbd, 0x3c, 0x8c, 0xab,
0x77, 0x78, 0x76, 0xca, 0xc8, 0x1d, 0x4a, 0x45, 0xcf, 0x01, 0x18, 0xa7, 0x3e, 0x32, 0x87, 0x33,
0x11, 0xcd, 0x2c, 0xe5, 0x61, 0x04, 0xe5, 0x15, 0xe4, 0x8e, 0x0c, 0xc3, 0xf5, 0xed, 0x96, 0xa2,
0x9b, 0x88, 0x46, 0x57, 0x81, 0x3c, 0x67, 0x14, 0x9e, 0x41, 0x90, 0xd6, 0x0d, 0xc3, 0x15, 0x6c,
0xec, 0xb7, 0xf2, 0xdf, 0x24, 0xac, 0x1c, 0x71, 0x7e, 0x8a, 0x5b, 0xfa, 0x08, 0xfb, 0x38, 0xfd,
0x8d, 0xde, 0x41, 0x9e, 0xf2, 0x61, 0xcf, 0xd3, 0xc8, 0xcc, 0xc1, 0xcc, 0x9a, 0xd5, 0xc3, 0xcd,
0x6a, 0x90, 0xce, 0xd5, 0x23, 0x0e, 0xf7, 0x66, 0x0e, 0x56, 0x73, 0x7a, 0xf8, 0x81, 0xaa, 0x50,
0xc2, 0x53, 0x82, 0x2d, 0x03, 0x1b, 0x9a, 0x33, 0xbe, 0x1e, 0x9a, 0x7d, 0xed, 0x0e, 0xcf, 0x44,
0x0a, 0xae, 0xfb, 0x50, 0x87, 0x21, 0x4d, 0x3c, 0x43, 0xbf, 0x86, 0xcd, 0x91, 0xee, 0x11, 0xec,
0x6a, 0xa1, 0x9f, 0xb8, 0x9b, 0xd2, 0x7b, 0x89, 0xfd, 0x82, 0x5a, 0xe6, 0x68, 0xd3, 0x77, 0x16,
0xc3, 0xd0, 0x2b, 0x58, 0x33, 0xb0, 0x6b, 0xde, 0xf3, 0xa4, 0x71, 0x74, 0x32, 0xd8, 0x5e, 0x62,
0x2b, 0xac, 0x86, 0xe4, 0x8e, 0x4e, 0x06, 0xe8, 0x35, 0xcd, 0x2e, 0x82, 0x5d, 0x4b, 0x1f, 0xb2,
0x05, 0xb8, 0xcb, 0x96, 0x99, 0xea, 0xa2, 0x8f, 0x34, 0xf1, 0xac, 0xc6, 0x7c, 0xf1, 0x1a, 0x90,
0x69, 0xcd, 0x71, 0xaf, 0x70, 0x6e, 0x1f, 0x09, 0xb8, 0x9f, 0x03, 0x4c, 0x74, 0xd2, 0x1f, 0x68,
0xb6, 0x35, 0x9c, 0x6d, 0x67, 0xf6, 0x12, 0xfb, 0x19, 0x35, 0xcb, 0x28, 0x6d, 0x6b, 0x38, 0x53,
0x0c, 0x7e, 0xcc, 0x84, 0x9f, 0x3d, 0x3f, 0x72, 0x3f, 0xad, 0xbf, 0x95, 0x53, 0x28, 0x47, 0x57,
0x11, 0x61, 0xaf, 0x42, 0x46, 0x64, 0x84, 0x7f, 0xa0, 0x91, 0xac, 0x8e, 0x43, 0x6a, 0xc0, 0xa3,
0xfc, 0x27, 0x01, 0xe5, 0xb3, 0x91, 0x63, 0xbb, 0xbe, 0xaa, 0xc7, 0xec, 0x7d, 0x20, 0xc8, 0xc9,
0x1f, 0x1e, 0xe4, 0xd4, 0x23, 0x41, 0x8e, 0x7b, 0x25, 0xfd, 0xe9, 0x5e, 0xd9, 0x82, 0x8d, 0xd8,
0x66, 0xc4, 0xc9, 0x74, 0x61, 0x93, 0x03, 0x81, 0x71, 0xfe, 0x3e, 0x9f, 0x03, 0x48, 0x5b, 0xe1,
0x37, 0x42, 0xd6, 0x09, 0xb6, 0xf0, 0x23, 0x42, 0xf4, 0x14, 0xb6, 0xe6, 0xd6, 0x14, 0xe6, 0xbc,
0x87, 0x5c, 0xcf, 0xd5, 0x2d, 0x4f, 0xef, 0xd3, 0x8c, 0x45, 0x1b, 0xb0, 0x4c, 0xa6, 0xda, 0x00,
0x4f, 0xc5, 0xfa, 0x4b, 0x64, 0xda, 0xc0, 0x53, 0x54, 0x86, 0xa5, 0xa1, 0x7e, 0x8d, 0x87, 0xc2,
0xc1, 0xfc, 0x43, 0xf9, 0x0d, 0xac, 0x31, 0x85, 0xde, 0x20, 0x08, 0xfa, 0x67, 0x50, 0x70, 0x38,
0x49, 0xc3, 0xae, 0x6b, 0xfb, 0x87, 0x3e, 0x2f, 0x88, 0x75, 0x4a, 0x53, 0xfe, 0x95, 0x00, 0xd4,
0xc5, 0x96, 0xc1, 0xef, 0xac, 0x20, 0x2f, 0x77, 0x00, 0x3c, 0x9d, 0x68, 0x0e, 0x0d, 0xd2, 0x84,
0x09, 0xa6, 0xd4, 0x8c, 0xa7, 0x93, 0x0e, 0x76, 0x9b, 0x13, 0xb4, 0x0f, 0x2b, 0x36, 0xe7, 0xdf,
0x4e, 0xb2, 0x6c, 0x5a, 0xad, 0x8a, 0x2a, 0x56, 0xed, 0x4d, 0xdb, 0x63, 0xa2, 0xfa, 0x70, 0x68,
0x6c, 0x4a, 0x32, 0x36, 0x5a, 0xc7, 0xd2, 0xb1, 0x3a, 0xf6, 0x05, 0xac, 0xd3, 0x52, 0x64, 0x68,
0x63, 0x8b, 0x32, 0x98, 0xee, 0x08, 0x1b, 0xec, 0x3c, 0x67, 0xd4, 0x22, 0x03, 0x2e, 0x43, 0xba,
0xf2, 0x1a, 0x4a, 0x11, 0xeb, 0xc5, 0xd6, 0x37, 0x60, 0xd9, 0xd5, 0x27, 0x1a, 0x09, 0x5c, 0xe7,
0xea, 0x93, 0xde, 0x54, 0x79, 0x03, 0xa8, 0xee, 0x11, 0x73, 0xa4, 0x13, 0x7c, 0x8a, 0xb1, 0xbf,
0xd7, 0x5d, 0xc8, 0x51, 0x85, 0x1a, 0xd1, 0xdd, 0x5b, 0xec, 0x5f, 0xc8, 0x40, 0x49, 0x3d, 0x46,
0x51, 0xbe, 0x82, 0x52, 0x44, 0x4c, 0x2c, 0xf2, 0xa8, 0x8f, 0x94, 0xff, 0xa5, 0x20, 0xdf, 0xc1,
0x96, 0x61, 0x5a, 0xb7, 0xdd, 0x09, 0xc6, 0x4e, 0xa4, 0x98, 0x24, 0xbe, 0xaf, 0x0e, 0xbe, 0x83,
0xfc, 0xc4, 0x24, 0xd6, 0x23, 0x09, 0x76, 0xc5, 0x61, 0x9e, 0x60, 0x93, 0xf0, 0x83, 0xa6, 0xae,
0x3e, 0xa2, 0x69, 0xae, 0x79, 0xba, 0x7f, 0xa4, 0xb2, 0x9c, 0xd2, 0xd5, 0x09, 0xfa, 0x19, 0xe4,
0x7d, 0xab, 0xaf, 0x67, 0x84, 0x9f, 0xa3, 0xc2, 0x71, 0x72, 0x3b, 0xa1, 0x02, 0xb7, 0xfd, 0x78,
0x46, 0x30, 0xad, 0xc3, 0xd7, 0xae, 0xad, 0x1b, 0x7d, 0xdd, 0x23, 0x9a, 0x4e, 0x08, 0x1e, 0x39,
0xc4, 0x63, 0x51, 0x28, 0xa8, 0xeb, 0x01, 0x72, 0x24, 0x00, 0x74, 0x08, 0x1b, 0x16, 0x9e, 0x12,
0x2d, 0x94, 0x19, 0x60, 0xf3, 0x76, 0xe0, 0xdf, 0xad, 0x25, 0x0a, 0x1e, 0xfb, 0x58, 0x83, 0x41,
0x54, 0xc6, 0xe5, 0x11, 0xc0, 0x86, 0x26, 0x07, 0x20, 0xc3, 0x65, 0x02, 0xb0, 0x16, 0x44, 0x02,
0x7d, 0x0d, 0x9b, 0xa1, 0x4c, 0x64, 0x1b, 0xd9, 0x60, 0x1b, 0xa1, 0x60, 0x37, 0xdc, 0x8f, 0x02,
0x05, 0x9f, 0xfd, 0x9e, 0xf1, 0x03, 0x6b, 0x0a, 0x72, 0x7c, 0xcb, 0x1f, 0x28, 0x09, 0xbd, 0x81,
0xad, 0x79, 0xe5, 0x9c, 0x3b, 0xc7, 0xb8, 0xcb, 0x31, 0xcd, 0x5c, 0xac, 0x0c, 0x4b, 0x37, 0xb6,
0xdb, 0xc7, 0xac, 0x32, 0x64, 0x54, 0xfe, 0xa1, 0x6c, 0x42, 0x59, 0x8e, 0xbe, 0x7f, 0xb0, 0x94,
0x2b, 0xd8, 0x88, 0xd1, 0x45, 0x36, 0xfd, 0x1e, 0x56, 0x1d, 0x0e, 0x68, 0x1e, 0x43, 0xc4, 0x45,
0xbd, 0x25, 0xc5, 0x5c, 0x96, 0x54, 0x0b, 0x8e, 0xac, 0x47, 0xf9, 0x77, 0x02, 0x56, 0x8f, 0xc7,
0x23, 0x47, 0x4a, 0xec, 0x1f, 0x94, 0x71, 0xbb, 0x90, 0xe3, 0xfe, 0x67, 0xb1, 0x60, 0x09, 0x57,
0x50, 0x81, 0x93, 0x68, 0x04, 0xe6, 0x12, 0x27, 0xb5, 0x30, 0x71, 0x02, 0x6f, 0xa4, 0x25, 0x6f,
0xcc, 0xbb, 0x7f, 0x69, 0xce, 0xfd, 0xca, 0x3a, 0xac, 0x05, 0xf6, 0x8b, 0x0b, 0xf1, 0x4b, 0x58,
0xa7, 0xe5, 0x2c, 0xe2, 0x41, 0xda, 0xec, 0xdc, 0x63, 0xf7, 0xda, 0xf6, 0x78, 0x15, 0xca, 0xa8,
0xfe, 0xa7, 0xf2, 0x5d, 0x92, 0x77, 0xcd, 0x31, 0xcf, 0xb6, 0xa0, 0x44, 0xc2, 0x6b, 0x55, 0x33,
0x30, 0xd1, 0xcd, 0xa1, 0x27, 0x3c, 0xf2, 0x54, 0x78, 0x44, 0xba, 0x78, 0x4f, 0x38, 0x43, 0xe3,
0x89, 0x8a, 0xc8, 0x1c, 0x15, 0x5d, 0xc1, 0x9a, 0xac, 0xcd, 0x34, 0x3c, 0xd1, 0x1a, 0xbe, 0x96,
0x02, 0x35, 0x6f, 0x85, 0xbc, 0xc0, 0xd9, 0x09, 0x55, 0xbe, 0x2a, 0xa9, 0x39, 0x33, 0xbc, 0xca,
0x3b, 0x58, 0x8d, 0xf2, 0xd0, 0xbe, 0x26, 0xbe, 0x14, 0xcd, 0x89, 0x6c, 0x5c, 0xf4, 0x38, 0x03,
0xcb, 0x3c, 0x67, 0x14, 0x1d, 0xb6, 0x5a, 0xf4, 0x8a, 0x95, 0x34, 0x49, 0xa5, 0x9b, 0x4c, 0x83,
0xf6, 0x96, 0xfd, 0x5e, 0x5c, 0x4b, 0xd0, 0x0e, 0x64, 0xed, 0x7b, 0xec, 0x4e, 0x5c, 0x53, 0x84,
0x39, 0xa3, 0x86, 0x04, 0xa5, 0x02, 0xdb, 0xf3, 0x4b, 0x88, 0x80, 0xfd, 0x35, 0x09, 0x6b, 0xa7,
0x63, 0xcb, 0xe8, 0x78, 0xd7, 0x41, 0xcb, 0x50, 0x86, 0xb4, 0xe3, 0x5d, 0xf3, 0x0c, 0xcc, 0x37,
0x9e, 0xa8, 0xec, 0x0b, 0xfd, 0x12, 0x52, 0xae, 0x3e, 0x11, 0xae, 0xdb, 0x90, 0x5c, 0xd7, 0x9b,
0xf6, 0xf0, 0xc8, 0x19, 0xea, 0x04, 0x37, 0x9e, 0xa8, 0x94, 0x07, 0xbd, 0x8c, 0x66, 0x26, 0xcb,
0xbb, 0x46, 0x22, 0x96, 0x9b, 0xb1, 0xfc, 0xa2, 0xd9, 0x97, 0x6e, 0x24, 0xa2, 0x07, 0x5c, 0x6a,
0x93, 0x97, 0x22, 0x6d, 0x72, 0xb4, 0x20, 0x2d, 0x7f, 0x4a, 0x41, 0x5a, 0x59, 0x5c, 0x90, 0x8e,
0x01, 0x32, 0x44, 0xd8, 0x7f, 0xbc, 0x0c, 0xe9, 0x1b, 0x8c, 0x3d, 0xe5, 0xef, 0x09, 0x28, 0x86,
0x5e, 0x11, 0x59, 0xb9, 0x0b, 0xb9, 0x9b, 0x31, 0xef, 0x99, 0x02, 0xef, 0xa8, 0xc0, 0x49, 0x94,
0x91, 0xb6, 0x55, 0xfd, 0x81, 0x6e, 0xdd, 0x62, 0x8d, 0x17, 0x53, 0xcd, 0xb4, 0x0c, 0x3c, 0x15,
0xb3, 0xc0, 0x3a, 0x87, 0x78, 0xdd, 0x3b, 0xa3, 0x00, 0xfa, 0x1a, 0xf2, 0x43, 0xbb, 0x7f, 0x87,
0x0d, 0x8d, 0x0f, 0x6e, 0x29, 0x76, 0x7d, 0x94, 0x25, 0xd7, 0xd2, 0xe1, 0x8d, 0x8d, 0x4b, 0x6a,
0x8e, 0x73, 0x5e, 0xb2, 0x39, 0xee, 0x1f, 0x09, 0x80, 0xd0, 0xeb, 0xe8, 0x15, 0x2c, 0x9b, 0x16,
0xab, 0xed, 0xfc, 0x02, 0x9a, 0xbb, 0x33, 0x04, 0x8c, 0x7e, 0x17, 0xef, 0x02, 0x94, 0x85, 0x61,
0xac, 0x8a, 0xe2, 0x5c, 0xb7, 0x88, 0x3b, 0x0b, 0x3a, 0x83, 0xca, 0x7b, 0xc8, 0xcb, 0x00, 0x2a,
0x42, 0xca, 0x6f, 0xb5, 0xb2, 0x2a, 0xfd, 0x49, 0x93, 0xf3, 0x5e, 0x1f, 0x8e, 0x79, 0xf1, 0x4b,
0xab, 0xfc, 0xe3, 0x7d, 0xf2, 0x6d, 0x42, 0x19, 0x40, 0x36, 0xd8, 0xcb, 0x8f, 0x9b, 0x37, 0xa3,
0x93, 0x62, 0x6a, 0x6e, 0x52, 0xec, 0x40, 0xe9, 0xd4, 0xb4, 0xf4, 0xa1, 0xf9, 0x2d, 0x96, 0x73,
0xfa, 0x7b, 0x83, 0xf7, 0x60, 0xaa, 0x29, 0x1f, 0xa1, 0x1c, 0xd5, 0x18, 0xe6, 0x03, 0x7b, 0x01,
0x88, 0xaa, 0xe4, 0x24, 0xa6, 0x72, 0x0f, 0xf2, 0xb4, 0xa7, 0xb9, 0xa1, 0xc2, 0xb4, 0xb3, 0x49,
0x72, 0x0e, 0x57, 0x9f, 0x30, 0x7d, 0xbd, 0xa9, 0x52, 0xe2, 0xd7, 0x25, 0x73, 0x4b, 0x50, 0x70,
0xce, 0xf9, 0x9d, 0xe8, 0x13, 0xc5, 0x6a, 0xf1, 0x64, 0x49, 0x7c, 0x62, 0xb2, 0x7c, 0xfe, 0x2d,
0x9f, 0x3c, 0xfd, 0x66, 0x23, 0x07, 0x2b, 0x97, 0x17, 0xcd, 0x8b, 0xf6, 0xd5, 0x45, 0xf1, 0x09,
0xda, 0x82, 0xd2, 0xd5, 0x59, 0xef, 0xa2, 0xde, 0xed, 0x6a, 0x9d, 0xcb, 0xe3, 0x66, 0xfd, 0xa3,
0xd6, 0x38, 0xea, 0x36, 0x8a, 0x09, 0xf4, 0x02, 0x2a, 0x17, 0xf5, 0x6e, 0xaf, 0x7e, 0xa2, 0x2d,
0xc2, 0x93, 0xe8, 0xe7, 0xf0, 0xb2, 0xf1, 0xf1, 0x58, 0x3d, 0x3b, 0xd1, 0x1e, 0x61, 0x4b, 0x7d,
0xfe, 0xb7, 0x14, 0xe4, 0xa4, 0xb6, 0x07, 0x95, 0x60, 0x4d, 0x2c, 0xee, 0x0b, 0x14, 0x9f, 0xa0,
0x6d, 0x28, 0xd7, 0xda, 0xe7, 0xe7, 0x67, 0xbd, 0xf3, 0xfa, 0x45, 0x4f, 0xeb, 0x9d, 0x9d, 0xd7,
0xb5, 0x56, 0xbb, 0xd6, 0x2c, 0x26, 0xa8, 0x79, 0x12, 0x72, 0xd1, 0xd6, 0x4e, 0xea, 0xad, 0xa3,
0x8f, 0xc5, 0x24, 0xda, 0x80, 0x75, 0x09, 0x50, 0xeb, 0x1f, 0xda, 0xcd, 0x7a, 0x31, 0x45, 0xf9,
0x1b, 0xbd, 0x56, 0x4d, 0x6b, 0x9f, 0x9e, 0xd6, 0xd5, 0xfa, 0x89, 0x0f, 0xa4, 0xe9, 0x12, 0x0c,
0x38, 0xaa, 0xd5, 0xea, 0x9d, 0x5e, 0x88, 0x2c, 0xb1, 0x8d, 0xc8, 0x22, 0x74, 0xf9, 0xf6, 0x65,
0x4f, 0xeb, 0xd6, 0x6b, 0xed, 0x8b, 0x13, 0xad, 0x55, 0xff, 0x50, 0x6f, 0x15, 0x97, 0xd1, 0x2f,
0x40, 0x89, 0x2a, 0xe8, 0x5e, 0xd6, 0x6a, 0x74, 0xbf, 0x11, 0xbe, 0x15, 0xb4, 0x0b, 0xcf, 0x62,
0x16, 0x9c, 0xb7, 0x7b, 0x75, 0x5f, 0x6b, 0x31, 0x83, 0xf6, 0x60, 0x27, 0x6e, 0x09, 0xe3, 0x10,
0xfa, 0x8a, 0x59, 0xb4, 0x03, 0xdb, 0x8c, 0x43, 0xd6, 0xec, 0xdb, 0x0b, 0xa8, 0x0c, 0x45, 0xdf,
0xd5, 0x81, 0x9f, 0x73, 0xe8, 0x19, 0x6c, 0xc5, 0xe2, 0x10, 0x80, 0xf9, 0x98, 0xb3, 0x8e, 0x2e,
0x6a, 0x8d, 0xb6, 0x5a, 0x2c, 0x1c, 0xfe, 0x33, 0x07, 0xd9, 0x2b, 0x96, 0x3c, 0x4d, 0x93, 0xa0,
0x16, 0xe4, 0xa4, 0x47, 0x25, 0xf4, 0x3c, 0x56, 0x1a, 0xa3, 0xcf, 0x5a, 0x95, 0x17, 0x0f, 0xc1,
0x41, 0x01, 0xcf, 0x49, 0xaf, 0x3c, 0x51, 0x6d, 0x73, 0x8f, 0x38, 0x51, 0x6d, 0x0b, 0x1e, 0x87,
0x54, 0x28, 0x44, 0xde, 0x69, 0xd0, 0xae, 0x24, 0xb0, 0xe8, 0x59, 0xa8, 0xb2, 0xf7, 0x30, 0x83,
0xd0, 0x79, 0x06, 0x10, 0x1e, 0x32, 0xb4, 0x13, 0xdb, 0x4f, 0xe4, 0x40, 0x56, 0x9e, 0x3f, 0x80,
0x0a, 0x55, 0xef, 0xa1, 0x70, 0x82, 0x5d, 0xf3, 0x1e, 0x5f, 0xe0, 0x29, 0xa1, 0xb3, 0xe6, 0xba,
0xc4, 0xcf, 0x27, 0xd4, 0xca, 0x66, 0x30, 0x6e, 0x35, 0xf1, 0xec, 0x04, 0x7b, 0x7d, 0xd7, 0x74,
0x88, 0xed, 0xa2, 0xb7, 0x90, 0xe5, 0xb2, 0x54, 0xae, 0x24, 0x33, 0xb5, 0xec, 0xbe, 0x4e, 0x6c,
0xf7, 0x41, 0xc9, 0xdf, 0x42, 0x86, 0xae, 0x47, 0x8f, 0x36, 0x8a, 0x8f, 0xb1, 0xbe, 0xe1, 0x5b,
0x73, 0x74, 0x61, 0x72, 0x1b, 0xf2, 0xf2, 0xab, 0x03, 0x8a, 0xc7, 0x33, 0xf6, 0xe8, 0x51, 0xd9,
0x7d, 0x10, 0x0f, 0x43, 0x14, 0x19, 0xd8, 0x23, 0x21, 0x5a, 0xf4, 0x2e, 0x11, 0x09, 0xd1, 0xc2,
0x59, 0x1f, 0xfd, 0x09, 0xd6, 0x62, 0x73, 0x37, 0x7a, 0x39, 0x27, 0x14, 0x7f, 0x07, 0xa8, 0x28,
0x8f, 0xb1, 0x08, 0xcd, 0x0d, 0x40, 0x62, 0xf4, 0x96, 0xa7, 0x77, 0xd9, 0x8b, 0x12, 0xbd, 0x52,
0x91, 0xfb, 0xf9, 0xd8, 0xc4, 0xde, 0x82, 0x9c, 0x34, 0xcd, 0x46, 0x12, 0x7d, 0x7e, 0x46, 0x8f,
0x24, 0xfa, 0xa2, 0x21, 0xb8, 0x05, 0x39, 0x69, 0x6c, 0x8d, 0x68, 0x9b, 0x9f, 0x82, 0x23, 0xda,
0x16, 0x4d, 0xbb, 0x2a, 0x14, 0x22, 0x83, 0x4b, 0x24, 0x26, 0x8b, 0x46, 0x9d, 0x48, 0x4c, 0x16,
0xcf, 0x3c, 0x7f, 0x80, 0x15, 0xd1, 0xf2, 0xa3, 0xa7, 0x12, 0x73, 0x74, 0x8c, 0x89, 0x78, 0x2c,
0x36, 0x21, 0xf8, 0x07, 0x4f, 0x98, 0xb4, 0xf3, 0x40, 0x0b, 0xbe, 0xf8, 0xe0, 0xc5, 0x8c, 0xf9,
0x0b, 0x14, 0xe3, 0x7d, 0x2d, 0x92, 0xc3, 0xff, 0x40, 0x5f, 0x5d, 0xf9, 0xec, 0x51, 0x1e, 0xa1,
0xbc, 0x06, 0x19, 0xbf, 0x03, 0x44, 0xf2, 0x7e, 0x62, 0xcd, 0x72, 0xe5, 0xd9, 0x42, 0x2c, 0x3c,
0x67, 0x72, 0xeb, 0x10, 0x39, 0x67, 0x0b, 0xba, 0x94, 0xc8, 0x39, 0x5b, 0xd4, 0x73, 0x1c, 0xff,
0xea, 0xcf, 0x07, 0xb7, 0x26, 0x19, 0x8c, 0xaf, 0xab, 0x7d, 0x7b, 0x74, 0x30, 0xa4, 0x63, 0xb9,
0x65, 0x5a, 0xb7, 0x16, 0x26, 0x13, 0xdb, 0xbd, 0x3b, 0x18, 0x5a, 0xc6, 0x01, 0xeb, 0x9c, 0x0e,
0x02, 0x3d, 0xd7, 0xcb, 0xec, 0xff, 0x13, 0x5f, 0xfd, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x19, 0xd8,
0xa1, 0x09, 0xe8, 0x18, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.

7
lnrpc/walletrpc/walletkit.proto

@ -724,6 +724,13 @@ message FundPsbtRequest {
account is used.
*/
string account = 5;
// The minimum number of confirmations each one of your outputs used for
// the transaction must satisfy.
int32 min_confs = 6;
// Whether unconfirmed outputs should be used as inputs for the transaction.
bool spend_unconfirmed = 7;
}
message FundPsbtResponse {
/*

10
lnrpc/walletrpc/walletkit.swagger.json

@ -1010,6 +1010,16 @@
"account": {
"type": "string",
"description": "The name of the account to fund the PSBT with. If empty, the default wallet\naccount is used."
},
"min_confs": {
"type": "integer",
"format": "int32",
"description": "The minimum number of confirmations each one of your outputs used for\nthe transaction must satisfy."
},
"spend_unconfirmed": {
"type": "boolean",
"format": "boolean",
"description": "Whether unconfirmed outputs should be used as inputs for the transaction."
}
}
},

11
lnrpc/walletrpc/walletkit_server.go

@ -1069,6 +1069,15 @@ func (w *WalletKit) FundPsbt(_ context.Context,
"specify either target_conf or set_per_vbyte")
}
// Then, we'll extract the minimum number of confirmations that each
// output we use to fund the transaction should satisfy.
minConfs, err := lnrpc.ExtractMinConfs(
req.GetMinConfs(), req.GetSpendUnconfirmed(),
)
if err != nil {
return nil, err
}
// The RPC parsing part is now over. Several of the following operations
// require us to hold the global coin selection lock so we do the rest
// of the tasks while holding the lock. The result is a list of locked
@ -1087,7 +1096,7 @@ func (w *WalletKit) FundPsbt(_ context.Context,
if len(packet.UnsignedTx.TxIn) > 0 {
// Get a list of all unspent witness outputs.
utxos, err := w.cfg.Wallet.ListUnspentWitness(
defaultMinConf, defaultMaxConf, account,
minConfs, defaultMaxConf, account,
)
if err != nil {
return err

6
lntest/mock/walletcontroller.go

@ -107,15 +107,15 @@ func (w *WalletController) SendOutputs(outputs []*wire.TxOut,
// CreateSimpleTx currently returns dummy values.
func (w *WalletController) CreateSimpleTx(outputs []*wire.TxOut,
_ chainfee.SatPerKWeight, _ bool) (*txauthor.AuthoredTx, error) {
_ chainfee.SatPerKWeight, _ int32, _ bool) (*txauthor.AuthoredTx, error) {
return nil, nil
}
// ListUnspentWitness is called by the wallet when doing coin selection. We just
// need one unspent for the funding transaction.
func (w *WalletController) ListUnspentWitness(minconfirms,
maxconfirms int32, _ string) ([]*lnwallet.Utxo, error) {
func (w *WalletController) ListUnspentWitness(minConfs,
maxConfs int32, _ string) ([]*lnwallet.Utxo, error) {
// If the mock already has a list of utxos, return it.
if w.Utxos != nil {

27
lnwallet/btcwallet/btcwallet.go

@ -484,7 +484,7 @@ func (b *BtcWallet) ImportPublicKey(pubKey *btcec.PublicKey,
//
// This is a part of the WalletController interface.
func (b *BtcWallet) SendOutputs(outputs []*wire.TxOut,
feeRate chainfee.SatPerKWeight, minconf int32, label string) (*wire.MsgTx, error) {
feeRate chainfee.SatPerKWeight, minConfs int32, label string) (*wire.MsgTx, error) {
// Convert our fee rate from sat/kw to sat/kb since it's required by
// SendOutputs.
@ -495,13 +495,13 @@ func (b *BtcWallet) SendOutputs(outputs []*wire.TxOut,
return nil, lnwallet.ErrNoOutputs
}
// Sanity check minconf.
if minconf < 0 {
// Sanity check minConfs.
if minConfs < 0 {
return nil, lnwallet.ErrInvalidMinconf
}
return b.wallet.SendOutputs(
outputs, nil, defaultAccount, minconf, feeSatPerKB, label,
outputs, nil, defaultAccount, minConfs, feeSatPerKB, label,
)
}
@ -519,7 +519,8 @@ func (b *BtcWallet) SendOutputs(outputs []*wire.TxOut,
//
// This is a part of the WalletController interface.
func (b *BtcWallet) CreateSimpleTx(outputs []*wire.TxOut,
feeRate chainfee.SatPerKWeight, dryRun bool) (*txauthor.AuthoredTx, error) {
feeRate chainfee.SatPerKWeight, minConfs int32,
dryRun bool) (*txauthor.AuthoredTx, error) {
// The fee rate is passed in using units of sat/kw, so we'll convert
// this to sat/KB as the CreateSimpleTx method requires this unit.
@ -529,6 +530,12 @@ func (b *BtcWallet) CreateSimpleTx(outputs []*wire.TxOut,
if len(outputs) < 1 {
return nil, lnwallet.ErrNoOutputs
}
// Sanity check minConfs.
if minConfs < 0 {
return nil, lnwallet.ErrInvalidMinconf
}
for _, output := range outputs {
// When checking an output for things like dusty-ness, we'll
// use the default mempool relay fee rather than the target
@ -544,7 +551,7 @@ func (b *BtcWallet) CreateSimpleTx(outputs []*wire.TxOut,
}
return b.wallet.CreateSimpleTx(
nil, defaultAccount, outputs, 1, feeSatPerKB, dryRun,
nil, defaultAccount, outputs, minConfs, feeSatPerKB, dryRun,
)
}
@ -608,11 +615,11 @@ func (b *BtcWallet) ReleaseOutput(id wtxmgr.LockID, op wire.OutPoint) error {
}
// ListUnspentWitness returns all unspent outputs which are version 0 witness
// programs. The 'minconfirms' and 'maxconfirms' parameters indicate the minimum
// programs. The 'minConfs' and 'maxConfs' parameters indicate the minimum
// and maximum number of confirmations an output needs in order to be returned
// by this method. Passing -1 as 'minconfirms' indicates that even unconfirmed
// outputs should be returned. Using MaxInt32 as 'maxconfirms' implies returning
// all outputs with at least 'minconfirms'. The account parameter serves as a
// by this method. Passing -1 as 'minConfs' indicates that even unconfirmed
// outputs should be returned. Using MaxInt32 as 'maxConfs' implies returning
// all outputs with at least 'minConfs'. The account parameter serves as a
// filter to retrieve the unspent outputs for a specific account. When empty,
// the unspent outputs of all wallet accounts are returned.
//

16
lnwallet/interface.go

@ -66,7 +66,7 @@ var (
var ErrNoOutputs = errors.New("no outputs")
// ErrInvalidMinconf is returned if we try to create a transaction with
// invalid minconf value.
// invalid minConfs value.
var ErrInvalidMinconf = errors.New("minimum number of confirmations must " +
"be a non-negative number")
@ -236,7 +236,7 @@ type WalletController interface {
//
// NOTE: This method requires the global coin selection lock to be held.
SendOutputs(outputs []*wire.TxOut,
feeRate chainfee.SatPerKWeight, minconf int32, label string) (*wire.MsgTx, error)
feeRate chainfee.SatPerKWeight, minConfs int32, label string) (*wire.MsgTx, error)
// CreateSimpleTx creates a Bitcoin transaction paying to the specified
// outputs. The transaction is not broadcasted to the network. In the
@ -251,20 +251,20 @@ type WalletController interface {
//
// NOTE: This method requires the global coin selection lock to be held.
CreateSimpleTx(outputs []*wire.TxOut, feeRate chainfee.SatPerKWeight,
dryRun bool) (*txauthor.AuthoredTx, error)
minConfs int32, dryRun bool) (*txauthor.AuthoredTx, error)
// ListUnspentWitness returns all unspent outputs which are version 0
// witness programs. The 'minconfirms' and 'maxconfirms' parameters
// witness programs. The 'minConfs' and 'maxConfs' parameters
// indicate the minimum and maximum number of confirmations an output
// needs in order to be returned by this method. Passing -1 as
// 'minconfirms' indicates that even unconfirmed outputs should be
// returned. Using MaxInt32 as 'maxconfirms' implies returning all
// outputs with at least 'minconfirms'. The account parameter serves as
// 'minConfs' indicates that even unconfirmed outputs should be
// returned. Using MaxInt32 as 'maxConfs' implies returning all
// outputs with at least 'minConfs'. The account parameter serves as
// a filter to retrieve the unspent outputs for a specific account.
// When empty, the unspent outputs of all wallet accounts are returned.
//
// NOTE: This method requires the global coin selection lock to be held.
ListUnspentWitness(minconfirms, maxconfirms int32,
ListUnspentWitness(minConfs, maxConfs int32,
accountFilter string) ([]*Utxo, error)
// ListTransactionDetails returns a list of all transactions which are

109
lnwallet/test/test_interface.go

@ -2547,6 +2547,8 @@ func testLastUnusedAddr(miner *rpctest.Harness,
// testCreateSimpleTx checks that a call to CreateSimpleTx will return a
// transaction that is equal to the one that is being created by SendOutputs in
// a subsequent call.
// All test cases are doubled-up: one for testing unconfirmed inputs,
// one for testing only confirmed inputs.
func testCreateSimpleTx(r *rpctest.Harness, w *lnwallet.LightningWallet,
_ *lnwallet.LightningWallet, t *testing.T) {
@ -2558,51 +2560,108 @@ func testCreateSimpleTx(r *rpctest.Harness, w *lnwallet.LightningWallet,
// The test cases we will run through for all backends.
testCases := []struct {
outVals []int64
feeRate chainfee.SatPerKWeight
valid bool
outVals []int64
feeRate chainfee.SatPerKWeight
valid bool
unconfirmed bool
}{
{
outVals: []int64{},
feeRate: 2500,
valid: false, // No outputs.
outVals: []int64{},
feeRate: 2500,
valid: false, // No outputs.
unconfirmed: false,
},
{
outVals: []int64{},
feeRate: 2500,
valid: false, // No outputs.
unconfirmed: true,
},
{
outVals: []int64{200},
feeRate: 2500,
valid: false, // Dust output.
outVals: []int64{200},
feeRate: 2500,
valid: false, // Dust output.
unconfirmed: false,
},
{
outVals: []int64{200},
feeRate: 2500,
valid: false, // Dust output.
unconfirmed: true,
},
{
outVals: []int64{1e8},
feeRate: 2500,
valid: true,
outVals: []int64{1e8},
feeRate: 2500,
valid: true,
unconfirmed: false,
},
{
outVals: []int64{1e8, 2e8, 1e8, 2e7, 3e5},
feeRate: 2500,
valid: true,
outVals: []int64{1e8},
feeRate: 2500,
valid: true,
unconfirmed: true,
},
{
outVals: []int64{1e8, 2e8, 1e8, 2e7, 3e5},
feeRate: 2500,
valid: true,
unconfirmed: false,
},
{
outVals: []int64{1e8, 2e8, 1e8, 2e7, 3e5},
feeRate: 12500,
valid: true,
outVals: []int64{1e8, 2e8, 1e8, 2e7, 3e5},
feeRate: 2500,
valid: true,
unconfirmed: true,
},
{
outVals: []int64{1e8, 2e8, 1e8, 2e7, 3e5},
feeRate: 12500,
valid: true,
unconfirmed: false,
},
{
outVals: []int64{1e8, 2e8, 1e8, 2e7, 3e5},
feeRate: 50000,
valid: true,
outVals: []int64{1e8, 2e8, 1e8, 2e7, 3e5},
feeRate: 12500,
valid: true,
unconfirmed: true,
},
{
outVals: []int64{1e8, 2e8, 1e8, 2e7, 3e5},
feeRate: 50000,
valid: true,
unconfirmed: false,
},
{
outVals: []int64{1e8, 2e8, 1e8, 2e7, 3e5},
feeRate: 50000,
valid: true,
unconfirmed: true,
},
{
outVals: []int64{1e8, 2e8, 1e8, 2e7, 3e5, 1e8, 2e8,
1e8, 2e7, 3e5},
feeRate: 44250,
valid: true,
unconfirmed: false,
},
{
outVals: []int64{1e8, 2e8, 1e8, 2e7, 3e5, 1e8, 2e8,
1e8, 2e7, 3e5},
feeRate: 44250,
valid: true,
feeRate: 44250,
valid: true,
unconfirmed: true,
},
}
for i, test := range testCases {
var minConfs int32 = 1
feeRate := test.feeRate
// Grab some fresh addresses from the miner that we will send
@ -2629,7 +2688,7 @@ func testCreateSimpleTx(r *rpctest.Harness, w *lnwallet.LightningWallet,
// Now try creating a tx spending to these outputs.
createTx, createErr := w.CreateSimpleTx(
outputs, feeRate, true,
outputs, feeRate, minConfs, true,
)
switch {
case test.valid && createErr != nil:
@ -2646,7 +2705,7 @@ func testCreateSimpleTx(r *rpctest.Harness, w *lnwallet.LightningWallet,
// _very_ similar to the one we just created being sent. The
// only difference is that the dry run tx is not signed, and
// that the change output position might be different.
tx, sendErr := w.SendOutputs(outputs, feeRate, 1, labels.External)
tx, sendErr := w.SendOutputs(outputs, feeRate, minConfs, labels.External)
switch {
case test.valid && sendErr != nil:
t.Fatalf("got unexpected error when sending tx: %v",

17
rpcserver.go

@ -964,7 +964,7 @@ func allowCORS(handler http.Handler, origins []string) http.Handler {
// more addresses specified in the passed payment map. The payment map maps an
// address to a specified output value to be sent to that address.
func (r *rpcServer) sendCoinsOnChain(paymentMap map[string]int64,
feeRate chainfee.SatPerKWeight, minconf int32,
feeRate chainfee.SatPerKWeight, minConfs int32,
label string) (*chainhash.Hash, error) {
outputs, err := addrPairsToOutputs(paymentMap, r.cfg.ActiveNetParams.Params)
@ -975,7 +975,7 @@ func (r *rpcServer) sendCoinsOnChain(paymentMap map[string]int64,
// We first do a dry run, to sanity check we won't spend our wallet
// balance below the reserved amount.
authoredTx, err := r.server.cc.Wallet.CreateSimpleTx(
outputs, feeRate, true,
outputs, feeRate, minConfs, true,
)
if err != nil {
return nil, err
@ -989,7 +989,7 @@ func (r *rpcServer) sendCoinsOnChain(paymentMap map[string]int64,
// If that checks out, we're failry confident that creating sending to
// these outputs will keep the wallet balance above the reserve.
tx, err := r.server.cc.Wallet.SendOutputs(
outputs, feeRate, minconf, label,
outputs, feeRate, minConfs, label,
)
if err != nil {
return nil, err
@ -1073,12 +1073,21 @@ func (r *rpcServer) EstimateFee(ctx context.Context,
return nil, err
}
// Then, we'll extract the minimum number of confirmations that each
// output we use to fund the transaction should satisfy.
minConfs, err := lnrpc.ExtractMinConfs(
in.GetMinConfs(), in.GetSpendUnconfirmed(),
)
if err != nil {
return nil, err
}
// We will ask the wallet to create a tx using this fee rate. We set
// dryRun=true to avoid inflating the change addresses in the db.
var tx *txauthor.AuthoredTx
wallet := r.server.cc.Wallet
err = wallet.WithCoinSelectLock(func() error {
tx, err = wallet.CreateSimpleTx(outputs, feePerKw, true)
tx, err = wallet.CreateSimpleTx(outputs, feePerKw, minConfs, true)
return err
})
if err != nil {

2
sweep/backend_mock_test.go

@ -87,7 +87,7 @@ func (b *mockBackend) PublishTransaction(tx *wire.MsgTx, _ string) error {
return err
}
func (b *mockBackend) ListUnspentWitnessFromDefaultAccount(minconfirms, maxconfirms int32) (
func (b *mockBackend) ListUnspentWitnessFromDefaultAccount(minConfs, maxConfs int32) (
[]*lnwallet.Utxo, error) {
b.lock.Lock()
defer b.lock.Unlock()

4
sweep/interface.go

@ -13,10 +13,10 @@ type Wallet interface {
// ListUnspentWitnessFromDefaultAccount returns all unspent outputs
// which are version 0 witness programs from the default wallet account.
// The 'minconfirms' and 'maxconfirms' parameters indicate the minimum
// The 'minConfs' and 'maxConfs' parameters indicate the minimum
// and maximum number of confirmations an output needs in order to be
// returned by this method.
ListUnspentWitnessFromDefaultAccount(minconfirms, maxconfirms int32) (
ListUnspentWitnessFromDefaultAccount(minConfs, maxConfs int32) (
[]*lnwallet.Utxo, error)
// WithCoinSelectLock will execute the passed function closure in a

2
sweep/tx_input_set_test.go

@ -112,7 +112,7 @@ type mockWallet struct {
Wallet
}
func (m *mockWallet) ListUnspentWitnessFromDefaultAccount(minconfirms, maxconfirms int32) (
func (m *mockWallet) ListUnspentWitnessFromDefaultAccount(minConfs, maxConfs int32) (
[]*lnwallet.Utxo, error) {
return []*lnwallet.Utxo{