diff --git a/proto/validator/accounts/v2/web_api.pb.go b/proto/validator/accounts/v2/web_api.pb.go index 088cfc0e63be..4b62597ef0e7 100755 --- a/proto/validator/accounts/v2/web_api.pb.go +++ b/proto/validator/accounts/v2/web_api.pb.go @@ -185,6 +185,61 @@ func (m *CreateWalletRequest) GetRemoteCaCrtPath() string { return "" } +type CreateWalletResponse struct { + Wallet *WalletResponse `protobuf:"bytes,1,opt,name=wallet,proto3" json:"wallet,omitempty"` + AccountsCreated *DepositDataResponse `protobuf:"bytes,2,opt,name=accounts_created,json=accountsCreated,proto3" json:"accounts_created,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CreateWalletResponse) Reset() { *m = CreateWalletResponse{} } +func (m *CreateWalletResponse) String() string { return proto.CompactTextString(m) } +func (*CreateWalletResponse) ProtoMessage() {} +func (*CreateWalletResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_8a5153635bfe042e, []int{1} +} +func (m *CreateWalletResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CreateWalletResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CreateWalletResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CreateWalletResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateWalletResponse.Merge(m, src) +} +func (m *CreateWalletResponse) XXX_Size() int { + return m.Size() +} +func (m *CreateWalletResponse) XXX_DiscardUnknown() { + xxx_messageInfo_CreateWalletResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_CreateWalletResponse proto.InternalMessageInfo + +func (m *CreateWalletResponse) GetWallet() *WalletResponse { + if m != nil { + return m.Wallet + } + return nil +} + +func (m *CreateWalletResponse) GetAccountsCreated() *DepositDataResponse { + if m != nil { + return m.AccountsCreated + } + return nil +} + type EditWalletConfigRequest struct { RemoteAddr string `protobuf:"bytes,1,opt,name=remote_addr,json=remoteAddr,proto3" json:"remote_addr,omitempty"` RemoteCrtPath string `protobuf:"bytes,2,opt,name=remote_crt_path,json=remoteCrtPath,proto3" json:"remote_crt_path,omitempty"` @@ -199,7 +254,7 @@ func (m *EditWalletConfigRequest) Reset() { *m = EditWalletConfigRequest func (m *EditWalletConfigRequest) String() string { return proto.CompactTextString(m) } func (*EditWalletConfigRequest) ProtoMessage() {} func (*EditWalletConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{1} + return fileDescriptor_8a5153635bfe042e, []int{2} } func (m *EditWalletConfigRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -267,7 +322,7 @@ func (m *GenerateMnemonicResponse) Reset() { *m = GenerateMnemonicRespon func (m *GenerateMnemonicResponse) String() string { return proto.CompactTextString(m) } func (*GenerateMnemonicResponse) ProtoMessage() {} func (*GenerateMnemonicResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{2} + return fileDescriptor_8a5153635bfe042e, []int{3} } func (m *GenerateMnemonicResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -316,7 +371,7 @@ func (m *WalletResponse) Reset() { *m = WalletResponse{} } func (m *WalletResponse) String() string { return proto.CompactTextString(m) } func (*WalletResponse) ProtoMessage() {} func (*WalletResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{3} + return fileDescriptor_8a5153635bfe042e, []int{4} } func (m *WalletResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -380,7 +435,7 @@ func (m *ListAccountsRequest) Reset() { *m = ListAccountsRequest{} } func (m *ListAccountsRequest) String() string { return proto.CompactTextString(m) } func (*ListAccountsRequest) ProtoMessage() {} func (*ListAccountsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{4} + return fileDescriptor_8a5153635bfe042e, []int{5} } func (m *ListAccountsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -450,7 +505,7 @@ func (m *ListAccountsResponse) Reset() { *m = ListAccountsResponse{} } func (m *ListAccountsResponse) String() string { return proto.CompactTextString(m) } func (*ListAccountsResponse) ProtoMessage() {} func (*ListAccountsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{5} + return fileDescriptor_8a5153635bfe042e, []int{6} } func (m *ListAccountsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -514,7 +569,7 @@ func (m *Account) Reset() { *m = Account{} } func (m *Account) String() string { return proto.CompactTextString(m) } func (*Account) ProtoMessage() {} func (*Account) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{6} + return fileDescriptor_8a5153635bfe042e, []int{7} } func (m *Account) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -583,7 +638,7 @@ func (m *AccountRequest) Reset() { *m = AccountRequest{} } func (m *AccountRequest) String() string { return proto.CompactTextString(m) } func (*AccountRequest) ProtoMessage() {} func (*AccountRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{7} + return fileDescriptor_8a5153635bfe042e, []int{8} } func (m *AccountRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -637,7 +692,7 @@ func (m *AuthRequest) Reset() { *m = AuthRequest{} } func (m *AuthRequest) String() string { return proto.CompactTextString(m) } func (*AuthRequest) ProtoMessage() {} func (*AuthRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{8} + return fileDescriptor_8a5153635bfe042e, []int{9} } func (m *AuthRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -685,7 +740,7 @@ func (m *AuthResponse) Reset() { *m = AuthResponse{} } func (m *AuthResponse) String() string { return proto.CompactTextString(m) } func (*AuthResponse) ProtoMessage() {} func (*AuthResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{9} + return fileDescriptor_8a5153635bfe042e, []int{10} } func (m *AuthResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -743,7 +798,7 @@ func (m *NodeConnectionResponse) Reset() { *m = NodeConnectionResponse{} func (m *NodeConnectionResponse) String() string { return proto.CompactTextString(m) } func (*NodeConnectionResponse) ProtoMessage() {} func (*NodeConnectionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{10} + return fileDescriptor_8a5153635bfe042e, []int{11} } func (m *NodeConnectionResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -819,7 +874,7 @@ func (m *ChangePasswordRequest) Reset() { *m = ChangePasswordRequest{} } func (m *ChangePasswordRequest) String() string { return proto.CompactTextString(m) } func (*ChangePasswordRequest) ProtoMessage() {} func (*ChangePasswordRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{11} + return fileDescriptor_8a5153635bfe042e, []int{12} } func (m *ChangePasswordRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -873,7 +928,7 @@ func (m *HasWalletResponse) Reset() { *m = HasWalletResponse{} } func (m *HasWalletResponse) String() string { return proto.CompactTextString(m) } func (*HasWalletResponse) ProtoMessage() {} func (*HasWalletResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{12} + return fileDescriptor_8a5153635bfe042e, []int{13} } func (m *HasWalletResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -921,7 +976,7 @@ func (m *ImportKeystoresRequest) Reset() { *m = ImportKeystoresRequest{} func (m *ImportKeystoresRequest) String() string { return proto.CompactTextString(m) } func (*ImportKeystoresRequest) ProtoMessage() {} func (*ImportKeystoresRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{13} + return fileDescriptor_8a5153635bfe042e, []int{14} } func (m *ImportKeystoresRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -975,7 +1030,7 @@ func (m *ImportKeystoresResponse) Reset() { *m = ImportKeystoresResponse func (m *ImportKeystoresResponse) String() string { return proto.CompactTextString(m) } func (*ImportKeystoresResponse) ProtoMessage() {} func (*ImportKeystoresResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{14} + return fileDescriptor_8a5153635bfe042e, []int{15} } func (m *ImportKeystoresResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1022,7 +1077,7 @@ func (m *CreateAccountRequest) Reset() { *m = CreateAccountRequest{} } func (m *CreateAccountRequest) String() string { return proto.CompactTextString(m) } func (*CreateAccountRequest) ProtoMessage() {} func (*CreateAccountRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{15} + return fileDescriptor_8a5153635bfe042e, []int{16} } func (m *CreateAccountRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1071,7 +1126,7 @@ func (m *DepositMessage) Reset() { *m = DepositMessage{} } func (m *DepositMessage) String() string { return proto.CompactTextString(m) } func (*DepositMessage) ProtoMessage() {} func (*DepositMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{16} + return fileDescriptor_8a5153635bfe042e, []int{17} } func (m *DepositMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1132,7 +1187,7 @@ func (m *DepositDataResponse) Reset() { *m = DepositDataResponse{} } func (m *DepositDataResponse) String() string { return proto.CompactTextString(m) } func (*DepositDataResponse) ProtoMessage() {} func (*DepositDataResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{17} + return fileDescriptor_8a5153635bfe042e, []int{18} } func (m *DepositDataResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1179,7 +1234,7 @@ func (m *DepositDataResponse_DepositData) Reset() { *m = DepositDataResp func (m *DepositDataResponse_DepositData) String() string { return proto.CompactTextString(m) } func (*DepositDataResponse_DepositData) ProtoMessage() {} func (*DepositDataResponse_DepositData) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{17, 0} + return fileDescriptor_8a5153635bfe042e, []int{18, 0} } func (m *DepositDataResponse_DepositData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1227,7 +1282,7 @@ func (m *BackupAccountsRequest) Reset() { *m = BackupAccountsRequest{} } func (m *BackupAccountsRequest) String() string { return proto.CompactTextString(m) } func (*BackupAccountsRequest) ProtoMessage() {} func (*BackupAccountsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{18} + return fileDescriptor_8a5153635bfe042e, []int{19} } func (m *BackupAccountsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1281,7 +1336,7 @@ func (m *BackupAccountsResponse) Reset() { *m = BackupAccountsResponse{} func (m *BackupAccountsResponse) String() string { return proto.CompactTextString(m) } func (*BackupAccountsResponse) ProtoMessage() {} func (*BackupAccountsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{19} + return fileDescriptor_8a5153635bfe042e, []int{20} } func (m *BackupAccountsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1328,7 +1383,7 @@ func (m *DeleteAccountsRequest) Reset() { *m = DeleteAccountsRequest{} } func (m *DeleteAccountsRequest) String() string { return proto.CompactTextString(m) } func (*DeleteAccountsRequest) ProtoMessage() {} func (*DeleteAccountsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{20} + return fileDescriptor_8a5153635bfe042e, []int{21} } func (m *DeleteAccountsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1375,7 +1430,7 @@ func (m *DeleteAccountsResponse) Reset() { *m = DeleteAccountsResponse{} func (m *DeleteAccountsResponse) String() string { return proto.CompactTextString(m) } func (*DeleteAccountsResponse) ProtoMessage() {} func (*DeleteAccountsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{21} + return fileDescriptor_8a5153635bfe042e, []int{22} } func (m *DeleteAccountsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1414,6 +1469,7 @@ func (m *DeleteAccountsResponse) GetDeletedKeys() [][]byte { func init() { proto.RegisterEnum("ethereum.validator.accounts.v2.KeymanagerKind", KeymanagerKind_name, KeymanagerKind_value) proto.RegisterType((*CreateWalletRequest)(nil), "ethereum.validator.accounts.v2.CreateWalletRequest") + proto.RegisterType((*CreateWalletResponse)(nil), "ethereum.validator.accounts.v2.CreateWalletResponse") proto.RegisterType((*EditWalletConfigRequest)(nil), "ethereum.validator.accounts.v2.EditWalletConfigRequest") proto.RegisterType((*GenerateMnemonicResponse)(nil), "ethereum.validator.accounts.v2.GenerateMnemonicResponse") proto.RegisterType((*WalletResponse)(nil), "ethereum.validator.accounts.v2.WalletResponse") @@ -1445,123 +1501,126 @@ func init() { } var fileDescriptor_8a5153635bfe042e = []byte{ - // 1851 bytes of a gzipped FileDescriptorProto + // 1896 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x6f, 0x23, 0x49, - 0x15, 0xa7, 0xec, 0x7c, 0x38, 0xcf, 0x8e, 0x93, 0x54, 0x12, 0x8f, 0xd7, 0x33, 0x93, 0x64, 0x7a, - 0xd9, 0xc9, 0xc7, 0x6c, 0xec, 0x25, 0x99, 0x9d, 0x09, 0xe1, 0x80, 0x66, 0x1c, 0xb3, 0x33, 0xca, - 0xce, 0xec, 0xa8, 0x37, 0x62, 0x4f, 0xa8, 0x55, 0xe9, 0xae, 0x69, 0x97, 0x6c, 0x77, 0xf7, 0x76, - 0x97, 0xf3, 0xc5, 0x6d, 0xc5, 0x15, 0x0e, 0x8b, 0x04, 0x42, 0x88, 0xcb, 0x48, 0x5c, 0xe0, 0xb2, - 0x48, 0x48, 0x48, 0x1c, 0x39, 0x71, 0x44, 0xe2, 0x0e, 0x68, 0xc4, 0x89, 0x23, 0x7f, 0x01, 0xaa, - 0x8f, 0xee, 0xb6, 0x9d, 0x0e, 0x4e, 0x16, 0x71, 0xb1, 0xba, 0xde, 0x7b, 0xf5, 0xde, 0xaf, 0xde, - 0x7b, 0xf5, 0x5e, 0x3d, 0xc3, 0x66, 0x10, 0xfa, 0xdc, 0x6f, 0x9c, 0x90, 0x2e, 0x73, 0x08, 0xf7, - 0xc3, 0x06, 0xb1, 0x6d, 0xbf, 0xef, 0xf1, 0xa8, 0x71, 0xb2, 0xd3, 0x38, 0xa5, 0xc7, 0x16, 0x09, - 0x58, 0x5d, 0xca, 0xe0, 0x15, 0xca, 0xdb, 0x34, 0xa4, 0xfd, 0x5e, 0x3d, 0x91, 0xae, 0xc7, 0xd2, - 0xf5, 0x93, 0x9d, 0xda, 0x1d, 0xd7, 0xf7, 0xdd, 0x2e, 0x6d, 0x90, 0x80, 0x35, 0x88, 0xe7, 0xf9, - 0x9c, 0x70, 0xe6, 0x7b, 0x91, 0xda, 0x5d, 0xbb, 0xad, 0xb9, 0x72, 0x75, 0xdc, 0x7f, 0xdd, 0xa0, - 0xbd, 0x80, 0x9f, 0x6b, 0xe6, 0xb6, 0xcb, 0x78, 0xbb, 0x7f, 0x5c, 0xb7, 0xfd, 0x5e, 0xc3, 0xf5, - 0x5d, 0x3f, 0x95, 0x12, 0x2b, 0x05, 0x51, 0x7c, 0x29, 0x71, 0xe3, 0x5f, 0x79, 0x58, 0x6c, 0x86, - 0x94, 0x70, 0xfa, 0x19, 0xe9, 0x76, 0x29, 0x37, 0xe9, 0xe7, 0x7d, 0x1a, 0x71, 0xbc, 0x0a, 0xc5, - 0x53, 0x49, 0xb0, 0x02, 0xc2, 0xdb, 0x55, 0xb4, 0x86, 0x36, 0x66, 0x4c, 0x50, 0xa4, 0x57, 0x84, - 0xb7, 0xf1, 0x4b, 0x80, 0x0e, 0x3d, 0xef, 0x11, 0x8f, 0xb8, 0x34, 0xac, 0xe6, 0xd6, 0xd0, 0x46, - 0x79, 0xa7, 0x5e, 0xff, 0xef, 0xe7, 0xaa, 0x1f, 0x26, 0x3b, 0x0e, 0x99, 0xe7, 0x98, 0x03, 0x1a, - 0xf0, 0x3a, 0xcc, 0x25, 0x06, 0xa3, 0xe8, 0xd4, 0x0f, 0x9d, 0x6a, 0x5e, 0x1a, 0x2d, 0xc7, 0x46, - 0x15, 0x15, 0xd7, 0xa0, 0xd0, 0xf3, 0x68, 0xcf, 0xf7, 0x98, 0x5d, 0x9d, 0x90, 0x12, 0xc9, 0x1a, - 0xdf, 0x83, 0x92, 0xd7, 0xef, 0x59, 0xb1, 0xc9, 0xea, 0xe4, 0x1a, 0xda, 0x98, 0x30, 0x8b, 0x5e, - 0xbf, 0xf7, 0x44, 0x93, 0xf0, 0x36, 0xe0, 0x0e, 0x3d, 0x8f, 0xb8, 0x1f, 0xd2, 0xc8, 0x62, 0xbd, - 0xc0, 0x0f, 0x39, 0x75, 0xaa, 0x53, 0x6b, 0xf9, 0x8d, 0x19, 0x73, 0x21, 0xe1, 0x3c, 0xd7, 0x8c, - 0x61, 0xf1, 0x04, 0xd9, 0xb4, 0xb4, 0x9b, 0x8a, 0x27, 0xe0, 0x56, 0xa1, 0x18, 0xd2, 0x9e, 0xcf, - 0xa9, 0x45, 0x1c, 0x27, 0xac, 0x16, 0x94, 0xdb, 0x14, 0xe9, 0x89, 0xe3, 0x84, 0xf8, 0x3e, 0xcc, - 0x69, 0x01, 0x3b, 0xd4, 0xbe, 0x9d, 0x91, 0x42, 0xb3, 0x8a, 0xdc, 0x0c, 0x95, 0x7b, 0x53, 0xb9, - 0x0e, 0x3d, 0x57, 0x72, 0x30, 0x28, 0x77, 0x48, 0xcf, 0xa5, 0xdc, 0x03, 0xc0, 0xb1, 0x3e, 0x92, - 0xaa, 0x2c, 0x4a, 0x51, 0xad, 0xa1, 0x49, 0xb4, 0x52, 0xe3, 0x0f, 0x08, 0x6e, 0xb5, 0x1c, 0xc6, - 0x55, 0xa8, 0x9b, 0xbe, 0xf7, 0x9a, 0xb9, 0x03, 0x01, 0x1f, 0x44, 0x8e, 0xae, 0x83, 0x3c, 0x77, - 0x4d, 0xe4, 0xf9, 0xeb, 0x23, 0x9f, 0xc8, 0x46, 0xfe, 0x08, 0xaa, 0x1f, 0x51, 0x8f, 0x86, 0x84, - 0xd3, 0x17, 0x3a, 0xd8, 0x26, 0x8d, 0x02, 0xdf, 0x8b, 0xe8, 0x50, 0x42, 0xa0, 0xe1, 0x84, 0x30, - 0xfe, 0x94, 0x83, 0x72, 0x9c, 0xd8, 0x5a, 0x7c, 0x6c, 0x66, 0x7f, 0x06, 0x73, 0x69, 0x5e, 0x5a, - 0x1d, 0xe6, 0x39, 0x5f, 0x33, 0xbd, 0xcb, 0x9d, 0xa1, 0x35, 0xfe, 0x1c, 0x16, 0x06, 0x14, 0xdb, - 0xd2, 0xfd, 0xd5, 0xfc, 0x5a, 0x7e, 0xa3, 0xb8, 0x73, 0x30, 0x4e, 0xf5, 0xf0, 0x21, 0x06, 0x2c, - 0xa9, 0x28, 0xb6, 0x3c, 0x1e, 0x9e, 0x9b, 0xf3, 0x9d, 0x11, 0x72, 0xad, 0x09, 0xcb, 0x99, 0xa2, - 0x78, 0x1e, 0xf2, 0x1d, 0x7a, 0xae, 0x4f, 0x2f, 0x3e, 0xf1, 0x12, 0x4c, 0x9e, 0x90, 0x6e, 0x9f, - 0xea, 0xa8, 0xaa, 0xc5, 0x7e, 0x6e, 0x0f, 0x19, 0x5f, 0x22, 0x58, 0xfc, 0x98, 0x45, 0x3c, 0xbe, - 0x43, 0x71, 0xca, 0x6c, 0xc3, 0xa2, 0x4b, 0xb9, 0xe5, 0xd0, 0xc0, 0x8f, 0x18, 0xb7, 0xf8, 0x99, - 0xe5, 0x10, 0x4e, 0xa4, 0xce, 0x82, 0x39, 0xef, 0x52, 0x7e, 0xa0, 0x38, 0x47, 0x67, 0x07, 0x84, - 0x13, 0x7c, 0x1b, 0x66, 0x02, 0xe2, 0x52, 0x2b, 0x62, 0x17, 0xca, 0xc8, 0xa4, 0x59, 0x10, 0x84, - 0x4f, 0xd9, 0x05, 0xc5, 0x77, 0x01, 0x24, 0x93, 0xfb, 0x1d, 0xea, 0xe9, 0x84, 0x91, 0xe2, 0x47, - 0x82, 0x20, 0xe0, 0x92, 0x6e, 0x57, 0x66, 0x47, 0xc1, 0x14, 0x9f, 0xc6, 0x1b, 0x04, 0x4b, 0xc3, - 0xa0, 0x74, 0x7c, 0x9b, 0x50, 0x48, 0xee, 0x3f, 0x92, 0xce, 0x5d, 0x1f, 0xe7, 0x5c, 0xad, 0xc3, - 0x4c, 0x36, 0x8a, 0x24, 0xf6, 0xe8, 0x99, 0x48, 0x91, 0x04, 0x93, 0x4e, 0x76, 0x41, 0x7e, 0x95, - 0xe0, 0xba, 0x0b, 0xc0, 0x7d, 0x4e, 0xba, 0xea, 0x50, 0x79, 0x79, 0xa8, 0x19, 0x49, 0x11, 0xa7, - 0x32, 0x7e, 0x87, 0x60, 0x5a, 0x2b, 0xc7, 0x3b, 0xb0, 0xac, 0xad, 0x33, 0xcf, 0xb5, 0x82, 0xfe, - 0x71, 0x97, 0xd9, 0x56, 0x1c, 0x83, 0x92, 0xb9, 0x98, 0x32, 0x5f, 0x49, 0xde, 0x21, 0x3d, 0x17, - 0xf5, 0x4c, 0x43, 0xb2, 0x3c, 0xd2, 0x8b, 0x43, 0x53, 0xd4, 0xb4, 0x97, 0xa4, 0x47, 0x05, 0xd2, - 0xd1, 0x00, 0xe4, 0xa5, 0xc2, 0x59, 0x67, 0xc8, 0xfb, 0xeb, 0x42, 0x2e, 0x64, 0x27, 0xb2, 0x93, - 0x0c, 0xde, 0xb5, 0x72, 0x4a, 0x96, 0x57, 0xed, 0x10, 0xca, 0xb1, 0x3f, 0xd2, 0xd2, 0x90, 0xc2, - 0x55, 0x4e, 0x2d, 0x99, 0x10, 0xc4, 0x28, 0x23, 0x5c, 0x85, 0x69, 0xe6, 0x39, 0xcc, 0xa6, 0x51, - 0x35, 0xb7, 0x96, 0xdf, 0x98, 0x30, 0xe3, 0xa5, 0xb1, 0x09, 0xc5, 0x27, 0x7d, 0xde, 0x8e, 0x35, - 0xd5, 0xa0, 0x90, 0xd4, 0x50, 0x7d, 0x55, 0xe3, 0xb5, 0xf1, 0x09, 0x94, 0x94, 0xa8, 0x8e, 0xe3, - 0x12, 0x4c, 0x2a, 0xc7, 0x2b, 0x41, 0xb5, 0xc0, 0x9b, 0x30, 0x2f, 0x3f, 0x2c, 0x7a, 0x16, 0xb0, - 0x50, 0xa2, 0x96, 0x5e, 0x99, 0x30, 0xe7, 0x24, 0xbd, 0x95, 0x90, 0x8d, 0xbf, 0x23, 0xa8, 0xbc, - 0xf4, 0x1d, 0xda, 0xf4, 0x3d, 0x8f, 0xda, 0x82, 0x94, 0xe8, 0xfe, 0x00, 0x96, 0x8e, 0x29, 0xb1, - 0x7d, 0xcf, 0xf2, 0x7c, 0x87, 0x5a, 0xd4, 0x73, 0x02, 0x9f, 0x79, 0x5c, 0x9b, 0xc2, 0x8a, 0x27, - 0xf6, 0xb6, 0x34, 0x07, 0xdf, 0x81, 0x19, 0x5b, 0xe9, 0xa1, 0xaa, 0x1c, 0x14, 0xcc, 0x94, 0x20, - 0x1c, 0x10, 0x9d, 0x7b, 0x36, 0xf3, 0x5c, 0xe9, 0xfc, 0x82, 0x19, 0x2f, 0x45, 0x04, 0x5d, 0xea, - 0xd1, 0x88, 0x45, 0x16, 0x67, 0x3d, 0x2a, 0x7d, 0x3e, 0x61, 0x16, 0x35, 0xed, 0x88, 0xf5, 0x28, - 0xde, 0x83, 0x6a, 0x1c, 0x41, 0xdb, 0xf7, 0x78, 0x48, 0x6c, 0x2e, 0x6b, 0x30, 0x8d, 0x54, 0x03, - 0x2b, 0x99, 0x15, 0xcd, 0x6f, 0x6a, 0xf6, 0x13, 0xc5, 0x35, 0xda, 0xb0, 0xdc, 0x6c, 0x13, 0xcf, - 0xa5, 0x71, 0xff, 0xb9, 0x86, 0x9f, 0xf1, 0x2e, 0x2c, 0xc7, 0xdf, 0xaa, 0x06, 0x85, 0xbd, 0xd4, - 0x8d, 0x33, 0xe6, 0x52, 0xcc, 0x6c, 0x0e, 0xf0, 0x8c, 0x3d, 0x58, 0x78, 0x46, 0xa2, 0x91, 0x4a, - 0xfa, 0x2e, 0xcc, 0xea, 0x4a, 0x4a, 0xcf, 0x58, 0x24, 0xaf, 0x9b, 0x38, 0x7b, 0x49, 0x11, 0x5b, - 0x92, 0x66, 0x9c, 0x40, 0x45, 0x35, 0xd3, 0xc3, 0xb8, 0x59, 0xa6, 0xe5, 0x23, 0xab, 0x13, 0xa3, - 0x9b, 0x75, 0xe2, 0xdc, 0x15, 0x9d, 0xd8, 0x38, 0x84, 0x5b, 0x97, 0xec, 0xa6, 0xd1, 0x8f, 0xcd, - 0x59, 0x97, 0x13, 0x1b, 0xc7, 0xbc, 0xe4, 0x1a, 0x46, 0xc6, 0xb7, 0x61, 0x49, 0x3d, 0x92, 0x46, - 0x6e, 0xc6, 0xe8, 0x7b, 0x03, 0x5d, 0x7a, 0x6f, 0x18, 0xbf, 0x42, 0x50, 0xd6, 0x75, 0xf0, 0x05, - 0x8d, 0x22, 0xe2, 0x52, 0xbc, 0x09, 0x53, 0x41, 0xff, 0x38, 0xb9, 0xfa, 0x4f, 0x17, 0xfe, 0xfd, - 0xb7, 0xd5, 0xd9, 0x28, 0xba, 0xd8, 0x16, 0x45, 0x64, 0xdf, 0x78, 0xb8, 0x67, 0x98, 0x5a, 0x00, - 0x3f, 0x83, 0xca, 0x29, 0xe3, 0x6d, 0x27, 0x24, 0xa7, 0xa4, 0x6b, 0xd9, 0x21, 0x75, 0xa8, 0xc7, - 0x19, 0xe9, 0x46, 0xf2, 0xe0, 0x97, 0xb6, 0xee, 0xee, 0x18, 0xe6, 0x72, 0xba, 0xa1, 0x99, 0xca, - 0xe3, 0x0a, 0x4c, 0x91, 0x9e, 0x80, 0x24, 0x33, 0x74, 0xc2, 0xd4, 0x2b, 0xe3, 0x37, 0x39, 0x58, - 0xd4, 0xf8, 0x44, 0x9d, 0x48, 0x9c, 0xd4, 0x81, 0x85, 0x38, 0x2b, 0x45, 0x51, 0xb1, 0xba, 0x2c, - 0xe2, 0xba, 0x9e, 0x7e, 0x77, 0x5c, 0x3d, 0xcd, 0xd0, 0x37, 0x44, 0x8b, 0x2b, 0x96, 0x58, 0x88, - 0x1a, 0x5e, 0xfb, 0x35, 0x82, 0xe2, 0x80, 0x00, 0xfe, 0x01, 0x4c, 0xe8, 0x56, 0x22, 0xec, 0x3d, - 0xff, 0x1f, 0xed, 0xd5, 0xc5, 0x8f, 0xea, 0x90, 0x52, 0x6d, 0xed, 0x31, 0xcc, 0x24, 0xa4, 0x1b, - 0x75, 0x42, 0x02, 0xcb, 0x4f, 0x89, 0xdd, 0xe9, 0x07, 0xa3, 0xad, 0x70, 0x6c, 0x89, 0x5c, 0x87, - 0xb9, 0x63, 0xb9, 0x73, 0x34, 0x75, 0xcb, 0x8a, 0x9c, 0xe4, 0xed, 0x2e, 0x54, 0x46, 0x4d, 0xe8, - 0x88, 0xbc, 0x03, 0x85, 0x0b, 0x16, 0x58, 0xaf, 0x59, 0x97, 0xea, 0x9e, 0x31, 0x7d, 0xc1, 0x82, - 0xef, 0xb1, 0x2e, 0x35, 0xf6, 0x60, 0xf9, 0x80, 0x76, 0x69, 0x92, 0x9f, 0xd7, 0xc6, 0x65, 0x7c, - 0x07, 0x2a, 0xa3, 0x3b, 0xb5, 0xb9, 0x7b, 0x50, 0x72, 0x24, 0xc7, 0x19, 0xdc, 0x5b, 0xd4, 0x34, - 0xb1, 0x79, 0xeb, 0x43, 0x28, 0x0f, 0x3f, 0x79, 0x70, 0x11, 0xa6, 0x0f, 0x5a, 0xe6, 0xf3, 0xef, - 0xb7, 0x0e, 0xe6, 0xbf, 0x81, 0x01, 0xa6, 0x0e, 0x9e, 0x9b, 0xad, 0xe6, 0xd1, 0x3c, 0x12, 0xdf, - 0x66, 0xeb, 0xc5, 0x27, 0x47, 0xad, 0xf9, 0xdc, 0xce, 0xcf, 0x0a, 0x30, 0xa5, 0x4a, 0x09, 0xfe, - 0x21, 0xcc, 0x24, 0x75, 0x05, 0x57, 0xea, 0x6a, 0xb0, 0xa9, 0xc7, 0x23, 0x4b, 0xbd, 0x25, 0x06, - 0x9b, 0xda, 0xb7, 0xc6, 0xc5, 0xff, 0x52, 0x69, 0x32, 0xde, 0xfd, 0xe2, 0xaf, 0xff, 0xfc, 0x69, - 0xee, 0x2e, 0xbe, 0x2d, 0x66, 0xaf, 0x74, 0x22, 0x53, 0x95, 0xa9, 0xa1, 0xca, 0x15, 0xfe, 0x25, - 0x82, 0xd2, 0xe0, 0xec, 0x83, 0x77, 0xc7, 0x19, 0xca, 0x98, 0x94, 0x6a, 0xf5, 0x9b, 0x3d, 0xdd, - 0x8c, 0xfb, 0x12, 0xda, 0x9a, 0x91, 0x0d, 0xcd, 0x96, 0x16, 0xf6, 0xd1, 0x16, 0x7e, 0x83, 0x00, - 0xc4, 0x63, 0x5d, 0xbd, 0xda, 0xf0, 0xe3, 0x71, 0x66, 0xae, 0x78, 0xd8, 0xdf, 0x18, 0xdf, 0x03, - 0x89, 0xef, 0x3d, 0x63, 0x2d, 0x1b, 0x9f, 0xd4, 0xdd, 0xa0, 0x0e, 0xe3, 0x02, 0x24, 0x87, 0xd2, - 0xa0, 0xcd, 0x2b, 0x43, 0x78, 0x53, 0x10, 0x77, 0x24, 0x88, 0x0a, 0x5e, 0xca, 0x02, 0x81, 0x7f, - 0x8c, 0x60, 0x7e, 0x74, 0x1c, 0xb8, 0xd2, 0xf4, 0xde, 0x38, 0xd3, 0x57, 0x0d, 0x16, 0xc6, 0xba, - 0x04, 0x71, 0x0f, 0xaf, 0x0e, 0x83, 0x88, 0x87, 0x8b, 0x86, 0xab, 0x37, 0xe2, 0x9f, 0x20, 0x28, - 0x0f, 0x37, 0x62, 0xfc, 0xe1, 0xd8, 0x54, 0xca, 0x6a, 0xdc, 0xb5, 0x2b, 0x0e, 0x61, 0x6c, 0x4b, - 0x28, 0xeb, 0x86, 0x91, 0x19, 0x94, 0xb8, 0xa4, 0x24, 0x61, 0xf9, 0x3d, 0x82, 0xb9, 0x91, 0xee, - 0x87, 0x1f, 0x8d, 0x43, 0x94, 0xdd, 0xa6, 0x6b, 0x8f, 0x6f, 0xbc, 0x4f, 0xbb, 0xef, 0x03, 0x89, - 0x79, 0xcb, 0x78, 0x2f, 0x13, 0x73, 0xd2, 0xb1, 0x1b, 0xaa, 0xdf, 0xee, 0xa3, 0xad, 0x9d, 0x3f, - 0x4e, 0x42, 0x21, 0x19, 0xd4, 0x7f, 0x8b, 0x60, 0x76, 0xa8, 0xe9, 0xe2, 0x87, 0xd7, 0xbb, 0x9e, - 0xc3, 0x3d, 0xba, 0xb6, 0xfb, 0x35, 0xba, 0x87, 0xd1, 0x90, 0xd8, 0x37, 0x8d, 0x6f, 0x66, 0x62, - 0x4f, 0xfe, 0xd8, 0x49, 0x6f, 0xeb, 0x2f, 0x10, 0x94, 0x06, 0xc7, 0x91, 0xf1, 0xb5, 0x24, 0x63, - 0xa2, 0xaa, 0x3d, 0xbc, 0xd9, 0x26, 0x0d, 0x76, 0x45, 0x82, 0xad, 0xe2, 0xca, 0x30, 0xd8, 0x64, - 0x98, 0xf9, 0x0a, 0x41, 0x79, 0xb8, 0xa7, 0x8c, 0x4f, 0xcf, 0xcc, 0x36, 0x57, 0x7b, 0x74, 0xd3, - 0x6d, 0x37, 0x73, 0xa7, 0x6a, 0x85, 0xc2, 0x9d, 0x5f, 0xc9, 0x57, 0xd3, 0x60, 0x5f, 0x1a, 0x0f, - 0x39, 0xb3, 0x03, 0x8e, 0x87, 0x9c, 0xdd, 0xfe, 0xae, 0x0b, 0x59, 0xb5, 0x43, 0x91, 0xbc, 0x6f, - 0x10, 0x4c, 0x3d, 0xa3, 0xa4, 0xcb, 0xdb, 0xf8, 0xe7, 0x08, 0x6e, 0x7d, 0x44, 0xf9, 0xd3, 0x64, - 0x8c, 0x48, 0x47, 0x90, 0x2b, 0xcb, 0xd4, 0x58, 0x9c, 0xd9, 0xa3, 0x8c, 0xf1, 0xbe, 0xc4, 0x79, - 0x1f, 0x8f, 0xe0, 0x6c, 0x4b, 0x24, 0x0d, 0x39, 0xde, 0xd8, 0xc9, 0xae, 0x9d, 0x2f, 0x73, 0x30, - 0x21, 0xa6, 0x2c, 0xfc, 0x05, 0x82, 0xc9, 0x8f, 0x7d, 0x97, 0x79, 0xf8, 0xc1, 0xd8, 0xe9, 0x38, - 0x1d, 0xe0, 0x6a, 0xef, 0x5f, 0x4f, 0x78, 0x38, 0x31, 0x8d, 0xc5, 0x61, 0x6c, 0x5d, 0x61, 0x57, - 0x44, 0xf9, 0x47, 0x08, 0xa6, 0x3e, 0x65, 0xae, 0xd7, 0x0f, 0xfe, 0x9f, 0x28, 0x56, 0x25, 0x8a, - 0x77, 0x8c, 0x91, 0x5e, 0x12, 0x49, 0xc3, 0xfb, 0x68, 0xeb, 0x69, 0xe9, 0xcf, 0x6f, 0x57, 0xd0, - 0x5f, 0xde, 0xae, 0xa0, 0x7f, 0xbc, 0x5d, 0x41, 0xc7, 0x53, 0x32, 0x30, 0xbb, 0xff, 0x09, 0x00, - 0x00, 0xff, 0xff, 0x74, 0x98, 0xa8, 0x97, 0xcf, 0x15, 0x00, 0x00, + 0x15, 0xa7, 0xec, 0x24, 0xe3, 0x3c, 0x3b, 0x4e, 0x52, 0x49, 0x3c, 0x5e, 0xcf, 0x4c, 0x92, 0xa9, + 0x65, 0x27, 0x1f, 0xb3, 0xb1, 0x17, 0x67, 0x77, 0x26, 0x84, 0x03, 0x9a, 0x71, 0xbc, 0x3b, 0xa3, + 0xec, 0xcc, 0x8e, 0x7a, 0x23, 0xf6, 0x04, 0xad, 0x8a, 0xbb, 0xc6, 0x2e, 0xd9, 0xee, 0xf6, 0x76, + 0x97, 0xf3, 0xc5, 0x6d, 0xc5, 0x15, 0x0e, 0xcb, 0x01, 0x21, 0xc1, 0x81, 0x91, 0xb8, 0xc0, 0x65, + 0x91, 0x90, 0x90, 0x38, 0x70, 0xe0, 0xc4, 0x11, 0x89, 0x3b, 0xa0, 0x11, 0x27, 0x8e, 0xfc, 0x05, + 0xa8, 0x3e, 0xba, 0xdb, 0x76, 0x3a, 0x38, 0x1e, 0xb4, 0x97, 0xc8, 0xf5, 0xea, 0x7d, 0xfc, 0xfa, + 0xbd, 0x57, 0xef, 0x23, 0xb0, 0xd5, 0xf3, 0x3d, 0xe1, 0x55, 0x4e, 0x68, 0x87, 0x3b, 0x54, 0x78, + 0x7e, 0x85, 0x36, 0x1a, 0x5e, 0xdf, 0x15, 0x41, 0xe5, 0xa4, 0x5a, 0x39, 0x65, 0xc7, 0x36, 0xed, + 0xf1, 0xb2, 0xe2, 0xc1, 0xab, 0x4c, 0xb4, 0x98, 0xcf, 0xfa, 0xdd, 0x72, 0xc4, 0x5d, 0x0e, 0xb9, + 0xcb, 0x27, 0xd5, 0xd2, 0xed, 0xa6, 0xe7, 0x35, 0x3b, 0xac, 0x42, 0x7b, 0xbc, 0x42, 0x5d, 0xd7, + 0x13, 0x54, 0x70, 0xcf, 0x0d, 0xb4, 0x74, 0xe9, 0x96, 0xb9, 0x55, 0xa7, 0xe3, 0xfe, 0xcb, 0x0a, + 0xeb, 0xf6, 0xc4, 0xb9, 0xb9, 0xdc, 0x69, 0x72, 0xd1, 0xea, 0x1f, 0x97, 0x1b, 0x5e, 0xb7, 0xd2, + 0xf4, 0x9a, 0x5e, 0xcc, 0x25, 0x4f, 0x1a, 0xa2, 0xfc, 0xa5, 0xd9, 0xc9, 0xbf, 0xd3, 0xb0, 0x54, + 0xf3, 0x19, 0x15, 0xec, 0x33, 0xda, 0xe9, 0x30, 0x61, 0xb1, 0xcf, 0xfb, 0x2c, 0x10, 0x78, 0x0d, + 0xb2, 0xa7, 0x8a, 0x60, 0xf7, 0xa8, 0x68, 0x15, 0xd1, 0x3a, 0xda, 0x9c, 0xb5, 0x40, 0x93, 0x5e, + 0x50, 0xd1, 0xc2, 0xcf, 0x01, 0xda, 0xec, 0xbc, 0x4b, 0x5d, 0xda, 0x64, 0x7e, 0x31, 0xb5, 0x8e, + 0x36, 0xf3, 0xd5, 0x72, 0xf9, 0x7f, 0x7f, 0x57, 0xf9, 0x30, 0x92, 0x38, 0xe4, 0xae, 0x63, 0x0d, + 0x68, 0xc0, 0x1b, 0x30, 0x1f, 0x19, 0x0c, 0x82, 0x53, 0xcf, 0x77, 0x8a, 0x69, 0x65, 0x34, 0x1f, + 0x1a, 0xd5, 0x54, 0x5c, 0x82, 0x4c, 0xd7, 0x65, 0x5d, 0xcf, 0xe5, 0x8d, 0xe2, 0x94, 0xe2, 0x88, + 0xce, 0xf8, 0x2e, 0xe4, 0xdc, 0x7e, 0xd7, 0x0e, 0x4d, 0x16, 0xa7, 0xd7, 0xd1, 0xe6, 0x94, 0x95, + 0x75, 0xfb, 0xdd, 0x47, 0x86, 0x84, 0x77, 0x00, 0xb7, 0xd9, 0x79, 0x20, 0x3c, 0x9f, 0x05, 0x36, + 0xef, 0xf6, 0x3c, 0x5f, 0x30, 0xa7, 0x38, 0xb3, 0x9e, 0xde, 0x9c, 0xb5, 0x16, 0xa3, 0x9b, 0xa7, + 0xe6, 0x62, 0x98, 0x3d, 0x42, 0x76, 0x43, 0xd9, 0x8d, 0xd9, 0x23, 0x70, 0x6b, 0x90, 0xf5, 0x59, + 0xd7, 0x13, 0xcc, 0xa6, 0x8e, 0xe3, 0x17, 0x33, 0xda, 0x6d, 0x9a, 0xf4, 0xc8, 0x71, 0x7c, 0x7c, + 0x0f, 0xe6, 0x0d, 0x43, 0xc3, 0x37, 0xbe, 0x9d, 0x55, 0x4c, 0x73, 0x9a, 0x5c, 0xf3, 0xb5, 0x7b, + 0x63, 0xbe, 0x36, 0x3b, 0xd7, 0x7c, 0x30, 0xc8, 0x77, 0xc8, 0xce, 0x15, 0xdf, 0x7d, 0xc0, 0xa1, + 0x3e, 0x1a, 0xab, 0xcc, 0x2a, 0x56, 0xa3, 0xa1, 0x46, 0x8d, 0x52, 0xf2, 0x27, 0x04, 0xcb, 0xc3, + 0xc1, 0x0e, 0x7a, 0x9e, 0x1b, 0x30, 0xfc, 0x21, 0xcc, 0x68, 0x2f, 0xab, 0x40, 0x67, 0xc7, 0x07, + 0x72, 0x58, 0xde, 0x32, 0xd2, 0xf8, 0x07, 0xb0, 0x10, 0x72, 0xd9, 0x0d, 0x65, 0xc8, 0x51, 0xa9, + 0x91, 0xad, 0xee, 0x8e, 0xd3, 0x78, 0xc0, 0x7a, 0x5e, 0xc0, 0xc5, 0x01, 0x15, 0x34, 0x52, 0x3b, + 0x1f, 0x32, 0x68, 0xd0, 0x0e, 0xf9, 0x03, 0x82, 0x9b, 0x75, 0x87, 0x0b, 0x6d, 0xbe, 0xe6, 0xb9, + 0x2f, 0x79, 0x73, 0x20, 0x63, 0x07, 0x5d, 0x8f, 0xae, 0xe3, 0xfa, 0xd4, 0x35, 0x5d, 0x9f, 0xbe, + 0xbe, 0xeb, 0xa7, 0x92, 0x5d, 0xff, 0x00, 0x8a, 0x1f, 0x31, 0x97, 0xf9, 0x54, 0xb0, 0x67, 0x26, + 0x5b, 0x23, 0xef, 0x0f, 0x66, 0x34, 0x1a, 0xce, 0x68, 0xf2, 0xe7, 0x14, 0xe4, 0x47, 0x82, 0x35, + 0xf6, 0x69, 0x7e, 0x06, 0xf3, 0xf1, 0xc3, 0xb2, 0xdb, 0xdc, 0x75, 0xde, 0xf0, 0x7d, 0xe6, 0xdb, + 0x43, 0x67, 0xfc, 0x39, 0x2c, 0x0e, 0x28, 0x6e, 0x28, 0xf7, 0x17, 0xd3, 0xeb, 0xe9, 0xcd, 0x6c, + 0xf5, 0x60, 0xb2, 0x8c, 0x19, 0xb0, 0xa4, 0xa3, 0x58, 0x77, 0x85, 0x7f, 0x6e, 0x2d, 0xb4, 0x47, + 0xc8, 0xa5, 0x1a, 0xac, 0x24, 0xb2, 0xe2, 0x05, 0x48, 0xb7, 0xd9, 0xb9, 0xf9, 0x7a, 0xf9, 0x13, + 0x2f, 0xc3, 0xf4, 0x09, 0xed, 0xf4, 0x99, 0x89, 0xaa, 0x3e, 0xec, 0xa7, 0xf6, 0x10, 0xf9, 0x12, + 0xc1, 0xd2, 0xc7, 0x3c, 0x10, 0x61, 0x11, 0x08, 0x53, 0x66, 0x07, 0x96, 0x9a, 0x4c, 0xd8, 0x8e, + 0x4e, 0x3d, 0x5b, 0x9c, 0xd9, 0x0e, 0x15, 0x54, 0xe9, 0xcc, 0x58, 0x0b, 0x4d, 0x26, 0x4c, 0x52, + 0x1e, 0x9d, 0xc9, 0xb4, 0xc4, 0xb7, 0x60, 0xb6, 0x47, 0x9b, 0xcc, 0x0e, 0xf8, 0x85, 0x36, 0x32, + 0x6d, 0x65, 0x24, 0xe1, 0x53, 0x7e, 0xc1, 0xf0, 0x1d, 0x00, 0x75, 0x29, 0xbc, 0x36, 0x73, 0x4d, + 0xc2, 0x28, 0xf6, 0x23, 0x49, 0x90, 0x70, 0x69, 0xa7, 0xa3, 0xb2, 0x23, 0x63, 0xc9, 0x9f, 0xe4, + 0x15, 0x82, 0xe5, 0x61, 0x50, 0x26, 0xbe, 0x35, 0xc8, 0x44, 0x05, 0x0c, 0x29, 0xe7, 0x6e, 0x8c, + 0x73, 0xae, 0xd1, 0x61, 0x45, 0x82, 0x32, 0x89, 0x5d, 0x76, 0x26, 0x53, 0x24, 0xc2, 0x64, 0x92, + 0x5d, 0x92, 0x5f, 0x44, 0xb8, 0xee, 0x00, 0x08, 0x4f, 0xd0, 0x8e, 0xfe, 0xa8, 0xb4, 0xfa, 0xa8, + 0x59, 0x45, 0x91, 0x5f, 0x45, 0x7e, 0x87, 0xe0, 0x86, 0x51, 0x8e, 0xab, 0xb0, 0x62, 0xac, 0x73, + 0xb7, 0x69, 0xf7, 0xfa, 0xc7, 0x1d, 0xde, 0xb0, 0xc3, 0x18, 0xe4, 0xac, 0xa5, 0xf8, 0xf2, 0x85, + 0xba, 0x3b, 0x64, 0xe7, 0xb2, 0x20, 0x1b, 0x48, 0xb6, 0x4b, 0xbb, 0x61, 0x68, 0xb2, 0x86, 0xf6, + 0x9c, 0x76, 0x99, 0x44, 0x3a, 0x1a, 0x80, 0xb4, 0x52, 0x38, 0xe7, 0x0c, 0x79, 0x7f, 0x43, 0xf2, + 0xf9, 0xfc, 0x44, 0xb5, 0xc2, 0xc1, 0xb7, 0x96, 0x8f, 0xc9, 0xea, 0xa9, 0x1d, 0x42, 0x3e, 0xf4, + 0x47, 0x5c, 0x1a, 0x62, 0xb8, 0xda, 0xa9, 0x39, 0x0b, 0x7a, 0x21, 0xca, 0x00, 0x17, 0xe1, 0x06, + 0x77, 0x1d, 0xde, 0x60, 0x41, 0x31, 0xb5, 0x9e, 0xde, 0x9c, 0xb2, 0xc2, 0x23, 0xd9, 0x82, 0xec, + 0xa3, 0xbe, 0x68, 0x85, 0x9a, 0x4a, 0x90, 0x89, 0x9a, 0x80, 0x79, 0xaa, 0xe1, 0x99, 0x7c, 0x02, + 0x39, 0xcd, 0x6a, 0xe2, 0xb8, 0x0c, 0xd3, 0xda, 0xf1, 0x9a, 0x51, 0x1f, 0xf0, 0x16, 0x2c, 0xa8, + 0x1f, 0x36, 0x3b, 0xeb, 0x71, 0x5f, 0xa1, 0x56, 0x5e, 0x99, 0xb2, 0xe6, 0x15, 0xbd, 0x1e, 0x91, + 0xc9, 0x3f, 0x10, 0x14, 0x9e, 0x7b, 0x0e, 0xab, 0x79, 0xae, 0xcb, 0x1a, 0x92, 0x14, 0xe9, 0x7e, + 0x0f, 0x96, 0x8f, 0x19, 0x6d, 0x78, 0xae, 0xed, 0x7a, 0x0e, 0xb3, 0x99, 0xeb, 0xf4, 0x3c, 0xee, + 0x0a, 0x63, 0x0a, 0xeb, 0x3b, 0x29, 0x5b, 0x37, 0x37, 0xf8, 0x36, 0xcc, 0x36, 0xb4, 0x1e, 0x53, + 0x93, 0x33, 0x56, 0x4c, 0x90, 0x0e, 0x08, 0xce, 0xdd, 0x06, 0x77, 0x9b, 0xca, 0xf9, 0x19, 0x2b, + 0x3c, 0xca, 0x08, 0x36, 0x99, 0xcb, 0x02, 0x1e, 0xd8, 0x82, 0x77, 0x99, 0xf2, 0xf9, 0x94, 0x95, + 0x35, 0xb4, 0x23, 0xde, 0x65, 0x78, 0x0f, 0x8a, 0x61, 0x04, 0x1b, 0x9e, 0x2b, 0x7c, 0xda, 0x10, + 0xaa, 0x06, 0xb3, 0x40, 0x77, 0xe0, 0x9c, 0x55, 0x30, 0xf7, 0x35, 0x73, 0xfd, 0x48, 0xdf, 0x92, + 0x16, 0xac, 0xd4, 0x5a, 0xd4, 0x6d, 0xb2, 0xb0, 0x81, 0x5e, 0xc3, 0xcf, 0x78, 0x17, 0x56, 0xc2, + 0xdf, 0xba, 0x06, 0xf9, 0xdd, 0xd8, 0x8d, 0xb3, 0xd6, 0x72, 0x78, 0x59, 0x1b, 0xb8, 0x23, 0x7b, + 0xb0, 0xf8, 0x84, 0x06, 0x23, 0x95, 0xf4, 0x6d, 0x98, 0x33, 0x95, 0x94, 0x9d, 0xf1, 0x40, 0x3d, + 0x37, 0xf9, 0xed, 0x39, 0x4d, 0xac, 0x2b, 0x1a, 0x39, 0x81, 0x82, 0x9e, 0x06, 0x0e, 0xc3, 0x6e, + 0x1f, 0x97, 0x8f, 0xa4, 0x51, 0x02, 0x4d, 0x36, 0x4a, 0xa4, 0xae, 0x18, 0x25, 0xc8, 0x21, 0xdc, + 0xbc, 0x64, 0x37, 0x8e, 0x7e, 0x68, 0xce, 0xbe, 0x9c, 0xd8, 0x38, 0xbc, 0x8b, 0x9e, 0x61, 0x40, + 0xbe, 0x1d, 0x36, 0xfe, 0x91, 0x97, 0x31, 0x3a, 0x30, 0xa1, 0x4b, 0x03, 0x13, 0xf9, 0x25, 0x82, + 0xbc, 0xa9, 0x83, 0xcf, 0x58, 0x10, 0xd0, 0x26, 0xc3, 0x5b, 0x30, 0xd3, 0xeb, 0x1f, 0x47, 0x4f, + 0xff, 0xf1, 0xe2, 0x7f, 0xfe, 0xbe, 0x36, 0x17, 0x04, 0x17, 0x3b, 0xb2, 0x88, 0xec, 0x93, 0xf7, + 0xf7, 0x88, 0x65, 0x18, 0xf0, 0x13, 0x28, 0x9c, 0x72, 0xd1, 0x72, 0x7c, 0x7a, 0x4a, 0x3b, 0x72, + 0x26, 0x70, 0x98, 0x2b, 0x38, 0xed, 0x04, 0xea, 0xc3, 0x2f, 0x89, 0xee, 0x56, 0x89, 0xb5, 0x12, + 0x0b, 0xd4, 0x62, 0x7e, 0x5c, 0x80, 0x19, 0xda, 0x95, 0x90, 0x54, 0x86, 0x4e, 0x59, 0xe6, 0x44, + 0x7e, 0x93, 0x82, 0xa5, 0x84, 0xe1, 0x01, 0xb7, 0x61, 0x31, 0xcc, 0x4a, 0x59, 0x54, 0xec, 0x0e, + 0x0f, 0x84, 0xa9, 0xa7, 0xdf, 0x7d, 0x83, 0x61, 0x64, 0x88, 0x16, 0x56, 0x2c, 0x79, 0x90, 0x35, + 0xbc, 0xf4, 0x6b, 0x04, 0xd9, 0x01, 0x06, 0xfc, 0x7d, 0x98, 0x32, 0xad, 0x44, 0xda, 0x7b, 0xfa, + 0x7f, 0xda, 0x2b, 0xcb, 0x3f, 0xba, 0x43, 0x2a, 0xb5, 0xa5, 0x87, 0x30, 0x1b, 0x91, 0x26, 0xea, + 0x84, 0x14, 0x56, 0x1e, 0xd3, 0x46, 0xbb, 0xdf, 0x1b, 0x6d, 0x85, 0x63, 0x4b, 0xe4, 0x06, 0xcc, + 0x1f, 0x2b, 0xc9, 0xd1, 0xd4, 0xcd, 0x6b, 0x72, 0x94, 0xb7, 0xbb, 0x50, 0x18, 0x35, 0x61, 0x22, + 0xf2, 0x16, 0x64, 0x2e, 0x78, 0xcf, 0x7e, 0xc9, 0x3b, 0xcc, 0xf4, 0x8c, 0x1b, 0x17, 0xbc, 0xf7, + 0x21, 0xef, 0x30, 0xb2, 0x07, 0x2b, 0x07, 0xac, 0xc3, 0xa2, 0xfc, 0xbc, 0x36, 0x2e, 0xf2, 0x1d, + 0x28, 0x8c, 0x4a, 0x1a, 0x73, 0x77, 0x21, 0xe7, 0xa8, 0x1b, 0x67, 0x50, 0x36, 0x6b, 0x68, 0x52, + 0x78, 0xfb, 0x03, 0xc8, 0x0f, 0x8f, 0x3c, 0x38, 0x0b, 0x37, 0x0e, 0xea, 0xd6, 0xd3, 0xef, 0xd5, + 0x0f, 0x16, 0xbe, 0x81, 0x01, 0x66, 0x0e, 0x9e, 0x5a, 0xf5, 0xda, 0xd1, 0x02, 0x92, 0xbf, 0xad, + 0xfa, 0xb3, 0x4f, 0x8e, 0xea, 0x0b, 0xa9, 0xea, 0x2f, 0x32, 0x30, 0xa3, 0x4b, 0x09, 0xfe, 0x21, + 0xcc, 0x46, 0x75, 0x05, 0x17, 0xca, 0x7a, 0x33, 0x2b, 0x87, 0x3b, 0x57, 0xb9, 0x2e, 0x37, 0xb3, + 0xd2, 0xb7, 0xc6, 0xc5, 0xff, 0x52, 0x69, 0x22, 0x6f, 0x7f, 0xf1, 0xb7, 0x7f, 0xfd, 0x34, 0x75, + 0x07, 0xdf, 0x92, 0xcb, 0x63, 0xbc, 0x52, 0xea, 0xca, 0x54, 0xd1, 0xe5, 0x0a, 0xff, 0x0a, 0x41, + 0x6e, 0x70, 0x9e, 0xc7, 0x63, 0xa7, 0xec, 0x84, 0x55, 0xaf, 0xf4, 0xfe, 0x64, 0x42, 0x06, 0xe0, + 0x3d, 0x05, 0x70, 0x9d, 0x24, 0x03, 0xd4, 0xc3, 0xff, 0x3e, 0xda, 0xc6, 0xaf, 0x10, 0x80, 0x1c, + 0xd9, 0xf5, 0xec, 0x86, 0x1f, 0x8e, 0x33, 0x76, 0xc5, 0x78, 0x5f, 0x9a, 0x70, 0x25, 0x21, 0xf7, + 0x15, 0xbe, 0x77, 0xc8, 0x7a, 0x32, 0x3e, 0xa5, 0xbb, 0xc2, 0x1c, 0x2e, 0x24, 0x48, 0x01, 0xb9, + 0x41, 0x9b, 0x57, 0x06, 0x72, 0x52, 0x10, 0xb7, 0x15, 0x88, 0x02, 0x5e, 0x4e, 0x02, 0x81, 0x7f, + 0x8c, 0x60, 0x61, 0x74, 0x29, 0xb8, 0xd2, 0xf4, 0xde, 0x38, 0xd3, 0x57, 0xad, 0x17, 0x64, 0x43, + 0x81, 0xb8, 0x8b, 0xd7, 0x86, 0x41, 0x84, 0x2b, 0x46, 0xa5, 0x69, 0x04, 0xf1, 0x4f, 0x10, 0xe4, + 0x87, 0xdb, 0x31, 0xfe, 0x60, 0x6c, 0x6e, 0x24, 0xb5, 0xef, 0xd2, 0x15, 0x1f, 0x41, 0x76, 0x14, + 0x94, 0x0d, 0x42, 0x12, 0x83, 0x12, 0x16, 0x96, 0x28, 0x2c, 0xbf, 0x47, 0x30, 0x3f, 0xd2, 0x03, + 0xf1, 0x83, 0x71, 0x88, 0x92, 0x9b, 0x75, 0xe9, 0xe1, 0xc4, 0x72, 0xc6, 0x7d, 0xef, 0x29, 0xcc, + 0xdb, 0xe4, 0x9d, 0x44, 0xcc, 0x51, 0xdf, 0xae, 0xe8, 0xae, 0xbb, 0x8f, 0xb6, 0xab, 0x7f, 0x9c, + 0x86, 0x4c, 0xf4, 0xff, 0x86, 0xdf, 0x22, 0x98, 0x1b, 0x6a, 0xbd, 0xf8, 0x9a, 0xef, 0x6d, 0xb8, + 0x53, 0x97, 0xde, 0x64, 0x81, 0x26, 0x15, 0x85, 0x7d, 0x8b, 0x7c, 0x33, 0x11, 0x7b, 0xf4, 0xff, + 0xa9, 0xf8, 0xb5, 0xfe, 0x1c, 0x41, 0x6e, 0x70, 0x29, 0x19, 0x5f, 0x51, 0x12, 0xf6, 0xaa, 0xf1, + 0x15, 0x25, 0x69, 0xef, 0x21, 0xab, 0x0a, 0x6c, 0x11, 0x17, 0x86, 0xc1, 0x46, 0x2b, 0xcd, 0x57, + 0x08, 0xf2, 0xc3, 0x9d, 0x65, 0x7c, 0x7a, 0x26, 0x36, 0xbb, 0xd2, 0x83, 0x49, 0xc5, 0x26, 0x73, + 0xa7, 0x6e, 0x88, 0xd2, 0x9d, 0x5f, 0xa9, 0xd9, 0x69, 0xb0, 0x3b, 0x8d, 0x87, 0x9c, 0xd8, 0x07, + 0xc7, 0x43, 0x4e, 0x6e, 0x82, 0xd7, 0x85, 0xac, 0x9b, 0xa2, 0x4c, 0xde, 0x57, 0x08, 0x66, 0x9e, + 0x30, 0xda, 0x11, 0x2d, 0xfc, 0x33, 0x04, 0x37, 0x3f, 0x62, 0xe2, 0x71, 0xb4, 0x4c, 0xc4, 0x8b, + 0xc8, 0x95, 0x65, 0x6a, 0x2c, 0xce, 0xe4, 0x85, 0x86, 0xbc, 0xab, 0x70, 0xde, 0xc3, 0x23, 0x38, + 0x5b, 0x0a, 0x49, 0x45, 0x2d, 0x39, 0x8d, 0x48, 0xaa, 0xfa, 0x65, 0x0a, 0xa6, 0xe4, 0xae, 0x85, + 0xbf, 0x40, 0x30, 0xfd, 0xb1, 0xd7, 0xe4, 0x2e, 0xbe, 0x3f, 0x76, 0x47, 0x8e, 0xd7, 0xb8, 0xd2, + 0xbb, 0xd7, 0x63, 0x1e, 0x4e, 0x4c, 0xb2, 0x34, 0x8c, 0xad, 0x23, 0xed, 0xca, 0x28, 0xff, 0x08, + 0xc1, 0xcc, 0xa7, 0xbc, 0xe9, 0xf6, 0x7b, 0x5f, 0x27, 0x8a, 0x35, 0x85, 0xe2, 0x2d, 0x32, 0xd2, + 0x4b, 0x02, 0x65, 0x78, 0x1f, 0x6d, 0x3f, 0xce, 0xfd, 0xe5, 0xf5, 0x2a, 0xfa, 0xeb, 0xeb, 0x55, + 0xf4, 0xcf, 0xd7, 0xab, 0xe8, 0x78, 0x46, 0x05, 0x66, 0xf7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, + 0xeb, 0xbf, 0x5b, 0xfe, 0x96, 0x16, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1577,7 +1636,7 @@ const _ = grpc.SupportPackageIsVersion4 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type WalletClient interface { HasWallet(ctx context.Context, in *types.Empty, opts ...grpc.CallOption) (*HasWalletResponse, error) - CreateWallet(ctx context.Context, in *CreateWalletRequest, opts ...grpc.CallOption) (*WalletResponse, error) + CreateWallet(ctx context.Context, in *CreateWalletRequest, opts ...grpc.CallOption) (*CreateWalletResponse, error) EditConfig(ctx context.Context, in *EditWalletConfigRequest, opts ...grpc.CallOption) (*WalletResponse, error) WalletConfig(ctx context.Context, in *types.Empty, opts ...grpc.CallOption) (*WalletResponse, error) GenerateMnemonic(ctx context.Context, in *types.Empty, opts ...grpc.CallOption) (*GenerateMnemonicResponse, error) @@ -1602,8 +1661,8 @@ func (c *walletClient) HasWallet(ctx context.Context, in *types.Empty, opts ...g return out, nil } -func (c *walletClient) CreateWallet(ctx context.Context, in *CreateWalletRequest, opts ...grpc.CallOption) (*WalletResponse, error) { - out := new(WalletResponse) +func (c *walletClient) CreateWallet(ctx context.Context, in *CreateWalletRequest, opts ...grpc.CallOption) (*CreateWalletResponse, error) { + out := new(CreateWalletResponse) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Wallet/CreateWallet", in, out, opts...) if err != nil { return nil, err @@ -1659,7 +1718,7 @@ func (c *walletClient) ImportKeystores(ctx context.Context, in *ImportKeystoresR // WalletServer is the server API for Wallet service. type WalletServer interface { HasWallet(context.Context, *types.Empty) (*HasWalletResponse, error) - CreateWallet(context.Context, *CreateWalletRequest) (*WalletResponse, error) + CreateWallet(context.Context, *CreateWalletRequest) (*CreateWalletResponse, error) EditConfig(context.Context, *EditWalletConfigRequest) (*WalletResponse, error) WalletConfig(context.Context, *types.Empty) (*WalletResponse, error) GenerateMnemonic(context.Context, *types.Empty) (*GenerateMnemonicResponse, error) @@ -1674,7 +1733,7 @@ type UnimplementedWalletServer struct { func (*UnimplementedWalletServer) HasWallet(ctx context.Context, req *types.Empty) (*HasWalletResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method HasWallet not implemented") } -func (*UnimplementedWalletServer) CreateWallet(ctx context.Context, req *CreateWalletRequest) (*WalletResponse, error) { +func (*UnimplementedWalletServer) CreateWallet(ctx context.Context, req *CreateWalletRequest) (*CreateWalletResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateWallet not implemented") } func (*UnimplementedWalletServer) EditConfig(ctx context.Context, req *EditWalletConfigRequest) (*WalletResponse, error) { @@ -2322,6 +2381,57 @@ func (m *CreateWalletRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *CreateWalletResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *CreateWalletResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CreateWalletResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.AccountsCreated != nil { + { + size, err := m.AccountsCreated.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintWebApi(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if m.Wallet != nil { + { + size, err := m.Wallet.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintWebApi(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *EditWalletConfigRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2661,20 +2771,20 @@ func (m *AccountRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Indices) > 0 { - dAtA2 := make([]byte, len(m.Indices)*10) - var j1 int + dAtA4 := make([]byte, len(m.Indices)*10) + var j3 int for _, num := range m.Indices { for num >= 1<<7 { - dAtA2[j1] = uint8(uint64(num)&0x7f | 0x80) + dAtA4[j3] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j1++ + j3++ } - dAtA2[j1] = uint8(num) - j1++ + dAtA4[j3] = uint8(num) + j3++ } - i -= j1 - copy(dAtA[i:], dAtA2[:j1]) - i = encodeVarintWebApi(dAtA, i, uint64(j1)) + i -= j3 + copy(dAtA[i:], dAtA4[:j3]) + i = encodeVarintWebApi(dAtA, i, uint64(j3)) i-- dAtA[i] = 0x12 } @@ -3367,6 +3477,26 @@ func (m *CreateWalletRequest) Size() (n int) { return n } +func (m *CreateWalletResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Wallet != nil { + l = m.Wallet.Size() + n += 1 + l + sovWebApi(uint64(l)) + } + if m.AccountsCreated != nil { + l = m.AccountsCreated.Size() + n += 1 + l + sovWebApi(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + func (m *EditWalletConfigRequest) Size() (n int) { if m == nil { return 0 @@ -4216,6 +4346,132 @@ func (m *CreateWalletRequest) Unmarshal(dAtA []byte) error { } return nil } +func (m *CreateWalletResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWebApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: CreateWalletResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: CreateWalletResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Wallet", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWebApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthWebApi + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthWebApi + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Wallet == nil { + m.Wallet = &WalletResponse{} + } + if err := m.Wallet.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AccountsCreated", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowWebApi + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthWebApi + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthWebApi + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.AccountsCreated == nil { + m.AccountsCreated = &DepositDataResponse{} + } + if err := m.AccountsCreated.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipWebApi(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthWebApi + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthWebApi + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *EditWalletConfigRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/proto/validator/accounts/v2/web_api.proto b/proto/validator/accounts/v2/web_api.proto index cc6af6c2a09f..67e760d5253a 100644 --- a/proto/validator/accounts/v2/web_api.proto +++ b/proto/validator/accounts/v2/web_api.proto @@ -12,7 +12,7 @@ service Wallet { get: "/v2/validator/wallet/exists" }; } - rpc CreateWallet(CreateWalletRequest) returns (WalletResponse) { + rpc CreateWallet(CreateWalletRequest) returns (CreateWalletResponse) { option (google.api.http) = { post: "/v2/validator/wallet/create", body: "*" @@ -130,6 +130,11 @@ message CreateWalletRequest { string remote_ca_crt_path = 11; } +message CreateWalletResponse { + WalletResponse wallet = 1; + DepositDataResponse accounts_created = 2; +} + message EditWalletConfigRequest { string remote_addr = 1; string remote_crt_path = 2; diff --git a/proto/validator/accounts/v2_gateway/web_api.pb.go b/proto/validator/accounts/v2_gateway/web_api.pb.go index 527bf8eb0dbe..1544b1e93d82 100755 --- a/proto/validator/accounts/v2_gateway/web_api.pb.go +++ b/proto/validator/accounts/v2_gateway/web_api.pb.go @@ -175,6 +175,53 @@ func (m *CreateWalletRequest) GetRemoteCaCrtPath() string { return "" } +type CreateWalletResponse struct { + Wallet *WalletResponse `protobuf:"bytes,1,opt,name=wallet,proto3" json:"wallet,omitempty"` + AccountsCreated *DepositDataResponse `protobuf:"bytes,2,opt,name=accounts_created,json=accountsCreated,proto3" json:"accounts_created,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CreateWalletResponse) Reset() { *m = CreateWalletResponse{} } +func (m *CreateWalletResponse) String() string { return proto.CompactTextString(m) } +func (*CreateWalletResponse) ProtoMessage() {} +func (*CreateWalletResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_8a5153635bfe042e, []int{1} +} + +func (m *CreateWalletResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CreateWalletResponse.Unmarshal(m, b) +} +func (m *CreateWalletResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CreateWalletResponse.Marshal(b, m, deterministic) +} +func (m *CreateWalletResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateWalletResponse.Merge(m, src) +} +func (m *CreateWalletResponse) XXX_Size() int { + return xxx_messageInfo_CreateWalletResponse.Size(m) +} +func (m *CreateWalletResponse) XXX_DiscardUnknown() { + xxx_messageInfo_CreateWalletResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_CreateWalletResponse proto.InternalMessageInfo + +func (m *CreateWalletResponse) GetWallet() *WalletResponse { + if m != nil { + return m.Wallet + } + return nil +} + +func (m *CreateWalletResponse) GetAccountsCreated() *DepositDataResponse { + if m != nil { + return m.AccountsCreated + } + return nil +} + type EditWalletConfigRequest struct { RemoteAddr string `protobuf:"bytes,1,opt,name=remote_addr,json=remoteAddr,proto3" json:"remote_addr,omitempty"` RemoteCrtPath string `protobuf:"bytes,2,opt,name=remote_crt_path,json=remoteCrtPath,proto3" json:"remote_crt_path,omitempty"` @@ -189,7 +236,7 @@ func (m *EditWalletConfigRequest) Reset() { *m = EditWalletConfigRequest func (m *EditWalletConfigRequest) String() string { return proto.CompactTextString(m) } func (*EditWalletConfigRequest) ProtoMessage() {} func (*EditWalletConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{1} + return fileDescriptor_8a5153635bfe042e, []int{2} } func (m *EditWalletConfigRequest) XXX_Unmarshal(b []byte) error { @@ -249,7 +296,7 @@ func (m *GenerateMnemonicResponse) Reset() { *m = GenerateMnemonicRespon func (m *GenerateMnemonicResponse) String() string { return proto.CompactTextString(m) } func (*GenerateMnemonicResponse) ProtoMessage() {} func (*GenerateMnemonicResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{2} + return fileDescriptor_8a5153635bfe042e, []int{3} } func (m *GenerateMnemonicResponse) XXX_Unmarshal(b []byte) error { @@ -290,7 +337,7 @@ func (m *WalletResponse) Reset() { *m = WalletResponse{} } func (m *WalletResponse) String() string { return proto.CompactTextString(m) } func (*WalletResponse) ProtoMessage() {} func (*WalletResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{3} + return fileDescriptor_8a5153635bfe042e, []int{4} } func (m *WalletResponse) XXX_Unmarshal(b []byte) error { @@ -346,7 +393,7 @@ func (m *ListAccountsRequest) Reset() { *m = ListAccountsRequest{} } func (m *ListAccountsRequest) String() string { return proto.CompactTextString(m) } func (*ListAccountsRequest) ProtoMessage() {} func (*ListAccountsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{4} + return fileDescriptor_8a5153635bfe042e, []int{5} } func (m *ListAccountsRequest) XXX_Unmarshal(b []byte) error { @@ -408,7 +455,7 @@ func (m *ListAccountsResponse) Reset() { *m = ListAccountsResponse{} } func (m *ListAccountsResponse) String() string { return proto.CompactTextString(m) } func (*ListAccountsResponse) ProtoMessage() {} func (*ListAccountsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{5} + return fileDescriptor_8a5153635bfe042e, []int{6} } func (m *ListAccountsResponse) XXX_Unmarshal(b []byte) error { @@ -464,7 +511,7 @@ func (m *Account) Reset() { *m = Account{} } func (m *Account) String() string { return proto.CompactTextString(m) } func (*Account) ProtoMessage() {} func (*Account) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{6} + return fileDescriptor_8a5153635bfe042e, []int{7} } func (m *Account) XXX_Unmarshal(b []byte) error { @@ -525,7 +572,7 @@ func (m *AccountRequest) Reset() { *m = AccountRequest{} } func (m *AccountRequest) String() string { return proto.CompactTextString(m) } func (*AccountRequest) ProtoMessage() {} func (*AccountRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{7} + return fileDescriptor_8a5153635bfe042e, []int{8} } func (m *AccountRequest) XXX_Unmarshal(b []byte) error { @@ -571,7 +618,7 @@ func (m *AuthRequest) Reset() { *m = AuthRequest{} } func (m *AuthRequest) String() string { return proto.CompactTextString(m) } func (*AuthRequest) ProtoMessage() {} func (*AuthRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{8} + return fileDescriptor_8a5153635bfe042e, []int{9} } func (m *AuthRequest) XXX_Unmarshal(b []byte) error { @@ -611,7 +658,7 @@ func (m *AuthResponse) Reset() { *m = AuthResponse{} } func (m *AuthResponse) String() string { return proto.CompactTextString(m) } func (*AuthResponse) ProtoMessage() {} func (*AuthResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{9} + return fileDescriptor_8a5153635bfe042e, []int{10} } func (m *AuthResponse) XXX_Unmarshal(b []byte) error { @@ -661,7 +708,7 @@ func (m *NodeConnectionResponse) Reset() { *m = NodeConnectionResponse{} func (m *NodeConnectionResponse) String() string { return proto.CompactTextString(m) } func (*NodeConnectionResponse) ProtoMessage() {} func (*NodeConnectionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{10} + return fileDescriptor_8a5153635bfe042e, []int{11} } func (m *NodeConnectionResponse) XXX_Unmarshal(b []byte) error { @@ -729,7 +776,7 @@ func (m *ChangePasswordRequest) Reset() { *m = ChangePasswordRequest{} } func (m *ChangePasswordRequest) String() string { return proto.CompactTextString(m) } func (*ChangePasswordRequest) ProtoMessage() {} func (*ChangePasswordRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{11} + return fileDescriptor_8a5153635bfe042e, []int{12} } func (m *ChangePasswordRequest) XXX_Unmarshal(b []byte) error { @@ -775,7 +822,7 @@ func (m *HasWalletResponse) Reset() { *m = HasWalletResponse{} } func (m *HasWalletResponse) String() string { return proto.CompactTextString(m) } func (*HasWalletResponse) ProtoMessage() {} func (*HasWalletResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{12} + return fileDescriptor_8a5153635bfe042e, []int{13} } func (m *HasWalletResponse) XXX_Unmarshal(b []byte) error { @@ -815,7 +862,7 @@ func (m *ImportKeystoresRequest) Reset() { *m = ImportKeystoresRequest{} func (m *ImportKeystoresRequest) String() string { return proto.CompactTextString(m) } func (*ImportKeystoresRequest) ProtoMessage() {} func (*ImportKeystoresRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{13} + return fileDescriptor_8a5153635bfe042e, []int{14} } func (m *ImportKeystoresRequest) XXX_Unmarshal(b []byte) error { @@ -861,7 +908,7 @@ func (m *ImportKeystoresResponse) Reset() { *m = ImportKeystoresResponse func (m *ImportKeystoresResponse) String() string { return proto.CompactTextString(m) } func (*ImportKeystoresResponse) ProtoMessage() {} func (*ImportKeystoresResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{14} + return fileDescriptor_8a5153635bfe042e, []int{15} } func (m *ImportKeystoresResponse) XXX_Unmarshal(b []byte) error { @@ -900,7 +947,7 @@ func (m *CreateAccountRequest) Reset() { *m = CreateAccountRequest{} } func (m *CreateAccountRequest) String() string { return proto.CompactTextString(m) } func (*CreateAccountRequest) ProtoMessage() {} func (*CreateAccountRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{15} + return fileDescriptor_8a5153635bfe042e, []int{16} } func (m *CreateAccountRequest) XXX_Unmarshal(b []byte) error { @@ -941,7 +988,7 @@ func (m *DepositMessage) Reset() { *m = DepositMessage{} } func (m *DepositMessage) String() string { return proto.CompactTextString(m) } func (*DepositMessage) ProtoMessage() {} func (*DepositMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{16} + return fileDescriptor_8a5153635bfe042e, []int{17} } func (m *DepositMessage) XXX_Unmarshal(b []byte) error { @@ -994,7 +1041,7 @@ func (m *DepositDataResponse) Reset() { *m = DepositDataResponse{} } func (m *DepositDataResponse) String() string { return proto.CompactTextString(m) } func (*DepositDataResponse) ProtoMessage() {} func (*DepositDataResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{17} + return fileDescriptor_8a5153635bfe042e, []int{18} } func (m *DepositDataResponse) XXX_Unmarshal(b []byte) error { @@ -1033,7 +1080,7 @@ func (m *DepositDataResponse_DepositData) Reset() { *m = DepositDataResp func (m *DepositDataResponse_DepositData) String() string { return proto.CompactTextString(m) } func (*DepositDataResponse_DepositData) ProtoMessage() {} func (*DepositDataResponse_DepositData) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{17, 0} + return fileDescriptor_8a5153635bfe042e, []int{18, 0} } func (m *DepositDataResponse_DepositData) XXX_Unmarshal(b []byte) error { @@ -1073,7 +1120,7 @@ func (m *BackupAccountsRequest) Reset() { *m = BackupAccountsRequest{} } func (m *BackupAccountsRequest) String() string { return proto.CompactTextString(m) } func (*BackupAccountsRequest) ProtoMessage() {} func (*BackupAccountsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{18} + return fileDescriptor_8a5153635bfe042e, []int{19} } func (m *BackupAccountsRequest) XXX_Unmarshal(b []byte) error { @@ -1119,7 +1166,7 @@ func (m *BackupAccountsResponse) Reset() { *m = BackupAccountsResponse{} func (m *BackupAccountsResponse) String() string { return proto.CompactTextString(m) } func (*BackupAccountsResponse) ProtoMessage() {} func (*BackupAccountsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{19} + return fileDescriptor_8a5153635bfe042e, []int{20} } func (m *BackupAccountsResponse) XXX_Unmarshal(b []byte) error { @@ -1158,7 +1205,7 @@ func (m *DeleteAccountsRequest) Reset() { *m = DeleteAccountsRequest{} } func (m *DeleteAccountsRequest) String() string { return proto.CompactTextString(m) } func (*DeleteAccountsRequest) ProtoMessage() {} func (*DeleteAccountsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{20} + return fileDescriptor_8a5153635bfe042e, []int{21} } func (m *DeleteAccountsRequest) XXX_Unmarshal(b []byte) error { @@ -1197,7 +1244,7 @@ func (m *DeleteAccountsResponse) Reset() { *m = DeleteAccountsResponse{} func (m *DeleteAccountsResponse) String() string { return proto.CompactTextString(m) } func (*DeleteAccountsResponse) ProtoMessage() {} func (*DeleteAccountsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8a5153635bfe042e, []int{21} + return fileDescriptor_8a5153635bfe042e, []int{22} } func (m *DeleteAccountsResponse) XXX_Unmarshal(b []byte) error { @@ -1228,6 +1275,7 @@ func (m *DeleteAccountsResponse) GetDeletedKeys() [][]byte { func init() { proto.RegisterEnum("ethereum.validator.accounts.v2.KeymanagerKind", KeymanagerKind_name, KeymanagerKind_value) proto.RegisterType((*CreateWalletRequest)(nil), "ethereum.validator.accounts.v2.CreateWalletRequest") + proto.RegisterType((*CreateWalletResponse)(nil), "ethereum.validator.accounts.v2.CreateWalletResponse") proto.RegisterType((*EditWalletConfigRequest)(nil), "ethereum.validator.accounts.v2.EditWalletConfigRequest") proto.RegisterType((*GenerateMnemonicResponse)(nil), "ethereum.validator.accounts.v2.GenerateMnemonicResponse") proto.RegisterType((*WalletResponse)(nil), "ethereum.validator.accounts.v2.WalletResponse") @@ -1259,122 +1307,125 @@ func init() { } var fileDescriptor_8a5153635bfe042e = []byte{ - // 1834 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4f, 0x6f, 0x23, 0x59, - 0x11, 0xa7, 0x6d, 0x27, 0xb1, 0xcb, 0x8e, 0x93, 0xbc, 0x24, 0x1e, 0xaf, 0x67, 0x66, 0x93, 0xe9, - 0x65, 0x27, 0x7f, 0x66, 0x63, 0x2f, 0xce, 0xec, 0x4c, 0x08, 0x07, 0x34, 0xe3, 0x98, 0x9d, 0x28, - 0x3b, 0xb3, 0xa3, 0xde, 0x88, 0x3d, 0xa1, 0xd6, 0x4b, 0xf7, 0x9b, 0xf6, 0x93, 0xed, 0xee, 0xde, - 0xee, 0xe7, 0x24, 0x0e, 0xb7, 0x15, 0x57, 0x38, 0x2c, 0x12, 0x08, 0x21, 0x2e, 0x23, 0x71, 0x81, - 0xcb, 0x22, 0x21, 0x21, 0x71, 0xe4, 0x2b, 0x70, 0x87, 0x0b, 0x27, 0x8e, 0x7c, 0x02, 0xf4, 0xfe, - 0x74, 0xb7, 0xed, 0x74, 0x70, 0xbc, 0x68, 0x2f, 0x56, 0xbf, 0xaa, 0x7a, 0x55, 0xbf, 0x57, 0x55, - 0xaf, 0xea, 0x95, 0x61, 0xc7, 0x0f, 0x3c, 0xe6, 0x35, 0xce, 0x71, 0x8f, 0xda, 0x98, 0x79, 0x41, - 0x03, 0x5b, 0x96, 0x37, 0x70, 0x59, 0xd8, 0x38, 0x6f, 0x36, 0x2e, 0xc8, 0x99, 0x89, 0x7d, 0x5a, - 0x17, 0x32, 0xe8, 0x5d, 0xc2, 0x3a, 0x24, 0x20, 0x83, 0x7e, 0x3d, 0x96, 0xae, 0x47, 0xd2, 0xf5, - 0xf3, 0x66, 0xed, 0x9e, 0xe3, 0x79, 0x4e, 0x8f, 0x34, 0xb0, 0x4f, 0x1b, 0xd8, 0x75, 0x3d, 0x86, - 0x19, 0xf5, 0xdc, 0x50, 0xee, 0xae, 0xdd, 0x55, 0x5c, 0xb1, 0x3a, 0x1b, 0xbc, 0x69, 0x90, 0xbe, - 0xcf, 0x86, 0x8a, 0xb9, 0xe7, 0x50, 0xd6, 0x19, 0x9c, 0xd5, 0x2d, 0xaf, 0xdf, 0x70, 0x3c, 0xc7, - 0x4b, 0xa4, 0xf8, 0x4a, 0x42, 0xe4, 0x5f, 0x52, 0x5c, 0xff, 0x77, 0x16, 0x56, 0x5b, 0x01, 0xc1, - 0x8c, 0x7c, 0x8e, 0x7b, 0x3d, 0xc2, 0x0c, 0xf2, 0xc5, 0x80, 0x84, 0x0c, 0x6d, 0x40, 0xf1, 0x42, - 0x10, 0x4c, 0x1f, 0xb3, 0x4e, 0x55, 0xdb, 0xd4, 0xb6, 0x0b, 0x06, 0x48, 0xd2, 0x6b, 0xcc, 0x3a, - 0xe8, 0x15, 0x40, 0x97, 0x0c, 0xfb, 0xd8, 0xc5, 0x0e, 0x09, 0xaa, 0x99, 0x4d, 0x6d, 0xbb, 0xdc, - 0xac, 0xd7, 0xff, 0xf7, 0xb9, 0xea, 0x27, 0xf1, 0x8e, 0x13, 0xea, 0xda, 0xc6, 0x88, 0x06, 0xb4, - 0x05, 0x4b, 0xb1, 0xc1, 0x30, 0xbc, 0xf0, 0x02, 0xbb, 0x9a, 0x15, 0x46, 0xcb, 0x91, 0x51, 0x49, - 0x45, 0x35, 0xc8, 0xf7, 0x5d, 0xd2, 0xf7, 0x5c, 0x6a, 0x55, 0x73, 0x42, 0x22, 0x5e, 0xa3, 0x07, - 0x50, 0x72, 0x07, 0x7d, 0x33, 0x32, 0x59, 0x9d, 0xdb, 0xd4, 0xb6, 0x73, 0x46, 0xd1, 0x1d, 0xf4, - 0x9f, 0x29, 0x12, 0xda, 0x03, 0xd4, 0x25, 0xc3, 0x90, 0x79, 0x01, 0x09, 0x4d, 0xda, 0xf7, 0xbd, - 0x80, 0x11, 0xbb, 0x3a, 0xbf, 0x99, 0xdd, 0x2e, 0x18, 0x2b, 0x31, 0xe7, 0x58, 0x31, 0xc6, 0xc5, - 0x63, 0x64, 0x0b, 0xc2, 0x6e, 0x22, 0x1e, 0x83, 0xdb, 0x80, 0x62, 0x40, 0xfa, 0x1e, 0x23, 0x26, - 0xb6, 0xed, 0xa0, 0x9a, 0x97, 0x6e, 0x93, 0xa4, 0x67, 0xb6, 0x1d, 0xa0, 0x87, 0xb0, 0xa4, 0x04, - 0xac, 0x40, 0xf9, 0xb6, 0x20, 0x84, 0x16, 0x25, 0xb9, 0x15, 0x48, 0xf7, 0x26, 0x72, 0x5d, 0x32, - 0x94, 0x72, 0x30, 0x2a, 0x77, 0x42, 0x86, 0x42, 0xee, 0x11, 0xa0, 0x48, 0x1f, 0x4e, 0x54, 0x16, - 0x85, 0xa8, 0xd2, 0xd0, 0xc2, 0x4a, 0xa9, 0xfe, 0x17, 0x0d, 0xee, 0xb4, 0x6d, 0xca, 0x64, 0xa8, - 0x5b, 0x9e, 0xfb, 0x86, 0x3a, 0x23, 0x01, 0x1f, 0x45, 0xae, 0xdd, 0x06, 0x79, 0xe6, 0x96, 0xc8, - 0xb3, 0xb7, 0x47, 0x9e, 0x4b, 0x47, 0xfe, 0x04, 0xaa, 0x1f, 0x13, 0x97, 0x04, 0x98, 0x91, 0x97, - 0x2a, 0xd8, 0x06, 0x09, 0x7d, 0xcf, 0x0d, 0xc9, 0x58, 0x42, 0x68, 0xe3, 0x09, 0xa1, 0xff, 0x2d, - 0x03, 0xe5, 0x28, 0xb1, 0x95, 0xf8, 0xd4, 0xcc, 0xfe, 0x1c, 0x96, 0x92, 0xbc, 0x34, 0xbb, 0xd4, - 0xb5, 0xbf, 0x61, 0x7a, 0x97, 0xbb, 0x63, 0x6b, 0xf4, 0x05, 0xac, 0x8c, 0x28, 0xb6, 0x84, 0xfb, - 0xab, 0xd9, 0xcd, 0xec, 0x76, 0xb1, 0x79, 0x34, 0x4d, 0xf5, 0xf8, 0x21, 0x46, 0x2c, 0xc9, 0x28, - 0xb6, 0x5d, 0x16, 0x0c, 0x8d, 0xe5, 0xee, 0x04, 0xb9, 0xd6, 0x82, 0xf5, 0x54, 0x51, 0xb4, 0x0c, - 0xd9, 0x2e, 0x19, 0xaa, 0xd3, 0xf3, 0x4f, 0xb4, 0x06, 0x73, 0xe7, 0xb8, 0x37, 0x20, 0x2a, 0xaa, - 0x72, 0x71, 0x98, 0x39, 0xd0, 0xf4, 0xaf, 0x34, 0x58, 0xfd, 0x84, 0x86, 0x2c, 0xba, 0x43, 0x51, - 0xca, 0xec, 0xc1, 0xaa, 0x43, 0x98, 0x69, 0x13, 0xdf, 0x0b, 0x29, 0x33, 0xd9, 0xa5, 0x69, 0x63, - 0x86, 0x85, 0xce, 0xbc, 0xb1, 0xec, 0x10, 0x76, 0x24, 0x39, 0xa7, 0x97, 0x47, 0x98, 0x61, 0x74, - 0x17, 0x0a, 0x3e, 0x76, 0x88, 0x19, 0xd2, 0x2b, 0x69, 0x64, 0xce, 0xc8, 0x73, 0xc2, 0x67, 0xf4, - 0x8a, 0xa0, 0xfb, 0x00, 0x82, 0xc9, 0xbc, 0x2e, 0x71, 0x55, 0xc2, 0x08, 0xf1, 0x53, 0x4e, 0xe0, - 0x70, 0x71, 0xaf, 0x27, 0xb2, 0x23, 0x6f, 0xf0, 0x4f, 0xfd, 0xad, 0x06, 0x6b, 0xe3, 0xa0, 0x54, - 0x7c, 0x5b, 0x90, 0x8f, 0xef, 0xbf, 0x26, 0x9c, 0xbb, 0x35, 0xcd, 0xb9, 0x4a, 0x87, 0x11, 0x6f, - 0xe4, 0x49, 0xec, 0x92, 0x4b, 0x9e, 0x22, 0x31, 0x26, 0x95, 0xec, 0x9c, 0xfc, 0x3a, 0xc6, 0x75, - 0x1f, 0x80, 0x79, 0x0c, 0xf7, 0xe4, 0xa1, 0xb2, 0xe2, 0x50, 0x05, 0x41, 0xe1, 0xa7, 0xd2, 0xff, - 0xa4, 0xc1, 0x82, 0x52, 0x8e, 0x9a, 0xb0, 0xae, 0xac, 0x53, 0xd7, 0x31, 0xfd, 0xc1, 0x59, 0x8f, - 0x5a, 0x66, 0x14, 0x83, 0x92, 0xb1, 0x9a, 0x30, 0x5f, 0x0b, 0xde, 0x09, 0x19, 0xf2, 0x7a, 0xa6, - 0x20, 0x99, 0x2e, 0xee, 0x47, 0xa1, 0x29, 0x2a, 0xda, 0x2b, 0xdc, 0x27, 0x1c, 0xe9, 0x64, 0x00, - 0xb2, 0x42, 0xe1, 0xa2, 0x3d, 0xe6, 0xfd, 0x2d, 0x2e, 0x17, 0xd0, 0x73, 0xd1, 0x49, 0x46, 0xef, - 0x5a, 0x39, 0x21, 0x8b, 0xab, 0x76, 0x02, 0xe5, 0xc8, 0x1f, 0x49, 0x69, 0x48, 0xe0, 0x4a, 0xa7, - 0x96, 0x0c, 0xf0, 0x23, 0x94, 0x21, 0xaa, 0xc2, 0x02, 0x75, 0x6d, 0x6a, 0x91, 0xb0, 0x9a, 0xd9, - 0xcc, 0x6e, 0xe7, 0x8c, 0x68, 0xa9, 0xef, 0x40, 0xf1, 0xd9, 0x80, 0x75, 0x22, 0x4d, 0x35, 0xc8, - 0xc7, 0x35, 0x54, 0x5d, 0xd5, 0x68, 0xad, 0x7f, 0x0a, 0x25, 0x29, 0xaa, 0xe2, 0xb8, 0x06, 0x73, - 0xd2, 0xf1, 0x52, 0x50, 0x2e, 0xd0, 0x0e, 0x2c, 0x8b, 0x0f, 0x93, 0x5c, 0xfa, 0x34, 0x10, 0xa8, - 0x85, 0x57, 0x72, 0xc6, 0x92, 0xa0, 0xb7, 0x63, 0xb2, 0xfe, 0x4f, 0x0d, 0x2a, 0xaf, 0x3c, 0x9b, - 0xb4, 0x3c, 0xd7, 0x25, 0x16, 0x27, 0xc5, 0xba, 0x3f, 0x84, 0xb5, 0x33, 0x82, 0x2d, 0xcf, 0x35, - 0x5d, 0xcf, 0x26, 0x26, 0x71, 0x6d, 0xdf, 0xa3, 0x2e, 0x53, 0xa6, 0x90, 0xe4, 0xf1, 0xbd, 0x6d, - 0xc5, 0x41, 0xf7, 0xa0, 0x60, 0x49, 0x3d, 0x44, 0x96, 0x83, 0xbc, 0x91, 0x10, 0xb8, 0x03, 0xc2, - 0xa1, 0x6b, 0x51, 0xd7, 0x11, 0xce, 0xcf, 0x1b, 0xd1, 0x92, 0x47, 0xd0, 0x21, 0x2e, 0x09, 0x69, - 0x68, 0x32, 0xda, 0x27, 0xc2, 0xe7, 0x39, 0xa3, 0xa8, 0x68, 0xa7, 0xb4, 0x4f, 0xd0, 0x01, 0x54, - 0xa3, 0x08, 0x5a, 0x9e, 0xcb, 0x02, 0x6c, 0x31, 0x51, 0x83, 0x49, 0x28, 0x1b, 0x58, 0xc9, 0xa8, - 0x28, 0x7e, 0x4b, 0xb1, 0x9f, 0x49, 0xae, 0xde, 0x81, 0xf5, 0x56, 0x07, 0xbb, 0x0e, 0x89, 0xfa, - 0xcf, 0x2d, 0xfc, 0x8c, 0xf6, 0x61, 0x3d, 0xfa, 0x96, 0x35, 0x28, 0xe8, 0x27, 0x6e, 0x2c, 0x18, - 0x6b, 0x11, 0xb3, 0x35, 0xc2, 0xd3, 0x0f, 0x60, 0xe5, 0x05, 0x0e, 0x27, 0x2a, 0xe9, 0x7b, 0xb0, - 0xa8, 0x2a, 0x29, 0xb9, 0xa4, 0xa1, 0xb8, 0x6e, 0xfc, 0xec, 0x25, 0x49, 0x6c, 0x0b, 0x9a, 0x7e, - 0x0e, 0x15, 0xd9, 0x4c, 0x4f, 0xa2, 0x66, 0x99, 0x94, 0x8f, 0xb4, 0x4e, 0xac, 0xcd, 0xd6, 0x89, - 0x33, 0x37, 0x74, 0x62, 0xfd, 0x04, 0xee, 0x5c, 0xb3, 0x9b, 0x44, 0x3f, 0x32, 0x67, 0x5e, 0x4f, - 0x6c, 0x14, 0xf1, 0xe2, 0x6b, 0x18, 0xea, 0xdf, 0x87, 0x35, 0xf9, 0x48, 0x9a, 0xb8, 0x19, 0x93, - 0xef, 0x0d, 0xed, 0xda, 0x7b, 0x43, 0xff, 0x9d, 0x06, 0x65, 0x55, 0x07, 0x5f, 0x92, 0x30, 0xc4, - 0x0e, 0x41, 0x3b, 0x30, 0xef, 0x0f, 0xce, 0xe2, 0xab, 0xff, 0x7c, 0xe5, 0x3f, 0xff, 0xd8, 0x58, - 0x0c, 0xc3, 0xab, 0x3d, 0x5e, 0x44, 0x0e, 0xf5, 0xc7, 0x07, 0xba, 0xa1, 0x04, 0xd0, 0x0b, 0xa8, - 0x5c, 0x50, 0xd6, 0xb1, 0x03, 0x7c, 0x81, 0x7b, 0xa6, 0x15, 0x10, 0x9b, 0xb8, 0x8c, 0xe2, 0x5e, - 0x28, 0x0e, 0x7e, 0x6d, 0xeb, 0x7e, 0x53, 0x37, 0xd6, 0x93, 0x0d, 0xad, 0x44, 0x1e, 0x55, 0x60, - 0x1e, 0xf7, 0x39, 0x24, 0x91, 0xa1, 0x39, 0x43, 0xad, 0xf4, 0x3f, 0x64, 0x60, 0x55, 0xe1, 0xe3, - 0x75, 0x22, 0x76, 0x52, 0x17, 0x56, 0xa2, 0xac, 0xe4, 0x45, 0xc5, 0xec, 0xd1, 0x90, 0xa9, 0x7a, - 0xfa, 0xc3, 0x69, 0xf5, 0x34, 0x45, 0xdf, 0x18, 0x2d, 0xaa, 0x58, 0x7c, 0xc1, 0x6b, 0x78, 0xed, - 0xf7, 0x1a, 0x14, 0x47, 0x04, 0xd0, 0x4f, 0x20, 0xa7, 0x5a, 0x09, 0xb7, 0x77, 0xfc, 0x7f, 0xda, - 0xab, 0xf3, 0x1f, 0xd9, 0x21, 0x85, 0xda, 0xda, 0x53, 0x28, 0xc4, 0xa4, 0x99, 0x3a, 0x21, 0x86, - 0xf5, 0xe7, 0xd8, 0xea, 0x0e, 0xfc, 0xc9, 0x56, 0x38, 0xb5, 0x44, 0x6e, 0xc1, 0xd2, 0x99, 0xd8, - 0x39, 0x99, 0xba, 0x65, 0x49, 0x8e, 0xf3, 0x76, 0x1f, 0x2a, 0x93, 0x26, 0x54, 0x44, 0xde, 0x81, - 0xfc, 0x15, 0xf5, 0xcd, 0x37, 0xb4, 0x47, 0x54, 0xcf, 0x58, 0xb8, 0xa2, 0xfe, 0x8f, 0x68, 0x8f, - 0xe8, 0x07, 0xb0, 0x7e, 0x44, 0x7a, 0x24, 0xce, 0xcf, 0x5b, 0xe3, 0xd2, 0x7f, 0x00, 0x95, 0xc9, - 0x9d, 0xca, 0xdc, 0x03, 0x28, 0xd9, 0x82, 0x63, 0x8f, 0xee, 0x2d, 0x2a, 0x1a, 0xdf, 0xbc, 0xfb, - 0x11, 0x94, 0xc7, 0x9f, 0x3c, 0xa8, 0x08, 0x0b, 0x47, 0x6d, 0xe3, 0xf8, 0xc7, 0xed, 0xa3, 0xe5, - 0xef, 0x20, 0x80, 0xf9, 0xa3, 0x63, 0xa3, 0xdd, 0x3a, 0x5d, 0xd6, 0xf8, 0xb7, 0xd1, 0x7e, 0xf9, - 0xe9, 0x69, 0x7b, 0x39, 0xd3, 0xfc, 0x55, 0x1e, 0xe6, 0x65, 0x29, 0x41, 0x3f, 0x85, 0x42, 0x5c, - 0x57, 0x50, 0xa5, 0x2e, 0x07, 0x9b, 0x7a, 0x34, 0xb2, 0xd4, 0xdb, 0x7c, 0xb0, 0xa9, 0x7d, 0x6f, - 0x5a, 0xfc, 0xaf, 0x95, 0x26, 0xfd, 0xbd, 0x2f, 0xff, 0xfe, 0xaf, 0x5f, 0x66, 0xee, 0xa3, 0xbb, - 0x7c, 0xf6, 0x4a, 0x26, 0x32, 0x59, 0x99, 0x1a, 0xb2, 0x5c, 0xa1, 0xdf, 0x6a, 0x50, 0x1a, 0x9d, - 0x7d, 0xd0, 0xfe, 0x34, 0x43, 0x29, 0x93, 0x52, 0xad, 0x3e, 0xdb, 0xd3, 0x4d, 0x7f, 0x28, 0xa0, - 0x6d, 0xea, 0xe9, 0xd0, 0x2c, 0x61, 0xe1, 0x50, 0xdb, 0x45, 0x6f, 0x35, 0x00, 0xfe, 0x58, 0x97, - 0xaf, 0x36, 0xf4, 0x74, 0x9a, 0x99, 0x1b, 0x1e, 0xf6, 0x33, 0xe3, 0x7b, 0x24, 0xf0, 0xbd, 0xaf, - 0x6f, 0xa6, 0xe3, 0x13, 0xba, 0x1b, 0xc4, 0xa6, 0x8c, 0x83, 0x64, 0x50, 0x1a, 0xb5, 0x79, 0x63, - 0x08, 0x67, 0x05, 0x71, 0x4f, 0x80, 0xa8, 0xa0, 0xb5, 0x34, 0x10, 0xe8, 0xe7, 0x1a, 0x2c, 0x4f, - 0x8e, 0x03, 0x37, 0x9a, 0x3e, 0x98, 0x66, 0xfa, 0xa6, 0xc1, 0x42, 0xdf, 0x12, 0x20, 0x1e, 0xa0, - 0x8d, 0x71, 0x10, 0xd1, 0x70, 0xd1, 0x70, 0xd4, 0x46, 0xf4, 0x0b, 0x0d, 0xca, 0xe3, 0x8d, 0x18, - 0x7d, 0x34, 0x35, 0x95, 0xd2, 0x1a, 0x77, 0xed, 0x86, 0x43, 0xe8, 0x7b, 0x02, 0xca, 0x96, 0xae, - 0xa7, 0x06, 0x25, 0x2a, 0x29, 0x71, 0x58, 0xfe, 0xac, 0xc1, 0xd2, 0x44, 0xf7, 0x43, 0x4f, 0xa6, - 0x21, 0x4a, 0x6f, 0xd3, 0xb5, 0xa7, 0x33, 0xef, 0x53, 0xee, 0xfb, 0x50, 0x60, 0xde, 0xd5, 0xdf, - 0x4f, 0xc5, 0x1c, 0x77, 0xec, 0x86, 0xec, 0xb7, 0x87, 0xda, 0x6e, 0xf3, 0xaf, 0x73, 0x90, 0x8f, - 0x07, 0xf5, 0x3f, 0x6a, 0xb0, 0x38, 0xd6, 0x74, 0xd1, 0xe3, 0xdb, 0x5d, 0xcf, 0xf1, 0x1e, 0x5d, - 0xdb, 0xff, 0x06, 0xdd, 0x43, 0x6f, 0x08, 0xec, 0x3b, 0xfa, 0x77, 0x53, 0xb1, 0xc7, 0x7f, 0xec, - 0x24, 0xb7, 0xf5, 0x37, 0x1a, 0x94, 0x46, 0xc7, 0x91, 0xe9, 0xb5, 0x24, 0x65, 0xa2, 0xaa, 0x3d, - 0x9e, 0x6d, 0x93, 0x02, 0xfb, 0xae, 0x00, 0x5b, 0x45, 0x95, 0x71, 0xb0, 0xf1, 0x30, 0xf3, 0xb5, - 0x06, 0xe5, 0xf1, 0x9e, 0x32, 0x3d, 0x3d, 0x53, 0xdb, 0x5c, 0xed, 0xc9, 0xac, 0xdb, 0x66, 0x73, - 0xa7, 0x6c, 0x85, 0xdc, 0x9d, 0x5f, 0x8b, 0x57, 0xd3, 0x68, 0x5f, 0x9a, 0x0e, 0x39, 0xb5, 0x03, - 0x4e, 0x87, 0x9c, 0xde, 0xfe, 0x6e, 0x0b, 0x59, 0xb6, 0x43, 0x9e, 0xbc, 0x6f, 0x35, 0x98, 0x7f, - 0x41, 0x70, 0x8f, 0x75, 0xd0, 0xaf, 0x35, 0xb8, 0xf3, 0x31, 0x61, 0xcf, 0xe3, 0x31, 0x22, 0x19, - 0x41, 0x6e, 0x2c, 0x53, 0x53, 0x71, 0xa6, 0x8f, 0x32, 0xfa, 0x07, 0x02, 0xe7, 0x43, 0x34, 0x81, - 0xb3, 0x23, 0x90, 0x34, 0xc4, 0x78, 0x63, 0xc5, 0xbb, 0x9a, 0x5f, 0x65, 0x20, 0xc7, 0xa7, 0x2c, - 0xf4, 0xa5, 0x06, 0x73, 0x9f, 0x78, 0x0e, 0x75, 0xd1, 0xa3, 0xa9, 0xd3, 0x71, 0x32, 0xc0, 0xd5, - 0x3e, 0xb8, 0x9d, 0xf0, 0x78, 0x62, 0xea, 0xab, 0xe3, 0xd8, 0x7a, 0xdc, 0x2e, 0x8f, 0xf2, 0xcf, - 0x34, 0x98, 0xff, 0x8c, 0x3a, 0xee, 0xc0, 0xff, 0x36, 0x51, 0x6c, 0x08, 0x14, 0xef, 0xe8, 0x13, - 0xbd, 0x24, 0x14, 0x86, 0x0f, 0xb5, 0xdd, 0xb3, 0x79, 0x11, 0x8a, 0xfd, 0xff, 0x06, 0x00, 0x00, - 0xff, 0xff, 0x62, 0xf6, 0x51, 0xfa, 0xc1, 0x15, 0x00, 0x00, + // 1878 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x6f, 0x23, 0x49, + 0x15, 0xa7, 0xed, 0x7c, 0x38, 0xcf, 0x8e, 0x93, 0x54, 0x12, 0x8f, 0xd7, 0x33, 0xb3, 0xc9, 0xd4, + 0xb2, 0x93, 0x8f, 0xd9, 0xd8, 0x8b, 0xb3, 0x3b, 0x13, 0xc2, 0x01, 0xcd, 0x38, 0xde, 0x9d, 0x51, + 0x76, 0x66, 0x47, 0xbd, 0x11, 0x7b, 0x82, 0x56, 0xc5, 0x5d, 0xd3, 0x2e, 0xd9, 0xee, 0xee, 0xed, + 0x2e, 0xe7, 0x8b, 0xdb, 0x8a, 0x2b, 0x1c, 0x96, 0x03, 0x42, 0x82, 0x03, 0x23, 0x71, 0x81, 0xcb, + 0x20, 0x21, 0x21, 0x71, 0xe0, 0xc0, 0xbf, 0xc0, 0x1d, 0x2e, 0x9c, 0x38, 0xf2, 0x17, 0xa0, 0xfa, + 0xe8, 0x6e, 0xdb, 0xe9, 0xd0, 0xc9, 0x20, 0x2e, 0x91, 0xeb, 0xd5, 0xfb, 0xf8, 0xf5, 0x7b, 0xaf, + 0xde, 0x47, 0x60, 0xcb, 0x0f, 0x3c, 0xee, 0x35, 0x4e, 0x48, 0x9f, 0xd9, 0x84, 0x7b, 0x41, 0x83, + 0x74, 0x3a, 0xde, 0xd0, 0xe5, 0x61, 0xe3, 0xa4, 0xd9, 0x38, 0xa5, 0xc7, 0x16, 0xf1, 0x59, 0x5d, + 0xf2, 0xa0, 0x77, 0x29, 0xef, 0xd2, 0x80, 0x0e, 0x07, 0xf5, 0x98, 0xbb, 0x1e, 0x71, 0xd7, 0x4f, + 0x9a, 0xb5, 0x3b, 0x8e, 0xe7, 0x39, 0x7d, 0xda, 0x20, 0x3e, 0x6b, 0x10, 0xd7, 0xf5, 0x38, 0xe1, + 0xcc, 0x73, 0x43, 0x25, 0x5d, 0xbb, 0xad, 0x6f, 0xe5, 0xe9, 0x78, 0xf8, 0xaa, 0x41, 0x07, 0x3e, + 0x3f, 0xd7, 0x97, 0x3b, 0x0e, 0xe3, 0xdd, 0xe1, 0x71, 0xbd, 0xe3, 0x0d, 0x1a, 0x8e, 0xe7, 0x78, + 0x09, 0x97, 0x38, 0x29, 0x88, 0xe2, 0x97, 0x62, 0xc7, 0xff, 0xca, 0xc3, 0x72, 0x2b, 0xa0, 0x84, + 0xd3, 0x2f, 0x49, 0xbf, 0x4f, 0xb9, 0x49, 0xbf, 0x1a, 0xd2, 0x90, 0xa3, 0x35, 0x28, 0x9e, 0x4a, + 0x82, 0xe5, 0x13, 0xde, 0xad, 0x1a, 0xeb, 0xc6, 0xe6, 0x9c, 0x09, 0x8a, 0xf4, 0x92, 0xf0, 0x2e, + 0x7a, 0x01, 0xd0, 0xa3, 0xe7, 0x03, 0xe2, 0x12, 0x87, 0x06, 0xd5, 0xdc, 0xba, 0xb1, 0x59, 0x6e, + 0xd6, 0xeb, 0xff, 0xfd, 0xbb, 0xea, 0x87, 0xb1, 0xc4, 0x21, 0x73, 0x6d, 0x73, 0x44, 0x03, 0xda, + 0x80, 0x85, 0xd8, 0x60, 0x18, 0x9e, 0x7a, 0x81, 0x5d, 0xcd, 0x4b, 0xa3, 0xe5, 0xc8, 0xa8, 0xa2, + 0xa2, 0x1a, 0x14, 0x06, 0x2e, 0x1d, 0x78, 0x2e, 0xeb, 0x54, 0xa7, 0x24, 0x47, 0x7c, 0x46, 0xf7, + 0xa0, 0xe4, 0x0e, 0x07, 0x56, 0x64, 0xb2, 0x3a, 0xbd, 0x6e, 0x6c, 0x4e, 0x99, 0x45, 0x77, 0x38, + 0x78, 0xac, 0x49, 0x68, 0x07, 0x50, 0x8f, 0x9e, 0x87, 0xdc, 0x0b, 0x68, 0x68, 0xb1, 0x81, 0xef, + 0x05, 0x9c, 0xda, 0xd5, 0x99, 0xf5, 0xfc, 0xe6, 0x9c, 0xb9, 0x14, 0xdf, 0x3c, 0xd3, 0x17, 0xe3, + 0xec, 0x31, 0xb2, 0x59, 0x69, 0x37, 0x61, 0x8f, 0xc1, 0xad, 0x41, 0x31, 0xa0, 0x03, 0x8f, 0x53, + 0x8b, 0xd8, 0x76, 0x50, 0x2d, 0x28, 0xb7, 0x29, 0xd2, 0x63, 0xdb, 0x0e, 0xd0, 0x7d, 0x58, 0xd0, + 0x0c, 0x9d, 0x40, 0xfb, 0x76, 0x4e, 0x32, 0xcd, 0x2b, 0x72, 0x2b, 0x50, 0xee, 0x4d, 0xf8, 0x7a, + 0xf4, 0x5c, 0xf1, 0xc1, 0x28, 0xdf, 0x21, 0x3d, 0x97, 0x7c, 0x0f, 0x00, 0x45, 0xfa, 0x48, 0xa2, + 0xb2, 0x28, 0x59, 0xb5, 0x86, 0x16, 0xd1, 0x4a, 0xf1, 0x5f, 0x0c, 0x58, 0x19, 0x0f, 0x76, 0xe8, + 0x7b, 0x6e, 0x48, 0xd1, 0x27, 0x30, 0xa3, 0xbc, 0x2c, 0x03, 0x5d, 0xcc, 0x0e, 0xe4, 0xb8, 0xbc, + 0xa9, 0xa5, 0xd1, 0x8f, 0x60, 0x31, 0xe2, 0xb2, 0x3a, 0xd2, 0x90, 0x2d, 0x53, 0xa3, 0xd8, 0xdc, + 0xcd, 0xd2, 0x78, 0x40, 0x7d, 0x2f, 0x64, 0xfc, 0x80, 0x70, 0x12, 0xab, 0x5d, 0x88, 0x18, 0x14, + 0x68, 0x1b, 0xff, 0xc9, 0x80, 0x5b, 0x6d, 0x9b, 0x71, 0x65, 0xbe, 0xe5, 0xb9, 0xaf, 0x98, 0x33, + 0x92, 0xb1, 0xa3, 0xae, 0x37, 0xae, 0xe3, 0xfa, 0xdc, 0x35, 0x5d, 0x9f, 0xbf, 0xbe, 0xeb, 0xa7, + 0xd2, 0x5d, 0xff, 0x10, 0xaa, 0x9f, 0x52, 0x97, 0x06, 0x84, 0xd3, 0xe7, 0x3a, 0x5b, 0x63, 0xef, + 0x8f, 0x66, 0xb4, 0x31, 0x9e, 0xd1, 0xf8, 0xaf, 0x39, 0x28, 0x4f, 0x04, 0x2b, 0xf3, 0x69, 0x7e, + 0x09, 0x0b, 0xc9, 0xc3, 0xb2, 0x7a, 0xcc, 0xb5, 0xdf, 0xf2, 0x7d, 0x96, 0x7b, 0x63, 0x67, 0xf4, + 0x15, 0x2c, 0x8d, 0x28, 0xee, 0x48, 0xf7, 0x57, 0xf3, 0xeb, 0xf9, 0xcd, 0x62, 0xf3, 0xe0, 0x66, + 0x19, 0x33, 0x62, 0x49, 0x45, 0xb1, 0xed, 0xf2, 0xe0, 0xdc, 0x5c, 0xec, 0x4d, 0x90, 0x6b, 0x2d, + 0x58, 0x4d, 0x65, 0x45, 0x8b, 0x90, 0xef, 0xd1, 0x73, 0xfd, 0xf5, 0xe2, 0x27, 0x5a, 0x81, 0xe9, + 0x13, 0xd2, 0x1f, 0x52, 0x1d, 0x55, 0x75, 0xd8, 0xcf, 0xed, 0x19, 0xf8, 0x1b, 0x03, 0x96, 0x3f, + 0x63, 0x21, 0x8f, 0x8a, 0x40, 0x94, 0x32, 0x3b, 0xb0, 0xec, 0x50, 0x6e, 0xd9, 0x2a, 0xf5, 0x2c, + 0x7e, 0x66, 0xd9, 0x84, 0x13, 0xa9, 0xb3, 0x60, 0x2e, 0x3a, 0x94, 0xeb, 0xa4, 0x3c, 0x3a, 0x13, + 0x69, 0x89, 0x6e, 0xc3, 0x9c, 0x4f, 0x1c, 0x6a, 0x85, 0xec, 0x42, 0x19, 0x99, 0x36, 0x0b, 0x82, + 0xf0, 0x05, 0xbb, 0xa0, 0xe8, 0x2e, 0x80, 0xbc, 0xe4, 0x5e, 0x8f, 0xba, 0x3a, 0x61, 0x24, 0xfb, + 0x91, 0x20, 0x08, 0xb8, 0xa4, 0xdf, 0x97, 0xd9, 0x51, 0x30, 0xc5, 0x4f, 0xfc, 0xda, 0x80, 0x95, + 0x71, 0x50, 0x3a, 0xbe, 0x2d, 0x28, 0xc4, 0x05, 0xcc, 0x90, 0xce, 0xdd, 0xc8, 0x72, 0xae, 0xd6, + 0x61, 0xc6, 0x82, 0x22, 0x89, 0x5d, 0x7a, 0x26, 0x52, 0x24, 0xc6, 0xa4, 0x93, 0x5d, 0x90, 0x5f, + 0xc6, 0xb8, 0xee, 0x02, 0x70, 0x8f, 0x93, 0xbe, 0xfa, 0xa8, 0xbc, 0xfc, 0xa8, 0x39, 0x49, 0x11, + 0x5f, 0x85, 0xff, 0x60, 0xc0, 0xac, 0x56, 0x8e, 0x9a, 0xb0, 0xaa, 0xad, 0x33, 0xd7, 0xb1, 0xfc, + 0xe1, 0x71, 0x9f, 0x75, 0xac, 0x28, 0x06, 0x25, 0x73, 0x39, 0xb9, 0x7c, 0x29, 0xef, 0x0e, 0xe9, + 0xb9, 0x28, 0xc8, 0x1a, 0x92, 0xe5, 0x92, 0x41, 0x14, 0x9a, 0xa2, 0xa6, 0xbd, 0x20, 0x03, 0x2a, + 0x90, 0x4e, 0x06, 0x20, 0x2f, 0x15, 0xce, 0xdb, 0x63, 0xde, 0xdf, 0x10, 0x7c, 0x01, 0x3b, 0x91, + 0xad, 0x70, 0xf4, 0xad, 0x95, 0x13, 0xb2, 0x7c, 0x6a, 0x87, 0x50, 0x8e, 0xfc, 0x91, 0x94, 0x86, + 0x04, 0xae, 0x72, 0x6a, 0xc9, 0x04, 0x3f, 0x42, 0x19, 0xa2, 0x2a, 0xcc, 0x32, 0xd7, 0x66, 0x1d, + 0x1a, 0x56, 0x73, 0xeb, 0xf9, 0xcd, 0x29, 0x33, 0x3a, 0xe2, 0x2d, 0x28, 0x3e, 0x1e, 0xf2, 0x6e, + 0xa4, 0xa9, 0x06, 0x85, 0xb8, 0x09, 0xe8, 0xa7, 0x1a, 0x9d, 0xf1, 0xe7, 0x50, 0x52, 0xac, 0x3a, + 0x8e, 0x2b, 0x30, 0xad, 0x1c, 0xaf, 0x18, 0xd5, 0x01, 0x6d, 0xc1, 0xa2, 0xfc, 0x61, 0xd1, 0x33, + 0x9f, 0x05, 0x12, 0xb5, 0xf4, 0xca, 0x94, 0xb9, 0x20, 0xe9, 0xed, 0x98, 0x8c, 0xff, 0x61, 0x40, + 0xe5, 0x85, 0x67, 0xd3, 0x96, 0xe7, 0xba, 0xb4, 0x23, 0x48, 0xb1, 0xee, 0x0f, 0x61, 0xe5, 0x98, + 0x92, 0x8e, 0xe7, 0x5a, 0xae, 0x67, 0x53, 0x8b, 0xba, 0xb6, 0xef, 0x31, 0x97, 0x6b, 0x53, 0x48, + 0xdd, 0x09, 0xd9, 0xb6, 0xbe, 0x41, 0x77, 0x60, 0xae, 0xa3, 0xf4, 0xe8, 0x9a, 0x5c, 0x30, 0x13, + 0x82, 0x70, 0x40, 0x78, 0xee, 0x76, 0x98, 0xeb, 0x48, 0xe7, 0x17, 0xcc, 0xe8, 0x28, 0x22, 0xe8, + 0x50, 0x97, 0x86, 0x2c, 0xb4, 0x38, 0x1b, 0x50, 0xe9, 0xf3, 0x29, 0xb3, 0xa8, 0x69, 0x47, 0x6c, + 0x40, 0xd1, 0x1e, 0x54, 0xa3, 0x08, 0x76, 0x3c, 0x97, 0x07, 0xa4, 0xc3, 0x65, 0x0d, 0xa6, 0xa1, + 0xea, 0xc0, 0x25, 0xb3, 0xa2, 0xef, 0x5b, 0xfa, 0xfa, 0xb1, 0xba, 0xc5, 0x5d, 0x58, 0x6d, 0x75, + 0x89, 0xeb, 0xd0, 0xa8, 0x81, 0x5e, 0xc3, 0xcf, 0x68, 0x17, 0x56, 0xa3, 0xdf, 0xaa, 0x06, 0x05, + 0x83, 0xc4, 0x8d, 0x73, 0xe6, 0x4a, 0x74, 0xd9, 0x1a, 0xb9, 0xc3, 0x7b, 0xb0, 0xf4, 0x94, 0x84, + 0x13, 0x95, 0xf4, 0x3d, 0x98, 0xd7, 0x95, 0x94, 0x9e, 0xb1, 0x50, 0x3e, 0x37, 0xf1, 0xed, 0x25, + 0x45, 0x6c, 0x4b, 0x1a, 0x3e, 0x81, 0x8a, 0x9a, 0x06, 0x0e, 0xa3, 0x6e, 0x9f, 0x94, 0x8f, 0xb4, + 0x51, 0xc2, 0xb8, 0xd9, 0x28, 0x91, 0xbb, 0x62, 0x94, 0xc0, 0x87, 0x70, 0xeb, 0x92, 0xdd, 0x24, + 0xfa, 0x91, 0x39, 0xeb, 0x72, 0x62, 0xa3, 0xe8, 0x2e, 0x7e, 0x86, 0x21, 0xfe, 0x6e, 0xd4, 0xf8, + 0x27, 0x5e, 0xc6, 0xe4, 0xc0, 0x64, 0x5c, 0x1a, 0x98, 0xf0, 0xaf, 0x0d, 0x28, 0xeb, 0x3a, 0xf8, + 0x9c, 0x86, 0x21, 0x71, 0x28, 0xda, 0x82, 0x19, 0x7f, 0x78, 0x1c, 0x3f, 0xfd, 0x27, 0x4b, 0xff, + 0xfe, 0xfb, 0xda, 0x7c, 0x18, 0x5e, 0xec, 0x88, 0x22, 0xb2, 0x8f, 0x3f, 0xda, 0xc3, 0xa6, 0x66, + 0x40, 0x4f, 0xa1, 0x72, 0xca, 0x78, 0xd7, 0x0e, 0xc8, 0x29, 0xe9, 0x8b, 0x99, 0xc0, 0xa6, 0x2e, + 0x67, 0xa4, 0x1f, 0xca, 0x0f, 0xbf, 0x24, 0xba, 0xdb, 0xc4, 0xe6, 0x6a, 0x22, 0xd0, 0x4a, 0xf8, + 0x51, 0x05, 0x66, 0xc8, 0x40, 0x40, 0x92, 0x19, 0x3a, 0x65, 0xea, 0x13, 0xfe, 0x5d, 0x0e, 0x96, + 0x53, 0x86, 0x07, 0xd4, 0x83, 0xa5, 0x28, 0x2b, 0x45, 0x51, 0xb1, 0xfa, 0x2c, 0xe4, 0xba, 0x9e, + 0x7e, 0xff, 0x2d, 0x86, 0x91, 0x31, 0x5a, 0x54, 0xb1, 0xc4, 0x41, 0xd4, 0xf0, 0xda, 0x6f, 0x0d, + 0x28, 0x8e, 0x30, 0xa0, 0x1f, 0xc2, 0x94, 0x6e, 0x25, 0xc2, 0xde, 0xb3, 0xff, 0xd1, 0x5e, 0x5d, + 0xfc, 0x51, 0x1d, 0x52, 0xaa, 0xad, 0x3d, 0x82, 0xb9, 0x98, 0x74, 0xa3, 0x4e, 0x48, 0x60, 0xf5, + 0x09, 0xe9, 0xf4, 0x86, 0xfe, 0x64, 0x2b, 0xcc, 0x2c, 0x91, 0x1b, 0xb0, 0x70, 0x2c, 0x25, 0x27, + 0x53, 0xb7, 0xac, 0xc8, 0x71, 0xde, 0xee, 0x42, 0x65, 0xd2, 0x84, 0x8e, 0xc8, 0x3b, 0x50, 0xb8, + 0x60, 0xbe, 0xf5, 0x8a, 0xf5, 0xa9, 0xee, 0x19, 0xb3, 0x17, 0xcc, 0xff, 0x84, 0xf5, 0x29, 0xde, + 0x83, 0xd5, 0x03, 0xda, 0xa7, 0x71, 0x7e, 0x5e, 0x1b, 0x17, 0xfe, 0x1e, 0x54, 0x26, 0x25, 0xb5, + 0xb9, 0x7b, 0x50, 0xb2, 0xe5, 0x8d, 0x3d, 0x2a, 0x5b, 0xd4, 0x34, 0x21, 0xbc, 0xfd, 0x31, 0x94, + 0xc7, 0x47, 0x1e, 0x54, 0x84, 0xd9, 0x83, 0xb6, 0xf9, 0xec, 0x07, 0xed, 0x83, 0xc5, 0x6f, 0x21, + 0x80, 0x99, 0x83, 0x67, 0x66, 0xbb, 0x75, 0xb4, 0x68, 0x88, 0xdf, 0x66, 0xfb, 0xf9, 0xe7, 0x47, + 0xed, 0xc5, 0x5c, 0xf3, 0x57, 0x05, 0x98, 0x51, 0xa5, 0x04, 0xfd, 0x18, 0xe6, 0xe2, 0xba, 0x82, + 0x2a, 0x75, 0xb5, 0x99, 0xd5, 0xa3, 0x9d, 0xab, 0xde, 0x16, 0x9b, 0x59, 0xed, 0x3b, 0x59, 0xf1, + 0xbf, 0x54, 0x9a, 0xf0, 0x7b, 0x5f, 0xff, 0xed, 0x9f, 0x3f, 0xcf, 0xdd, 0x45, 0xb7, 0xc5, 0xf2, + 0x98, 0xac, 0x94, 0xaa, 0x32, 0x35, 0x54, 0xb9, 0x42, 0xbf, 0x31, 0xa0, 0x34, 0x3a, 0xcf, 0xa3, + 0xcc, 0x29, 0x3b, 0x65, 0xd5, 0xab, 0x7d, 0x74, 0x33, 0x21, 0x0d, 0xf0, 0xbe, 0x04, 0xb8, 0x8e, + 0xd3, 0x01, 0xaa, 0xe1, 0x7f, 0xdf, 0xd8, 0x46, 0xaf, 0x0d, 0x00, 0x31, 0xb2, 0xab, 0xd9, 0x0d, + 0x3d, 0xca, 0x32, 0x76, 0xc5, 0x78, 0x5f, 0xbb, 0xe1, 0x4a, 0x82, 0x1f, 0x48, 0x7c, 0xef, 0xe3, + 0xf5, 0x74, 0x7c, 0x52, 0x77, 0x83, 0xda, 0x8c, 0x0b, 0x90, 0x1c, 0x4a, 0xa3, 0x36, 0xaf, 0x0c, + 0xe4, 0x4d, 0x41, 0xdc, 0x91, 0x20, 0x2a, 0x68, 0x25, 0x0d, 0x04, 0xfa, 0xa9, 0x01, 0x8b, 0x93, + 0x4b, 0xc1, 0x95, 0xa6, 0xf7, 0xb2, 0x4c, 0x5f, 0xb5, 0x5e, 0xe0, 0x0d, 0x09, 0xe2, 0x1e, 0x5a, + 0x1b, 0x07, 0x11, 0xad, 0x18, 0x0d, 0x47, 0x0b, 0xa2, 0x9f, 0x19, 0x50, 0x1e, 0x6f, 0xc7, 0xe8, + 0xe3, 0xcc, 0xdc, 0x48, 0x6b, 0xdf, 0xb5, 0x2b, 0x3e, 0x02, 0xef, 0x48, 0x28, 0x1b, 0x18, 0xa7, + 0x06, 0x25, 0x2a, 0x2c, 0x71, 0x58, 0xfe, 0x68, 0xc0, 0xc2, 0x44, 0x0f, 0x44, 0x0f, 0xb3, 0x10, + 0xa5, 0x37, 0xeb, 0xda, 0xa3, 0x1b, 0xcb, 0x69, 0xf7, 0x7d, 0x28, 0x31, 0x6f, 0xe3, 0xf7, 0x53, + 0x31, 0xc7, 0x7d, 0xbb, 0xa1, 0xba, 0xee, 0xbe, 0xb1, 0xdd, 0xfc, 0xf3, 0x34, 0x14, 0xe2, 0xff, + 0x37, 0xfc, 0xde, 0x80, 0xf9, 0xb1, 0xd6, 0x8b, 0xae, 0xf9, 0xde, 0xc6, 0x3b, 0x75, 0xed, 0x6d, + 0x16, 0x68, 0xdc, 0x90, 0xd8, 0xb7, 0xf0, 0xb7, 0x53, 0xb1, 0xc7, 0xff, 0x9f, 0x4a, 0x5e, 0xeb, + 0x2f, 0x0d, 0x28, 0x8d, 0x2e, 0x25, 0xd9, 0x15, 0x25, 0x65, 0xaf, 0xca, 0xae, 0x28, 0x69, 0x7b, + 0x0f, 0x7e, 0x57, 0x82, 0xad, 0xa2, 0xca, 0x38, 0xd8, 0x78, 0xa5, 0x79, 0x63, 0x40, 0x79, 0xbc, + 0xb3, 0x64, 0xa7, 0x67, 0x6a, 0xb3, 0xab, 0x3d, 0xbc, 0xa9, 0xd8, 0xcd, 0xdc, 0xa9, 0x1a, 0xa2, + 0x70, 0xe7, 0x1b, 0x39, 0x3b, 0x8d, 0x76, 0xa7, 0x6c, 0xc8, 0xa9, 0x7d, 0x30, 0x1b, 0x72, 0x7a, + 0x13, 0xbc, 0x2e, 0x64, 0xd5, 0x14, 0x45, 0xf2, 0xbe, 0x36, 0x60, 0xe6, 0x29, 0x25, 0x7d, 0xde, + 0x45, 0xbf, 0x30, 0xe0, 0xd6, 0xa7, 0x94, 0x3f, 0x89, 0x97, 0x89, 0x64, 0x11, 0xb9, 0xb2, 0x4c, + 0x65, 0xe2, 0x4c, 0x5f, 0x68, 0xf0, 0x07, 0x12, 0xe7, 0x7d, 0x34, 0x81, 0xb3, 0x2b, 0x91, 0x34, + 0xe4, 0x92, 0xd3, 0x89, 0xa5, 0x9a, 0xdf, 0xe4, 0x60, 0x4a, 0xec, 0x5a, 0xe8, 0x6b, 0x03, 0xa6, + 0x3f, 0xf3, 0x1c, 0xe6, 0xa2, 0x07, 0x99, 0x3b, 0x72, 0xb2, 0xc6, 0xd5, 0x3e, 0xb8, 0x1e, 0xf3, + 0x78, 0x62, 0xe2, 0xe5, 0x71, 0x6c, 0x7d, 0x61, 0x57, 0x44, 0xf9, 0x27, 0x06, 0xcc, 0x7c, 0xc1, + 0x1c, 0x77, 0xe8, 0xff, 0x3f, 0x51, 0xac, 0x49, 0x14, 0xef, 0xe0, 0x89, 0x5e, 0x12, 0x4a, 0xc3, + 0xfb, 0xc6, 0xf6, 0xf1, 0x8c, 0x0c, 0xc5, 0xee, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x86, 0x7d, + 0xe0, 0x8d, 0x88, 0x16, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1390,7 +1441,7 @@ const _ = grpc.SupportPackageIsVersion6 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type WalletClient interface { HasWallet(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*HasWalletResponse, error) - CreateWallet(ctx context.Context, in *CreateWalletRequest, opts ...grpc.CallOption) (*WalletResponse, error) + CreateWallet(ctx context.Context, in *CreateWalletRequest, opts ...grpc.CallOption) (*CreateWalletResponse, error) EditConfig(ctx context.Context, in *EditWalletConfigRequest, opts ...grpc.CallOption) (*WalletResponse, error) WalletConfig(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*WalletResponse, error) GenerateMnemonic(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GenerateMnemonicResponse, error) @@ -1415,8 +1466,8 @@ func (c *walletClient) HasWallet(ctx context.Context, in *empty.Empty, opts ...g return out, nil } -func (c *walletClient) CreateWallet(ctx context.Context, in *CreateWalletRequest, opts ...grpc.CallOption) (*WalletResponse, error) { - out := new(WalletResponse) +func (c *walletClient) CreateWallet(ctx context.Context, in *CreateWalletRequest, opts ...grpc.CallOption) (*CreateWalletResponse, error) { + out := new(CreateWalletResponse) err := c.cc.Invoke(ctx, "/ethereum.validator.accounts.v2.Wallet/CreateWallet", in, out, opts...) if err != nil { return nil, err @@ -1472,7 +1523,7 @@ func (c *walletClient) ImportKeystores(ctx context.Context, in *ImportKeystoresR // WalletServer is the server API for Wallet service. type WalletServer interface { HasWallet(context.Context, *empty.Empty) (*HasWalletResponse, error) - CreateWallet(context.Context, *CreateWalletRequest) (*WalletResponse, error) + CreateWallet(context.Context, *CreateWalletRequest) (*CreateWalletResponse, error) EditConfig(context.Context, *EditWalletConfigRequest) (*WalletResponse, error) WalletConfig(context.Context, *empty.Empty) (*WalletResponse, error) GenerateMnemonic(context.Context, *empty.Empty) (*GenerateMnemonicResponse, error) @@ -1487,7 +1538,7 @@ type UnimplementedWalletServer struct { func (*UnimplementedWalletServer) HasWallet(ctx context.Context, req *empty.Empty) (*HasWalletResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method HasWallet not implemented") } -func (*UnimplementedWalletServer) CreateWallet(ctx context.Context, req *CreateWalletRequest) (*WalletResponse, error) { +func (*UnimplementedWalletServer) CreateWallet(ctx context.Context, req *CreateWalletRequest) (*CreateWalletResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateWallet not implemented") } func (*UnimplementedWalletServer) EditConfig(ctx context.Context, req *EditWalletConfigRequest) (*WalletResponse, error) { diff --git a/validator/accounts/v2/BUILD.bazel b/validator/accounts/v2/BUILD.bazel index f3b0cc4ee36d..30d0ff54db4d 100644 --- a/validator/accounts/v2/BUILD.bazel +++ b/validator/accounts/v2/BUILD.bazel @@ -24,11 +24,13 @@ go_library( "//validator:__subpackages__", ], deps = [ + "//proto/validator/accounts/v2:go_default_library", "//shared/bls:go_default_library", "//shared/bytesutil:go_default_library", "//shared/cmd:go_default_library", "//shared/featureconfig:go_default_library", "//shared/fileutil:go_default_library", + "//shared/params:go_default_library", "//shared/petnames:go_default_library", "//shared/promptutil:go_default_library", "//validator/accounts/v2/prompt:go_default_library", diff --git a/validator/accounts/v2/accounts_create.go b/validator/accounts/v2/accounts_create.go index a51dbbd56b21..1e8c6e9f70a7 100644 --- a/validator/accounts/v2/accounts_create.go +++ b/validator/accounts/v2/accounts_create.go @@ -6,6 +6,9 @@ import ( "strings" "github.com/pkg/errors" + ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" + pb "github.com/prysmaticlabs/prysm/proto/validator/accounts/v2" + "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/validator/accounts/v2/wallet" "github.com/prysmaticlabs/prysm/validator/flags" v2keymanager "github.com/prysmaticlabs/prysm/validator/keymanager/v2" @@ -89,3 +92,33 @@ func CreateAccount(ctx context.Context, cfg *CreateAccountConfig) error { } return nil } + +// DepositDataJSON creates a raw map to match the deposit_data.json file format +// from the official eth2.0-deposit-cli https://github.com/ethereum/eth2.0-deposit-cli. +// The reason we utilize this map is to ensure we match the format of +// the eth2 deposit cli, which utilizes snake case and hex strings to represent binary data. +// Our gRPC gateway instead uses camel case and base64, which is why we use this workaround. +func DepositDataJSON(depositData *ethpb.Deposit_Data) (map[string]string, error) { + depositMessage := &pb.DepositMessage{ + Pubkey: depositData.PublicKey, + WithdrawalCredentials: depositData.WithdrawalCredentials, + Amount: depositData.Amount, + } + depositMessageRoot, err := depositMessage.HashTreeRoot() + if err != nil { + return nil, err + } + depositDataRoot, err := depositData.HashTreeRoot() + if err != nil { + return nil, err + } + data := make(map[string]string) + data["pubkey"] = fmt.Sprintf("%x", depositData.PublicKey) + data["withdrawal_credentials"] = fmt.Sprintf("%x", depositData.WithdrawalCredentials) + data["amount"] = fmt.Sprintf("%d", depositData.Amount) + data["signature"] = fmt.Sprintf("%x", depositData.Signature) + data["deposit_message_root"] = fmt.Sprintf("%x", depositMessageRoot) + data["deposit_data_root"] = fmt.Sprintf("%x", depositDataRoot) + data["fork_version"] = fmt.Sprintf("%x", params.BeaconConfig().GenesisForkVersion) + return data, nil +} diff --git a/validator/accounts/v2/accounts_create_test.go b/validator/accounts/v2/accounts_create_test.go index ddf4604c16bc..e61d41a88056 100644 --- a/validator/accounts/v2/accounts_create_test.go +++ b/validator/accounts/v2/accounts_create_test.go @@ -2,10 +2,14 @@ package v2 import ( "context" + "encoding/hex" + "fmt" "io/ioutil" "os" "testing" + ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" + "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/promptutil" "github.com/prysmaticlabs/prysm/shared/testutil/assert" "github.com/prysmaticlabs/prysm/shared/testutil/require" @@ -140,3 +144,31 @@ func Test_KeysConsistency_Direct(t *testing.T) { require.NoError(t, err) assert.LogsContain(t, logHook, "Successfully created new validator account") } + +func TestDepositDataJSON(t *testing.T) { + // Use a real deposit data JSON fixture generated by the eth2 deposit cli + fixture := make(map[string]string) + fixture["pubkey"] = "a611f309b4a24853e0b04bd70e35fbac887e099b9f81c2fac2bb2cde9f6f58bd37d947be552ec515b1f45d406f61de27" + fixture["withdrawal_credentials"] = "003561705197f621bfaa59add59ee066e6f2fe356201d00c610ed5d6cd7fcb83" + fixture["amount"] = "32000000000" + fixture["signature"] = "b0a27f2e7684fc1aa6403e2e76dcbcf29568ba02e9076e61b4c926bccec25ec636a1fdc8d08457cf23a1715ea9ee4fe20b030820e2fcf6dee07a3ce5e6ec65a824027f4cb01c143db74b34f5ca54f7e011d84fe89ce55b0e75f39003e2c9afe9" + fixture["deposit_message_root"] = "12c267fdc80fb07b47770f8fcf5e25ed2280df391d7de224cc6486e925b7d7f9" + fixture["deposit_data_root"] = "3b3c62bcff04d0249209c79a76cea98520932609986c11cb4ff62a4f54b76548" + fixture["fork_version"] = fmt.Sprintf("%x", params.BeaconConfig().GenesisForkVersion) + + pubKey, err := hex.DecodeString(fixture["pubkey"]) + require.NoError(t, err) + credentials, err := hex.DecodeString(fixture["withdrawal_credentials"]) + require.NoError(t, err) + sig, err := hex.DecodeString(fixture["signature"]) + require.NoError(t, err) + depositData := ðpb.Deposit_Data{ + PublicKey: pubKey, + WithdrawalCredentials: credentials, + Amount: 32000000000, + Signature: sig, + } + got, err := DepositDataJSON(depositData) + require.NoError(t, err) + assert.DeepEqual(t, fixture, got) +} diff --git a/validator/accounts/v2/wallet_recover.go b/validator/accounts/v2/wallet_recover.go index de9259bf655c..2eee078a4d6f 100644 --- a/validator/accounts/v2/wallet_recover.go +++ b/validator/accounts/v2/wallet_recover.go @@ -10,6 +10,7 @@ import ( "strings" "github.com/pkg/errors" + ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/prysm/shared/promptutil" "github.com/prysmaticlabs/prysm/validator/accounts/v2/prompt" "github.com/prysmaticlabs/prysm/validator/accounts/v2/wallet" @@ -57,7 +58,7 @@ func RecoverWalletCli(cliCtx *cli.Context) error { if err != nil { return errors.Wrap(err, "could not get number of accounts to recover") } - w, err := RecoverWallet(cliCtx.Context, &RecoverWalletConfig{ + w, _, err := RecoverWallet(cliCtx.Context, &RecoverWalletConfig{ WalletDir: walletDir, WalletPassword: walletPassword, Mnemonic: mnemonic, @@ -78,14 +79,14 @@ func RecoverWalletCli(cliCtx *cli.Context) error { } // RecoverWallet uses a menmonic seed phrase to recover a wallet into the path provided. -func RecoverWallet(ctx context.Context, cfg *RecoverWalletConfig) (*wallet.Wallet, error) { +func RecoverWallet(ctx context.Context, cfg *RecoverWalletConfig) (*wallet.Wallet, []*ethpb.Deposit_Data, error) { // Ensure that the wallet directory does not contain a wallet already dirExists, err := wallet.Exists(cfg.WalletDir) if err != nil { - return nil, err + return nil, nil, err } if dirExists { - return nil, errors.New("a wallet already exists at this location. Please input an" + + return nil, nil, errors.New("a wallet already exists at this location. Please input an" + " alternative location for the new wallet or remove the current wallet") } w := wallet.New(&wallet.Config{ @@ -95,13 +96,13 @@ func RecoverWallet(ctx context.Context, cfg *RecoverWalletConfig) (*wallet.Walle }) keymanagerConfig, err := derived.MarshalOptionsFile(ctx, derived.DefaultKeymanagerOpts()) if err != nil { - return nil, errors.Wrap(err, "could not marshal keymanager config file") + return nil, nil, errors.Wrap(err, "could not marshal keymanager config file") } if err := w.SaveWallet(); err != nil { - return nil, errors.Wrap(err, "could not save wallet to disk") + return nil, nil, errors.Wrap(err, "could not save wallet to disk") } if err := w.WriteKeymanagerConfigToDisk(ctx, keymanagerConfig); err != nil { - return nil, errors.Wrap(err, "could not write keymanager config to disk") + return nil, nil, errors.Wrap(err, "could not write keymanager config to disk") } km, err := derived.KeymanagerForPhrase(ctx, &derived.SetupConfig{ Opts: derived.DefaultKeymanagerOpts(), @@ -109,27 +110,32 @@ func RecoverWallet(ctx context.Context, cfg *RecoverWalletConfig) (*wallet.Walle Mnemonic: cfg.Mnemonic, }) if err != nil { - return nil, errors.Wrap(err, "could not make keymanager for given phrase") + return nil, nil, errors.Wrap(err, "could not make keymanager for given phrase") } if err := km.WriteEncryptedSeedToWallet(ctx, cfg.Mnemonic); err != nil { - return nil, err + return nil, nil, err } + depositDataList := make([]*ethpb.Deposit_Data, cfg.NumAccounts) if cfg.NumAccounts == 1 { - if _, _, err := km.CreateAccount(ctx); err != nil { - return nil, errors.Wrap(err, "could not create account in wallet") + _, depositData, err := km.CreateAccount(ctx) + if err != nil { + return nil, nil, errors.Wrap(err, "could not create account in wallet") } - return w, nil + depositDataList[0] = depositData + return w, nil, nil } for i := int64(0); i < cfg.NumAccounts; i++ { - if _, _, err := km.CreateAccount(ctx); err != nil { - return nil, errors.Wrap(err, "could not create account in wallet") + _, depositData, err := km.CreateAccount(ctx) + if err != nil { + return nil, nil, errors.Wrap(err, "could not create account in wallet") } + depositDataList[i] = depositData } log.WithField("wallet-path", w.AccountsDir()).Infof( "Successfully recovered HD wallet with %d accounts. Please use accounts-v2 list to view details for your accounts", cfg.NumAccounts, ) - return w, nil + return w, depositDataList, nil } func inputMnemonic(cliCtx *cli.Context) (string, error) { diff --git a/validator/rpc/accounts.go b/validator/rpc/accounts.go index ff3f4156db30..02f4a282368e 100644 --- a/validator/rpc/accounts.go +++ b/validator/rpc/accounts.go @@ -13,7 +13,6 @@ import ( "github.com/prysmaticlabs/prysm/shared/bls" "github.com/prysmaticlabs/prysm/shared/cmd" "github.com/prysmaticlabs/prysm/shared/pagination" - "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/petnames" v2 "github.com/prysmaticlabs/prysm/validator/accounts/v2" v2keymanager "github.com/prysmaticlabs/prysm/validator/keymanager/v2" @@ -218,34 +217,14 @@ func (s *Server) DeleteAccounts( func createAccountWithDepositData(ctx context.Context, km accountCreator) (*pb.DepositDataResponse_DepositData, error) { // Create a new validator account using the specified keymanager. - pubKey, depositData, err := km.CreateAccount(ctx) + _, depositData, err := km.CreateAccount(ctx) if err != nil { return nil, errors.Wrap(err, "could not create account in wallet") } - depositMessage := &pb.DepositMessage{ - Pubkey: pubKey, - WithdrawalCredentials: depositData.WithdrawalCredentials, - Amount: depositData.Amount, - } - depositMessageRoot, err := depositMessage.HashTreeRoot() + data, err := v2.DepositDataJSON(depositData) if err != nil { - return nil, err - } - depositDataRoot, err := depositData.HashTreeRoot() - if err != nil { - return nil, err + return nil, errors.Wrap(err, "could not create deposit data JSON") } - // The reason we utilize this map is to ensure we match the format of - // the eth2 deposit cli, which utilizes snake case and hex strings to represent binary data. - // Our gRPC gateway instead uses camel case and base64, which is why we use this workaround. - data := make(map[string]string) - data["pubkey"] = fmt.Sprintf("%x", pubKey) - data["withdrawal_credentials"] = fmt.Sprintf("%x", depositData.WithdrawalCredentials) - data["amount"] = fmt.Sprintf("%d", depositData.Amount) - data["signature"] = fmt.Sprintf("%x", depositData.Signature) - data["deposit_message_root"] = fmt.Sprintf("%x", depositMessageRoot) - data["deposit_data_root"] = fmt.Sprintf("%x", depositDataRoot) - data["fork_version"] = fmt.Sprintf("%x", params.BeaconConfig().GenesisForkVersion) return &pb.DepositDataResponse_DepositData{ Data: data, }, nil diff --git a/validator/rpc/wallet.go b/validator/rpc/wallet.go index 5a0e1966ac95..19b2914a6d88 100644 --- a/validator/rpc/wallet.go +++ b/validator/rpc/wallet.go @@ -49,7 +49,7 @@ func (s *Server) HasWallet(ctx context.Context, _ *ptypes.Empty) (*pb.HasWalletR // CreateWallet via an API request, allowing a user to save a new // derived, direct, or remote wallet. -func (s *Server) CreateWallet(ctx context.Context, req *pb.CreateWalletRequest) (*pb.WalletResponse, error) { +func (s *Server) CreateWallet(ctx context.Context, req *pb.CreateWalletRequest) (*pb.CreateWalletResponse, error) { // Currently defaultWalletPath is used as the wallet directory and req's WalletPath is ignored for simplicity exists, err := wallet.Exists(defaultWalletPath) if err != nil { @@ -99,8 +99,11 @@ func (s *Server) CreateWallet(ctx context.Context, req *pb.CreateWalletRequest) }); err != nil { return nil, err } - return &pb.WalletResponse{ - WalletPath: defaultWalletPath, + return &pb.CreateWalletResponse{ + Wallet: &pb.WalletResponse{ + WalletPath: defaultWalletPath, + KeymanagerKind: pb.KeymanagerKind_DIRECT, + }, }, nil case pb.KeymanagerKind_DERIVED: if req.NumAccounts < 1 { @@ -109,7 +112,7 @@ func (s *Server) CreateWallet(ctx context.Context, req *pb.CreateWalletRequest) if req.Mnemonic == "" { return nil, status.Error(codes.InvalidArgument, "Must include mnemonic in request") } - _, err := v2.RecoverWallet(ctx, &v2.RecoverWalletConfig{ + _, depositData, err := v2.RecoverWallet(ctx, &v2.RecoverWalletConfig{ WalletDir: defaultWalletPath, WalletPassword: req.WalletPassword, Mnemonic: req.Mnemonic, @@ -125,8 +128,25 @@ func (s *Server) CreateWallet(ctx context.Context, req *pb.CreateWalletRequest) }); err != nil { return nil, err } - return &pb.WalletResponse{ - WalletPath: defaultWalletPath, + + depositDataList := make([]*pb.DepositDataResponse_DepositData, len(depositData)) + for i, item := range depositData { + data, err := v2.DepositDataJSON(item) + if err != nil { + return nil, err + } + depositDataList[i] = &pb.DepositDataResponse_DepositData{ + Data: data, + } + } + return &pb.CreateWalletResponse{ + Wallet: &pb.WalletResponse{ + WalletPath: defaultWalletPath, + KeymanagerKind: pb.KeymanagerKind_DERIVED, + }, + AccountsCreated: &pb.DepositDataResponse{ + DepositDataList: depositDataList, + }, }, nil case pb.KeymanagerKind_REMOTE: return nil, status.Error(codes.Unimplemented, "Remote keymanager not yet supported")