update machine message

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>
This commit is contained in:
Lorenz Herzberger 2023-09-06 11:41:54 +02:00
parent 6d7158d124
commit b1f572ddee
No known key found for this signature in database
GPG Key ID: FA5EE906EB55316A
3 changed files with 94 additions and 37 deletions

View File

@ -16,6 +16,7 @@ message Machine {
string machineId = 9;
Metadata metadata = 10;
uint32 type = 11;
string machineIdSignature = 12;
}
message Metadata {

View File

@ -72,6 +72,8 @@ func (s *E2ETestSuite) TearDownSuite() {
func (s *E2ETestSuite) TestAttestMachine() {
val := s.network.Validators[0]
// register Ta
machine := sample.Machine(sample.Name, sample.PubKey)
machineJSON, err := json.Marshal(&machine)
s.Require().NoError(err)
@ -102,4 +104,6 @@ func (s *E2ETestSuite) TestAttestMachine() {
_, err = clitestutil.ExecTestCLICmd(val.ClientCtx, machinecli.CmdGetMachineByPublicKey(), args)
s.Require().NoError(err)
// verify double registration fails
}

View File

@ -23,17 +23,18 @@ var _ = math.Inf
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
type Machine struct {
Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
Ticker string `protobuf:"bytes,2,opt,name=ticker,proto3" json:"ticker,omitempty"`
Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"`
Reissue bool `protobuf:"varint,4,opt,name=reissue,proto3" json:"reissue,omitempty"`
Amount uint64 `protobuf:"varint,5,opt,name=amount,proto3" json:"amount,omitempty"`
Precision uint64 `protobuf:"varint,6,opt,name=precision,proto3" json:"precision,omitempty"`
IssuerPlanetmint string `protobuf:"bytes,7,opt,name=issuerPlanetmint,proto3" json:"issuerPlanetmint,omitempty"`
IssuerLiquid string `protobuf:"bytes,8,opt,name=issuerLiquid,proto3" json:"issuerLiquid,omitempty"`
MachineId string `protobuf:"bytes,9,opt,name=machineId,proto3" json:"machineId,omitempty"`
Metadata *Metadata `protobuf:"bytes,10,opt,name=metadata,proto3" json:"metadata,omitempty"`
Type uint32 `protobuf:"varint,11,opt,name=type,proto3" json:"type,omitempty"`
Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
Ticker string `protobuf:"bytes,2,opt,name=ticker,proto3" json:"ticker,omitempty"`
Domain string `protobuf:"bytes,3,opt,name=domain,proto3" json:"domain,omitempty"`
Reissue bool `protobuf:"varint,4,opt,name=reissue,proto3" json:"reissue,omitempty"`
Amount uint64 `protobuf:"varint,5,opt,name=amount,proto3" json:"amount,omitempty"`
Precision uint64 `protobuf:"varint,6,opt,name=precision,proto3" json:"precision,omitempty"`
IssuerPlanetmint string `protobuf:"bytes,7,opt,name=issuerPlanetmint,proto3" json:"issuerPlanetmint,omitempty"`
IssuerLiquid string `protobuf:"bytes,8,opt,name=issuerLiquid,proto3" json:"issuerLiquid,omitempty"`
MachineId string `protobuf:"bytes,9,opt,name=machineId,proto3" json:"machineId,omitempty"`
Metadata *Metadata `protobuf:"bytes,10,opt,name=metadata,proto3" json:"metadata,omitempty"`
Type uint32 `protobuf:"varint,11,opt,name=type,proto3" json:"type,omitempty"`
MachineIdSignature string `protobuf:"bytes,12,opt,name=machineIdSignature,proto3" json:"machineIdSignature,omitempty"`
}
func (m *Machine) Reset() { *m = Machine{} }
@ -146,6 +147,13 @@ func (m *Machine) GetType() uint32 {
return 0
}
func (m *Machine) GetMachineIdSignature() string {
if m != nil {
return m.MachineIdSignature
}
return ""
}
type Metadata struct {
Gps string `protobuf:"bytes,1,opt,name=gps,proto3" json:"gps,omitempty"`
Device string `protobuf:"bytes,2,opt,name=device,proto3" json:"device,omitempty"`
@ -285,32 +293,33 @@ func init() {
}
var fileDescriptor_1bb279745bef7c4b = []byte{
// 394 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x4a, 0xf3, 0x40,
0x14, 0xc5, 0x3b, 0x6d, 0xbf, 0x36, 0xb9, 0xed, 0x87, 0x75, 0x10, 0x99, 0x85, 0x86, 0x90, 0x55,
0x10, 0x4d, 0x41, 0x17, 0x82, 0x4b, 0xed, 0xa6, 0x60, 0x41, 0xb2, 0x74, 0x37, 0x26, 0x63, 0x1d,
0x6c, 0x26, 0x31, 0x99, 0x4a, 0x05, 0x1f, 0xc1, 0x85, 0x8f, 0xe5, 0xb2, 0x4b, 0xc1, 0x8d, 0xb4,
0x2f, 0x22, 0x99, 0x4c, 0x5a, 0xfb, 0x67, 0xe1, 0x2a, 0xe7, 0x9c, 0x7b, 0x86, 0x49, 0x7e, 0xb9,
0xe0, 0x24, 0x23, 0x2a, 0x98, 0x8c, 0xb8, 0x90, 0xc3, 0xb8, 0x1b, 0xd1, 0xe0, 0x81, 0x0b, 0x56,
0x3e, 0xbd, 0x24, 0x8d, 0x65, 0x8c, 0xf7, 0x7e, 0x77, 0x3c, 0x3d, 0x73, 0xbe, 0xaa, 0xd0, 0x1c,
0x14, 0x1a, 0x63, 0xa8, 0x0b, 0x1a, 0x31, 0x82, 0x6c, 0xe4, 0x9a, 0xbe, 0xd2, 0x78, 0x1f, 0x1a,
0x92, 0x07, 0x8f, 0x2c, 0x25, 0x55, 0x95, 0x6a, 0x97, 0xe7, 0x61, 0x1c, 0x51, 0x2e, 0x48, 0xad,
0xc8, 0x0b, 0x87, 0x09, 0x34, 0x53, 0xc6, 0xb3, 0x6c, 0xcc, 0x48, 0xdd, 0x46, 0xae, 0xe1, 0x97,
0x36, 0x3f, 0x41, 0xa3, 0x78, 0x2c, 0x24, 0xf9, 0x67, 0x23, 0xb7, 0xee, 0x6b, 0x87, 0x0f, 0xc0,
0x4c, 0x52, 0x16, 0xf0, 0x8c, 0xc7, 0x82, 0x34, 0xd4, 0x68, 0x19, 0xe0, 0x23, 0xe8, 0xa8, 0xe3,
0xe9, 0xcd, 0xe2, 0xed, 0x49, 0x53, 0xdd, 0xb8, 0x91, 0x63, 0x07, 0xda, 0x45, 0x76, 0xcd, 0x9f,
0xc6, 0x3c, 0x24, 0x86, 0xea, 0xad, 0x64, 0xf9, 0x6d, 0xfa, 0xd3, 0xfb, 0x21, 0x31, 0x55, 0x61,
0x19, 0xe0, 0x0b, 0x30, 0x22, 0x26, 0x69, 0x48, 0x25, 0x25, 0x60, 0x23, 0xb7, 0x75, 0x6a, 0x79,
0xdb, 0xb0, 0x79, 0x03, 0xdd, 0xf2, 0x17, 0xfd, 0x9c, 0x9e, 0x7c, 0x49, 0x18, 0x69, 0xd9, 0xc8,
0xfd, 0xef, 0x2b, 0xed, 0xbc, 0x21, 0x30, 0xca, 0x2a, 0xee, 0x40, 0x6d, 0x98, 0x64, 0x9a, 0x6e,
0x2e, 0x15, 0x44, 0xf6, 0xcc, 0x03, 0x56, 0xc2, 0x2d, 0x1c, 0x76, 0x61, 0x87, 0x66, 0x19, 0x93,
0x3d, 0x76, 0xcf, 0x05, 0x97, 0x39, 0x98, 0x82, 0xf2, 0x7a, 0x8c, 0x8f, 0x61, 0x97, 0x86, 0xa1,
0xd2, 0x74, 0xd4, 0xa3, 0x92, 0x5e, 0xf5, 0x7b, 0x0a, 0xbc, 0xe9, 0x6f, 0x0e, 0x9c, 0x57, 0x68,
0xeb, 0x7f, 0xdd, 0x17, 0x21, 0x9b, 0xac, 0xc2, 0x40, 0xeb, 0x30, 0xb6, 0xa1, 0xaf, 0xfe, 0x11,
0x7d, 0x6d, 0x13, 0xfd, 0xe5, 0xf9, 0xc7, 0xcc, 0x42, 0xd3, 0x99, 0x85, 0xbe, 0x67, 0x16, 0x7a,
0x9f, 0x5b, 0x95, 0xe9, 0xdc, 0xaa, 0x7c, 0xce, 0xad, 0xca, 0xed, 0xe1, 0x92, 0xf1, 0xc9, 0x30,
0xee, 0x4e, 0x16, 0x1b, 0x9c, 0x43, 0xcc, 0xee, 0x1a, 0x6a, 0x81, 0xcf, 0x7e, 0x02, 0x00, 0x00,
0xff, 0xff, 0xb9, 0x18, 0x24, 0xb2, 0xe6, 0x02, 0x00, 0x00,
// 415 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0x3d, 0x4f, 0xe3, 0x40,
0x10, 0xcd, 0xc6, 0xb9, 0xc4, 0x9e, 0xe4, 0x74, 0xb9, 0xd5, 0xe9, 0xb4, 0xc5, 0x9d, 0x65, 0xb9,
0xb2, 0x4e, 0x77, 0x8e, 0x74, 0x14, 0x48, 0x94, 0x90, 0x26, 0x12, 0x91, 0x90, 0xe9, 0xe8, 0x16,
0x7b, 0x31, 0x2b, 0xe2, 0xb5, 0xb1, 0xd7, 0x28, 0x48, 0xfc, 0x03, 0x28, 0xf8, 0x59, 0x94, 0x29,
0x29, 0x51, 0xf2, 0x47, 0x90, 0xd7, 0x1f, 0x21, 0x1f, 0x05, 0x95, 0xe7, 0xbd, 0x79, 0xbb, 0xe3,
0x7d, 0x6f, 0xc0, 0x4e, 0x66, 0x54, 0x30, 0x19, 0x71, 0x21, 0xc3, 0x78, 0x14, 0x51, 0xff, 0x9a,
0x0b, 0x56, 0x7f, 0xdd, 0x24, 0x8d, 0x65, 0x8c, 0x7f, 0x7c, 0xd4, 0xb8, 0x55, 0xcf, 0x7e, 0xd4,
0xa0, 0x37, 0x2d, 0x6b, 0x8c, 0xa1, 0x23, 0x68, 0xc4, 0x08, 0xb2, 0x90, 0x63, 0x78, 0xaa, 0xc6,
0x3f, 0xa1, 0x2b, 0xb9, 0x7f, 0xc3, 0x52, 0xd2, 0x56, 0x6c, 0x85, 0x0a, 0x3e, 0x88, 0x23, 0xca,
0x05, 0xd1, 0x4a, 0xbe, 0x44, 0x98, 0x40, 0x2f, 0x65, 0x3c, 0xcb, 0x72, 0x46, 0x3a, 0x16, 0x72,
0x74, 0xaf, 0x86, 0xc5, 0x09, 0x1a, 0xc5, 0xb9, 0x90, 0xe4, 0x8b, 0x85, 0x9c, 0x8e, 0x57, 0x21,
0xfc, 0x0b, 0x8c, 0x24, 0x65, 0x3e, 0xcf, 0x78, 0x2c, 0x48, 0x57, 0xb5, 0xd6, 0x04, 0xfe, 0x03,
0x43, 0x75, 0x3c, 0x3d, 0x6b, 0xfe, 0x9e, 0xf4, 0xd4, 0xc4, 0x1d, 0x1e, 0xdb, 0x30, 0x28, 0xb9,
0x53, 0x7e, 0x9b, 0xf3, 0x80, 0xe8, 0x4a, 0xb7, 0xc1, 0x15, 0xd3, 0xaa, 0xa7, 0x4f, 0x02, 0x62,
0x28, 0xc1, 0x9a, 0xc0, 0x47, 0xa0, 0x47, 0x4c, 0xd2, 0x80, 0x4a, 0x4a, 0xc0, 0x42, 0x4e, 0xff,
0xbf, 0xe9, 0xee, 0xb3, 0xcd, 0x9d, 0x56, 0x2a, 0xaf, 0xd1, 0x17, 0xee, 0xc9, 0xfb, 0x84, 0x91,
0xbe, 0x85, 0x9c, 0xaf, 0x9e, 0xaa, 0xb1, 0x0b, 0xb8, 0xb9, 0xfc, 0x9c, 0x87, 0x82, 0xca, 0x3c,
0x65, 0x64, 0xa0, 0xc6, 0xee, 0xe9, 0xd8, 0x4f, 0x08, 0xf4, 0xfa, 0x6a, 0x3c, 0x04, 0x2d, 0x4c,
0xb2, 0x2a, 0x8d, 0xa2, 0x54, 0xa6, 0xb3, 0x3b, 0xee, 0xb3, 0x3a, 0x8c, 0x12, 0x61, 0x07, 0xbe,
0xd1, 0x2c, 0x63, 0x72, 0xcc, 0xae, 0xb8, 0xe0, 0xb2, 0x30, 0xb2, 0x4c, 0x65, 0x9b, 0xc6, 0x7f,
0xe1, 0x3b, 0x0d, 0x02, 0x55, 0xd3, 0xd9, 0x98, 0x4a, 0x7a, 0x32, 0x19, 0xab, 0xa0, 0x0c, 0x6f,
0xb7, 0x61, 0x3f, 0xc0, 0xa0, 0xda, 0x8d, 0x89, 0x08, 0xd8, 0x7c, 0xd3, 0x3c, 0xb4, 0x6d, 0xde,
0xbe, 0xa8, 0xda, 0x9f, 0x8c, 0x4a, 0xdb, 0x8d, 0xea, 0xf8, 0xf0, 0x65, 0x69, 0xa2, 0xc5, 0xd2,
0x44, 0x6f, 0x4b, 0x13, 0x3d, 0xaf, 0xcc, 0xd6, 0x62, 0x65, 0xb6, 0x5e, 0x57, 0x66, 0xeb, 0xe2,
0xf7, 0x3a, 0x93, 0x7f, 0x61, 0x3c, 0x9a, 0x37, 0x1b, 0x5f, 0x98, 0x9e, 0x5d, 0x76, 0xd5, 0xc2,
0x1f, 0xbc, 0x07, 0x00, 0x00, 0xff, 0xff, 0xec, 0xa8, 0x9d, 0xcd, 0x16, 0x03, 0x00, 0x00,
}
func (m *Machine) Marshal() (dAtA []byte, err error) {
@ -333,6 +342,13 @@ func (m *Machine) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
if len(m.MachineIdSignature) > 0 {
i -= len(m.MachineIdSignature)
copy(dAtA[i:], m.MachineIdSignature)
i = encodeVarintMachine(dAtA, i, uint64(len(m.MachineIdSignature)))
i--
dAtA[i] = 0x62
}
if m.Type != 0 {
i = encodeVarintMachine(dAtA, i, uint64(m.Type))
i--
@ -567,6 +583,10 @@ func (m *Machine) Size() (n int) {
if m.Type != 0 {
n += 1 + sovMachine(uint64(m.Type))
}
l = len(m.MachineIdSignature)
if l > 0 {
n += 1 + l + sovMachine(uint64(l))
}
return n
}
@ -956,6 +976,38 @@ func (m *Machine) Unmarshal(dAtA []byte) error {
break
}
}
case 12:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field MachineIdSignature", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMachine
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
stringLen |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthMachine
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return ErrInvalidLengthMachine
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.MachineIdSignature = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipMachine(dAtA[iNdEx:])