diff --git a/proto/validator/accounts/v2/web_api.pb.go b/proto/validator/accounts/v2/web_api.pb.go index 835b5b45c4..6222a2f195 100755 --- a/proto/validator/accounts/v2/web_api.pb.go +++ b/proto/validator/accounts/v2/web_api.pb.go @@ -1397,124 +1397,122 @@ func init() { } var fileDescriptor_8a5153635bfe042e = []byte{ - // 1857 bytes of a gzipped FileDescriptorProto + // 1832 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x6f, 0x23, 0x49, - 0x15, 0xa7, 0x9c, 0xc4, 0x63, 0x3f, 0x3b, 0x8e, 0x53, 0x49, 0x3c, 0xc6, 0x33, 0x93, 0xc9, 0xf4, - 0xb2, 0x33, 0x49, 0x66, 0xc7, 0x5e, 0x3c, 0xcb, 0x4c, 0x08, 0x07, 0x34, 0xe3, 0x98, 0x9d, 0x28, - 0xf3, 0xa5, 0xde, 0x88, 0x15, 0x07, 0x68, 0x55, 0xdc, 0xb5, 0xed, 0x92, 0xed, 0x6a, 0x6f, 0x77, - 0x39, 0x1f, 0xc3, 0x6d, 0x85, 0xc4, 0x01, 0x38, 0xc0, 0x1e, 0x10, 0x07, 0x0e, 0x8c, 0xc4, 0x05, - 0x2e, 0x20, 0x21, 0x71, 0xe3, 0xc0, 0x89, 0x23, 0x12, 0x77, 0x40, 0x23, 0xae, 0x5c, 0xf8, 0x0b, - 0x50, 0x7d, 0x74, 0xbb, 0xed, 0xd8, 0x38, 0x19, 0xb4, 0x17, 0xab, 0xeb, 0xd5, 0xab, 0xf7, 0x7e, - 0xf5, 0xbe, 0xcb, 0xb0, 0xd5, 0x0f, 0x7c, 0xe1, 0xd7, 0x8e, 0x49, 0x97, 0xb9, 0x44, 0xf8, 0x41, - 0x8d, 0xb4, 0x5a, 0xfe, 0x80, 0x8b, 0xb0, 0x76, 0x5c, 0xaf, 0x9d, 0xd0, 0x23, 0x87, 0xf4, 0x59, - 0x55, 0xf1, 0xe0, 0x75, 0x2a, 0xda, 0x34, 0xa0, 0x83, 0x5e, 0x35, 0xe6, 0xae, 0x46, 0xdc, 0xd5, - 0xe3, 0x7a, 0xe5, 0xba, 0xe7, 0xfb, 0x5e, 0x97, 0xd6, 0x48, 0x9f, 0xd5, 0x08, 0xe7, 0xbe, 0x20, - 0x82, 0xf9, 0x3c, 0xd4, 0xa7, 0x2b, 0xd7, 0xcc, 0xae, 0x5a, 0x1d, 0x0d, 0x3e, 0xa9, 0xd1, 0x5e, - 0x5f, 0x9c, 0x99, 0xcd, 0x7b, 0x1e, 0x13, 0xed, 0xc1, 0x51, 0xb5, 0xe5, 0xf7, 0x6a, 0x9e, 0xef, - 0xf9, 0x43, 0x2e, 0xb9, 0xd2, 0x10, 0xe5, 0x97, 0x66, 0xb7, 0x7e, 0x3c, 0x07, 0x2b, 0x8d, 0x80, - 0x12, 0x41, 0x3f, 0x26, 0xdd, 0x2e, 0x15, 0x36, 0xfd, 0x74, 0x40, 0x43, 0x81, 0x6f, 0x42, 0xee, - 0x44, 0x11, 0x9c, 0x3e, 0x11, 0xed, 0x32, 0xda, 0x40, 0x9b, 0x59, 0x1b, 0x34, 0xe9, 0x25, 0x11, - 0x6d, 0xfc, 0x1c, 0xa0, 0x43, 0xcf, 0x7a, 0x84, 0x13, 0x8f, 0x06, 0xe5, 0xd4, 0x06, 0xda, 0x2c, - 0xd4, 0xab, 0xd5, 0xff, 0x7d, 0xaf, 0xea, 0x41, 0x7c, 0xe2, 0x80, 0x71, 0xd7, 0x4e, 0x48, 0xc0, - 0x77, 0x60, 0x29, 0x56, 0x18, 0x86, 0x27, 0x7e, 0xe0, 0x96, 0xe7, 0x94, 0xd2, 0x42, 0xa4, 0x54, - 0x53, 0x71, 0x05, 0x32, 0x3d, 0x4e, 0x7b, 0x3e, 0x67, 0xad, 0xf2, 0xbc, 0xe2, 0x88, 0xd7, 0xf8, - 0x16, 0xe4, 0xf9, 0xa0, 0xe7, 0x44, 0x2a, 0xcb, 0x0b, 0x1b, 0x68, 0x73, 0xde, 0xce, 0xf1, 0x41, - 0xef, 0x91, 0x21, 0xc9, 0x8b, 0x05, 0xb4, 0xe7, 0x0b, 0xea, 0x10, 0xd7, 0x0d, 0xca, 0x69, 0x7d, - 0x31, 0x4d, 0x7a, 0xe4, 0xba, 0x01, 0xbe, 0x0d, 0x4b, 0x86, 0xa1, 0x15, 0x98, 0xdb, 0x5f, 0x51, - 0x4c, 0x8b, 0x9a, 0xdc, 0x08, 0xb4, 0x01, 0x86, 0x7c, 0x1d, 0x7a, 0xa6, 0xf9, 0x32, 0x49, 0xbe, - 0x03, 0x7a, 0xa6, 0xf8, 0xee, 0x02, 0x8e, 0xe4, 0x91, 0xa1, 0xc8, 0xac, 0x62, 0x35, 0x12, 0x1a, - 0xc4, 0x08, 0xb5, 0xfe, 0x84, 0x60, 0x75, 0xd4, 0x1d, 0x61, 0xdf, 0xe7, 0x21, 0xc5, 0xdf, 0x82, - 0xb4, 0xb6, 0x83, 0x72, 0x45, 0x6e, 0xb6, 0xa9, 0x47, 0xcf, 0xdb, 0xe6, 0x34, 0xfe, 0x1e, 0x14, - 0x23, 0x2e, 0xa7, 0xa5, 0x14, 0xb9, 0xca, 0x79, 0xb9, 0xfa, 0xfd, 0x59, 0x12, 0xf7, 0x68, 0xdf, - 0x0f, 0x99, 0xd8, 0x23, 0x82, 0xc4, 0x62, 0x97, 0x22, 0x06, 0x0d, 0xda, 0xb5, 0xfe, 0x88, 0xe0, - 0x6a, 0xd3, 0x65, 0x42, 0xab, 0x6f, 0xf8, 0xfc, 0x13, 0xe6, 0x25, 0x62, 0x2a, 0x69, 0x7a, 0x74, - 0x11, 0xd3, 0xa7, 0x2e, 0x68, 0xfa, 0xb9, 0x8b, 0x9b, 0x7e, 0x7e, 0xb2, 0xe9, 0x1f, 0x40, 0xf9, - 0x43, 0xca, 0x69, 0x40, 0x04, 0x7d, 0x66, 0xe2, 0x29, 0xb6, 0x7e, 0x32, 0xe6, 0xd0, 0x68, 0xcc, - 0x59, 0x7f, 0x4e, 0x41, 0x61, 0xcc, 0x59, 0x33, 0x93, 0xe7, 0x63, 0x58, 0x1a, 0x86, 0xbe, 0xd3, - 0x61, 0xdc, 0x7d, 0xcb, 0x0c, 0x2a, 0x74, 0x46, 0xd6, 0xf8, 0x53, 0x58, 0x4e, 0x08, 0x6e, 0x29, - 0xf3, 0x97, 0xe7, 0x36, 0xe6, 0x36, 0x73, 0xf5, 0xbd, 0xcb, 0x45, 0x4c, 0x42, 0x93, 0xf6, 0x62, - 0x93, 0x8b, 0xe0, 0xcc, 0x2e, 0x76, 0xc6, 0xc8, 0x95, 0x06, 0xac, 0x4d, 0x64, 0xc5, 0x45, 0x98, - 0xeb, 0xd0, 0x33, 0x73, 0x7b, 0xf9, 0x89, 0x57, 0x61, 0xe1, 0x98, 0x74, 0x07, 0xd4, 0x78, 0x55, - 0x2f, 0x76, 0x53, 0x3b, 0xc8, 0xfa, 0x19, 0x82, 0x95, 0xa7, 0x2c, 0x14, 0x51, 0x9a, 0x46, 0x21, - 0x73, 0x0f, 0x56, 0x3c, 0x2a, 0x1c, 0x57, 0x87, 0x9e, 0x23, 0x4e, 0x1d, 0x97, 0x08, 0xa2, 0x64, - 0x66, 0xec, 0xa2, 0x47, 0x85, 0x09, 0xca, 0xc3, 0x53, 0x19, 0x96, 0xf8, 0x1a, 0x64, 0xfb, 0xc4, - 0xa3, 0x4e, 0xc8, 0x5e, 0x69, 0x25, 0x0b, 0x76, 0x46, 0x12, 0x3e, 0x62, 0xaf, 0x28, 0xbe, 0x01, - 0xa0, 0x36, 0x85, 0xdf, 0xa1, 0xdc, 0x04, 0x8c, 0x62, 0x3f, 0x94, 0x04, 0x09, 0x97, 0x74, 0xbb, - 0x2a, 0x3a, 0x32, 0xb6, 0xfc, 0xb4, 0x5e, 0x23, 0x58, 0x1d, 0x05, 0x65, 0xfc, 0xdb, 0x80, 0x4c, - 0x5c, 0x62, 0x90, 0x32, 0xee, 0x9d, 0x59, 0xc6, 0x35, 0x32, 0xec, 0xf8, 0xa0, 0x0c, 0x62, 0x4e, - 0x4f, 0x65, 0x88, 0xc4, 0x98, 0x4c, 0xb0, 0x4b, 0xf2, 0xcb, 0x18, 0xd7, 0x0d, 0x00, 0xe1, 0x0b, - 0xd2, 0xd5, 0x97, 0x9a, 0x53, 0x97, 0xca, 0x2a, 0x8a, 0xbc, 0x95, 0xf5, 0x7b, 0x04, 0x57, 0x8c, - 0x70, 0x5c, 0x87, 0x35, 0xa3, 0x9d, 0x71, 0xcf, 0xe9, 0x0f, 0x8e, 0xba, 0xac, 0xe5, 0x44, 0x3e, - 0xc8, 0xdb, 0x2b, 0xc3, 0xcd, 0x97, 0x6a, 0xef, 0x80, 0x9e, 0xc9, 0x92, 0x69, 0x20, 0x39, 0x9c, - 0xf4, 0x22, 0xd7, 0xe4, 0x0c, 0xed, 0x39, 0xe9, 0x51, 0x89, 0x74, 0xdc, 0x01, 0x73, 0x4a, 0xe0, - 0xa2, 0x3b, 0x62, 0xfd, 0x3b, 0x92, 0x2f, 0x60, 0xc7, 0xaa, 0x59, 0x25, 0x73, 0xad, 0x30, 0x24, - 0xab, 0x54, 0x3b, 0x80, 0x42, 0x64, 0x8f, 0x61, 0x69, 0x18, 0xc2, 0xd5, 0x46, 0xcd, 0xdb, 0xd0, - 0x8f, 0x50, 0x86, 0xb8, 0x0c, 0x57, 0x18, 0x77, 0x59, 0x8b, 0x86, 0xe5, 0xd4, 0xc6, 0xdc, 0xe6, - 0xbc, 0x1d, 0x2d, 0xad, 0x27, 0x90, 0x7b, 0x34, 0x10, 0xed, 0x48, 0x52, 0x05, 0x32, 0x71, 0x03, - 0x31, 0xa9, 0x1a, 0xad, 0xa5, 0x29, 0x4d, 0x5e, 0xba, 0x2c, 0x30, 0x37, 0xcd, 0x6a, 0xca, 0x1e, - 0x0b, 0xac, 0x17, 0x90, 0xd7, 0x92, 0x8c, 0x9b, 0x57, 0x61, 0x41, 0xfb, 0x45, 0xcb, 0xd1, 0x0b, - 0xbc, 0x05, 0x45, 0xf5, 0xe1, 0xd0, 0xd3, 0x3e, 0x0b, 0xd4, 0xa5, 0x94, 0xa8, 0x79, 0x7b, 0x49, - 0xd1, 0x9b, 0x31, 0xd9, 0xfa, 0x07, 0x82, 0xd2, 0x73, 0xdf, 0xa5, 0x0d, 0x9f, 0x73, 0xda, 0x92, - 0xa4, 0x58, 0xf6, 0xfb, 0xb0, 0x7a, 0x44, 0x49, 0xcb, 0xe7, 0x0e, 0xf7, 0x5d, 0xea, 0x50, 0xee, - 0xf6, 0x7d, 0xc6, 0x85, 0x51, 0x85, 0xf5, 0x9e, 0x3c, 0xdb, 0x34, 0x3b, 0xf8, 0x3a, 0x64, 0x5b, - 0x5a, 0x8e, 0x29, 0xd9, 0x19, 0x7b, 0x48, 0x90, 0xf6, 0x09, 0xcf, 0x78, 0x8b, 0x71, 0x4f, 0xf9, - 0x26, 0x63, 0x47, 0x4b, 0xe9, 0x60, 0x8f, 0x72, 0x1a, 0xb2, 0xd0, 0x11, 0xac, 0x47, 0x95, 0x4b, - 0xe6, 0xed, 0x9c, 0xa1, 0x1d, 0xb2, 0x1e, 0xc5, 0x3b, 0x50, 0x8e, 0x1c, 0xdc, 0xf2, 0xb9, 0x08, - 0x48, 0x4b, 0xa8, 0x12, 0x4d, 0x43, 0xdd, 0x42, 0xf3, 0x76, 0xc9, 0xec, 0x37, 0xcc, 0xf6, 0x23, - 0xbd, 0x6b, 0x7d, 0x8e, 0x60, 0xad, 0xd1, 0x26, 0xdc, 0xa3, 0x51, 0x7f, 0x8e, 0xfc, 0xb0, 0x05, - 0xc5, 0xd6, 0x20, 0x08, 0x28, 0x4f, 0x34, 0x74, 0x7d, 0xb9, 0x25, 0x43, 0x4f, 0x76, 0xf4, 0x98, - 0x25, 0x35, 0xe6, 0xb2, 0xfb, 0xb0, 0x16, 0x7d, 0xeb, 0x72, 0x16, 0xf4, 0xb4, 0xc9, 0x75, 0xfe, - 0xae, 0x46, 0x9b, 0x8d, 0xc4, 0x9e, 0xb5, 0x03, 0xcb, 0x4f, 0x48, 0x38, 0x56, 0x94, 0xdf, 0x81, - 0x45, 0xe3, 0x7c, 0x7a, 0xca, 0x42, 0x95, 0xb9, 0xd2, 0x4e, 0x79, 0x4d, 0x6c, 0x2a, 0x9a, 0x75, - 0x0c, 0xa5, 0xfd, 0x5e, 0xdf, 0x0f, 0x84, 0x0c, 0x3a, 0xe1, 0x07, 0x34, 0x51, 0x89, 0x70, 0x27, - 0xa2, 0x39, 0x4c, 0xf1, 0x50, 0x57, 0x05, 0x6a, 0xd6, 0x5e, 0x8e, 0x77, 0xf6, 0xcd, 0xc6, 0x28, - 0xfb, 0xd8, 0xed, 0x86, 0xec, 0x91, 0x09, 0xac, 0x03, 0xb8, 0x7a, 0x4e, 0xef, 0x30, 0x52, 0x22, - 0x75, 0xce, 0xf9, 0x1c, 0xc1, 0xd1, 0x5e, 0x9c, 0xd1, 0xa1, 0xf5, 0xf5, 0x68, 0x86, 0x18, 0x4b, - 0xb2, 0xf1, 0xe9, 0x08, 0x9d, 0x9b, 0x8e, 0xac, 0x5f, 0x22, 0x28, 0x98, 0x92, 0xfa, 0x8c, 0x86, - 0x21, 0xf1, 0x28, 0xde, 0x82, 0x74, 0x7f, 0x70, 0x14, 0x57, 0x91, 0xc7, 0xcb, 0xff, 0xf9, 0xfb, - 0xcd, 0xc5, 0x30, 0x7c, 0x75, 0x4f, 0xd6, 0xa3, 0x5d, 0xeb, 0x83, 0x1d, 0xcb, 0x36, 0x0c, 0xf8, - 0x09, 0x94, 0x4e, 0x98, 0x68, 0xbb, 0x01, 0x39, 0x21, 0x5d, 0x39, 0x5e, 0xb8, 0x94, 0x0b, 0x46, - 0xba, 0xa1, 0xba, 0xf8, 0xb9, 0xa3, 0xf7, 0xeb, 0x96, 0xbd, 0x36, 0x3c, 0xd0, 0x18, 0xf2, 0xe3, - 0x12, 0xa4, 0x49, 0x4f, 0x42, 0x52, 0x7e, 0x9e, 0xb7, 0xcd, 0xca, 0xfa, 0x4d, 0x0a, 0x56, 0x26, - 0xcc, 0x21, 0xb8, 0x03, 0xcb, 0x51, 0x04, 0xcb, 0xfa, 0xe4, 0x74, 0x59, 0x28, 0x4c, 0x69, 0xfe, - 0xe6, 0x5b, 0xcc, 0x35, 0x23, 0xb4, 0xa8, 0xf8, 0xc9, 0x85, 0x6c, 0x07, 0x95, 0x5f, 0x23, 0xc8, - 0x25, 0x18, 0xf0, 0x77, 0x61, 0xde, 0x74, 0x25, 0xa9, 0x6f, 0xff, 0xff, 0xd4, 0x57, 0x95, 0x3f, - 0xba, 0xd9, 0x2a, 0xb1, 0x95, 0x87, 0x90, 0x8d, 0x49, 0x97, 0x6a, 0xaa, 0x3b, 0xb0, 0xb6, 0x47, - 0xbb, 0x34, 0x8e, 0x83, 0xf0, 0xa2, 0xd5, 0xd6, 0xfa, 0x06, 0x94, 0xc6, 0x4f, 0x1a, 0x43, 0xdf, - 0x82, 0xbc, 0xab, 0x76, 0xdc, 0xe4, 0xd9, 0x9c, 0xa1, 0xc9, 0xc3, 0xdb, 0x0f, 0xa1, 0x30, 0x3a, - 0xa5, 0xe0, 0x1c, 0x5c, 0xd9, 0x6b, 0xda, 0xfb, 0xdf, 0x6e, 0xee, 0x15, 0xbf, 0x84, 0xf3, 0x90, - 0xd9, 0x7f, 0xf6, 0xf2, 0x85, 0x7d, 0xd8, 0xdc, 0x2b, 0x22, 0x0c, 0x90, 0xb6, 0x9b, 0xcf, 0x5e, - 0x1c, 0x36, 0x8b, 0xa9, 0xfa, 0x8f, 0xae, 0x40, 0x5a, 0x27, 0x2d, 0xfe, 0x3e, 0x64, 0xe3, 0x0c, - 0xc6, 0xa5, 0xaa, 0x7e, 0xf0, 0x54, 0xa3, 0xa7, 0x4c, 0xb5, 0x29, 0x1f, 0x3c, 0x95, 0xaf, 0xce, - 0xb2, 0xf4, 0xb9, 0x22, 0x60, 0xbd, 0xf3, 0xd9, 0xdf, 0xfe, 0xf5, 0x79, 0xea, 0x06, 0xbe, 0x26, - 0xdf, 0x64, 0xc3, 0x97, 0x9a, 0xae, 0x01, 0x35, 0x5d, 0x18, 0xf0, 0xaf, 0x10, 0xe4, 0x93, 0x43, - 0x38, 0x9e, 0x39, 0x1a, 0x4f, 0x78, 0x41, 0x55, 0x3e, 0xb8, 0xdc, 0x21, 0x03, 0xf0, 0xb6, 0x02, - 0xb8, 0x61, 0x4d, 0x06, 0xa8, 0x27, 0xf6, 0x5d, 0xb4, 0x8d, 0x5f, 0x23, 0x00, 0x39, 0x67, 0xeb, - 0x81, 0x0b, 0x3f, 0x9c, 0xa5, 0x6c, 0xca, 0x4c, 0x5e, 0xb9, 0xe4, 0x3b, 0xc2, 0xba, 0xab, 0xf0, - 0xbd, 0x6b, 0x6d, 0x4c, 0xc6, 0xa7, 0x64, 0xd7, 0xa8, 0xcb, 0x84, 0x04, 0x29, 0x20, 0x9f, 0xd4, - 0x39, 0xd5, 0x91, 0x97, 0x05, 0x71, 0x5d, 0x81, 0x28, 0xe1, 0xd5, 0x49, 0x20, 0xf0, 0x4f, 0x10, - 0x14, 0xc7, 0x27, 0xf9, 0xa9, 0xaa, 0x77, 0x66, 0xa9, 0x9e, 0xf6, 0x26, 0xb0, 0xee, 0x28, 0x10, - 0xb7, 0xf0, 0xcd, 0x51, 0x10, 0xd1, 0xbb, 0xa0, 0xe6, 0x99, 0x83, 0xf8, 0x0f, 0x08, 0x96, 0xc6, - 0x8a, 0x3b, 0x7e, 0x30, 0x4b, 0xed, 0xe4, 0x2e, 0x54, 0x79, 0x78, 0xe9, 0x73, 0x06, 0xed, 0xfb, - 0x0a, 0xed, 0xb6, 0xf5, 0xee, 0x44, 0xbf, 0xc5, 0x0d, 0xa9, 0xa6, 0xdb, 0xc9, 0x2e, 0xda, 0xae, - 0xff, 0x74, 0x01, 0x32, 0xf1, 0xab, 0xf9, 0xb7, 0x08, 0x16, 0x47, 0x7a, 0x0a, 0xbe, 0x60, 0x78, - 0x8f, 0xb6, 0xa0, 0xca, 0xdb, 0x3c, 0x32, 0xad, 0x9a, 0xc2, 0xbe, 0x65, 0x7d, 0x65, 0x22, 0xf6, - 0xf8, 0x5f, 0x96, 0x61, 0x72, 0xfc, 0x02, 0x41, 0x3e, 0x39, 0xb8, 0xcf, 0x4e, 0xe0, 0x09, 0x6f, - 0x8f, 0xd9, 0x09, 0x3c, 0xe9, 0x6d, 0x60, 0xad, 0x2b, 0xb0, 0x65, 0x5c, 0x1a, 0x05, 0x1b, 0x8f, - 0xfd, 0xbf, 0x53, 0x1d, 0x36, 0x59, 0x5b, 0xf1, 0xd7, 0x66, 0x1b, 0x65, 0x42, 0x15, 0xaf, 0x3c, - 0xb8, 0xec, 0xb1, 0xcb, 0x99, 0x53, 0x97, 0x74, 0x69, 0xce, 0x1f, 0x22, 0x28, 0x8c, 0x0e, 0x79, - 0xb3, 0x21, 0x4f, 0x1c, 0x0a, 0x2b, 0x53, 0xb2, 0x70, 0x5a, 0xd5, 0x8b, 0xe6, 0xa6, 0xa8, 0xa0, - 0xd4, 0x5f, 0x23, 0x48, 0x3f, 0xa1, 0xa4, 0x2b, 0xda, 0xf8, 0xe7, 0x08, 0xae, 0x7e, 0x48, 0xc5, - 0xe3, 0x78, 0x50, 0x1e, 0x0e, 0xd9, 0x53, 0x93, 0x7d, 0xa6, 0xc5, 0x26, 0x0f, 0xeb, 0xd6, 0x7b, - 0x0a, 0xde, 0x6d, 0x3c, 0x66, 0xb1, 0xb6, 0x42, 0x52, 0x53, 0x03, 0x7c, 0x2b, 0x3e, 0x55, 0xff, - 0x77, 0x0a, 0xe6, 0xe5, 0x3b, 0x02, 0x7f, 0x86, 0x60, 0xe1, 0xa9, 0xef, 0x31, 0x8e, 0xef, 0xce, - 0x7c, 0x1e, 0x0e, 0x5f, 0x30, 0x95, 0xf7, 0x2e, 0xc6, 0x3c, 0x1a, 0x6f, 0xd6, 0xca, 0x28, 0xb6, - 0xae, 0xd4, 0x2b, 0x9d, 0xf7, 0x03, 0x04, 0xe9, 0x8f, 0x98, 0xc7, 0x07, 0xfd, 0x2f, 0x12, 0xc5, - 0x4d, 0x85, 0xe2, 0xcb, 0xd6, 0x58, 0x45, 0x0e, 0x95, 0x62, 0x09, 0xe3, 0x3b, 0x90, 0x7e, 0xea, - 0x7b, 0xfe, 0x60, 0x7a, 0x37, 0x9f, 0x16, 0x1b, 0x53, 0x44, 0x77, 0x95, 0xb4, 0x5d, 0xb4, 0xfd, - 0x38, 0xff, 0x97, 0x37, 0xeb, 0xe8, 0xaf, 0x6f, 0xd6, 0xd1, 0x3f, 0xdf, 0xac, 0xa3, 0xa3, 0xb4, - 0x3a, 0x7e, 0xff, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x37, 0x7b, 0x03, 0x0b, 0x8e, 0x15, 0x00, - 0x00, + 0x15, 0xa7, 0x6c, 0xc7, 0xb1, 0x9f, 0x1d, 0xc7, 0xa9, 0x24, 0x1e, 0xe3, 0x99, 0xc9, 0x64, 0x7a, + 0xd9, 0x99, 0x24, 0xb3, 0x63, 0x2f, 0x9e, 0x65, 0x27, 0x84, 0x03, 0x9a, 0x71, 0xcc, 0x4e, 0x94, + 0xf9, 0x52, 0x6f, 0xc4, 0x8a, 0x03, 0xb4, 0x2a, 0xee, 0xda, 0x76, 0xc9, 0x76, 0xb5, 0xb7, 0xbb, + 0x9c, 0x8f, 0xe1, 0xb6, 0x42, 0xe2, 0x00, 0x5c, 0xd8, 0x03, 0xe2, 0xc0, 0x81, 0x91, 0xb8, 0xc0, + 0x09, 0x09, 0x89, 0x1b, 0x07, 0x4e, 0x1c, 0x91, 0xb8, 0x2f, 0x68, 0xc4, 0x95, 0x0b, 0x7f, 0x01, + 0xaa, 0x8f, 0x6e, 0x7f, 0xc4, 0xc6, 0xc9, 0x20, 0x2e, 0x56, 0xd7, 0xab, 0x57, 0xef, 0xfd, 0xea, + 0x7d, 0x97, 0x61, 0xbb, 0x1f, 0xf8, 0xc2, 0xaf, 0x9d, 0x90, 0x2e, 0x73, 0x89, 0xf0, 0x83, 0x1a, + 0x69, 0xb5, 0xfc, 0x01, 0x17, 0x61, 0xed, 0xa4, 0x5e, 0x3b, 0xa5, 0xc7, 0x0e, 0xe9, 0xb3, 0xaa, + 0xe2, 0xc1, 0x1b, 0x54, 0xb4, 0x69, 0x40, 0x07, 0xbd, 0x6a, 0xcc, 0x5d, 0x8d, 0xb8, 0xab, 0x27, + 0xf5, 0xca, 0x0d, 0xcf, 0xf7, 0xbd, 0x2e, 0xad, 0x91, 0x3e, 0xab, 0x11, 0xce, 0x7d, 0x41, 0x04, + 0xf3, 0x79, 0xa8, 0x4f, 0x57, 0xae, 0x9b, 0x5d, 0xb5, 0x3a, 0x1e, 0x7c, 0x5a, 0xa3, 0xbd, 0xbe, + 0x38, 0x37, 0x9b, 0xf7, 0x3d, 0x26, 0xda, 0x83, 0xe3, 0x6a, 0xcb, 0xef, 0xd5, 0x3c, 0xdf, 0xf3, + 0x87, 0x5c, 0x72, 0xa5, 0x21, 0xca, 0x2f, 0xcd, 0x6e, 0xfd, 0x34, 0x09, 0xab, 0x8d, 0x80, 0x12, + 0x41, 0x3f, 0x21, 0xdd, 0x2e, 0x15, 0x36, 0xfd, 0x6c, 0x40, 0x43, 0x81, 0x6f, 0x41, 0xee, 0x54, + 0x11, 0x9c, 0x3e, 0x11, 0xed, 0x32, 0xda, 0x44, 0x5b, 0x59, 0x1b, 0x34, 0xe9, 0x25, 0x11, 0x6d, + 0xfc, 0x1c, 0xa0, 0x43, 0xcf, 0x7b, 0x84, 0x13, 0x8f, 0x06, 0xe5, 0xc4, 0x26, 0xda, 0x2a, 0xd4, + 0xab, 0xd5, 0xff, 0x7e, 0xaf, 0xea, 0x61, 0x7c, 0xe2, 0x90, 0x71, 0xd7, 0x1e, 0x91, 0x80, 0xef, + 0xc2, 0x72, 0xac, 0x30, 0x0c, 0x4f, 0xfd, 0xc0, 0x2d, 0x27, 0x95, 0xd2, 0x42, 0xa4, 0x54, 0x53, + 0x71, 0x05, 0x32, 0x3d, 0x4e, 0x7b, 0x3e, 0x67, 0xad, 0x72, 0x4a, 0x71, 0xc4, 0x6b, 0x7c, 0x1b, + 0xf2, 0x7c, 0xd0, 0x73, 0x22, 0x95, 0xe5, 0x85, 0x4d, 0xb4, 0x95, 0xb2, 0x73, 0x7c, 0xd0, 0x7b, + 0x64, 0x48, 0xf2, 0x62, 0x01, 0xed, 0xf9, 0x82, 0x3a, 0xc4, 0x75, 0x83, 0x72, 0x5a, 0x5f, 0x4c, + 0x93, 0x1e, 0xb9, 0x6e, 0x80, 0xef, 0xc0, 0xb2, 0x61, 0x68, 0x05, 0xe6, 0xf6, 0x8b, 0x8a, 0x69, + 0x49, 0x93, 0x1b, 0x81, 0x36, 0xc0, 0x90, 0xaf, 0x43, 0xcf, 0x35, 0x5f, 0x66, 0x94, 0xef, 0x90, + 0x9e, 0x2b, 0xbe, 0x7b, 0x80, 0x23, 0x79, 0x64, 0x28, 0x32, 0xab, 0x58, 0x8d, 0x84, 0x06, 0x31, + 0x42, 0xad, 0x3f, 0x21, 0x58, 0x1b, 0x77, 0x47, 0xd8, 0xf7, 0x79, 0x48, 0xf1, 0x77, 0x20, 0xad, + 0xed, 0xa0, 0x5c, 0x91, 0x9b, 0x6f, 0xea, 0xf1, 0xf3, 0xb6, 0x39, 0x8d, 0x7f, 0x00, 0xc5, 0x88, + 0xcb, 0x69, 0x29, 0x45, 0xae, 0x72, 0x5e, 0xae, 0xfe, 0x60, 0x9e, 0xc4, 0x7d, 0xda, 0xf7, 0x43, + 0x26, 0xf6, 0x89, 0x20, 0xb1, 0xd8, 0xe5, 0x88, 0x41, 0x83, 0x76, 0xad, 0x3f, 0x22, 0xb8, 0xd6, + 0x74, 0x99, 0xd0, 0xea, 0x1b, 0x3e, 0xff, 0x94, 0x79, 0x23, 0x31, 0x35, 0x6a, 0x7a, 0x74, 0x19, + 0xd3, 0x27, 0x2e, 0x69, 0xfa, 0xe4, 0xe5, 0x4d, 0x9f, 0x9a, 0x6e, 0xfa, 0x0f, 0xa1, 0xfc, 0x11, + 0xe5, 0x34, 0x20, 0x82, 0x3e, 0x33, 0xf1, 0x14, 0x5b, 0x7f, 0x34, 0xe6, 0xd0, 0x78, 0xcc, 0x59, + 0x7f, 0x4e, 0x40, 0x61, 0xc2, 0x59, 0x73, 0x93, 0xe7, 0x13, 0x58, 0x1e, 0x86, 0xbe, 0xd3, 0x61, + 0xdc, 0x7d, 0xcb, 0x0c, 0x2a, 0x74, 0xc6, 0xd6, 0xf8, 0x33, 0x58, 0x19, 0x11, 0xdc, 0x52, 0xe6, + 0x2f, 0x27, 0x37, 0x93, 0x5b, 0xb9, 0xfa, 0xfe, 0xd5, 0x22, 0x66, 0x44, 0x93, 0xf6, 0x62, 0x93, + 0x8b, 0xe0, 0xdc, 0x2e, 0x76, 0x26, 0xc8, 0x95, 0x06, 0xac, 0x4f, 0x65, 0xc5, 0x45, 0x48, 0x76, + 0xe8, 0xb9, 0xb9, 0xbd, 0xfc, 0xc4, 0x6b, 0xb0, 0x70, 0x42, 0xba, 0x03, 0x6a, 0xbc, 0xaa, 0x17, + 0x7b, 0x89, 0x5d, 0x64, 0xfd, 0x1c, 0xc1, 0xea, 0x53, 0x16, 0x8a, 0x28, 0x4d, 0xa3, 0x90, 0xb9, + 0x0f, 0xab, 0x1e, 0x15, 0x8e, 0xab, 0x43, 0xcf, 0x11, 0x67, 0x8e, 0x4b, 0x04, 0x51, 0x32, 0x33, + 0x76, 0xd1, 0xa3, 0xc2, 0x04, 0xe5, 0xd1, 0x99, 0x0c, 0x4b, 0x7c, 0x1d, 0xb2, 0x7d, 0xe2, 0x51, + 0x27, 0x64, 0xaf, 0xb4, 0x92, 0x05, 0x3b, 0x23, 0x09, 0x1f, 0xb3, 0x57, 0x14, 0xdf, 0x04, 0x50, + 0x9b, 0xc2, 0xef, 0x50, 0x6e, 0x02, 0x46, 0xb1, 0x1f, 0x49, 0x82, 0x84, 0x4b, 0xba, 0x5d, 0x15, + 0x1d, 0x19, 0x5b, 0x7e, 0x5a, 0xaf, 0x11, 0xac, 0x8d, 0x83, 0x32, 0xfe, 0x6d, 0x40, 0x26, 0x2e, + 0x31, 0x48, 0x19, 0xf7, 0xee, 0x3c, 0xe3, 0x1a, 0x19, 0x76, 0x7c, 0x50, 0x06, 0x31, 0xa7, 0x67, + 0x32, 0x44, 0x62, 0x4c, 0x26, 0xd8, 0x25, 0xf9, 0x65, 0x8c, 0xeb, 0x26, 0x80, 0xf0, 0x05, 0xe9, + 0xea, 0x4b, 0x25, 0xd5, 0xa5, 0xb2, 0x8a, 0x22, 0x6f, 0x65, 0xfd, 0x1e, 0xc1, 0xa2, 0x11, 0x8e, + 0xeb, 0xb0, 0x6e, 0xb4, 0x33, 0xee, 0x39, 0xfd, 0xc1, 0x71, 0x97, 0xb5, 0x9c, 0xc8, 0x07, 0x79, + 0x7b, 0x75, 0xb8, 0xf9, 0x52, 0xed, 0x1d, 0xd2, 0x73, 0x59, 0x32, 0x0d, 0x24, 0x87, 0x93, 0x5e, + 0xe4, 0x9a, 0x9c, 0xa1, 0x3d, 0x27, 0x3d, 0x2a, 0x91, 0x4e, 0x3a, 0x20, 0xa9, 0x04, 0x2e, 0xb9, + 0x63, 0xd6, 0xbf, 0x2b, 0xf9, 0x02, 0x76, 0xa2, 0x9a, 0xd5, 0x68, 0xae, 0x15, 0x86, 0x64, 0x95, + 0x6a, 0x87, 0x50, 0x88, 0xec, 0x31, 0x2c, 0x0d, 0x43, 0xb8, 0xda, 0xa8, 0x79, 0x1b, 0xfa, 0x11, + 0xca, 0x10, 0x97, 0x61, 0x91, 0x71, 0x97, 0xb5, 0x68, 0x58, 0x4e, 0x6c, 0x26, 0xb7, 0x52, 0x76, + 0xb4, 0xb4, 0x9e, 0x40, 0xee, 0xd1, 0x40, 0xb4, 0x23, 0x49, 0x15, 0xc8, 0xc4, 0x0d, 0xc4, 0xa4, + 0x6a, 0xb4, 0x96, 0xa6, 0x34, 0x79, 0xe9, 0xb2, 0xc0, 0xdc, 0x34, 0xab, 0x29, 0xfb, 0x2c, 0xb0, + 0x5e, 0x40, 0x5e, 0x4b, 0x32, 0x6e, 0x5e, 0x83, 0x05, 0xed, 0x17, 0x2d, 0x47, 0x2f, 0xf0, 0x36, + 0x14, 0xd5, 0x87, 0x43, 0xcf, 0xfa, 0x2c, 0x50, 0x97, 0x52, 0xa2, 0x52, 0xf6, 0xb2, 0xa2, 0x37, + 0x63, 0xb2, 0xf5, 0x77, 0x04, 0xa5, 0xe7, 0xbe, 0x4b, 0x1b, 0x3e, 0xe7, 0xb4, 0x25, 0x49, 0xb1, + 0xec, 0xf7, 0x61, 0xed, 0x98, 0x92, 0x96, 0xcf, 0x1d, 0xee, 0xbb, 0xd4, 0xa1, 0xdc, 0xed, 0xfb, + 0x8c, 0x0b, 0xa3, 0x0a, 0xeb, 0x3d, 0x79, 0xb6, 0x69, 0x76, 0xf0, 0x0d, 0xc8, 0xb6, 0xb4, 0x1c, + 0x53, 0xb2, 0x33, 0xf6, 0x90, 0x20, 0xed, 0x13, 0x9e, 0xf3, 0x16, 0xe3, 0x9e, 0xf2, 0x4d, 0xc6, + 0x8e, 0x96, 0xd2, 0xc1, 0x1e, 0xe5, 0x34, 0x64, 0xa1, 0x23, 0x58, 0x8f, 0x2a, 0x97, 0xa4, 0xec, + 0x9c, 0xa1, 0x1d, 0xb1, 0x1e, 0xc5, 0xbb, 0x50, 0x8e, 0x1c, 0xdc, 0xf2, 0xb9, 0x08, 0x48, 0x4b, + 0xa8, 0x12, 0x4d, 0x43, 0xdd, 0x42, 0xf3, 0x76, 0xc9, 0xec, 0x37, 0xcc, 0xf6, 0x23, 0xbd, 0x6b, + 0x7d, 0x81, 0x60, 0xbd, 0xd1, 0x26, 0xdc, 0xa3, 0x51, 0x7f, 0x8e, 0xfc, 0xb0, 0x0d, 0xc5, 0xd6, + 0x20, 0x08, 0x28, 0x1f, 0x69, 0xe8, 0xfa, 0x72, 0xcb, 0x86, 0x3e, 0xda, 0xd1, 0x63, 0x96, 0xc4, + 0x84, 0xcb, 0x1e, 0xc0, 0x7a, 0xf4, 0xad, 0xcb, 0x59, 0xd0, 0xd3, 0x26, 0xd7, 0xf9, 0xbb, 0x16, + 0x6d, 0x36, 0x46, 0xf6, 0xac, 0x5d, 0x58, 0x79, 0x42, 0xc2, 0x89, 0xa2, 0xfc, 0x0e, 0x2c, 0x19, + 0xe7, 0xd3, 0x33, 0x16, 0xaa, 0xcc, 0x95, 0x76, 0xca, 0x6b, 0x62, 0x53, 0xd1, 0xac, 0x13, 0x28, + 0x1d, 0xf4, 0xfa, 0x7e, 0x20, 0x64, 0xd0, 0x09, 0x3f, 0xa0, 0x23, 0x95, 0x08, 0x77, 0x22, 0x9a, + 0xc3, 0x14, 0x0f, 0x75, 0x55, 0xa0, 0x66, 0xed, 0x95, 0x78, 0xe7, 0xc0, 0x6c, 0x8c, 0xb3, 0x4f, + 0xdc, 0x6e, 0xc8, 0x1e, 0x99, 0xc0, 0x3a, 0x84, 0x6b, 0x17, 0xf4, 0x0e, 0x23, 0x25, 0x52, 0xe7, + 0x5c, 0xcc, 0x11, 0x1c, 0xed, 0xc5, 0x19, 0x1d, 0x5a, 0xdf, 0x8c, 0x66, 0x88, 0x89, 0x24, 0x9b, + 0x9c, 0x8e, 0xd0, 0x85, 0xe9, 0xc8, 0xfa, 0x15, 0x82, 0x82, 0x29, 0xa9, 0xcf, 0x68, 0x18, 0x12, + 0x8f, 0xe2, 0x6d, 0x48, 0xf7, 0x07, 0xc7, 0x71, 0x15, 0x79, 0xbc, 0xf2, 0xef, 0x2f, 0x6f, 0x2d, + 0x85, 0xe1, 0xab, 0xfb, 0xb2, 0x1e, 0xed, 0x59, 0x1f, 0xec, 0x5a, 0xb6, 0x61, 0xc0, 0x4f, 0xa0, + 0x74, 0xca, 0x44, 0xdb, 0x0d, 0xc8, 0x29, 0xe9, 0xca, 0xf1, 0xc2, 0xa5, 0x5c, 0x30, 0xd2, 0x0d, + 0xd5, 0xc5, 0x2f, 0x1c, 0x7d, 0x50, 0xb7, 0xec, 0xf5, 0xe1, 0x81, 0xc6, 0x90, 0x1f, 0x97, 0x20, + 0x4d, 0x7a, 0x12, 0x92, 0xf2, 0x73, 0xca, 0x36, 0x2b, 0xeb, 0xb7, 0x09, 0x58, 0x9d, 0x32, 0x87, + 0xe0, 0x0e, 0xac, 0x44, 0x11, 0x2c, 0xeb, 0x93, 0xd3, 0x65, 0xa1, 0x30, 0xa5, 0xf9, 0xdb, 0x6f, + 0x31, 0xd7, 0x8c, 0xd1, 0xa2, 0xe2, 0x27, 0x17, 0xb2, 0x1d, 0x54, 0x7e, 0x83, 0x20, 0x37, 0xc2, + 0x80, 0xbf, 0x0f, 0x29, 0xd3, 0x95, 0xa4, 0xbe, 0x83, 0xff, 0x51, 0x5f, 0x55, 0xfe, 0xe8, 0x66, + 0xab, 0xc4, 0x56, 0x1e, 0x42, 0x36, 0x26, 0x5d, 0xa9, 0xa9, 0xee, 0xc2, 0xfa, 0x3e, 0xed, 0xd2, + 0x38, 0x0e, 0xc2, 0xcb, 0x56, 0x5b, 0xeb, 0x5b, 0x50, 0x9a, 0x3c, 0x69, 0x0c, 0x7d, 0x1b, 0xf2, + 0xae, 0xda, 0x71, 0x47, 0xcf, 0xe6, 0x0c, 0x4d, 0x1e, 0xde, 0x79, 0x08, 0x85, 0xf1, 0x29, 0x05, + 0xe7, 0x60, 0x71, 0xbf, 0x69, 0x1f, 0x7c, 0xb7, 0xb9, 0x5f, 0xfc, 0x0a, 0xce, 0x43, 0xe6, 0xe0, + 0xd9, 0xcb, 0x17, 0xf6, 0x51, 0x73, 0xbf, 0x88, 0x30, 0x40, 0xda, 0x6e, 0x3e, 0x7b, 0x71, 0xd4, + 0x2c, 0x26, 0xea, 0x3f, 0x59, 0x84, 0xb4, 0x4e, 0x5a, 0xfc, 0x43, 0xc8, 0xc6, 0x19, 0x8c, 0x4b, + 0x55, 0xfd, 0xe0, 0xa9, 0x46, 0x4f, 0x99, 0x6a, 0x53, 0x3e, 0x78, 0x2a, 0x5f, 0x9f, 0x67, 0xe9, + 0x0b, 0x45, 0xc0, 0x7a, 0xe7, 0xf3, 0xbf, 0xfd, 0xf3, 0x8b, 0xc4, 0x4d, 0x7c, 0x5d, 0xbe, 0xc9, + 0x86, 0x2f, 0x35, 0x5d, 0x03, 0x6a, 0xba, 0x30, 0xe0, 0x5f, 0x23, 0xc8, 0x8f, 0x0e, 0xe1, 0x78, + 0xee, 0x68, 0x3c, 0xe5, 0x05, 0x55, 0xf9, 0xe0, 0x6a, 0x87, 0x0c, 0xc0, 0x3b, 0x0a, 0xe0, 0xa6, + 0x35, 0x1d, 0xa0, 0x9e, 0xd8, 0xf7, 0xd0, 0x0e, 0x7e, 0x8d, 0x00, 0xe4, 0x9c, 0xad, 0x07, 0x2e, + 0xfc, 0x70, 0x9e, 0xb2, 0x19, 0x33, 0x79, 0xe5, 0x8a, 0xef, 0x08, 0xeb, 0x9e, 0xc2, 0xf7, 0xae, + 0xb5, 0x39, 0x1d, 0x9f, 0x92, 0x5d, 0xa3, 0x2e, 0x13, 0x12, 0xa4, 0x80, 0xfc, 0xa8, 0xce, 0x99, + 0x8e, 0xbc, 0x2a, 0x88, 0x1b, 0x0a, 0x44, 0x09, 0xaf, 0x4d, 0x03, 0x81, 0x7f, 0x86, 0xa0, 0x38, + 0x39, 0xc9, 0xcf, 0x54, 0xbd, 0x3b, 0x4f, 0xf5, 0xac, 0x37, 0x81, 0x75, 0x57, 0x81, 0xb8, 0x8d, + 0x6f, 0x8d, 0x83, 0x88, 0xde, 0x05, 0x35, 0xcf, 0x1c, 0xc4, 0x7f, 0x40, 0xb0, 0x3c, 0x51, 0xdc, + 0xf1, 0x87, 0xf3, 0xd4, 0x4e, 0xef, 0x42, 0x95, 0x87, 0x57, 0x3e, 0x67, 0xd0, 0xbe, 0xaf, 0xd0, + 0xee, 0x58, 0xef, 0x4e, 0xf5, 0x5b, 0xdc, 0x90, 0x6a, 0xba, 0x9d, 0xec, 0xa1, 0x9d, 0xfa, 0x97, + 0x49, 0xc8, 0xc4, 0xaf, 0xe6, 0xdf, 0x21, 0x58, 0x1a, 0xeb, 0x29, 0xf8, 0x92, 0xe1, 0x3d, 0xde, + 0x82, 0x2a, 0x6f, 0xf3, 0xc8, 0xb4, 0x6a, 0x0a, 0xfb, 0xb6, 0xf5, 0xb5, 0xa9, 0xd8, 0xe3, 0x7f, + 0x59, 0x86, 0xc9, 0xf1, 0x4b, 0x04, 0xf9, 0xd1, 0xc1, 0x7d, 0x7e, 0x02, 0x4f, 0x79, 0x7b, 0xcc, + 0x4f, 0xe0, 0x69, 0x6f, 0x03, 0x6b, 0x43, 0x81, 0x2d, 0xe3, 0xd2, 0x38, 0xd8, 0x78, 0xec, 0xff, + 0x31, 0x82, 0xc2, 0xf8, 0xc4, 0x84, 0xbf, 0x31, 0xd7, 0x94, 0xd3, 0x26, 0xac, 0xca, 0x8c, 0x90, + 0x9e, 0x55, 0x42, 0xa2, 0x21, 0x24, 0xca, 0xce, 0xfa, 0x6b, 0x04, 0xe9, 0x27, 0x94, 0x74, 0x45, + 0x1b, 0xff, 0x02, 0xc1, 0xb5, 0x8f, 0xa8, 0x78, 0x1c, 0x4f, 0x9d, 0xc3, 0x89, 0x75, 0x66, 0xe6, + 0xcc, 0x0d, 0xe1, 0xe9, 0x93, 0xaf, 0xf5, 0x9e, 0x82, 0x77, 0x07, 0x4f, 0x78, 0xb3, 0xad, 0x90, + 0xd4, 0xd4, 0x34, 0xdc, 0x8a, 0x4f, 0xd5, 0xff, 0x95, 0x80, 0x94, 0x1c, 0xca, 0xf1, 0xe7, 0x08, + 0x16, 0x9e, 0xfa, 0x1e, 0xe3, 0xf8, 0xde, 0xdc, 0xb7, 0xd6, 0xf0, 0x39, 0x50, 0x79, 0xef, 0x72, + 0xcc, 0xe3, 0xce, 0xb3, 0x56, 0xc7, 0xb1, 0x75, 0xa5, 0x5e, 0x19, 0x58, 0x3f, 0x42, 0x90, 0xfe, + 0x98, 0x79, 0x7c, 0xd0, 0xff, 0x7f, 0xa2, 0xb8, 0xa5, 0x50, 0x7c, 0xd5, 0x9a, 0x28, 0x6f, 0xa1, + 0x52, 0x2c, 0x61, 0x7c, 0x0f, 0xd2, 0x4f, 0x7d, 0xcf, 0x1f, 0xcc, 0x6e, 0x8d, 0xb3, 0x62, 0x63, + 0x86, 0xe8, 0xae, 0x92, 0xb6, 0x87, 0x76, 0x1e, 0xe7, 0xff, 0xf2, 0x66, 0x03, 0xfd, 0xf5, 0xcd, + 0x06, 0xfa, 0xc7, 0x9b, 0x0d, 0x74, 0x9c, 0x56, 0xc7, 0x1f, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, + 0x85, 0x27, 0xdc, 0xab, 0xdb, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1783,7 +1781,6 @@ var _Wallet_serviceDesc = grpc.ServiceDesc{ type AccountsClient interface { CreateAccount(ctx context.Context, in *CreateAccountRequest, opts ...grpc.CallOption) (*DepositDataResponse, error) ListAccounts(ctx context.Context, in *ListAccountsRequest, opts ...grpc.CallOption) (*ListAccountsResponse, error) - DeleteAccounts(ctx context.Context, in *DeleteAccountsRequest, opts ...grpc.CallOption) (*DeleteAccountsResponse, error) ChangePassword(ctx context.Context, in *ChangePasswordRequest, opts ...grpc.CallOption) (*types.Empty, error) } @@ -1813,15 +1810,6 @@ func (c *accountsClient) ListAccounts(ctx context.Context, in *ListAccountsReque return out, nil } -func (c *accountsClient) DeleteAccounts(ctx context.Context, in *DeleteAccountsRequest, opts ...grpc.CallOption) (*DeleteAccountsResponse, error) { - out := new(DeleteAccountsResponse) - err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Accounts/DeleteAccounts", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *accountsClient) ChangePassword(ctx context.Context, in *ChangePasswordRequest, opts ...grpc.CallOption) (*types.Empty, error) { out := new(types.Empty) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Accounts/ChangePassword", in, out, opts...) @@ -1835,7 +1823,6 @@ func (c *accountsClient) ChangePassword(ctx context.Context, in *ChangePasswordR type AccountsServer interface { CreateAccount(context.Context, *CreateAccountRequest) (*DepositDataResponse, error) ListAccounts(context.Context, *ListAccountsRequest) (*ListAccountsResponse, error) - DeleteAccounts(context.Context, *DeleteAccountsRequest) (*DeleteAccountsResponse, error) ChangePassword(context.Context, *ChangePasswordRequest) (*types.Empty, error) } @@ -1849,9 +1836,6 @@ func (*UnimplementedAccountsServer) CreateAccount(ctx context.Context, req *Crea func (*UnimplementedAccountsServer) ListAccounts(ctx context.Context, req *ListAccountsRequest) (*ListAccountsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListAccounts not implemented") } -func (*UnimplementedAccountsServer) DeleteAccounts(ctx context.Context, req *DeleteAccountsRequest) (*DeleteAccountsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method DeleteAccounts not implemented") -} func (*UnimplementedAccountsServer) ChangePassword(ctx context.Context, req *ChangePasswordRequest) (*types.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method ChangePassword not implemented") } @@ -1896,24 +1880,6 @@ func _Accounts_ListAccounts_Handler(srv interface{}, ctx context.Context, dec fu return interceptor(ctx, in, info, handler) } -func _Accounts_DeleteAccounts_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(DeleteAccountsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(AccountsServer).DeleteAccounts(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/ethereum.validator.accounts.v2.Accounts/DeleteAccounts", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AccountsServer).DeleteAccounts(ctx, req.(*DeleteAccountsRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Accounts_ChangePassword_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ChangePasswordRequest) if err := dec(in); err != nil { @@ -1944,10 +1910,6 @@ var _Accounts_serviceDesc = grpc.ServiceDesc{ MethodName: "ListAccounts", Handler: _Accounts_ListAccounts_Handler, }, - { - MethodName: "DeleteAccounts", - Handler: _Accounts_DeleteAccounts_Handler, - }, { MethodName: "ChangePassword", Handler: _Accounts_ChangePassword_Handler, diff --git a/proto/validator/accounts/v2/web_api.proto b/proto/validator/accounts/v2/web_api.proto index 56ab9df73d..f1d3d9cec6 100644 --- a/proto/validator/accounts/v2/web_api.proto +++ b/proto/validator/accounts/v2/web_api.proto @@ -54,12 +54,6 @@ service Accounts { get: "/v2/validator/accounts" }; } - rpc DeleteAccounts(DeleteAccountsRequest) returns (DeleteAccountsResponse) { - option (google.api.http) = { - post: "/v2/validator/wallet/accounts/delete", - body: "*" - }; - } rpc ChangePassword(ChangePasswordRequest) returns (google.protobuf.Empty) { option (google.api.http) = { post: "/v2/validator/password/edit", diff --git a/proto/validator/accounts/v2_gateway/web_api.pb.go b/proto/validator/accounts/v2_gateway/web_api.pb.go index 755c9ebc7c..e80a54df7d 100755 --- a/proto/validator/accounts/v2_gateway/web_api.pb.go +++ b/proto/validator/accounts/v2_gateway/web_api.pb.go @@ -1219,122 +1219,121 @@ func init() { } var fileDescriptor_8a5153635bfe042e = []byte{ - // 1839 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x73, 0x1b, 0x49, - 0x15, 0x67, 0x24, 0x59, 0x91, 0x9e, 0x64, 0x59, 0x6e, 0xdb, 0x8a, 0x50, 0x92, 0x8d, 0x33, 0xcb, - 0x26, 0xb6, 0xb3, 0x91, 0x16, 0x65, 0x49, 0x8c, 0x39, 0x50, 0x59, 0x59, 0x6c, 0x5c, 0xce, 0x57, - 0xcd, 0xba, 0xd8, 0xe2, 0x00, 0x53, 0xed, 0x99, 0xde, 0x51, 0x97, 0xa4, 0x1e, 0xed, 0x4c, 0xcb, - 0x1f, 0xe1, 0xb6, 0x45, 0x15, 0x07, 0xe0, 0x00, 0x7b, 0xa0, 0x38, 0x70, 0x20, 0x55, 0x5c, 0xe0, - 0x02, 0x55, 0x54, 0x71, 0xe3, 0xc0, 0xbf, 0xc0, 0x1d, 0x2e, 0x5c, 0xb9, 0xf0, 0x17, 0x50, 0xfd, - 0x31, 0x1f, 0x92, 0x25, 0x64, 0x87, 0xe2, 0xa2, 0x9a, 0x7e, 0xfd, 0xfa, 0xbd, 0x5f, 0xbf, 0xef, - 0x16, 0x6c, 0x8f, 0x02, 0x9f, 0xfb, 0xad, 0x13, 0x3c, 0xa0, 0x2e, 0xe6, 0x7e, 0xd0, 0xc2, 0x8e, - 0xe3, 0x8f, 0x19, 0x0f, 0x5b, 0x27, 0xed, 0xd6, 0x29, 0x39, 0xb6, 0xf1, 0x88, 0x36, 0x25, 0x0f, - 0x7a, 0x87, 0xf0, 0x1e, 0x09, 0xc8, 0x78, 0xd8, 0x8c, 0xb9, 0x9b, 0x11, 0x77, 0xf3, 0xa4, 0xdd, - 0xb8, 0xe9, 0xf9, 0xbe, 0x37, 0x20, 0x2d, 0x3c, 0xa2, 0x2d, 0xcc, 0x98, 0xcf, 0x31, 0xa7, 0x3e, - 0x0b, 0xd5, 0xe9, 0xc6, 0x0d, 0xbd, 0x2b, 0x57, 0xc7, 0xe3, 0xcf, 0x5a, 0x64, 0x38, 0xe2, 0xe7, - 0x7a, 0xf3, 0x81, 0x47, 0x79, 0x6f, 0x7c, 0xdc, 0x74, 0xfc, 0x61, 0xcb, 0xf3, 0x3d, 0x3f, 0xe1, - 0x12, 0x2b, 0x05, 0x51, 0x7c, 0x29, 0x76, 0xf3, 0xa7, 0x59, 0x58, 0xeb, 0x04, 0x04, 0x73, 0xf2, - 0x29, 0x1e, 0x0c, 0x08, 0xb7, 0xc8, 0xe7, 0x63, 0x12, 0x72, 0x74, 0x1b, 0x4a, 0xa7, 0x92, 0x60, - 0x8f, 0x30, 0xef, 0xd5, 0x8d, 0x4d, 0x63, 0xab, 0x68, 0x81, 0x22, 0xbd, 0xc2, 0xbc, 0x87, 0x5e, - 0x00, 0xf4, 0xc9, 0xf9, 0x10, 0x33, 0xec, 0x91, 0xa0, 0x9e, 0xd9, 0x34, 0xb6, 0x2a, 0xed, 0x66, - 0xf3, 0xbf, 0xdf, 0xab, 0x79, 0x18, 0x9f, 0x38, 0xa4, 0xcc, 0xb5, 0x52, 0x12, 0xd0, 0x3d, 0x58, - 0x89, 0x15, 0x86, 0xe1, 0xa9, 0x1f, 0xb8, 0xf5, 0xac, 0x54, 0x5a, 0x89, 0x94, 0x2a, 0x2a, 0x6a, - 0x40, 0x61, 0xc8, 0xc8, 0xd0, 0x67, 0xd4, 0xa9, 0xe7, 0x24, 0x47, 0xbc, 0x46, 0x77, 0xa0, 0xcc, - 0xc6, 0x43, 0x3b, 0x52, 0x59, 0x5f, 0xda, 0x34, 0xb6, 0x72, 0x56, 0x89, 0x8d, 0x87, 0x4f, 0x34, - 0x49, 0x5c, 0x2c, 0x20, 0x43, 0x9f, 0x13, 0x1b, 0xbb, 0x6e, 0x50, 0xcf, 0xab, 0x8b, 0x29, 0xd2, - 0x13, 0xd7, 0x0d, 0xd0, 0x5d, 0x58, 0xd1, 0x0c, 0x4e, 0xa0, 0x6f, 0x7f, 0x4d, 0x32, 0x2d, 0x2b, - 0x72, 0x27, 0x50, 0x06, 0x48, 0xf8, 0xfa, 0xe4, 0x5c, 0xf1, 0x15, 0xd2, 0x7c, 0x87, 0xe4, 0x5c, - 0xf2, 0xdd, 0x07, 0x14, 0xc9, 0xc3, 0x89, 0xc8, 0xa2, 0x64, 0xd5, 0x12, 0x3a, 0x58, 0x0b, 0x35, - 0xff, 0x62, 0xc0, 0xfa, 0xa4, 0x3b, 0xc2, 0x91, 0xcf, 0x42, 0x82, 0xbe, 0x03, 0x79, 0x65, 0x07, - 0xe9, 0x8a, 0xd2, 0x62, 0x53, 0x4f, 0x9e, 0xb7, 0xf4, 0x69, 0xf4, 0x03, 0xa8, 0x46, 0x5c, 0xb6, - 0x23, 0x15, 0xb9, 0xd2, 0x79, 0xa5, 0xf6, 0xc3, 0x45, 0x12, 0xf7, 0xc9, 0xc8, 0x0f, 0x29, 0xdf, - 0xc7, 0x1c, 0xc7, 0x62, 0x57, 0x22, 0x06, 0x05, 0xda, 0x35, 0xff, 0x6c, 0xc0, 0xf5, 0xae, 0x4b, - 0xb9, 0x52, 0xdf, 0xf1, 0xd9, 0x67, 0xd4, 0x4b, 0xc5, 0x54, 0xda, 0xf4, 0xc6, 0x65, 0x4c, 0x9f, - 0xb9, 0xa4, 0xe9, 0xb3, 0x97, 0x37, 0x7d, 0x6e, 0xb6, 0xe9, 0x1f, 0x41, 0xfd, 0x63, 0xc2, 0x48, - 0x80, 0x39, 0x79, 0xae, 0xe3, 0x29, 0xb6, 0x7e, 0x3a, 0xe6, 0x8c, 0xc9, 0x98, 0x33, 0xff, 0x9a, - 0x81, 0xca, 0x94, 0xb3, 0x16, 0x26, 0xcf, 0xa7, 0xb0, 0x92, 0x84, 0xbe, 0xdd, 0xa7, 0xcc, 0x7d, - 0xcb, 0x0c, 0xaa, 0xf4, 0x27, 0xd6, 0xe8, 0x73, 0x58, 0x4d, 0x09, 0x76, 0xa4, 0xf9, 0xeb, 0xd9, - 0xcd, 0xec, 0x56, 0xa9, 0xbd, 0x7f, 0xb5, 0x88, 0x49, 0x69, 0x52, 0x5e, 0xec, 0x32, 0x1e, 0x9c, - 0x5b, 0xd5, 0xfe, 0x14, 0xb9, 0xd1, 0x81, 0x8d, 0x99, 0xac, 0xa8, 0x0a, 0xd9, 0x3e, 0x39, 0xd7, - 0xb7, 0x17, 0x9f, 0x68, 0x1d, 0x96, 0x4e, 0xf0, 0x60, 0x4c, 0xb4, 0x57, 0xd5, 0x62, 0x2f, 0xb3, - 0x6b, 0x98, 0xbf, 0x30, 0x60, 0xed, 0x19, 0x0d, 0x79, 0x94, 0xa6, 0x51, 0xc8, 0x3c, 0x80, 0x35, - 0x8f, 0x70, 0xdb, 0x55, 0xa1, 0x67, 0xf3, 0x33, 0xdb, 0xc5, 0x1c, 0x4b, 0x99, 0x05, 0xab, 0xea, - 0x11, 0xae, 0x83, 0xf2, 0xe8, 0x4c, 0x84, 0x25, 0xba, 0x01, 0xc5, 0x11, 0xf6, 0x88, 0x1d, 0xd2, - 0xd7, 0x4a, 0xc9, 0x92, 0x55, 0x10, 0x84, 0x4f, 0xe8, 0x6b, 0x82, 0x6e, 0x01, 0xc8, 0x4d, 0xee, - 0xf7, 0x09, 0xd3, 0x01, 0x23, 0xd9, 0x8f, 0x04, 0x41, 0xc0, 0xc5, 0x83, 0x81, 0x8c, 0x8e, 0x82, - 0x25, 0x3e, 0xcd, 0x37, 0x06, 0xac, 0x4f, 0x82, 0xd2, 0xfe, 0xed, 0x40, 0x21, 0x2e, 0x31, 0x86, - 0x34, 0xee, 0xbd, 0x45, 0xc6, 0xd5, 0x32, 0xac, 0xf8, 0xa0, 0x08, 0x62, 0x46, 0xce, 0x44, 0x88, - 0xc4, 0x98, 0x74, 0xb0, 0x0b, 0xf2, 0xab, 0x18, 0xd7, 0x2d, 0x00, 0xee, 0x73, 0x3c, 0x50, 0x97, - 0xca, 0xca, 0x4b, 0x15, 0x25, 0x45, 0xdc, 0xca, 0xfc, 0xa3, 0x01, 0xd7, 0xb4, 0x70, 0xd4, 0x86, - 0x0d, 0xad, 0x9d, 0x32, 0xcf, 0x1e, 0x8d, 0x8f, 0x07, 0xd4, 0xb1, 0x23, 0x1f, 0x94, 0xad, 0xb5, - 0x64, 0xf3, 0x95, 0xdc, 0x3b, 0x24, 0xe7, 0xa2, 0x64, 0x6a, 0x48, 0x36, 0xc3, 0xc3, 0xc8, 0x35, - 0x25, 0x4d, 0x7b, 0x81, 0x87, 0x44, 0x20, 0x9d, 0x76, 0x40, 0x56, 0x0a, 0x5c, 0x76, 0x27, 0xac, - 0x7f, 0x4f, 0xf0, 0x05, 0xf4, 0x44, 0x36, 0xab, 0x74, 0xae, 0x55, 0x12, 0xb2, 0x4c, 0xb5, 0x43, - 0xa8, 0x44, 0xf6, 0x48, 0x4a, 0x43, 0x02, 0x57, 0x19, 0xb5, 0x6c, 0xc1, 0x28, 0x42, 0x19, 0xa2, - 0x3a, 0x5c, 0xa3, 0xcc, 0xa5, 0x0e, 0x09, 0xeb, 0x99, 0xcd, 0xec, 0x56, 0xce, 0x8a, 0x96, 0xe6, - 0x53, 0x28, 0x3d, 0x19, 0xf3, 0x5e, 0x24, 0xa9, 0x01, 0x85, 0xb8, 0x81, 0xe8, 0x54, 0x8d, 0xd6, - 0xc2, 0x94, 0x3a, 0x2f, 0x5d, 0x1a, 0xe8, 0x9b, 0x16, 0x15, 0x65, 0x9f, 0x06, 0xe6, 0x4b, 0x28, - 0x2b, 0x49, 0xda, 0xcd, 0xeb, 0xb0, 0xa4, 0xfc, 0xa2, 0xe4, 0xa8, 0x05, 0xda, 0x86, 0xaa, 0xfc, - 0xb0, 0xc9, 0xd9, 0x88, 0x06, 0xf2, 0x52, 0x52, 0x54, 0xce, 0x5a, 0x91, 0xf4, 0x6e, 0x4c, 0x36, - 0xff, 0x61, 0x40, 0xed, 0x85, 0xef, 0x92, 0x8e, 0xcf, 0x18, 0x71, 0x04, 0x29, 0x96, 0xfd, 0x01, - 0xac, 0x1f, 0x13, 0xec, 0xf8, 0xcc, 0x66, 0xbe, 0x4b, 0x6c, 0xc2, 0xdc, 0x91, 0x4f, 0x19, 0xd7, - 0xaa, 0x90, 0xda, 0x13, 0x67, 0xbb, 0x7a, 0x07, 0xdd, 0x84, 0xa2, 0xa3, 0xe4, 0xe8, 0x92, 0x5d, - 0xb0, 0x12, 0x82, 0xb0, 0x4f, 0x78, 0xce, 0x1c, 0xca, 0x3c, 0xe9, 0x9b, 0x82, 0x15, 0x2d, 0x85, - 0x83, 0x3d, 0xc2, 0x48, 0x48, 0x43, 0x9b, 0xd3, 0x21, 0x91, 0x2e, 0xc9, 0x59, 0x25, 0x4d, 0x3b, - 0xa2, 0x43, 0x82, 0x76, 0xa1, 0x1e, 0x39, 0xd8, 0xf1, 0x19, 0x0f, 0xb0, 0xc3, 0x65, 0x89, 0x26, - 0xa1, 0x6a, 0xa1, 0x65, 0xab, 0xa6, 0xf7, 0x3b, 0x7a, 0xfb, 0x89, 0xda, 0x35, 0xbf, 0x34, 0x60, - 0xa3, 0xd3, 0xc3, 0xcc, 0x23, 0x51, 0x7f, 0x8e, 0xfc, 0xb0, 0x0d, 0x55, 0x67, 0x1c, 0x04, 0x84, - 0xa5, 0x1a, 0xba, 0xba, 0xdc, 0x8a, 0xa6, 0xa7, 0x3b, 0x7a, 0xcc, 0x92, 0x99, 0x72, 0xd9, 0x43, - 0xd8, 0x88, 0xbe, 0x55, 0x39, 0x0b, 0x86, 0xca, 0xe4, 0x2a, 0x7f, 0xd7, 0xa3, 0xcd, 0x4e, 0x6a, - 0xcf, 0xdc, 0x85, 0xd5, 0xa7, 0x38, 0x9c, 0x2a, 0xca, 0xef, 0xc2, 0xb2, 0x76, 0x3e, 0x39, 0xa3, - 0xa1, 0xcc, 0x5c, 0x61, 0xa7, 0xb2, 0x22, 0x76, 0x25, 0xcd, 0x3c, 0x81, 0xda, 0xc1, 0x70, 0xe4, - 0x07, 0x5c, 0x04, 0x1d, 0xf7, 0x03, 0x92, 0xaa, 0x44, 0xa8, 0x1f, 0xd1, 0x6c, 0x2a, 0x79, 0x88, - 0x2b, 0x03, 0xb5, 0x68, 0xad, 0xc6, 0x3b, 0x07, 0x7a, 0x63, 0x92, 0x7d, 0xea, 0x76, 0x09, 0x7b, - 0x64, 0x02, 0xf3, 0x10, 0xae, 0x5f, 0xd0, 0x9b, 0x44, 0x4a, 0xa4, 0xce, 0xbe, 0x98, 0x23, 0x28, - 0xda, 0x8b, 0x33, 0x3a, 0x34, 0xbf, 0x19, 0xcd, 0x10, 0x53, 0x49, 0x36, 0x3d, 0x1d, 0x19, 0x17, - 0xa6, 0x23, 0xf3, 0xd7, 0x06, 0x54, 0x74, 0x49, 0x7d, 0x4e, 0xc2, 0x10, 0x7b, 0x04, 0x6d, 0x43, - 0x7e, 0x34, 0x3e, 0x8e, 0xab, 0xc8, 0x47, 0xab, 0xff, 0xfe, 0xfb, 0xed, 0xe5, 0x30, 0x7c, 0xfd, - 0x40, 0xd4, 0xa3, 0x3d, 0xf3, 0xc3, 0x5d, 0xd3, 0xd2, 0x0c, 0xe8, 0x29, 0xd4, 0x4e, 0x29, 0xef, - 0xb9, 0x01, 0x3e, 0xc5, 0x03, 0x31, 0x5e, 0xb8, 0x84, 0x71, 0x8a, 0x07, 0xa1, 0xbc, 0xf8, 0x85, - 0xa3, 0x0f, 0xdb, 0xa6, 0xb5, 0x91, 0x1c, 0xe8, 0x24, 0xfc, 0xa8, 0x06, 0x79, 0x3c, 0x14, 0x90, - 0xa4, 0x9f, 0x73, 0x96, 0x5e, 0x99, 0xbf, 0xcb, 0xc0, 0xda, 0x8c, 0x39, 0x04, 0xf5, 0x61, 0x35, - 0x8a, 0x60, 0x51, 0x9f, 0xec, 0x01, 0x0d, 0xb9, 0x2e, 0xcd, 0xdf, 0x7e, 0x8b, 0xb9, 0x66, 0x82, - 0x16, 0x15, 0x3f, 0xb1, 0x10, 0xed, 0xa0, 0xf1, 0x5b, 0x03, 0x4a, 0x29, 0x06, 0xf4, 0x7d, 0xc8, - 0xe9, 0xae, 0x24, 0xf4, 0x1d, 0xfc, 0x8f, 0xfa, 0x9a, 0xe2, 0x47, 0x35, 0x5b, 0x29, 0xb6, 0xf1, - 0x18, 0x8a, 0x31, 0xe9, 0x4a, 0x4d, 0x75, 0x17, 0x36, 0xf6, 0xc9, 0x80, 0xc4, 0x71, 0x10, 0x5e, - 0xb6, 0xda, 0x9a, 0xdf, 0x82, 0xda, 0xf4, 0x49, 0x6d, 0xe8, 0x3b, 0x50, 0x76, 0xe5, 0x8e, 0x9b, - 0x3e, 0x5b, 0xd2, 0x34, 0x71, 0x78, 0xe7, 0x31, 0x54, 0x26, 0xa7, 0x14, 0x54, 0x82, 0x6b, 0xfb, - 0x5d, 0xeb, 0xe0, 0xbb, 0xdd, 0xfd, 0xea, 0x57, 0x50, 0x19, 0x0a, 0x07, 0xcf, 0x5f, 0xbd, 0xb4, - 0x8e, 0xba, 0xfb, 0x55, 0x03, 0x01, 0xe4, 0xad, 0xee, 0xf3, 0x97, 0x47, 0xdd, 0x6a, 0xa6, 0xfd, - 0x93, 0x6b, 0x90, 0x57, 0x49, 0x8b, 0x7e, 0x08, 0xc5, 0x38, 0x83, 0x51, 0xad, 0xa9, 0x1e, 0x3c, - 0xcd, 0xe8, 0x29, 0xd3, 0xec, 0x8a, 0x07, 0x4f, 0xe3, 0xeb, 0x8b, 0x2c, 0x7d, 0xa1, 0x08, 0x98, - 0xef, 0x7e, 0xf1, 0xb7, 0x7f, 0x7e, 0x99, 0xb9, 0x85, 0x6e, 0x88, 0x37, 0x59, 0xf2, 0x52, 0x53, - 0x35, 0xa0, 0xa5, 0x0a, 0x03, 0xfa, 0x8d, 0x01, 0xe5, 0xf4, 0x10, 0x8e, 0x16, 0x8e, 0xc6, 0x33, - 0x5e, 0x50, 0x8d, 0x0f, 0xaf, 0x76, 0x48, 0x03, 0xbc, 0x2b, 0x01, 0x6e, 0x9a, 0xb3, 0x01, 0xaa, - 0x89, 0x7d, 0xcf, 0xd8, 0x41, 0x6f, 0x0c, 0x00, 0x31, 0x67, 0xab, 0x81, 0x0b, 0x3d, 0x5e, 0xa4, - 0x6c, 0xce, 0x4c, 0xde, 0xb8, 0xe2, 0x3b, 0xc2, 0xbc, 0x2f, 0xf1, 0xbd, 0x67, 0x6e, 0xce, 0xc6, - 0x27, 0x65, 0xb7, 0x88, 0x4b, 0xb9, 0x00, 0xc9, 0xa1, 0x9c, 0xd6, 0x39, 0xd7, 0x91, 0x57, 0x05, - 0x71, 0x53, 0x82, 0xa8, 0xa1, 0xf5, 0x59, 0x20, 0xd0, 0xcf, 0x0c, 0xa8, 0x4e, 0x4f, 0xf2, 0x73, - 0x55, 0xef, 0x2e, 0x52, 0x3d, 0xef, 0x4d, 0x60, 0xde, 0x93, 0x20, 0xee, 0xa0, 0xdb, 0x93, 0x20, - 0xa2, 0x77, 0x41, 0xcb, 0xd3, 0x07, 0xd1, 0x9f, 0x0c, 0x58, 0x99, 0x2a, 0xee, 0xe8, 0xd1, 0x22, - 0xb5, 0xb3, 0xbb, 0x50, 0xe3, 0xf1, 0x95, 0xcf, 0x69, 0xb4, 0x1f, 0x48, 0xb4, 0x3b, 0xe6, 0x7b, - 0x33, 0xfd, 0x16, 0x37, 0xa4, 0x96, 0x6a, 0x27, 0x7b, 0xc6, 0x4e, 0xfb, 0xe7, 0x4b, 0x50, 0x88, - 0x5f, 0xcd, 0xbf, 0x37, 0x60, 0x79, 0xa2, 0xa7, 0xa0, 0x4b, 0x86, 0xf7, 0x64, 0x0b, 0x6a, 0xbc, - 0xcd, 0x23, 0xd3, 0x6c, 0x49, 0xec, 0xdb, 0xe6, 0xd7, 0x66, 0x62, 0x8f, 0xff, 0x65, 0x49, 0x92, - 0xe3, 0x57, 0x06, 0x94, 0xd3, 0x83, 0xfb, 0xe2, 0x04, 0x9e, 0xf1, 0xf6, 0x58, 0x9c, 0xc0, 0xb3, - 0xde, 0x06, 0xe6, 0x3b, 0x12, 0x6c, 0x1d, 0xd5, 0x26, 0xc1, 0xc6, 0x63, 0xff, 0x1f, 0x64, 0x87, - 0x4d, 0xd7, 0x56, 0xf4, 0x8d, 0xc5, 0x46, 0x99, 0x51, 0xc5, 0x1b, 0x8f, 0xae, 0x7a, 0xec, 0x6a, - 0xe6, 0x54, 0x25, 0x5d, 0x98, 0xf3, 0xc7, 0x06, 0x54, 0x26, 0x87, 0xbc, 0xc5, 0x90, 0x67, 0x0e, - 0x85, 0x8d, 0x39, 0x59, 0x38, 0xaf, 0xea, 0x45, 0x73, 0x53, 0x54, 0x50, 0xda, 0x6f, 0x0c, 0xc8, - 0x3f, 0x25, 0x78, 0xc0, 0x7b, 0xe8, 0x97, 0x06, 0x5c, 0xff, 0x98, 0xf0, 0x8f, 0xe2, 0x41, 0x39, - 0x19, 0xb2, 0xe7, 0x26, 0xfb, 0x42, 0x8b, 0xcd, 0x1e, 0xd6, 0xcd, 0xf7, 0x25, 0xbc, 0xbb, 0x68, - 0xca, 0x62, 0x3d, 0x89, 0xa4, 0x25, 0x07, 0x78, 0x27, 0x3e, 0xd5, 0xfe, 0x57, 0x06, 0x72, 0xe2, - 0x1d, 0x81, 0xbe, 0x30, 0x60, 0xe9, 0x99, 0xef, 0x51, 0x86, 0xee, 0x2f, 0x7c, 0x1e, 0x26, 0x2f, - 0x98, 0xc6, 0xfb, 0x97, 0x63, 0x9e, 0x8c, 0x37, 0x73, 0x6d, 0x12, 0xdb, 0x40, 0xe8, 0x15, 0xce, - 0xfb, 0x91, 0x01, 0xf9, 0x4f, 0xa8, 0xc7, 0xc6, 0xa3, 0xff, 0x27, 0x8a, 0xdb, 0x12, 0xc5, 0x57, - 0xcd, 0xa9, 0x8a, 0x1c, 0x4a, 0xc5, 0x02, 0xc6, 0xf7, 0x20, 0xff, 0xcc, 0xf7, 0xfc, 0xf1, 0xfc, - 0x6e, 0x3e, 0x2f, 0x36, 0xe6, 0x88, 0x1e, 0x48, 0x69, 0x7b, 0xc6, 0xce, 0x71, 0x5e, 0x1e, 0x78, - 0xf8, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1e, 0x2d, 0x88, 0x66, 0x80, 0x15, 0x00, 0x00, + // 1817 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4d, 0x6f, 0x23, 0x49, + 0xf9, 0xff, 0xb7, 0xed, 0x38, 0xf6, 0x63, 0xc7, 0x71, 0x2a, 0x89, 0xc7, 0x7f, 0xcf, 0xcc, 0x4e, + 0xa6, 0x97, 0x9d, 0x49, 0x32, 0x3b, 0xf6, 0xe2, 0x59, 0x76, 0x42, 0x38, 0xa0, 0x59, 0xc7, 0xec, + 0x44, 0x99, 0x37, 0xf5, 0x46, 0xac, 0x38, 0x40, 0xab, 0xd2, 0x5d, 0xdb, 0x2e, 0xd9, 0xae, 0xf6, + 0x76, 0x97, 0xf3, 0x32, 0xdc, 0x56, 0x48, 0x1c, 0x80, 0x0b, 0x7b, 0x40, 0x1c, 0x38, 0x30, 0x12, + 0x17, 0x38, 0x21, 0x21, 0x71, 0xe3, 0xc0, 0x57, 0xe0, 0xbe, 0x5c, 0xb8, 0x72, 0xe1, 0x13, 0xa0, + 0x7a, 0xe9, 0x17, 0x3b, 0x36, 0x4e, 0x06, 0x71, 0xb1, 0xba, 0x9e, 0x7a, 0xea, 0x79, 0x7e, 0xf5, + 0xbc, 0x97, 0x61, 0x67, 0x14, 0xf8, 0xdc, 0x6f, 0x9d, 0xe2, 0x01, 0x75, 0x31, 0xf7, 0x83, 0x16, + 0x76, 0x1c, 0x7f, 0xcc, 0x78, 0xd8, 0x3a, 0x6d, 0xb7, 0xce, 0xc8, 0x89, 0x8d, 0x47, 0xb4, 0x29, + 0x79, 0xd0, 0x3b, 0x84, 0xf7, 0x48, 0x40, 0xc6, 0xc3, 0x66, 0xcc, 0xdd, 0x8c, 0xb8, 0x9b, 0xa7, + 0xed, 0xc6, 0x2d, 0xcf, 0xf7, 0xbd, 0x01, 0x69, 0xe1, 0x11, 0x6d, 0x61, 0xc6, 0x7c, 0x8e, 0x39, + 0xf5, 0x59, 0xa8, 0x4e, 0x37, 0x6e, 0xea, 0x5d, 0xb9, 0x3a, 0x19, 0x7f, 0xde, 0x22, 0xc3, 0x11, + 0xbf, 0xd0, 0x9b, 0x0f, 0x3d, 0xca, 0x7b, 0xe3, 0x93, 0xa6, 0xe3, 0x0f, 0x5b, 0x9e, 0xef, 0xf9, + 0x09, 0x97, 0x58, 0x29, 0x88, 0xe2, 0x4b, 0xb1, 0x9b, 0x3f, 0xcf, 0xc2, 0x7a, 0x27, 0x20, 0x98, + 0x93, 0xcf, 0xf0, 0x60, 0x40, 0xb8, 0x45, 0xbe, 0x18, 0x93, 0x90, 0xa3, 0x3b, 0x50, 0x3a, 0x93, + 0x04, 0x7b, 0x84, 0x79, 0xaf, 0x6e, 0x6c, 0x19, 0xdb, 0x45, 0x0b, 0x14, 0xe9, 0x15, 0xe6, 0x3d, + 0xf4, 0x02, 0xa0, 0x4f, 0x2e, 0x86, 0x98, 0x61, 0x8f, 0x04, 0xf5, 0xcc, 0x96, 0xb1, 0x5d, 0x69, + 0x37, 0x9b, 0xff, 0xf9, 0x5e, 0xcd, 0xa3, 0xf8, 0xc4, 0x11, 0x65, 0xae, 0x95, 0x92, 0x80, 0xee, + 0xc3, 0x6a, 0xac, 0x30, 0x0c, 0xcf, 0xfc, 0xc0, 0xad, 0x67, 0xa5, 0xd2, 0x4a, 0xa4, 0x54, 0x51, + 0x51, 0x03, 0x0a, 0x43, 0x46, 0x86, 0x3e, 0xa3, 0x4e, 0x3d, 0x27, 0x39, 0xe2, 0x35, 0xba, 0x0b, + 0x65, 0x36, 0x1e, 0xda, 0x91, 0xca, 0xfa, 0xd2, 0x96, 0xb1, 0x9d, 0xb3, 0x4a, 0x6c, 0x3c, 0x7c, + 0xa2, 0x49, 0xe2, 0x62, 0x01, 0x19, 0xfa, 0x9c, 0xd8, 0xd8, 0x75, 0x83, 0x7a, 0x5e, 0x5d, 0x4c, + 0x91, 0x9e, 0xb8, 0x6e, 0x80, 0xee, 0xc1, 0xaa, 0x66, 0x70, 0x02, 0x7d, 0xfb, 0x65, 0xc9, 0xb4, + 0xa2, 0xc8, 0x9d, 0x40, 0x19, 0x20, 0xe1, 0xeb, 0x93, 0x0b, 0xc5, 0x57, 0x48, 0xf3, 0x1d, 0x91, + 0x0b, 0xc9, 0xf7, 0x00, 0x50, 0x24, 0x0f, 0x27, 0x22, 0x8b, 0x92, 0x55, 0x4b, 0xe8, 0x60, 0x2d, + 0xd4, 0xfc, 0x8b, 0x01, 0x1b, 0x93, 0xee, 0x08, 0x47, 0x3e, 0x0b, 0x09, 0xfa, 0x1e, 0xe4, 0x95, + 0x1d, 0xa4, 0x2b, 0x4a, 0x8b, 0x4d, 0x3d, 0x79, 0xde, 0xd2, 0xa7, 0xd1, 0x8f, 0xa0, 0x1a, 0x71, + 0xd9, 0x8e, 0x54, 0xe4, 0x4a, 0xe7, 0x95, 0xda, 0x8f, 0x16, 0x49, 0x3c, 0x20, 0x23, 0x3f, 0xa4, + 0xfc, 0x00, 0x73, 0x1c, 0x8b, 0x5d, 0x8d, 0x18, 0x14, 0x68, 0xd7, 0xfc, 0xb3, 0x01, 0x37, 0xba, + 0x2e, 0xe5, 0x4a, 0x7d, 0xc7, 0x67, 0x9f, 0x53, 0x2f, 0x15, 0x53, 0x69, 0xd3, 0x1b, 0x57, 0x31, + 0x7d, 0xe6, 0x8a, 0xa6, 0xcf, 0x5e, 0xdd, 0xf4, 0xb9, 0xd9, 0xa6, 0xff, 0x08, 0xea, 0x9f, 0x10, + 0x46, 0x02, 0xcc, 0xc9, 0x73, 0x1d, 0x4f, 0xb1, 0xf5, 0xd3, 0x31, 0x67, 0x4c, 0xc6, 0x9c, 0xf9, + 0xd7, 0x0c, 0x54, 0xa6, 0x9c, 0xb5, 0x30, 0x79, 0x3e, 0x83, 0xd5, 0x24, 0xf4, 0xed, 0x3e, 0x65, + 0xee, 0x5b, 0x66, 0x50, 0xa5, 0x3f, 0xb1, 0x46, 0x5f, 0xc0, 0x5a, 0x4a, 0xb0, 0x23, 0xcd, 0x5f, + 0xcf, 0x6e, 0x65, 0xb7, 0x4b, 0xed, 0x83, 0xeb, 0x45, 0x4c, 0x4a, 0x93, 0xf2, 0x62, 0x97, 0xf1, + 0xe0, 0xc2, 0xaa, 0xf6, 0xa7, 0xc8, 0x8d, 0x0e, 0x6c, 0xce, 0x64, 0x45, 0x55, 0xc8, 0xf6, 0xc9, + 0x85, 0xbe, 0xbd, 0xf8, 0x44, 0x1b, 0xb0, 0x74, 0x8a, 0x07, 0x63, 0xa2, 0xbd, 0xaa, 0x16, 0xfb, + 0x99, 0x3d, 0xc3, 0xfc, 0xa5, 0x01, 0xeb, 0xcf, 0x68, 0xc8, 0xa3, 0x34, 0x8d, 0x42, 0xe6, 0x21, + 0xac, 0x7b, 0x84, 0xdb, 0xae, 0x0a, 0x3d, 0x9b, 0x9f, 0xdb, 0x2e, 0xe6, 0x58, 0xca, 0x2c, 0x58, + 0x55, 0x8f, 0x70, 0x1d, 0x94, 0xc7, 0xe7, 0x22, 0x2c, 0xd1, 0x4d, 0x28, 0x8e, 0xb0, 0x47, 0xec, + 0x90, 0xbe, 0x56, 0x4a, 0x96, 0xac, 0x82, 0x20, 0x7c, 0x4a, 0x5f, 0x13, 0x74, 0x1b, 0x40, 0x6e, + 0x72, 0xbf, 0x4f, 0x98, 0x0e, 0x18, 0xc9, 0x7e, 0x2c, 0x08, 0x02, 0x2e, 0x1e, 0x0c, 0x64, 0x74, + 0x14, 0x2c, 0xf1, 0x69, 0xbe, 0x31, 0x60, 0x63, 0x12, 0x94, 0xf6, 0x6f, 0x07, 0x0a, 0x71, 0x89, + 0x31, 0xa4, 0x71, 0xef, 0x2f, 0x32, 0xae, 0x96, 0x61, 0xc5, 0x07, 0x45, 0x10, 0x33, 0x72, 0x2e, + 0x42, 0x24, 0xc6, 0xa4, 0x83, 0x5d, 0x90, 0x5f, 0xc5, 0xb8, 0x6e, 0x03, 0x70, 0x9f, 0xe3, 0x81, + 0xba, 0x54, 0x56, 0x5e, 0xaa, 0x28, 0x29, 0xe2, 0x56, 0xe6, 0x1f, 0x0d, 0x58, 0xd6, 0xc2, 0x51, + 0x1b, 0x36, 0xb5, 0x76, 0xca, 0x3c, 0x7b, 0x34, 0x3e, 0x19, 0x50, 0xc7, 0x8e, 0x7c, 0x50, 0xb6, + 0xd6, 0x93, 0xcd, 0x57, 0x72, 0xef, 0x88, 0x5c, 0x88, 0x92, 0xa9, 0x21, 0xd9, 0x0c, 0x0f, 0x23, + 0xd7, 0x94, 0x34, 0xed, 0x05, 0x1e, 0x12, 0x81, 0x74, 0xda, 0x01, 0x59, 0x29, 0x70, 0xc5, 0x9d, + 0xb0, 0xfe, 0x7d, 0xc1, 0x17, 0xd0, 0x53, 0xd9, 0xac, 0xd2, 0xb9, 0x56, 0x49, 0xc8, 0x32, 0xd5, + 0x8e, 0xa0, 0x12, 0xd9, 0x23, 0x29, 0x0d, 0x09, 0x5c, 0x65, 0xd4, 0xb2, 0x05, 0xa3, 0x08, 0x65, + 0x88, 0xea, 0xb0, 0x4c, 0x99, 0x4b, 0x1d, 0x12, 0xd6, 0x33, 0x5b, 0xd9, 0xed, 0x9c, 0x15, 0x2d, + 0xcd, 0xa7, 0x50, 0x7a, 0x32, 0xe6, 0xbd, 0x48, 0x52, 0x03, 0x0a, 0x71, 0x03, 0xd1, 0xa9, 0x1a, + 0xad, 0x85, 0x29, 0x75, 0x5e, 0xba, 0x34, 0xd0, 0x37, 0x2d, 0x2a, 0xca, 0x01, 0x0d, 0xcc, 0x97, + 0x50, 0x56, 0x92, 0xb4, 0x9b, 0x37, 0x60, 0x49, 0xf9, 0x45, 0xc9, 0x51, 0x0b, 0xb4, 0x03, 0x55, + 0xf9, 0x61, 0x93, 0xf3, 0x11, 0x0d, 0xe4, 0xa5, 0xa4, 0xa8, 0x9c, 0xb5, 0x2a, 0xe9, 0xdd, 0x98, + 0x6c, 0xfe, 0xdd, 0x80, 0xda, 0x0b, 0xdf, 0x25, 0x1d, 0x9f, 0x31, 0xe2, 0x08, 0x52, 0x2c, 0xfb, + 0x03, 0xd8, 0x38, 0x21, 0xd8, 0xf1, 0x99, 0xcd, 0x7c, 0x97, 0xd8, 0x84, 0xb9, 0x23, 0x9f, 0x32, + 0xae, 0x55, 0x21, 0xb5, 0x27, 0xce, 0x76, 0xf5, 0x0e, 0xba, 0x05, 0x45, 0x47, 0xc9, 0xd1, 0x25, + 0xbb, 0x60, 0x25, 0x04, 0x61, 0x9f, 0xf0, 0x82, 0x39, 0x94, 0x79, 0xd2, 0x37, 0x05, 0x2b, 0x5a, + 0x0a, 0x07, 0x7b, 0x84, 0x91, 0x90, 0x86, 0x36, 0xa7, 0x43, 0x22, 0x5d, 0x92, 0xb3, 0x4a, 0x9a, + 0x76, 0x4c, 0x87, 0x04, 0xed, 0x41, 0x3d, 0x72, 0xb0, 0xe3, 0x33, 0x1e, 0x60, 0x87, 0xcb, 0x12, + 0x4d, 0x42, 0xd5, 0x42, 0xcb, 0x56, 0x4d, 0xef, 0x77, 0xf4, 0xf6, 0x13, 0xb5, 0x6b, 0x7e, 0x65, + 0xc0, 0x66, 0xa7, 0x87, 0x99, 0x47, 0xa2, 0xfe, 0x1c, 0xf9, 0x61, 0x07, 0xaa, 0xce, 0x38, 0x08, + 0x08, 0x4b, 0x35, 0x74, 0x75, 0xb9, 0x55, 0x4d, 0x4f, 0x77, 0xf4, 0x98, 0x25, 0x33, 0xe5, 0xb2, + 0x47, 0xb0, 0x19, 0x7d, 0xab, 0x72, 0x16, 0x0c, 0x95, 0xc9, 0x55, 0xfe, 0x6e, 0x44, 0x9b, 0x9d, + 0xd4, 0x9e, 0xb9, 0x07, 0x6b, 0x4f, 0x71, 0x38, 0x55, 0x94, 0xdf, 0x85, 0x15, 0xed, 0x7c, 0x72, + 0x4e, 0x43, 0x99, 0xb9, 0xc2, 0x4e, 0x65, 0x45, 0xec, 0x4a, 0x9a, 0x79, 0x0a, 0xb5, 0xc3, 0xe1, + 0xc8, 0x0f, 0xb8, 0x08, 0x3a, 0xee, 0x07, 0x24, 0x55, 0x89, 0x50, 0x3f, 0xa2, 0xd9, 0x54, 0xf2, + 0x10, 0x57, 0x06, 0x6a, 0xd1, 0x5a, 0x8b, 0x77, 0x0e, 0xf5, 0xc6, 0x24, 0xfb, 0xd4, 0xed, 0x12, + 0xf6, 0xc8, 0x04, 0xe6, 0x11, 0xdc, 0xb8, 0xa4, 0x37, 0x89, 0x94, 0x48, 0x9d, 0x7d, 0x39, 0x47, + 0x50, 0xb4, 0x17, 0x67, 0x74, 0x68, 0x7e, 0x3b, 0x9a, 0x21, 0xa6, 0x92, 0x6c, 0x7a, 0x3a, 0x32, + 0x2e, 0x4d, 0x47, 0xe6, 0x6f, 0x0c, 0xa8, 0xe8, 0x92, 0xfa, 0x9c, 0x84, 0x21, 0xf6, 0x08, 0xda, + 0x81, 0xfc, 0x68, 0x7c, 0x12, 0x57, 0x91, 0x8f, 0xd7, 0xfe, 0xf5, 0xf5, 0x9d, 0x95, 0x30, 0x7c, + 0xfd, 0x50, 0xd4, 0xa3, 0x7d, 0xf3, 0xc3, 0x3d, 0xd3, 0xd2, 0x0c, 0xe8, 0x29, 0xd4, 0xce, 0x28, + 0xef, 0xb9, 0x01, 0x3e, 0xc3, 0x03, 0x31, 0x5e, 0xb8, 0x84, 0x71, 0x8a, 0x07, 0xa1, 0xbc, 0xf8, + 0xa5, 0xa3, 0x8f, 0xda, 0xa6, 0xb5, 0x99, 0x1c, 0xe8, 0x24, 0xfc, 0xa8, 0x06, 0x79, 0x3c, 0x14, + 0x90, 0xa4, 0x9f, 0x73, 0x96, 0x5e, 0x99, 0xbf, 0xcf, 0xc0, 0xfa, 0x8c, 0x39, 0x04, 0xf5, 0x61, + 0x2d, 0x8a, 0x60, 0x51, 0x9f, 0xec, 0x01, 0x0d, 0xb9, 0x2e, 0xcd, 0xdf, 0x7d, 0x8b, 0xb9, 0x66, + 0x82, 0x16, 0x15, 0x3f, 0xb1, 0x10, 0xed, 0xa0, 0xf1, 0x3b, 0x03, 0x4a, 0x29, 0x06, 0xf4, 0x43, + 0xc8, 0xe9, 0xae, 0x24, 0xf4, 0x1d, 0xfe, 0x97, 0xfa, 0x9a, 0xe2, 0x47, 0x35, 0x5b, 0x29, 0xb6, + 0xf1, 0x18, 0x8a, 0x31, 0xe9, 0x5a, 0x4d, 0x75, 0x0f, 0x36, 0x0f, 0xc8, 0x80, 0xc4, 0x71, 0x10, + 0x5e, 0xb5, 0xda, 0x9a, 0xdf, 0x81, 0xda, 0xf4, 0x49, 0x6d, 0xe8, 0xbb, 0x50, 0x76, 0xe5, 0x8e, + 0x9b, 0x3e, 0x5b, 0xd2, 0x34, 0x71, 0x78, 0xf7, 0x31, 0x54, 0x26, 0xa7, 0x14, 0x54, 0x82, 0xe5, + 0x83, 0xae, 0x75, 0xf8, 0xfd, 0xee, 0x41, 0xf5, 0xff, 0x50, 0x19, 0x0a, 0x87, 0xcf, 0x5f, 0xbd, + 0xb4, 0x8e, 0xbb, 0x07, 0x55, 0x03, 0x01, 0xe4, 0xad, 0xee, 0xf3, 0x97, 0xc7, 0xdd, 0x6a, 0xa6, + 0xfd, 0xb3, 0x65, 0xc8, 0xab, 0xa4, 0x45, 0x3f, 0x86, 0x62, 0x9c, 0xc1, 0xa8, 0xd6, 0x54, 0x0f, + 0x9e, 0x66, 0xf4, 0x94, 0x69, 0x76, 0xc5, 0x83, 0xa7, 0xf1, 0xcd, 0x45, 0x96, 0xbe, 0x54, 0x04, + 0xcc, 0x77, 0xbf, 0xfc, 0xdb, 0x3f, 0xbe, 0xca, 0xdc, 0x46, 0x37, 0xc5, 0x9b, 0x2c, 0x79, 0xa9, + 0xa9, 0x1a, 0xd0, 0x52, 0x85, 0x01, 0xfd, 0xd6, 0x80, 0x72, 0x7a, 0x08, 0x47, 0x0b, 0x47, 0xe3, + 0x19, 0x2f, 0xa8, 0xc6, 0x87, 0xd7, 0x3b, 0xa4, 0x01, 0xde, 0x93, 0x00, 0xb7, 0xcc, 0xd9, 0x00, + 0xd5, 0xc4, 0xbe, 0x6f, 0xec, 0xa2, 0x37, 0x06, 0x80, 0x98, 0xb3, 0xd5, 0xc0, 0x85, 0x1e, 0x2f, + 0x52, 0x36, 0x67, 0x26, 0x6f, 0x5c, 0xf3, 0x1d, 0x61, 0x3e, 0x90, 0xf8, 0xde, 0x33, 0xb7, 0x66, + 0xe3, 0x93, 0xb2, 0x5b, 0xc4, 0xa5, 0x5c, 0x80, 0xe4, 0x50, 0x4e, 0xeb, 0x9c, 0xeb, 0xc8, 0xeb, + 0x82, 0xb8, 0x25, 0x41, 0xd4, 0xd0, 0xc6, 0x2c, 0x10, 0xe8, 0x17, 0x06, 0x54, 0xa7, 0x27, 0xf9, + 0xb9, 0xaa, 0xf7, 0x16, 0xa9, 0x9e, 0xf7, 0x26, 0x30, 0xef, 0x4b, 0x10, 0x77, 0xd1, 0x9d, 0x49, + 0x10, 0xd1, 0xbb, 0xa0, 0xe5, 0xe9, 0x83, 0xe8, 0x4f, 0x06, 0xac, 0x4e, 0x15, 0x77, 0xf4, 0xd1, + 0x22, 0xb5, 0xb3, 0xbb, 0x50, 0xe3, 0xf1, 0xb5, 0xcf, 0x69, 0xb4, 0x1f, 0x48, 0xb4, 0xbb, 0xe6, + 0x7b, 0x33, 0xfd, 0x16, 0x37, 0xa4, 0x96, 0x6a, 0x27, 0xfb, 0xc6, 0x6e, 0xfb, 0xeb, 0x2c, 0x14, + 0xe2, 0x57, 0xf3, 0x1f, 0x0c, 0x58, 0x99, 0xe8, 0x29, 0xe8, 0x8a, 0xe1, 0x3d, 0xd9, 0x82, 0x1a, + 0x6f, 0xf3, 0xc8, 0x34, 0x5b, 0x12, 0xfb, 0x8e, 0xf9, 0x8d, 0x99, 0xd8, 0xe3, 0x7f, 0x59, 0x92, + 0xe4, 0xf8, 0xb5, 0x01, 0xe5, 0xf4, 0xe0, 0xbe, 0x38, 0x81, 0x67, 0xbc, 0x3d, 0x16, 0x27, 0xf0, + 0xac, 0xb7, 0x81, 0xf9, 0x8e, 0x04, 0x5b, 0x47, 0xb5, 0x49, 0xb0, 0xf1, 0xd8, 0xff, 0x53, 0x03, + 0x2a, 0x93, 0x13, 0x13, 0xfa, 0xd6, 0x42, 0x53, 0xce, 0x9a, 0xb0, 0x1a, 0x73, 0x42, 0x7a, 0x5e, + 0x09, 0x89, 0x86, 0x90, 0x28, 0x3b, 0xdb, 0x6f, 0x0c, 0xc8, 0x3f, 0x25, 0x78, 0xc0, 0x7b, 0xe8, + 0x57, 0x06, 0xdc, 0xf8, 0x84, 0xf0, 0x8f, 0xe3, 0xa9, 0x33, 0x99, 0x58, 0xe7, 0x66, 0xce, 0xc2, + 0x10, 0x9e, 0x3d, 0xf9, 0x9a, 0xef, 0x4b, 0x78, 0xf7, 0xd0, 0x94, 0x37, 0x7b, 0x12, 0x49, 0x4b, + 0x4e, 0xc3, 0x4e, 0x7c, 0xaa, 0xfd, 0xcf, 0x0c, 0xe4, 0xc4, 0x50, 0x8e, 0xbe, 0x34, 0x60, 0xe9, + 0x99, 0xef, 0x51, 0x86, 0x1e, 0x2c, 0x7c, 0x6b, 0x25, 0xcf, 0x81, 0xc6, 0xfb, 0x57, 0x63, 0x9e, + 0x74, 0x9e, 0xb9, 0x3e, 0x89, 0x6d, 0x20, 0xf4, 0x8a, 0xc0, 0xfa, 0x89, 0x01, 0xf9, 0x4f, 0xa9, + 0xc7, 0xc6, 0xa3, 0xff, 0x25, 0x8a, 0x3b, 0x12, 0xc5, 0xff, 0x9b, 0x53, 0xe5, 0x2d, 0x94, 0x8a, + 0x05, 0x8c, 0x1f, 0x40, 0xfe, 0x99, 0xef, 0xf9, 0xe3, 0xf9, 0xad, 0x71, 0x5e, 0x6c, 0xcc, 0x11, + 0x3d, 0x90, 0xd2, 0xf6, 0x8d, 0xdd, 0x93, 0xbc, 0x3c, 0xf0, 0xe8, 0xdf, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x5e, 0xfd, 0x9b, 0x9e, 0xcd, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1603,7 +1602,6 @@ var _Wallet_serviceDesc = grpc.ServiceDesc{ type AccountsClient interface { CreateAccount(ctx context.Context, in *CreateAccountRequest, opts ...grpc.CallOption) (*DepositDataResponse, error) ListAccounts(ctx context.Context, in *ListAccountsRequest, opts ...grpc.CallOption) (*ListAccountsResponse, error) - DeleteAccounts(ctx context.Context, in *DeleteAccountsRequest, opts ...grpc.CallOption) (*DeleteAccountsResponse, error) ChangePassword(ctx context.Context, in *ChangePasswordRequest, opts ...grpc.CallOption) (*empty.Empty, error) } @@ -1633,15 +1631,6 @@ func (c *accountsClient) ListAccounts(ctx context.Context, in *ListAccountsReque return out, nil } -func (c *accountsClient) DeleteAccounts(ctx context.Context, in *DeleteAccountsRequest, opts ...grpc.CallOption) (*DeleteAccountsResponse, error) { - out := new(DeleteAccountsResponse) - err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Accounts/DeleteAccounts", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *accountsClient) ChangePassword(ctx context.Context, in *ChangePasswordRequest, opts ...grpc.CallOption) (*empty.Empty, error) { out := new(empty.Empty) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Accounts/ChangePassword", in, out, opts...) @@ -1655,7 +1644,6 @@ func (c *accountsClient) ChangePassword(ctx context.Context, in *ChangePasswordR type AccountsServer interface { CreateAccount(context.Context, *CreateAccountRequest) (*DepositDataResponse, error) ListAccounts(context.Context, *ListAccountsRequest) (*ListAccountsResponse, error) - DeleteAccounts(context.Context, *DeleteAccountsRequest) (*DeleteAccountsResponse, error) ChangePassword(context.Context, *ChangePasswordRequest) (*empty.Empty, error) } @@ -1669,9 +1657,6 @@ func (*UnimplementedAccountsServer) CreateAccount(ctx context.Context, req *Crea func (*UnimplementedAccountsServer) ListAccounts(ctx context.Context, req *ListAccountsRequest) (*ListAccountsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListAccounts not implemented") } -func (*UnimplementedAccountsServer) DeleteAccounts(ctx context.Context, req *DeleteAccountsRequest) (*DeleteAccountsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method DeleteAccounts not implemented") -} func (*UnimplementedAccountsServer) ChangePassword(ctx context.Context, req *ChangePasswordRequest) (*empty.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method ChangePassword not implemented") } @@ -1716,24 +1701,6 @@ func _Accounts_ListAccounts_Handler(srv interface{}, ctx context.Context, dec fu return interceptor(ctx, in, info, handler) } -func _Accounts_DeleteAccounts_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(DeleteAccountsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(AccountsServer).DeleteAccounts(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/ethereum.validator.accounts.v2.Accounts/DeleteAccounts", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AccountsServer).DeleteAccounts(ctx, req.(*DeleteAccountsRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Accounts_ChangePassword_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ChangePasswordRequest) if err := dec(in); err != nil { @@ -1764,10 +1731,6 @@ var _Accounts_serviceDesc = grpc.ServiceDesc{ MethodName: "ListAccounts", Handler: _Accounts_ListAccounts_Handler, }, - { - MethodName: "DeleteAccounts", - Handler: _Accounts_DeleteAccounts_Handler, - }, { MethodName: "ChangePassword", Handler: _Accounts_ChangePassword_Handler, diff --git a/proto/validator/accounts/v2_gateway/web_api.pb.gw.go b/proto/validator/accounts/v2_gateway/web_api.pb.gw.go index 6f83d57d62..d38356beaa 100755 --- a/proto/validator/accounts/v2_gateway/web_api.pb.gw.go +++ b/proto/validator/accounts/v2_gateway/web_api.pb.gw.go @@ -258,40 +258,6 @@ func local_request_Accounts_ListAccounts_0(ctx context.Context, marshaler runtim } -func request_Accounts_DeleteAccounts_0(ctx context.Context, marshaler runtime.Marshaler, client AccountsClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq DeleteAccountsRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.DeleteAccounts(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Accounts_DeleteAccounts_0(ctx context.Context, marshaler runtime.Marshaler, server AccountsServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq DeleteAccountsRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.DeleteAccounts(ctx, &protoReq) - return msg, metadata, err - -} - func request_Accounts_ChangePassword_0(ctx context.Context, marshaler runtime.Marshaler, client AccountsClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq ChangePasswordRequest var metadata runtime.ServerMetadata @@ -619,26 +585,6 @@ func RegisterAccountsHandlerServer(ctx context.Context, mux *runtime.ServeMux, s }) - mux.Handle("POST", pattern_Accounts_DeleteAccounts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Accounts_DeleteAccounts_0(rctx, inboundMarshaler, server, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Accounts_DeleteAccounts_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - mux.Handle("POST", pattern_Accounts_ChangePassword_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1025,26 +971,6 @@ func RegisterAccountsHandlerClient(ctx context.Context, mux *runtime.ServeMux, c }) - mux.Handle("POST", pattern_Accounts_DeleteAccounts_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Accounts_DeleteAccounts_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Accounts_DeleteAccounts_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - mux.Handle("POST", pattern_Accounts_ChangePassword_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1073,8 +999,6 @@ var ( pattern_Accounts_ListAccounts_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v2", "validator", "accounts"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Accounts_DeleteAccounts_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"v2", "validator", "wallet", "accounts", "delete"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Accounts_ChangePassword_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"v2", "validator", "password", "edit"}, "", runtime.AssumeColonVerbOpt(true))) ) @@ -1083,8 +1007,6 @@ var ( forward_Accounts_ListAccounts_0 = runtime.ForwardResponseMessage - forward_Accounts_DeleteAccounts_0 = runtime.ForwardResponseMessage - forward_Accounts_ChangePassword_0 = runtime.ForwardResponseMessage ) diff --git a/validator/flags/flags.go b/validator/flags/flags.go index 01ac2116eb..9f8bd2e913 100644 --- a/validator/flags/flags.go +++ b/validator/flags/flags.go @@ -14,6 +14,8 @@ import ( const ( // WalletDefaultDirName for accounts. WalletDefaultDirName = "prysm-wallet-v2" + // DefaultGatewayHost for the validator client. + DefaultGatewayHost = "127.0.0.1" ) var ( @@ -102,7 +104,7 @@ var ( GRPCGatewayHost = &cli.StringFlag{ Name: "grpc-gateway-host", Usage: "The host on which the gateway server runs on", - Value: "127.0.0.1", + Value: DefaultGatewayHost, } // GRPCGatewayPort enables a gRPC gateway to be exposed for the validator client. GRPCGatewayPort = &cli.IntFlag{ diff --git a/validator/node/node.go b/validator/node/node.go index f86167624f..cf6105b74c 100644 --- a/validator/node/node.go +++ b/validator/node/node.go @@ -428,6 +428,12 @@ func (s *ValidatorClient) registerRPCService(cliCtx *cli.Context, km keymanager. func (s *ValidatorClient) registerRPCGatewayService(cliCtx *cli.Context) error { gatewayHost := cliCtx.String(flags.GRPCGatewayHost.Name) + if gatewayHost != flags.DefaultGatewayHost { + log.WithField("web-host", gatewayHost).Warn( + "You are using a non-default web host. Web traffic is served by HTTP, so be wary of " + + "changing this parameter if you are exposing this host to the Internet!", + ) + } gatewayPort := cliCtx.Int(flags.GRPCGatewayPort.Name) rpcHost := cliCtx.String(flags.RPCHost.Name) rpcPort := cliCtx.Int(flags.RPCPort.Name) diff --git a/validator/rpc/accounts.go b/validator/rpc/accounts.go index 1c4cfa19d4..b751809b02 100644 --- a/validator/rpc/accounts.go +++ b/validator/rpc/accounts.go @@ -89,31 +89,6 @@ func (s *Server) ListAccounts(ctx context.Context, req *pb.ListAccountsRequest) }, nil } -// DeleteAccounts deletes accounts from a user if their wallet is an imported wallet. -func (s *Server) DeleteAccounts( - ctx context.Context, req *pb.DeleteAccountsRequest, -) (*pb.DeleteAccountsResponse, error) { - if req.PublicKeys == nil || len(req.PublicKeys) < 1 { - return nil, status.Error(codes.InvalidArgument, "No public keys specified to delete") - } - if s.wallet == nil || s.keymanager == nil { - return nil, status.Error(codes.FailedPrecondition, "No wallet found") - } - if s.wallet.KeymanagerKind() != keymanager.Imported { - return nil, status.Error(codes.FailedPrecondition, "Only imported wallets can delete accounts") - } - if err := accounts.DeleteAccount(ctx, &accounts.DeleteAccountConfig{ - Wallet: s.wallet, - Keymanager: s.keymanager, - PublicKeys: req.PublicKeys, - }); err != nil { - return nil, status.Errorf(codes.Internal, "Could not delete public keys: %v", err) - } - return &pb.DeleteAccountsResponse{ - DeletedKeys: req.PublicKeys, - }, nil -} - func createAccountWithDepositData(ctx context.Context, km accountCreator) (*pb.DepositDataResponse_DepositData, error) { // Create a new validator account using the specified keymanager. _, depositData, err := km.CreateAccount(ctx) diff --git a/validator/rpc/accounts_test.go b/validator/rpc/accounts_test.go index 24e832cf8a..f06a811a27 100644 --- a/validator/rpc/accounts_test.go +++ b/validator/rpc/accounts_test.go @@ -162,65 +162,3 @@ func Test_createAccountWithDepositData(t *testing.T) { t, rawResp.Data["fork_version"], fmt.Sprintf("%x", params.BeaconConfig().GenesisForkVersion), ) } - -func TestServer_DeleteAccounts_FailedPreconditions_WrongKeymanagerKind(t *testing.T) { - localWalletDir := setupWalletDir(t) - defaultWalletPath = localWalletDir - ctx := context.Background() - strongPass := "29384283xasjasd32%%&*@*#*" - w, err := accounts.CreateWalletWithKeymanager(ctx, &accounts.CreateWalletConfig{ - WalletCfg: &wallet.Config{ - WalletDir: defaultWalletPath, - KeymanagerKind: keymanager.Derived, - WalletPassword: strongPass, - }, - SkipMnemonicConfirm: true, - }) - require.NoError(t, err) - km, err := w.InitializeKeymanager(ctx, &iface.InitializeKeymanagerConfig{ - SkipMnemonicConfirm: true, - }) - require.NoError(t, err) - ss := &Server{ - wallet: w, - keymanager: km, - } - _, err = ss.DeleteAccounts(ctx, &pb.DeleteAccountsRequest{ - PublicKeys: make([][]byte, 1), - }) - assert.ErrorContains(t, "Only imported wallets can delete accounts", err) -} - -func TestServer_DeleteAccounts_FailedPreconditions(t *testing.T) { - ss := &Server{} - ctx := context.Background() - _, err := ss.DeleteAccounts(ctx, &pb.DeleteAccountsRequest{}) - assert.ErrorContains(t, "No public keys specified", err) - _, err = ss.DeleteAccounts(ctx, &pb.DeleteAccountsRequest{ - PublicKeys: make([][]byte, 1), - }) - assert.ErrorContains(t, "No wallet found", err) -} - -func TestServer_DeleteAccounts_OK(t *testing.T) { - ss, pubKeys := createImportedWalletWithAccounts(t, 3) - ctx := context.Background() - keys, err := ss.keymanager.FetchValidatingPublicKeys(ctx) - require.NoError(t, err) - require.Equal(t, len(pubKeys), len(keys)) - - // Next, we attempt to delete one of the keystores. - _, err = ss.DeleteAccounts(ctx, &pb.DeleteAccountsRequest{ - PublicKeys: pubKeys[:1], // Delete the 0th public key - }) - require.NoError(t, err) - ss.keymanager, err = ss.wallet.InitializeKeymanager(ctx, &iface.InitializeKeymanagerConfig{ - SkipMnemonicConfirm: true, - }) - require.NoError(t, err) - - // We expect one of the keys to have been deleted. - keys, err = ss.keymanager.FetchValidatingPublicKeys(ctx) - require.NoError(t, err) - assert.Equal(t, len(pubKeys)-1, len(keys)) -} diff --git a/validator/rpc/auth.go b/validator/rpc/auth.go index d91c8d30bd..fd592a7aa5 100644 --- a/validator/rpc/auth.go +++ b/validator/rpc/auth.go @@ -28,7 +28,8 @@ var ( const ( // HashedRPCPassword for the validator RPC access. - HashedRPCPassword = "rpc-password-hash" + HashedRPCPassword = "rpc-password-hash" + checkUserSignupInterval = time.Second * 30 ) // Signup to authenticate access to the validator RPC API using bcrypt and @@ -143,6 +144,40 @@ func (s *Server) ChangePassword(ctx context.Context, req *pb.ChangePasswordReque return &ptypes.Empty{}, nil } +// SaveHashedPassword to disk for the validator RPC. +func (s *Server) SaveHashedPassword(password string) error { + hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), hashCost) + if err != nil { + return errors.Wrap(err, "could not generate hashed password") + } + hashFilePath := filepath.Join(s.walletDir, HashedRPCPassword) + return ioutil.WriteFile(hashFilePath, hashedPassword, params.BeaconIoConfig().ReadWritePermissions) +} + +// Interval in which we should check if a user has not yet used the RPC Signup endpoint +// which means they are using the --web flag and someone could come in and signup for them +// if they have their web host:port exposed to the Internet. +func (s *Server) checkUserSignup(ctx context.Context) { + ticker := time.NewTicker(checkUserSignupInterval) + defer ticker.Stop() + for { + select { + case <-ticker.C: + hashedPasswordPath := filepath.Join(s.walletDir, HashedRPCPassword) + if fileutil.FileExists(hashedPasswordPath) { + return + } + log.Warn( + "You are using the --web option but have not yet signed via a browser. " + + "If your web host and port are exposed to the Internet, someone else can attempt to sign up " + + "for you!", + ) + case <-s.ctx.Done(): + return + } + } +} + // Creates a JWT token string using the JWT key with an expiration timestamp. func (s *Server) createTokenString() (string, uint64, error) { // Create a new token object, specifying signing method and the claims @@ -158,13 +193,3 @@ func (s *Server) createTokenString() (string, uint64, error) { } return tokenString, uint64(expirationTime.Unix()), nil } - -// SaveHashedPassword to disk for the validator RPC. -func (s *Server) SaveHashedPassword(password string) error { - hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), hashCost) - if err != nil { - return errors.Wrap(err, "could not generate hashed password") - } - hashFilePath := filepath.Join(s.walletDir, HashedRPCPassword) - return ioutil.WriteFile(hashFilePath, hashedPassword, params.BeaconIoConfig().ReadWritePermissions) -} diff --git a/validator/rpc/server.go b/validator/rpc/server.go index c2d2632444..109ceb5787 100644 --- a/validator/rpc/server.go +++ b/validator/rpc/server.go @@ -154,6 +154,7 @@ func (s *Server) Start() { } } }() + go s.checkUserSignup(s.ctx) log.WithField("address", address).Info("gRPC server listening on address") }