From 98c082693d7e8930d98fc8e3d8c0d11768bc5252 Mon Sep 17 00:00:00 2001 From: turtlebasket Date: Thu, 22 Sep 2022 23:01:31 +0000 Subject: [PATCH] hardware specs mandatory in auction creation msg --- proto/colinearcore/tx.proto | 9 ++ x/colinearcore/types/tx.pb.go | 268 +++++++++++++++++++++++++++++----- 2 files changed, 244 insertions(+), 33 deletions(-) diff --git a/proto/colinearcore/tx.proto b/proto/colinearcore/tx.proto index d61a731..0474177 100644 --- a/proto/colinearcore/tx.proto +++ b/proto/colinearcore/tx.proto @@ -5,6 +5,8 @@ package colinear.colinearcore; option go_package = "colinear/x/colinearcore/types"; +import "colinearcore/hardware.proto"; + // Msg defines the Msg service. service Msg { rpc NewAuction(MsgNewAuction) returns (MsgNewAuctionResponse); @@ -26,6 +28,13 @@ message MsgNewAuction { // verified providers just specifies who's allowed to bid on the lease auction. // STORED IN MEMORY. DOES NOT GET WRITTEN TO CHAIN STATE. repeated string verifiedProviders = 7; + + // hardware specs (mandatory) + repeated string gpus = 8; + uint64 cpuCores = 9; + CpuArchitecture cpuArch = 10; + uint64 memMb = 11; + uint64 storageGb = 12; } message MsgNewAuctionResponse { diff --git a/x/colinearcore/types/tx.pb.go b/x/colinearcore/types/tx.pb.go index cd4ba90..e137ec1 100644 --- a/x/colinearcore/types/tx.pb.go +++ b/x/colinearcore/types/tx.pb.go @@ -37,6 +37,12 @@ type MsgNewAuction struct { // verified providers just specifies who's allowed to bid on the lease auction. // STORED IN MEMORY. DOES NOT GET WRITTEN TO CHAIN STATE. VerifiedProviders []string `protobuf:"bytes,7,rep,name=verifiedProviders,proto3" json:"verifiedProviders,omitempty"` + // hardware specs (mandatory) + Gpus []string `protobuf:"bytes,8,rep,name=gpus,proto3" json:"gpus,omitempty"` + CpuCores uint64 `protobuf:"varint,9,opt,name=cpuCores,proto3" json:"cpuCores,omitempty"` + CpuArch CpuArchitecture `protobuf:"varint,10,opt,name=cpuArch,proto3,enum=colinear.colinearcore.CpuArchitecture" json:"cpuArch,omitempty"` + MemMb uint64 `protobuf:"varint,11,opt,name=memMb,proto3" json:"memMb,omitempty"` + StorageGb uint64 `protobuf:"varint,12,opt,name=storageGb,proto3" json:"storageGb,omitempty"` } func (m *MsgNewAuction) Reset() { *m = MsgNewAuction{} } @@ -121,6 +127,41 @@ func (m *MsgNewAuction) GetVerifiedProviders() []string { return nil } +func (m *MsgNewAuction) GetGpus() []string { + if m != nil { + return m.Gpus + } + return nil +} + +func (m *MsgNewAuction) GetCpuCores() uint64 { + if m != nil { + return m.CpuCores + } + return 0 +} + +func (m *MsgNewAuction) GetCpuArch() CpuArchitecture { + if m != nil { + return m.CpuArch + } + return CpuArchitecture_ANY +} + +func (m *MsgNewAuction) GetMemMb() uint64 { + if m != nil { + return m.MemMb + } + return 0 +} + +func (m *MsgNewAuction) GetStorageGb() uint64 { + if m != nil { + return m.StorageGb + } + return 0 +} + type MsgNewAuctionResponse struct { AuctionId string `protobuf:"bytes,1,opt,name=auctionId,proto3" json:"auctionId,omitempty"` } @@ -623,39 +664,45 @@ func init() { func init() { proto.RegisterFile("colinearcore/tx.proto", fileDescriptor_0c3854a2a9bba3b4) } var fileDescriptor_0c3854a2a9bba3b4 = []byte{ - // 512 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x51, 0x8b, 0xd3, 0x40, - 0x10, 0xc7, 0x9b, 0xb6, 0xd7, 0x33, 0x73, 0xe7, 0xc1, 0xad, 0x77, 0x35, 0x46, 0x0d, 0x21, 0x2a, - 0x04, 0xbc, 0x6b, 0x45, 0x11, 0x5f, 0xbd, 0x8a, 0x8a, 0x60, 0x45, 0x8a, 0xbe, 0x08, 0xc2, 0xc5, - 0xec, 0x1a, 0x16, 0xd3, 0xdd, 0xb2, 0x9b, 0x9e, 0xf5, 0x5b, 0xf8, 0xb1, 0x7c, 0x3c, 0xdf, 0xf4, - 0x4d, 0xda, 0x2f, 0x22, 0x6e, 0x92, 0x4d, 0x72, 0xb5, 0x69, 0xe1, 0xde, 0x3a, 0x33, 0xff, 0xf9, - 0x4d, 0x76, 0xe7, 0xdf, 0x85, 0xc3, 0x90, 0xc7, 0x94, 0x91, 0x40, 0x84, 0x5c, 0x90, 0x7e, 0x32, - 0xeb, 0x4d, 0x04, 0x4f, 0x38, 0xd2, 0xe9, 0x5e, 0xb9, 0xee, 0xfd, 0x36, 0xe0, 0xea, 0x50, 0x46, - 0x6f, 0xc8, 0xd7, 0x93, 0x69, 0x98, 0x50, 0xce, 0x90, 0x05, 0xdb, 0xa1, 0x20, 0x41, 0xc2, 0x85, - 0x65, 0xb8, 0x86, 0x6f, 0x8e, 0xf2, 0x10, 0x21, 0x68, 0xb3, 0x60, 0x4c, 0xac, 0xa6, 0x4a, 0xab, - 0xdf, 0xc8, 0x85, 0x1d, 0x4c, 0x64, 0x28, 0xe8, 0xe4, 0x5f, 0xb3, 0xd5, 0x52, 0xa5, 0x72, 0x4a, - 0xf1, 0x08, 0x8d, 0x29, 0x8b, 0xac, 0x76, 0xc6, 0x4b, 0x43, 0x74, 0x00, 0x5b, 0x98, 0x30, 0x3e, - 0xb6, 0xb6, 0x54, 0x3e, 0x0d, 0x90, 0x0d, 0x57, 0x62, 0x12, 0x48, 0xf2, 0x9c, 0x61, 0xab, 0xe3, - 0x1a, 0x7e, 0x7b, 0xa4, 0x63, 0x74, 0x04, 0xfb, 0x67, 0x44, 0xd0, 0xcf, 0x94, 0xe0, 0xb7, 0x82, - 0x9f, 0x51, 0x4c, 0x84, 0xb4, 0xb6, 0xdd, 0x96, 0x6f, 0x8e, 0x96, 0x0b, 0xde, 0x63, 0x38, 0xac, - 0x1c, 0x6d, 0x44, 0xe4, 0x84, 0x33, 0x49, 0xd0, 0x2d, 0x30, 0x83, 0x34, 0xf5, 0x0a, 0x67, 0x87, - 0x2c, 0x12, 0x5e, 0x00, 0x66, 0xda, 0x36, 0xa0, 0xb8, 0xe6, 0x36, 0x3c, 0xd8, 0xcd, 0x7b, 0x18, - 0x26, 0xb3, 0xec, 0x56, 0x2a, 0x39, 0xd4, 0x85, 0x4e, 0x30, 0xe6, 0x53, 0x96, 0x64, 0x17, 0x93, - 0x45, 0xde, 0x35, 0xd8, 0xd7, 0x23, 0xf2, 0xaf, 0xf2, 0x9e, 0xc2, 0xee, 0x50, 0x46, 0xaf, 0x79, - 0xf8, 0xe5, 0xc5, 0x94, 0x61, 0x59, 0x33, 0xba, 0xc0, 0x36, 0x2b, 0xd8, 0x2e, 0x1c, 0x94, 0x09, - 0x9a, 0x3c, 0x80, 0xbd, 0xa1, 0x8c, 0xde, 0xb3, 0xf8, 0x12, 0x6c, 0x0b, 0xba, 0x55, 0x86, 0xa6, - 0x1f, 0xab, 0xc3, 0xa4, 0x95, 0x93, 0x38, 0x5e, 0x33, 0xc0, 0xbb, 0x09, 0x37, 0x96, 0xe4, 0x9a, - 0xf5, 0x52, 0xb9, 0xf1, 0x59, 0x1c, 0xd0, 0xf1, 0xba, 0x0f, 0xad, 0x2c, 0xb1, 0x79, 0x71, 0x89, - 0xd7, 0xd5, 0xee, 0x0b, 0x50, 0x3e, 0xe1, 0xe1, 0xcf, 0x36, 0xb4, 0x86, 0x32, 0x42, 0xa7, 0x00, - 0x25, 0xd3, 0xdf, 0xed, 0xfd, 0xf7, 0xef, 0xd1, 0xab, 0xf8, 0xc7, 0x3e, 0xda, 0x44, 0xa5, 0x5d, - 0xf6, 0x0e, 0x3a, 0x99, 0x89, 0xdc, 0xda, 0xbe, 0x01, 0xc5, 0xb6, 0xbf, 0x4e, 0xa1, 0xa9, 0x1f, - 0xc1, 0x2c, 0x2c, 0x72, 0x67, 0x75, 0x9b, 0x16, 0xd9, 0xf7, 0x37, 0x10, 0x69, 0x7c, 0x08, 0x3b, - 0x65, 0x9f, 0xdc, 0x5b, 0xdd, 0x5b, 0x92, 0xd9, 0xc7, 0x1b, 0xc9, 0xf4, 0x90, 0x18, 0xf6, 0x2e, - 0xd8, 0xc5, 0x5f, 0x07, 0xc8, 0x95, 0xf6, 0x83, 0x4d, 0x95, 0x7a, 0xda, 0x29, 0x40, 0xc9, 0x50, - 0x35, 0x9b, 0x2e, 0x54, 0x75, 0x9b, 0x5e, 0xf6, 0xd4, 0xe0, 0xc9, 0x8f, 0xb9, 0x63, 0x9c, 0xcf, - 0x1d, 0xe3, 0xcf, 0xdc, 0x31, 0xbe, 0x2f, 0x9c, 0xc6, 0xf9, 0xc2, 0x69, 0xfc, 0x5a, 0x38, 0x8d, - 0x0f, 0xb7, 0xf3, 0xee, 0xfe, 0xac, 0x5f, 0x7d, 0x97, 0xbf, 0x4d, 0x88, 0xfc, 0xd4, 0x51, 0x6f, - 0xf3, 0xa3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x40, 0xff, 0x13, 0xb4, 0x05, 0x00, 0x00, + // 601 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x5f, 0x4f, 0xd4, 0x4e, + 0x14, 0xa5, 0xcb, 0xb2, 0xd0, 0x0b, 0x3f, 0x12, 0xe6, 0x07, 0x38, 0x16, 0x6d, 0x9a, 0xfa, 0x27, + 0x4d, 0x84, 0xc5, 0x60, 0x8c, 0xaf, 0xb0, 0x44, 0x89, 0x89, 0x6b, 0xcc, 0x46, 0x5f, 0x4c, 0x4c, + 0x28, 0xed, 0x58, 0x26, 0xb6, 0x9d, 0x66, 0xa6, 0x05, 0xfc, 0x16, 0x7e, 0x2c, 0x1f, 0xf1, 0xcd, + 0x47, 0xc3, 0x7e, 0x10, 0xcd, 0x4e, 0xdb, 0x69, 0xcb, 0xba, 0x7f, 0x12, 0xdf, 0x7a, 0xef, 0x3d, + 0xe7, 0xdc, 0x69, 0xcf, 0x69, 0x06, 0xb6, 0x3c, 0x16, 0xd2, 0x98, 0xb8, 0xdc, 0x63, 0x9c, 0xec, + 0xa7, 0x57, 0xdd, 0x84, 0xb3, 0x94, 0x21, 0xd5, 0xee, 0xd6, 0xe7, 0xc6, 0x4e, 0x03, 0x7d, 0xee, + 0x72, 0xff, 0xd2, 0xe5, 0x24, 0xe7, 0xd8, 0xbf, 0x5b, 0xf0, 0x5f, 0x5f, 0x04, 0x6f, 0xc9, 0xe5, + 0x51, 0xe6, 0xa5, 0x94, 0xc5, 0x08, 0xc3, 0xb2, 0xc7, 0x89, 0x9b, 0x32, 0x8e, 0x35, 0x4b, 0x73, + 0xf4, 0x41, 0x59, 0x22, 0x04, 0xed, 0xd8, 0x8d, 0x08, 0x6e, 0xc9, 0xb6, 0x7c, 0x46, 0x16, 0xac, + 0xfa, 0x44, 0x78, 0x9c, 0x26, 0x23, 0x32, 0x5e, 0x94, 0xa3, 0x7a, 0x4b, 0xea, 0x11, 0x1a, 0xd2, + 0x38, 0xc0, 0xed, 0x42, 0x2f, 0x2f, 0xd1, 0x26, 0x2c, 0xf9, 0x24, 0x66, 0x11, 0x5e, 0x92, 0xfd, + 0xbc, 0x40, 0x06, 0xac, 0x84, 0xc4, 0x15, 0xe4, 0x65, 0xec, 0xe3, 0x8e, 0xa5, 0x39, 0xed, 0x81, + 0xaa, 0xd1, 0x2e, 0x6c, 0x5c, 0x10, 0x4e, 0x3f, 0x53, 0xe2, 0xbf, 0xe3, 0xec, 0x82, 0xfa, 0x84, + 0x0b, 0xbc, 0x6c, 0x2d, 0x3a, 0xfa, 0x60, 0x7c, 0x30, 0x3a, 0x6f, 0x90, 0x64, 0x02, 0xaf, 0x48, + 0x80, 0x7c, 0x1e, 0xa9, 0x7b, 0x49, 0x76, 0xcc, 0x38, 0x11, 0x58, 0xcf, 0xd5, 0xcb, 0x1a, 0x1d, + 0xc2, 0xb2, 0x97, 0x64, 0x47, 0xdc, 0x3b, 0xc7, 0x60, 0x69, 0xce, 0xfa, 0xc1, 0xe3, 0xee, 0x5f, + 0xbf, 0x68, 0xf7, 0x38, 0x47, 0xd1, 0x94, 0x78, 0x69, 0xc6, 0xc9, 0xa0, 0xa4, 0x8d, 0xde, 0x28, + 0x22, 0x51, 0xff, 0x0c, 0xaf, 0x4a, 0xe9, 0xbc, 0x40, 0xf7, 0x40, 0x17, 0x29, 0xe3, 0x6e, 0x40, + 0x4e, 0xce, 0xf0, 0x9a, 0x9c, 0x54, 0x0d, 0xfb, 0x39, 0x6c, 0x35, 0x0c, 0x18, 0x10, 0x91, 0xb0, + 0x58, 0x90, 0x11, 0xcd, 0xcd, 0x5b, 0xaf, 0xfd, 0xc2, 0x8a, 0xaa, 0x61, 0xbb, 0xa0, 0xe7, 0xb4, + 0x1e, 0xf5, 0xa7, 0x78, 0x66, 0xc3, 0x5a, 0xc9, 0x89, 0x7d, 0x72, 0x55, 0x78, 0xd7, 0xe8, 0xa1, + 0x6d, 0xe8, 0xb8, 0x11, 0xcb, 0xe2, 0xb4, 0xb0, 0xaf, 0xa8, 0xec, 0xff, 0x61, 0x43, 0xad, 0x28, + 0x4f, 0x65, 0x1f, 0xc2, 0x5a, 0x5f, 0x04, 0x6f, 0x98, 0xf7, 0xe5, 0x55, 0x16, 0xfb, 0x62, 0xca, + 0xea, 0x4a, 0xb6, 0xd5, 0x90, 0xdd, 0x86, 0xcd, 0xba, 0x82, 0x52, 0xee, 0xc1, 0x7a, 0x5f, 0x04, + 0x1f, 0xe2, 0xf0, 0x1f, 0xb4, 0x31, 0x6c, 0x37, 0x35, 0x94, 0xfa, 0x9e, 0x7c, 0x99, 0x7c, 0x72, + 0x14, 0x86, 0x33, 0x16, 0xd8, 0x3b, 0x70, 0x77, 0x0c, 0xae, 0xb4, 0x4e, 0xe4, 0x3f, 0x73, 0x1c, + 0xba, 0x34, 0x9a, 0x75, 0xd0, 0x86, 0x89, 0xad, 0xdb, 0x26, 0xde, 0x91, 0xde, 0x57, 0x42, 0xe5, + 0x86, 0x83, 0x1f, 0x6d, 0x58, 0xec, 0x8b, 0x00, 0x9d, 0x02, 0xd4, 0x7e, 0xcd, 0x87, 0x13, 0xf2, + 0xd8, 0xc8, 0x8f, 0xb1, 0x3b, 0x0f, 0x4a, 0xa5, 0xec, 0x3d, 0x74, 0x8a, 0x10, 0x59, 0x53, 0x79, + 0x3d, 0xea, 0x1b, 0xce, 0x2c, 0x84, 0x52, 0xfd, 0x04, 0x7a, 0x15, 0x91, 0x07, 0x93, 0x69, 0x0a, + 0x64, 0x3c, 0x99, 0x03, 0xa4, 0xe4, 0x3d, 0x58, 0xad, 0xe7, 0xe4, 0xd1, 0x64, 0x6e, 0x0d, 0x66, + 0xec, 0xcd, 0x05, 0x53, 0x4b, 0x42, 0x58, 0xbf, 0x15, 0x17, 0x67, 0x96, 0x40, 0x89, 0x34, 0x9e, + 0xce, 0x8b, 0x54, 0xdb, 0x4e, 0x01, 0x6a, 0x81, 0x9a, 0xe2, 0x74, 0x85, 0x9a, 0xe6, 0xf4, 0x78, + 0xa6, 0x7a, 0x2f, 0xbe, 0xdf, 0x98, 0xda, 0xf5, 0x8d, 0xa9, 0xfd, 0xba, 0x31, 0xb5, 0x6f, 0x43, + 0x73, 0xe1, 0x7a, 0x68, 0x2e, 0xfc, 0x1c, 0x9a, 0x0b, 0x1f, 0xef, 0x97, 0xec, 0xfd, 0xab, 0xfd, + 0xe6, 0xd5, 0xf2, 0x35, 0x21, 0xe2, 0xac, 0x23, 0xaf, 0x8a, 0x67, 0x7f, 0x02, 0x00, 0x00, 0xff, + 0xff, 0x44, 0xed, 0x86, 0xa7, 0x77, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -938,6 +985,35 @@ func (m *MsgNewAuction) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.StorageGb != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.StorageGb)) + i-- + dAtA[i] = 0x60 + } + if m.MemMb != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.MemMb)) + i-- + dAtA[i] = 0x58 + } + if m.CpuArch != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.CpuArch)) + i-- + dAtA[i] = 0x50 + } + if m.CpuCores != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.CpuCores)) + i-- + dAtA[i] = 0x48 + } + if len(m.Gpus) > 0 { + for iNdEx := len(m.Gpus) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Gpus[iNdEx]) + copy(dAtA[i:], m.Gpus[iNdEx]) + i = encodeVarintTx(dAtA, i, uint64(len(m.Gpus[iNdEx]))) + i-- + dAtA[i] = 0x42 + } + } if len(m.VerifiedProviders) > 0 { for iNdEx := len(m.VerifiedProviders) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.VerifiedProviders[iNdEx]) @@ -1366,6 +1442,24 @@ func (m *MsgNewAuction) Size() (n int) { n += 1 + l + sovTx(uint64(l)) } } + if len(m.Gpus) > 0 { + for _, s := range m.Gpus { + l = len(s) + n += 1 + l + sovTx(uint64(l)) + } + } + if m.CpuCores != 0 { + n += 1 + sovTx(uint64(m.CpuCores)) + } + if m.CpuArch != 0 { + n += 1 + sovTx(uint64(m.CpuArch)) + } + if m.MemMb != 0 { + n += 1 + sovTx(uint64(m.MemMb)) + } + if m.StorageGb != 0 { + n += 1 + sovTx(uint64(m.StorageGb)) + } return n } @@ -1758,6 +1852,114 @@ func (m *MsgNewAuction) Unmarshal(dAtA []byte) error { } m.VerifiedProviders = append(m.VerifiedProviders, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Gpus", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + 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 ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Gpus = append(m.Gpus, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CpuCores", wireType) + } + m.CpuCores = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.CpuCores |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 10: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CpuArch", wireType) + } + m.CpuArch = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.CpuArch |= CpuArchitecture(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 11: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MemMb", wireType) + } + m.MemMb = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.MemMb |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 12: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field StorageGb", wireType) + } + m.StorageGb = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.StorageGb |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:])