Merge pull request #4436 from yyforyongyu/accept-base-pubkey
signrpc: SharedKeyRequest accept raw pubkey
This commit is contained in:
Oliver Gugger
GitHub
commit
85c2103f44
@ -55,7 +55,7 @@ const (
|
||||
// KeyFamilyRevocationBase are keys that are used within channels to
|
||||
// create revocation basepoints that the remote party will use to
|
||||
// create revocation keys for us.
|
||||
KeyFamilyRevocationBase = 1
|
||||
KeyFamilyRevocationBase KeyFamily = 1
|
||||
|
||||
// KeyFamilyHtlcBase are keys used within channels that will be
|
||||
// combined with per-state randomness to produce public keys that will
|
||||
|
||||
@ -30,6 +30,9 @@ var versionZeroKeyFamilies = []KeyFamily{
|
||||
KeyFamilyDelayBase,
|
||||
KeyFamilyRevocationRoot,
|
||||
KeyFamilyNodeKey,
|
||||
KeyFamilyStaticBackup,
|
||||
KeyFamilyTowerSession,
|
||||
KeyFamilyTowerID,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@ -673,12 +673,18 @@ type SharedKeyRequest struct {
|
||||
// The ephemeral public key to use for the DH key derivation.
|
||||
EphemeralPubkey []byte `protobuf:"bytes,1,opt,name=ephemeral_pubkey,json=ephemeralPubkey,proto3" json:"ephemeral_pubkey,omitempty"`
|
||||
//
|
||||
//The optional key locator of the local key that should be used. If this
|
||||
//parameter is not set then the node's identity private key will be used.
|
||||
KeyLoc *KeyLocator `protobuf:"bytes,2,opt,name=key_loc,json=keyLoc,proto3" json:"key_loc,omitempty"`
|
||||
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||
XXX_unrecognized []byte `json:"-"`
|
||||
XXX_sizecache int32 `json:"-"`
|
||||
//Deprecated. The optional key locator of the local key that should be used.
|
||||
//If this parameter is not set then the node's identity private key will be
|
||||
//used.
|
||||
KeyLoc *KeyLocator `protobuf:"bytes,2,opt,name=key_loc,json=keyLoc,proto3" json:"key_loc,omitempty"` // Deprecated: Do not use.
|
||||
//
|
||||
//A key descriptor describes the key used for performing ECDH. Either a key
|
||||
//locator or a raw public key is expected, if neither is supplied, defaults to
|
||||
//the node's identity private key.
|
||||
KeyDesc *KeyDescriptor `protobuf:"bytes,3,opt,name=key_desc,json=keyDesc,proto3" json:"key_desc,omitempty"`
|
||||
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||
XXX_unrecognized []byte `json:"-"`
|
||||
XXX_sizecache int32 `json:"-"`
|
||||
}
|
||||
|
||||
func (m *SharedKeyRequest) Reset() { *m = SharedKeyRequest{} }
|
||||
@ -713,6 +719,7 @@ func (m *SharedKeyRequest) GetEphemeralPubkey() []byte {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Deprecated: Do not use.
|
||||
func (m *SharedKeyRequest) GetKeyLoc() *KeyLocator {
|
||||
if m != nil {
|
||||
return m.KeyLoc
|
||||
@ -720,6 +727,13 @@ func (m *SharedKeyRequest) GetKeyLoc() *KeyLocator {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *SharedKeyRequest) GetKeyDesc() *KeyDescriptor {
|
||||
if m != nil {
|
||||
return m.KeyDesc
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type SharedKeyResponse struct {
|
||||
// The shared public key, hashed with sha256.
|
||||
SharedKey []byte `protobuf:"bytes,1,opt,name=shared_key,json=sharedKey,proto3" json:"shared_key,omitempty"`
|
||||
@ -780,55 +794,56 @@ func init() {
|
||||
func init() { proto.RegisterFile("signrpc/signer.proto", fileDescriptor_4ecd772f6c7ffacf) }
|
||||
|
||||
var fileDescriptor_4ecd772f6c7ffacf = []byte{
|
||||
// 756 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x5d, 0x8f, 0xdb, 0x44,
|
||||
0x14, 0xd5, 0x26, 0x6c, 0x92, 0xbd, 0x4e, 0x76, 0xb3, 0xc3, 0xaa, 0xb8, 0x0b, 0x88, 0x60, 0xa9,
|
||||
0x28, 0x95, 0x20, 0x11, 0x01, 0x21, 0xc1, 0x13, 0x2a, 0xd5, 0xaa, 0x55, 0x8a, 0x5a, 0x39, 0x2b,
|
||||
0x1e, 0xfa, 0x62, 0x39, 0xce, 0xad, 0x33, 0xb2, 0x63, 0xcf, 0xce, 0x8c, 0xeb, 0xf8, 0x77, 0xf0,
|
||||
0xd7, 0xf8, 0x41, 0x68, 0x3e, 0xe2, 0xd8, 0x29, 0x54, 0xea, 0xd3, 0xfa, 0x9e, 0xb9, 0x73, 0xee,
|
||||
0xd9, 0x73, 0xae, 0x63, 0xb8, 0x11, 0x34, 0xce, 0x38, 0x8b, 0xe6, 0xea, 0x2f, 0xf2, 0x19, 0xe3,
|
||||
0xb9, 0xcc, 0x49, 0xdf, 0xa2, 0xde, 0x0b, 0x80, 0x25, 0x56, 0xaf, 0xf2, 0x28, 0x94, 0x39, 0x27,
|
||||
0x5f, 0x03, 0x24, 0x58, 0x05, 0xef, 0xc2, 0x1d, 0x4d, 0x2b, 0xf7, 0x6c, 0x72, 0x36, 0x3d, 0xf7,
|
||||
0x2f, 0x12, 0xac, 0xee, 0x34, 0x40, 0xbe, 0x04, 0x55, 0x04, 0x34, 0xdb, 0xe0, 0xde, 0xed, 0xe8,
|
||||
0xd3, 0x41, 0x82, 0xd5, 0x4b, 0x55, 0x7b, 0x21, 0x8c, 0x96, 0x58, 0x3d, 0x47, 0x11, 0x71, 0xca,
|
||||
0x14, 0x99, 0x07, 0x23, 0x1e, 0x96, 0x81, 0xba, 0xb1, 0xae, 0x24, 0x0a, 0xcd, 0x37, 0xf4, 0x1d,
|
||||
0x1e, 0x96, 0x4b, 0xac, 0x9e, 0x29, 0x88, 0x7c, 0x0f, 0x7d, 0x75, 0x9e, 0xe6, 0x91, 0xe6, 0x73,
|
||||
0x16, 0x9f, 0xcf, 0xac, 0xb2, 0xd9, 0x51, 0x96, 0xdf, 0x4b, 0xf4, 0xb3, 0xf7, 0x1b, 0x9c, 0xdf,
|
||||
0xef, 0x5f, 0x17, 0x92, 0xdc, 0xc0, 0xf9, 0xfb, 0x30, 0x2d, 0x50, 0x53, 0x76, 0x7d, 0x53, 0x28,
|
||||
0x79, 0x2c, 0x09, 0xcc, 0x7c, 0x4d, 0x37, 0xf4, 0x07, 0x2c, 0x59, 0xe9, 0xda, 0xfb, 0xbb, 0x03,
|
||||
0x97, 0x2b, 0x1a, 0x67, 0x0d, 0x81, 0x3f, 0x82, 0x52, 0x1f, 0x6c, 0x50, 0x44, 0x9a, 0xc8, 0x59,
|
||||
0x3c, 0x6a, 0x4e, 0x3f, 0x76, 0xfa, 0x4a, 0xa4, 0x2a, 0xc9, 0xb7, 0x30, 0x14, 0x34, 0x8b, 0x53,
|
||||
0x0c, 0x64, 0x89, 0x61, 0x62, 0xa7, 0x38, 0x06, 0xbb, 0x57, 0x90, 0x6a, 0xd9, 0xe4, 0xc5, 0xba,
|
||||
0x6e, 0xe9, 0x9a, 0x16, 0x83, 0x99, 0x96, 0x27, 0x70, 0x59, 0x52, 0x99, 0xa1, 0x10, 0x07, 0xb5,
|
||||
0x9f, 0xe9, 0xa6, 0x91, 0x45, 0x8d, 0x64, 0xf2, 0x1d, 0xf4, 0xf2, 0x42, 0xb2, 0x42, 0xba, 0xe7,
|
||||
0x5a, 0xdd, 0x65, 0xad, 0x4e, 0xbb, 0xe0, 0xdb, 0x53, 0xe2, 0x82, 0x8a, 0x73, 0x1b, 0x8a, 0xad,
|
||||
0xdb, 0x9f, 0x9c, 0x4d, 0x47, 0xfe, 0xa1, 0x24, 0xdf, 0x80, 0x43, 0x33, 0x56, 0x48, 0x1b, 0xd9,
|
||||
0x40, 0x47, 0x06, 0x1a, 0x32, 0xa1, 0x45, 0xd0, 0x57, 0xa6, 0xf8, 0xf8, 0x40, 0x26, 0x30, 0x54,
|
||||
0x71, 0xc9, 0x7d, 0x2b, 0x2d, 0xe0, 0x61, 0x79, 0xbf, 0x37, 0x61, 0xfd, 0x02, 0xa0, 0x04, 0x68,
|
||||
0xc3, 0x84, 0xdb, 0x99, 0x74, 0xa7, 0xce, 0xe2, 0x8b, 0x5a, 0x53, 0xdb, 0x5c, 0xff, 0x42, 0xd8,
|
||||
0x5a, 0x78, 0x4f, 0x60, 0x60, 0x86, 0x08, 0x46, 0x1e, 0xc3, 0x40, 0x4d, 0x11, 0x34, 0x56, 0x13,
|
||||
0xba, 0xd3, 0xa1, 0xdf, 0xe7, 0x61, 0xb9, 0xa2, 0xb1, 0xf0, 0xee, 0xc0, 0x79, 0xa9, 0x94, 0xd9,
|
||||
0xff, 0xde, 0x85, 0xbe, 0xb5, 0xe3, 0xd0, 0x68, 0x4b, 0xb5, 0xa5, 0x82, 0xc6, 0xed, 0xa0, 0xd5,
|
||||
0x38, 0x9b, 0xf4, 0x2b, 0xb8, 0x6a, 0xf0, 0xe8, 0xa9, 0xbf, 0xc2, 0xc8, 0xf8, 0x60, 0xee, 0x18,
|
||||
0x46, 0x67, 0x71, 0x53, 0x8b, 0x6f, 0x5e, 0x18, 0xd2, 0x63, 0x21, 0xbc, 0x37, 0x66, 0x6d, 0xfe,
|
||||
0x44, 0x21, 0xc2, 0x18, 0x95, 0x51, 0x63, 0xe8, 0xee, 0x44, 0x6c, 0xfd, 0x51, 0x8f, 0x9f, 0xb8,
|
||||
0xc5, 0x73, 0xb8, 0x6a, 0x31, 0x0a, 0x46, 0xbe, 0x02, 0x6d, 0x57, 0x28, 0x0b, 0x8e, 0x96, 0xf8,
|
||||
0x08, 0x78, 0x6f, 0x61, 0xfc, 0x17, 0x72, 0xfa, 0xae, 0xfa, 0xa8, 0x88, 0x16, 0x47, 0xe7, 0x84,
|
||||
0x83, 0x3c, 0x82, 0x1e, 0x2b, 0xd6, 0x09, 0x56, 0x76, 0x1f, 0x6d, 0xe5, 0x3d, 0x85, 0xeb, 0x13,
|
||||
0x6e, 0xc1, 0xec, 0xeb, 0x45, 0x37, 0x9a, 0x7e, 0xe0, 0x9b, 0xc2, 0x4b, 0x60, 0xbc, 0xda, 0x86,
|
||||
0x1c, 0x37, 0x4b, 0xac, 0x7c, 0x7c, 0x28, 0x50, 0x48, 0xf2, 0x14, 0xc6, 0xc8, 0xb6, 0xb8, 0x43,
|
||||
0x1e, 0xa6, 0x81, 0x1d, 0x60, 0x34, 0x5d, 0xd5, 0xf8, 0x1b, 0x0d, 0x7f, 0xa2, 0x49, 0x0b, 0xb8,
|
||||
0x6e, 0x0c, 0x13, 0x2c, 0xcf, 0x04, 0xea, 0xe0, 0x35, 0x18, 0x1c, 0xe7, 0x5c, 0x88, 0x43, 0xdb,
|
||||
0xe2, 0x9f, 0x0e, 0xf4, 0x56, 0xfa, 0x57, 0x8e, 0xfc, 0x0c, 0x23, 0xf5, 0xf4, 0x5a, 0xbf, 0x20,
|
||||
0x7e, 0x58, 0x92, 0x71, 0x6b, 0x4f, 0x7d, 0x7c, 0xb8, 0xbd, 0x3e, 0x41, 0x04, 0x23, 0xbf, 0x03,
|
||||
0xf9, 0x23, 0xdf, 0xb1, 0x42, 0x62, 0x73, 0x11, 0x3f, 0xbc, 0xea, 0xfe, 0xe7, 0xde, 0x18, 0x06,
|
||||
0xa7, 0x91, 0x2d, 0x69, 0xbf, 0x1d, 0xc7, 0xf8, 0x1a, 0x0c, 0xa7, 0xab, 0x70, 0x07, 0xa3, 0x56,
|
||||
0x20, 0xe4, 0x71, 0xdd, 0x7a, 0xba, 0x04, 0xb7, 0xb7, 0xff, 0x77, 0x24, 0x18, 0x79, 0x01, 0x57,
|
||||
0xcf, 0x91, 0xd3, 0xf7, 0x58, 0xdb, 0xd8, 0x60, 0x3a, 0xcd, 0xb1, 0xc1, 0xf4, 0x81, 0xeb, 0xcf,
|
||||
0xe6, 0x6f, 0x7f, 0x88, 0xa9, 0xdc, 0x16, 0xeb, 0x59, 0x94, 0xef, 0xe6, 0x29, 0x8d, 0xb7, 0x32,
|
||||
0xa3, 0x59, 0x9c, 0xa1, 0x2c, 0x73, 0x9e, 0xcc, 0xd3, 0x6c, 0x33, 0x4f, 0xeb, 0x2f, 0x0c, 0x67,
|
||||
0xd1, 0xba, 0xa7, 0xbf, 0x31, 0x3f, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x73, 0xb0, 0xe9, 0x51,
|
||||
0x7b, 0x06, 0x00, 0x00,
|
||||
// 775 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xed, 0x8e, 0xdb, 0x44,
|
||||
0x14, 0x55, 0x12, 0x36, 0xc9, 0x5e, 0x27, 0xbb, 0xd9, 0x61, 0x55, 0xdc, 0x05, 0xc4, 0x62, 0xa9,
|
||||
0x68, 0x2b, 0x41, 0x02, 0x01, 0x21, 0xc1, 0x2f, 0xb4, 0x54, 0xab, 0x56, 0x29, 0x6a, 0xe5, 0xac,
|
||||
0xf8, 0xd1, 0x3f, 0x96, 0xe3, 0xdc, 0x3a, 0x23, 0x3b, 0xf6, 0xec, 0xcc, 0xb8, 0x8e, 0x9f, 0x83,
|
||||
0x37, 0xe0, 0x99, 0x78, 0x20, 0x34, 0x1f, 0x71, 0xec, 0x14, 0x50, 0xf9, 0xb5, 0xbe, 0xc7, 0x77,
|
||||
0xce, 0x3d, 0x7b, 0xce, 0x9d, 0x18, 0x2e, 0x05, 0x8d, 0x33, 0xce, 0xa2, 0x99, 0xfa, 0x8b, 0x7c,
|
||||
0xca, 0x78, 0x2e, 0x73, 0x32, 0xb0, 0xa8, 0xf7, 0x1c, 0x60, 0x81, 0xd5, 0xcb, 0x3c, 0x0a, 0x65,
|
||||
0xce, 0xc9, 0xe7, 0x00, 0x09, 0x56, 0xc1, 0xdb, 0x70, 0x4b, 0xd3, 0xca, 0xed, 0x5c, 0x77, 0x6e,
|
||||
0x4e, 0xfc, 0xd3, 0x04, 0xab, 0x3b, 0x0d, 0x90, 0x4f, 0x41, 0x15, 0x01, 0xcd, 0xd6, 0xb8, 0x73,
|
||||
0xbb, 0xfa, 0xed, 0x30, 0xc1, 0xea, 0x85, 0xaa, 0xbd, 0x10, 0xc6, 0x0b, 0xac, 0x9e, 0xa1, 0x88,
|
||||
0x38, 0x65, 0x8a, 0xcc, 0x83, 0x31, 0x0f, 0xcb, 0x40, 0x9d, 0x58, 0x55, 0x12, 0x85, 0xe6, 0x1b,
|
||||
0xf9, 0x0e, 0x0f, 0xcb, 0x05, 0x56, 0xb7, 0x0a, 0x22, 0x5f, 0xc3, 0x40, 0xbd, 0x4f, 0xf3, 0x48,
|
||||
0xf3, 0x39, 0xf3, 0x8f, 0xa7, 0x56, 0xd9, 0xf4, 0x20, 0xcb, 0xef, 0x27, 0xfa, 0xd9, 0xfb, 0x19,
|
||||
0x4e, 0xee, 0x77, 0xaf, 0x0a, 0x49, 0x2e, 0xe1, 0xe4, 0x5d, 0x98, 0x16, 0xa8, 0x29, 0x7b, 0xbe,
|
||||
0x29, 0x94, 0x3c, 0x96, 0x04, 0x66, 0xbe, 0xa6, 0x1b, 0xf9, 0x43, 0x96, 0x2c, 0x75, 0xed, 0xfd,
|
||||
0xd1, 0x85, 0xb3, 0x25, 0x8d, 0xb3, 0x86, 0xc0, 0xef, 0x40, 0xa9, 0x0f, 0xd6, 0x28, 0x22, 0x4d,
|
||||
0xe4, 0xcc, 0x1f, 0x35, 0xa7, 0x1f, 0x3a, 0x7d, 0x25, 0x52, 0x95, 0xe4, 0x4b, 0x18, 0x09, 0x9a,
|
||||
0xc5, 0x29, 0x06, 0xb2, 0xc4, 0x30, 0xb1, 0x53, 0x1c, 0x83, 0xdd, 0x2b, 0x48, 0xb5, 0xac, 0xf3,
|
||||
0x62, 0x55, 0xb7, 0xf4, 0x4c, 0x8b, 0xc1, 0x4c, 0xcb, 0x13, 0x38, 0x2b, 0xa9, 0xcc, 0x50, 0x88,
|
||||
0xbd, 0xda, 0x8f, 0x74, 0xd3, 0xd8, 0xa2, 0x46, 0x32, 0xf9, 0x0a, 0xfa, 0x79, 0x21, 0x59, 0x21,
|
||||
0xdd, 0x13, 0xad, 0xee, 0xac, 0x56, 0xa7, 0x5d, 0xf0, 0xed, 0x5b, 0xe2, 0x82, 0x8a, 0x73, 0x13,
|
||||
0x8a, 0x8d, 0x3b, 0xb8, 0xee, 0xdc, 0x8c, 0xfd, 0x7d, 0x49, 0xbe, 0x00, 0x87, 0x66, 0xac, 0x90,
|
||||
0x36, 0xb2, 0xa1, 0x8e, 0x0c, 0x34, 0x64, 0x42, 0x8b, 0x60, 0xa0, 0x4c, 0xf1, 0xf1, 0x81, 0x5c,
|
||||
0xc3, 0x48, 0xc5, 0x25, 0x77, 0xad, 0xb4, 0x80, 0x87, 0xe5, 0xfd, 0xce, 0x84, 0xf5, 0x23, 0x80,
|
||||
0x12, 0xa0, 0x0d, 0x13, 0x6e, 0xf7, 0xba, 0x77, 0xe3, 0xcc, 0x3f, 0xa9, 0x35, 0xb5, 0xcd, 0xf5,
|
||||
0x4f, 0x85, 0xad, 0x85, 0xf7, 0x04, 0x86, 0x66, 0x88, 0x60, 0xe4, 0x31, 0x0c, 0xd5, 0x14, 0x41,
|
||||
0x63, 0x35, 0xa1, 0x77, 0x33, 0xf2, 0x07, 0x3c, 0x2c, 0x97, 0x34, 0x16, 0xde, 0x1d, 0x38, 0x2f,
|
||||
0x94, 0x32, 0xfb, 0xdf, 0xbb, 0x30, 0xb0, 0x76, 0xec, 0x1b, 0x6d, 0xa9, 0xb6, 0x54, 0xd0, 0xb8,
|
||||
0x1d, 0xb4, 0x1a, 0x67, 0x93, 0x7e, 0x09, 0xe7, 0x0d, 0x1e, 0x3d, 0xf5, 0x27, 0x18, 0x1b, 0x1f,
|
||||
0xcc, 0x19, 0xc3, 0xe8, 0xcc, 0x2f, 0x6b, 0xf1, 0xcd, 0x03, 0x23, 0x7a, 0x28, 0x84, 0xf7, 0xda,
|
||||
0xac, 0xcd, 0x6f, 0x28, 0x44, 0x18, 0xa3, 0x32, 0x6a, 0x02, 0xbd, 0xad, 0x88, 0xad, 0x3f, 0xea,
|
||||
0xf1, 0x7f, 0x6e, 0xf1, 0x0c, 0xce, 0x5b, 0x8c, 0x82, 0x91, 0xcf, 0x40, 0xdb, 0x15, 0xca, 0x82,
|
||||
0xa3, 0x25, 0x3e, 0x00, 0xde, 0x1b, 0x98, 0xfc, 0x8e, 0x9c, 0xbe, 0xad, 0xfe, 0x53, 0x44, 0x8b,
|
||||
0xa3, 0x7b, 0xc4, 0x41, 0x1e, 0x41, 0x9f, 0x15, 0xab, 0x04, 0x2b, 0xbb, 0x8f, 0xb6, 0xf2, 0x9e,
|
||||
0xc2, 0xc5, 0x11, 0xb7, 0x60, 0xf6, 0x7a, 0xd1, 0xb5, 0xa6, 0x1f, 0xfa, 0xa6, 0xf0, 0xfe, 0xec,
|
||||
0xc0, 0x64, 0xb9, 0x09, 0x39, 0xae, 0x17, 0x58, 0xf9, 0xf8, 0x50, 0xa0, 0x90, 0xe4, 0x29, 0x4c,
|
||||
0x90, 0x6d, 0x70, 0x8b, 0x3c, 0x4c, 0x03, 0x3b, 0xc1, 0x88, 0x3a, 0xaf, 0xf1, 0xd7, 0x1a, 0x26,
|
||||
0xdf, 0x7e, 0x88, 0x4b, 0xb7, 0x5d, 0xb7, 0xb3, 0x77, 0xaa, 0x75, 0x41, 0x7b, 0x1f, 0x74, 0x41,
|
||||
0xbd, 0x39, 0x5c, 0x34, 0x34, 0x0a, 0x96, 0x67, 0x02, 0xf5, 0xc2, 0x68, 0x30, 0x38, 0xc8, 0x3b,
|
||||
0x15, 0xfb, 0xb6, 0xf9, 0x5f, 0x5d, 0xe8, 0x2f, 0xf5, 0xaf, 0x23, 0xf9, 0x01, 0xc6, 0xea, 0xe9,
|
||||
0x95, 0xbe, 0x58, 0x7e, 0x58, 0x92, 0x49, 0x6b, 0xbf, 0x7d, 0x7c, 0xb8, 0xba, 0x38, 0x42, 0x04,
|
||||
0x23, 0xbf, 0x00, 0xf9, 0x35, 0xdf, 0xb2, 0x42, 0x62, 0x73, 0x81, 0xdf, 0x3f, 0xea, 0xfe, 0xe3,
|
||||
0xbe, 0x19, 0x06, 0xa7, 0xb1, 0x13, 0xa4, 0x7d, 0xab, 0x0e, 0xb1, 0x37, 0x18, 0x8e, 0x57, 0xe8,
|
||||
0x0e, 0xc6, 0xad, 0x20, 0xc9, 0xe3, 0xba, 0xf5, 0x78, 0x79, 0xae, 0xae, 0xfe, 0xed, 0x95, 0x60,
|
||||
0xe4, 0x39, 0x9c, 0x3f, 0x43, 0x4e, 0xdf, 0x61, 0x6d, 0x63, 0x83, 0xe9, 0x38, 0xfe, 0x06, 0xd3,
|
||||
0x7b, 0xae, 0xdf, 0xce, 0xde, 0x7c, 0x13, 0x53, 0xb9, 0x29, 0x56, 0xd3, 0x28, 0xdf, 0xce, 0x52,
|
||||
0x1a, 0x6f, 0x64, 0x46, 0xb3, 0x38, 0x43, 0x59, 0xe6, 0x3c, 0x99, 0xa5, 0xd9, 0x7a, 0x96, 0xd6,
|
||||
0x5f, 0x26, 0xce, 0xa2, 0x55, 0x5f, 0x7f, 0x9b, 0xbe, 0xff, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x7d,
|
||||
0x28, 0x4a, 0xad, 0xb3, 0x06, 0x00, 0x00,
|
||||
}
|
||||
|
||||
// Reference imports to suppress errors if they are not otherwise used.
|
||||
@ -882,8 +897,9 @@ type SignerClient interface {
|
||||
//
|
||||
//DeriveSharedKey returns a shared secret key by performing Diffie-Hellman key
|
||||
//derivation between the ephemeral public key in the request and the node's
|
||||
//key specified in the key_loc parameter (or the node's identity private key
|
||||
//if no key locator is specified):
|
||||
//key specified in the key_desc parameter. Either a key locator or a raw
|
||||
//public key is expected in the key_desc, if neither is supplied, defaults to
|
||||
//the node's identity private key:
|
||||
//P_shared = privKeyNode * ephemeralPubkey
|
||||
//The resulting shared public key is serialized in the compressed format and
|
||||
//hashed with sha256, resulting in the final key length of 256bit.
|
||||
@ -984,8 +1000,9 @@ type SignerServer interface {
|
||||
//
|
||||
//DeriveSharedKey returns a shared secret key by performing Diffie-Hellman key
|
||||
//derivation between the ephemeral public key in the request and the node's
|
||||
//key specified in the key_loc parameter (or the node's identity private key
|
||||
//if no key locator is specified):
|
||||
//key specified in the key_desc parameter. Either a key locator or a raw
|
||||
//public key is expected in the key_desc, if neither is supplied, defaults to
|
||||
//the node's identity private key:
|
||||
//P_shared = privKeyNode * ephemeralPubkey
|
||||
//The resulting shared public key is serialized in the compressed format and
|
||||
//hashed with sha256, resulting in the final key length of 256bit.
|
||||
|
||||
@ -54,8 +54,9 @@ service Signer {
|
||||
/*
|
||||
DeriveSharedKey returns a shared secret key by performing Diffie-Hellman key
|
||||
derivation between the ephemeral public key in the request and the node's
|
||||
key specified in the key_loc parameter (or the node's identity private key
|
||||
if no key locator is specified):
|
||||
key specified in the key_desc parameter. Either a key locator or a raw
|
||||
public key is expected in the key_desc, if neither is supplied, defaults to
|
||||
the node's identity private key:
|
||||
P_shared = privKeyNode * ephemeralPubkey
|
||||
The resulting shared public key is serialized in the compressed format and
|
||||
hashed with sha256, resulting in the final key length of 256bit.
|
||||
@ -220,10 +221,18 @@ message SharedKeyRequest {
|
||||
bytes ephemeral_pubkey = 1;
|
||||
|
||||
/*
|
||||
The optional key locator of the local key that should be used. If this
|
||||
parameter is not set then the node's identity private key will be used.
|
||||
Deprecated. The optional key locator of the local key that should be used.
|
||||
If this parameter is not set then the node's identity private key will be
|
||||
used.
|
||||
*/
|
||||
KeyLocator key_loc = 2;
|
||||
KeyLocator key_loc = 2 [deprecated = true];
|
||||
|
||||
/*
|
||||
A key descriptor describes the key used for performing ECDH. Either a key
|
||||
locator or a raw public key is expected, if neither is supplied, defaults to
|
||||
the node's identity private key.
|
||||
*/
|
||||
KeyDescriptor key_desc = 3;
|
||||
}
|
||||
|
||||
message SharedKeyResponse {
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
},
|
||||
"/v2/signer/sharedkey": {
|
||||
"post": {
|
||||
"summary": "DeriveSharedKey returns a shared secret key by performing Diffie-Hellman key\nderivation between the ephemeral public key in the request and the node's\nkey specified in the key_loc parameter (or the node's identity private key\nif no key locator is specified):\nP_shared = privKeyNode * ephemeralPubkey\nThe resulting shared public key is serialized in the compressed format and\nhashed with sha256, resulting in the final key length of 256bit.",
|
||||
"summary": "DeriveSharedKey returns a shared secret key by performing Diffie-Hellman key\nderivation between the ephemeral public key in the request and the node's\nkey specified in the key_desc parameter. Either a key locator or a raw\npublic key is expected in the key_desc, if neither is supplied, defaults to\nthe node's identity private key:\nP_shared = privKeyNode * ephemeralPubkey\nThe resulting shared public key is serialized in the compressed format and\nhashed with sha256, resulting in the final key length of 256bit.",
|
||||
"operationId": "DeriveSharedKey",
|
||||
"responses": {
|
||||
"200": {
|
||||
@ -284,7 +284,11 @@
|
||||
},
|
||||
"key_loc": {
|
||||
"$ref": "#/definitions/signrpcKeyLocator",
|
||||
"description": "The optional key locator of the local key that should be used. If this\nparameter is not set then the node's identity private key will be used."
|
||||
"description": "Deprecated. The optional key locator of the local key that should be used.\nIf this parameter is not set then the node's identity private key will be\nused."
|
||||
},
|
||||
"key_desc": {
|
||||
"$ref": "#/definitions/signrpcKeyDescriptor",
|
||||
"description": "A key descriptor describes the key used for performing ECDH. Either a key\nlocator or a raw public key is expected, if neither is supplied, defaults to\nthe node's identity private key."
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@ -254,27 +254,11 @@ func (s *Server) SignOutputRaw(ctx context.Context, in *SignReq) (*SignResp, err
|
||||
// If this method doesn't return nil, then we know that user is
|
||||
// attempting to include a raw serialized pub key.
|
||||
if keyDesc.GetRawKeyBytes() != nil {
|
||||
rawKeyBytes := keyDesc.GetRawKeyBytes()
|
||||
|
||||
switch {
|
||||
// If the user provided a raw key, but it's of the
|
||||
// wrong length, then we'll return with an error.
|
||||
case len(rawKeyBytes) != 0 && len(rawKeyBytes) != 33:
|
||||
|
||||
return nil, fmt.Errorf("pubkey must be " +
|
||||
"serialized in compressed format if " +
|
||||
"specified")
|
||||
|
||||
// If a proper raw key was provided, then we'll attempt
|
||||
// to decode and parse it.
|
||||
case len(rawKeyBytes) != 0 && len(rawKeyBytes) == 33:
|
||||
targetPubKey, err = btcec.ParsePubKey(
|
||||
rawKeyBytes, btcec.S256(),
|
||||
)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("unable to "+
|
||||
"parse pubkey: %v", err)
|
||||
}
|
||||
targetPubKey, err = parseRawKeyBytes(
|
||||
keyDesc.GetRawKeyBytes(),
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
@ -507,38 +491,82 @@ func (s *Server) VerifyMessage(ctx context.Context,
|
||||
|
||||
// DeriveSharedKey returns a shared secret key by performing Diffie-Hellman key
|
||||
// derivation between the ephemeral public key in the request and the node's
|
||||
// key specified in the key_loc parameter (or the node's identity private key
|
||||
// if no key locator is specified):
|
||||
// P_shared = privKeyNode * ephemeralPubkey
|
||||
// key specified in the key_desc parameter. Either a key locator or a raw public
|
||||
// key is expected in the key_desc, if neither is supplied, defaults to the
|
||||
// node's identity private key. The old key_loc parameter in the request
|
||||
// shouldn't be used anymore.
|
||||
// The resulting shared public key is serialized in the compressed format and
|
||||
// hashed with sha256, resulting in the final key length of 256bit.
|
||||
func (s *Server) DeriveSharedKey(_ context.Context, in *SharedKeyRequest) (
|
||||
*SharedKeyResponse, error) {
|
||||
|
||||
if len(in.EphemeralPubkey) != 33 {
|
||||
return nil, fmt.Errorf("ephemeral pubkey must be " +
|
||||
"serialized in compressed format")
|
||||
}
|
||||
ephemeralPubkey, err := btcec.ParsePubKey(
|
||||
in.EphemeralPubkey, btcec.S256(),
|
||||
)
|
||||
// Check that EphemeralPubkey is valid.
|
||||
ephemeralPubkey, err := parseRawKeyBytes(in.EphemeralPubkey)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("unable to parse pubkey: %v", err)
|
||||
return nil, fmt.Errorf("error in ephemeral pubkey: %v", err)
|
||||
}
|
||||
if ephemeralPubkey == nil {
|
||||
return nil, fmt.Errorf("must provide ephemeral pubkey")
|
||||
}
|
||||
|
||||
// By default, use the node identity private key.
|
||||
locator := keychain.KeyLocator{
|
||||
Family: keychain.KeyFamilyNodeKey,
|
||||
Index: 0,
|
||||
// Check for backward compatibility. The caller either specifies the old
|
||||
// key_loc field, or the new key_desc field, but not both.
|
||||
if in.KeyDesc != nil && in.KeyLoc != nil {
|
||||
return nil, fmt.Errorf("use either key_desc or key_loc")
|
||||
}
|
||||
if in.KeyLoc != nil {
|
||||
locator.Family = keychain.KeyFamily(in.KeyLoc.KeyFamily)
|
||||
locator.Index = uint32(in.KeyLoc.KeyIndex)
|
||||
|
||||
// When key_desc is used, the key_desc.key_loc is expected as the caller
|
||||
// needs to specify the KeyFamily.
|
||||
if in.KeyDesc != nil && in.KeyDesc.KeyLoc == nil {
|
||||
return nil, fmt.Errorf("when setting key_desc the field " +
|
||||
"key_desc.key_loc must also be set")
|
||||
}
|
||||
|
||||
// We extract two params, rawKeyBytes and keyLoc. Notice their initial
|
||||
// values will be overwritten if not using the deprecated RPC param.
|
||||
var rawKeyBytes []byte
|
||||
keyLoc := in.KeyLoc
|
||||
if in.KeyDesc != nil {
|
||||
keyLoc = in.KeyDesc.GetKeyLoc()
|
||||
rawKeyBytes = in.KeyDesc.GetRawKeyBytes()
|
||||
}
|
||||
|
||||
// When no keyLoc is supplied, defaults to the node's identity private
|
||||
// key.
|
||||
if keyLoc == nil {
|
||||
keyLoc = &KeyLocator{
|
||||
KeyFamily: int32(keychain.KeyFamilyNodeKey),
|
||||
KeyIndex: 0,
|
||||
}
|
||||
}
|
||||
|
||||
// Check the caller is using either the key index or the raw public key
|
||||
// to perform the ECDH, we can't have both.
|
||||
if rawKeyBytes != nil && keyLoc.KeyIndex != 0 {
|
||||
return nil, fmt.Errorf("use either raw_key_bytes or key_index")
|
||||
}
|
||||
|
||||
// Check the raw public key is valid. Notice that if the rawKeyBytes is
|
||||
// empty, the parseRawKeyBytes won't return an error, a nil
|
||||
// *btcec.PublicKey is returned instead.
|
||||
pk, err := parseRawKeyBytes(rawKeyBytes)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error in raw pubkey: %v", err)
|
||||
}
|
||||
|
||||
// Create a key descriptor. When the KeyIndex is not specified, it uses
|
||||
// the empty value 0, and when the raw public key is not specified, the
|
||||
// pk is nil.
|
||||
keyDescriptor := keychain.KeyDescriptor{
|
||||
KeyLocator: keychain.KeyLocator{
|
||||
Family: keychain.KeyFamily(keyLoc.KeyFamily),
|
||||
Index: uint32(keyLoc.KeyIndex),
|
||||
},
|
||||
PubKey: pk,
|
||||
}
|
||||
|
||||
// Derive the shared key using ECDH and hashing the serialized
|
||||
// compressed shared point.
|
||||
keyDescriptor := keychain.KeyDescriptor{KeyLocator: locator}
|
||||
sharedKeyHash, err := s.cfg.KeyRing.ECDH(keyDescriptor, ephemeralPubkey)
|
||||
if err != nil {
|
||||
err := fmt.Errorf("unable to derive shared key: %v", err)
|
||||
@ -548,3 +576,29 @@ func (s *Server) DeriveSharedKey(_ context.Context, in *SharedKeyRequest) (
|
||||
|
||||
return &SharedKeyResponse{SharedKey: sharedKeyHash[:]}, nil
|
||||
}
|
||||
|
||||
// parseRawKeyBytes checks that the provided raw public key is valid and returns
|
||||
// the public key. A nil public key is returned if the length of the rawKeyBytes
|
||||
// is zero.
|
||||
func parseRawKeyBytes(rawKeyBytes []byte) (*btcec.PublicKey, error) {
|
||||
switch {
|
||||
|
||||
case len(rawKeyBytes) == 33:
|
||||
// If a proper raw key was provided, then we'll attempt
|
||||
// to decode and parse it.
|
||||
return btcec.ParsePubKey(
|
||||
rawKeyBytes, btcec.S256(),
|
||||
)
|
||||
|
||||
case len(rawKeyBytes) == 0:
|
||||
// No key is provided, return nil.
|
||||
return nil, nil
|
||||
|
||||
default:
|
||||
// If the user provided a raw key, but it's of the
|
||||
// wrong length, then we'll return with an error.
|
||||
return nil, fmt.Errorf("pubkey must be " +
|
||||
"serialized in compressed format if " +
|
||||
"specified")
|
||||
}
|
||||
}
|
||||
|
||||
@ -14236,6 +14236,10 @@ var testsCases = []*testCase{
|
||||
name: "node sign verify",
|
||||
test: testNodeSignVerify,
|
||||
},
|
||||
{
|
||||
name: "derive shared key",
|
||||
test: testDeriveSharedKey,
|
||||
},
|
||||
{
|
||||
name: "async payments benchmark",
|
||||
test: testAsyncPayments,
|
||||
|
||||
@ -227,3 +227,7 @@
|
||||
<time> [ERR] RPCS: [/lnrpc.Lightning/ConnectPeer]: dial tcp <ip>: i/o timeout
|
||||
<time> [ERR] RPCS: [connectpeer]: error connecting to peer: dial tcp <ip>: i/o timeout
|
||||
<time> [ERR] SRVR: Unable to connect to <hex>@<ip>: dial tcp <ip>: i/o timeout
|
||||
<time> [ERR] RPCS: [/signrpc.Signer/DeriveSharedKey]: use either key_desc or key_loc
|
||||
<time> [ERR] RPCS: [/signrpc.Signer/DeriveSharedKey]: use either raw_key_bytes or key_index
|
||||
<time> [ERR] RPCS: [/signrpc.Signer/DeriveSharedKey]: when setting key_desc the field key_desc.key_loc must also be set
|
||||
<time> [ERR] RPCS: [/signrpc.Signer/DeriveSharedKey]: must provide ephemeral pubkey
|
||||
206
lntest/itest/signer.go
Normal file
206
lntest/itest/signer.go
Normal file
@ -0,0 +1,206 @@
|
||||
// +build rpctest
|
||||
|
||||
package itest
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/btcsuite/btcd/btcec"
|
||||
"github.com/lightningnetwork/lnd/keychain"
|
||||
"github.com/lightningnetwork/lnd/lnrpc/signrpc"
|
||||
"github.com/lightningnetwork/lnd/lntest"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
// testDeriveSharedKey checks the ECDH performed by the endpoint
|
||||
// DeriveSharedKey. It creates an ephemeral private key, performing an ECDH with
|
||||
// the node's pubkey and a customized public key to check the validity of the
|
||||
// result.
|
||||
func testDeriveSharedKey(net *lntest.NetworkHarness, t *harnessTest) {
|
||||
ctxb := context.Background()
|
||||
|
||||
// Create an ephemeral key, extracts its public key, and make a
|
||||
// PrivKeyECDH using the ephemeral key.
|
||||
ephemeralPriv, err := btcec.NewPrivateKey(btcec.S256())
|
||||
require.NoError(t.t, err, "failed to create ephemeral key")
|
||||
|
||||
ephemeralPubBytes := ephemeralPriv.PubKey().SerializeCompressed()
|
||||
privKeyECDH := &keychain.PrivKeyECDH{PrivKey: ephemeralPriv}
|
||||
|
||||
// assertECDHMatch checks the correctness of the ECDH between the
|
||||
// ephemeral key and the given public key.
|
||||
assertECDHMatch := func(pub *btcec.PublicKey,
|
||||
req *signrpc.SharedKeyRequest) {
|
||||
|
||||
ctxt, _ := context.WithTimeout(ctxb, defaultTimeout)
|
||||
resp, err := net.Alice.SignerClient.DeriveSharedKey(ctxt, req)
|
||||
require.NoError(t.t, err, "calling DeriveSharedKey failed")
|
||||
|
||||
sharedKey, _ := privKeyECDH.ECDH(pub)
|
||||
require.Equal(
|
||||
t.t, sharedKey[:], resp.SharedKey,
|
||||
"failed to derive the expected key",
|
||||
)
|
||||
}
|
||||
|
||||
nodePub, err := btcec.ParsePubKey(net.Alice.PubKey[:], btcec.S256())
|
||||
require.NoError(t.t, err, "failed to parse node pubkey")
|
||||
|
||||
customizedKeyFamily := int32(keychain.KeyFamilyMultiSig)
|
||||
customizedIndex := int32(1)
|
||||
customizedPub, err := deriveCustomizedKey(
|
||||
ctxb, net.Alice, customizedKeyFamily, customizedIndex,
|
||||
)
|
||||
require.NoError(t.t, err, "failed to create customized pubkey")
|
||||
|
||||
// Test DeriveSharedKey with no optional arguments. It will result in
|
||||
// performing an ECDH between the ephemeral key and the node's pubkey.
|
||||
req := &signrpc.SharedKeyRequest{EphemeralPubkey: ephemeralPubBytes}
|
||||
assertECDHMatch(nodePub, req)
|
||||
|
||||
// Test DeriveSharedKey with a KeyLoc which points to the node's pubkey.
|
||||
req = &signrpc.SharedKeyRequest{
|
||||
EphemeralPubkey: ephemeralPubBytes,
|
||||
KeyLoc: &signrpc.KeyLocator{
|
||||
KeyFamily: int32(keychain.KeyFamilyNodeKey),
|
||||
KeyIndex: 0,
|
||||
},
|
||||
}
|
||||
assertECDHMatch(nodePub, req)
|
||||
|
||||
// Test DeriveSharedKey with a KeyLoc being set in KeyDesc. The KeyLoc
|
||||
// points to the node's pubkey.
|
||||
req = &signrpc.SharedKeyRequest{
|
||||
EphemeralPubkey: ephemeralPubBytes,
|
||||
KeyDesc: &signrpc.KeyDescriptor{
|
||||
KeyLoc: &signrpc.KeyLocator{
|
||||
KeyFamily: int32(keychain.KeyFamilyNodeKey),
|
||||
KeyIndex: 0,
|
||||
},
|
||||
},
|
||||
}
|
||||
assertECDHMatch(nodePub, req)
|
||||
|
||||
// Test DeriveSharedKey with RawKeyBytes set in KeyDesc. The RawKeyBytes
|
||||
// is the node's pubkey bytes, and the KeyFamily is KeyFamilyNodeKey.
|
||||
req = &signrpc.SharedKeyRequest{
|
||||
EphemeralPubkey: ephemeralPubBytes,
|
||||
KeyDesc: &signrpc.KeyDescriptor{
|
||||
RawKeyBytes: net.Alice.PubKey[:],
|
||||
KeyLoc: &signrpc.KeyLocator{
|
||||
KeyFamily: int32(keychain.KeyFamilyNodeKey),
|
||||
},
|
||||
},
|
||||
}
|
||||
assertECDHMatch(nodePub, req)
|
||||
|
||||
// Test DeriveSharedKey with a KeyLoc which points to the customized
|
||||
// public key.
|
||||
req = &signrpc.SharedKeyRequest{
|
||||
EphemeralPubkey: ephemeralPubBytes,
|
||||
KeyLoc: &signrpc.KeyLocator{
|
||||
KeyFamily: customizedKeyFamily,
|
||||
KeyIndex: customizedIndex,
|
||||
},
|
||||
}
|
||||
assertECDHMatch(customizedPub, req)
|
||||
|
||||
// Test DeriveSharedKey with a KeyLoc being set in KeyDesc. The KeyLoc
|
||||
// points to the customized public key.
|
||||
req = &signrpc.SharedKeyRequest{
|
||||
EphemeralPubkey: ephemeralPubBytes,
|
||||
KeyDesc: &signrpc.KeyDescriptor{
|
||||
KeyLoc: &signrpc.KeyLocator{
|
||||
KeyFamily: customizedKeyFamily,
|
||||
KeyIndex: customizedIndex,
|
||||
},
|
||||
},
|
||||
}
|
||||
assertECDHMatch(customizedPub, req)
|
||||
|
||||
// Test DeriveSharedKey with RawKeyBytes set in KeyDesc. The RawKeyBytes
|
||||
// is the customized public key. The KeyLoc is also set with the family
|
||||
// being the customizedKeyFamily.
|
||||
req = &signrpc.SharedKeyRequest{
|
||||
EphemeralPubkey: ephemeralPubBytes,
|
||||
KeyDesc: &signrpc.KeyDescriptor{
|
||||
RawKeyBytes: customizedPub.SerializeCompressed(),
|
||||
KeyLoc: &signrpc.KeyLocator{
|
||||
KeyFamily: customizedKeyFamily,
|
||||
},
|
||||
},
|
||||
}
|
||||
assertECDHMatch(customizedPub, req)
|
||||
|
||||
// assertErrorMatch checks when calling DeriveSharedKey with invalid
|
||||
// params, the expected error is returned.
|
||||
assertErrorMatch := func(match string, req *signrpc.SharedKeyRequest) {
|
||||
ctxt, _ := context.WithTimeout(ctxb, defaultTimeout)
|
||||
_, err := net.Alice.SignerClient.DeriveSharedKey(ctxt, req)
|
||||
require.Error(t.t, err, "expected to have an error")
|
||||
require.Contains(
|
||||
t.t, err.Error(), match, "error failed to match",
|
||||
)
|
||||
}
|
||||
|
||||
// Test that EphemeralPubkey must be supplied.
|
||||
req = &signrpc.SharedKeyRequest{}
|
||||
assertErrorMatch("must provide ephemeral pubkey", req)
|
||||
|
||||
// Test that cannot use both KeyDesc and KeyLoc.
|
||||
req = &signrpc.SharedKeyRequest{
|
||||
EphemeralPubkey: ephemeralPubBytes,
|
||||
KeyDesc: &signrpc.KeyDescriptor{
|
||||
RawKeyBytes: customizedPub.SerializeCompressed(),
|
||||
},
|
||||
KeyLoc: &signrpc.KeyLocator{
|
||||
KeyFamily: customizedKeyFamily,
|
||||
KeyIndex: 0,
|
||||
},
|
||||
}
|
||||
assertErrorMatch("use either key_desc or key_loc", req)
|
||||
|
||||
// Test when KeyDesc is used, KeyLoc must be set.
|
||||
req = &signrpc.SharedKeyRequest{
|
||||
EphemeralPubkey: ephemeralPubBytes,
|
||||
KeyDesc: &signrpc.KeyDescriptor{
|
||||
RawKeyBytes: net.Alice.PubKey[:],
|
||||
},
|
||||
}
|
||||
assertErrorMatch("key_desc.key_loc must also be set", req)
|
||||
|
||||
// Test that cannot use both RawKeyBytes and KeyIndex.
|
||||
req = &signrpc.SharedKeyRequest{
|
||||
EphemeralPubkey: ephemeralPubBytes,
|
||||
KeyDesc: &signrpc.KeyDescriptor{
|
||||
RawKeyBytes: customizedPub.SerializeCompressed(),
|
||||
KeyLoc: &signrpc.KeyLocator{
|
||||
KeyFamily: customizedKeyFamily,
|
||||
KeyIndex: 1,
|
||||
},
|
||||
},
|
||||
}
|
||||
assertErrorMatch("use either raw_key_bytes or key_index", req)
|
||||
}
|
||||
|
||||
// deriveCustomizedKey uses the family and index to derive a public key from
|
||||
// the node's walletkit client.
|
||||
func deriveCustomizedKey(ctx context.Context, node *lntest.HarnessNode,
|
||||
family, index int32) (*btcec.PublicKey, error) {
|
||||
|
||||
ctxt, _ := context.WithTimeout(ctx, defaultTimeout)
|
||||
req := &signrpc.KeyLocator{
|
||||
KeyFamily: family,
|
||||
KeyIndex: index,
|
||||
}
|
||||
resp, err := node.WalletKitClient.DeriveKey(ctxt, req)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to derive key: %v", err)
|
||||
}
|
||||
pub, err := btcec.ParsePubKey(resp.RawKeyBytes, btcec.S256())
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to parse node pubkey: %v", err)
|
||||
}
|
||||
return pub, nil
|
||||
}
|
||||
@ -26,6 +26,7 @@ import (
|
||||
"github.com/lightningnetwork/lnd/lnrpc"
|
||||
"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
|
||||
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
|
||||
"github.com/lightningnetwork/lnd/lnrpc/signrpc"
|
||||
"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
|
||||
"github.com/lightningnetwork/lnd/lnrpc/watchtowerrpc"
|
||||
"github.com/lightningnetwork/lnd/lnrpc/wtclientrpc"
|
||||
@ -285,6 +286,10 @@ type HarnessNode struct {
|
||||
|
||||
invoicesrpc.InvoicesClient
|
||||
|
||||
// SignerClient cannot be embedded because the name collisions of the
|
||||
// methods SignMessage and VerifyMessage.
|
||||
SignerClient signrpc.SignerClient
|
||||
|
||||
// conn is the underlying connection to the grpc endpoint of the node.
|
||||
conn *grpc.ClientConn
|
||||
|
||||
@ -584,6 +589,7 @@ func (hn *HarnessNode) initLightningClient(conn *grpc.ClientConn) error {
|
||||
hn.WalletKitClient = walletrpc.NewWalletKitClient(conn)
|
||||
hn.Watchtower = watchtowerrpc.NewWatchtowerClient(conn)
|
||||
hn.WatchtowerClient = wtclientrpc.NewWatchtowerClientClient(conn)
|
||||
hn.SignerClient = signrpc.NewSignerClient(conn)
|
||||
|
||||
// Set the harness node's pubkey to what the node claims in GetInfo.
|
||||
err := hn.FetchNodeInfo()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user