adjusted machine.proto and updated code accordingly

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>

.gitignore

@@ -1 +1,2 @@
 planetmint-god
+.vscode

proto/planetmintgo/machine/machine.proto

@@ -8,8 +8,18 @@ message Machine {
   string name = 1; 
   string ticker = 2; 
   uint64 issued = 3; 
-  uint64 precision = 4; 
+  uint64 amount = 4; 
-  string issuerPlanetmint = 5; 
+  uint64 precision = 5; 
-  string issuerLiquid = 6; 
+  string issuerPlanetmint = 6; 
-  string cid = 7; 
+  string issuerLiquid = 7; 
+  string machineId = 8; 
+  Metadata metadata = 9;
 }
+
+message Metadata {
+
+  map<string, string> gps = 1;
+  map<string, string> device = 2;
+  map<string, string> assetDefinition = 3;
+  string additionalDataCID = 4; 
+}

testutil/keeper/asset.go

@@ -48,8 +48,8 @@ func AssetKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
 	ctrl := gomock.NewController(t)
 	mk := assettestutils.NewMockMachineKeeper(ctrl)
 	sk, pk := sample.KeyPair()
-	mk.EXPECT().GetMachine(ctx, pk).Return(sample.Machine(pk, pk), true).AnyTimes()
+	mk.EXPECT().GetMachine(ctx, pk).Return(sample.Machine(pk, pk, pk), true).AnyTimes()
-	mk.EXPECT().GetMachine(ctx, sk).Return(sample.Machine(pk, pk), false).AnyTimes()
+	mk.EXPECT().GetMachine(ctx, sk).Return(sample.Machine(pk, pk, pk), false).AnyTimes()
 
 	k := keeper.NewKeeper(
 		cdc,

testutil/sample/sample.go

@@ -23,15 +23,33 @@ func AccAddress() string {
 	return sdk.AccAddress(addr).String()
 }
 
-func Machine(pkPM string, pkL string) machinetypes.Machine {
+func Machine(machineId string, pkPM string, pkL string) machinetypes.Machine {
 	m := machinetypes.Machine{
 		Name:             "machine",
 		Ticker:           "PM",
 		Issued:           1,
+		Amount:           1000,
 		Precision:        8,
 		IssuerPlanetmint: pkPM,
 		IssuerLiquid:     pkL,
-		Cid:              "Cid",
+		MachineId:        machineId,
 	}
 	return m
 }
+
+func Metadata() machinetypes.Metadata {
+	return machinetypes.Metadata{
+		Gps: map[string]string{
+			"Latitude":  "-48.876667",
+			"Longitude": "-123.393333",
+		},
+		Device: map[string]string{
+			"Manufacturer": "RDDL",
+			"Serial":       "AdnT2uyt",
+		},
+		AssetDefinition: map[string]string{
+			"Version": "0.1",
+		},
+		AdditionalDataCID: "CID",
+	}
+}

x/machine/types/machine.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: planetmintgo/machine/machine.proto
+// source: proto/planetmintgo/machine/machine.proto
 
 package types
 
@@ -23,20 +23,22 @@ 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"`
+	Name             string    `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Ticker           string `protobuf:"bytes,2,opt,name=ticker,proto3" json:"ticker,omitempty"`
+	Ticker           string    `protobuf:"bytes,2,opt,name=ticker,proto3" json:"ticker,omitempty"`
-	Issued           uint64 `protobuf:"varint,3,opt,name=issued,proto3" json:"issued,omitempty"`
+	Issued           uint64    `protobuf:"varint,3,opt,name=issued,proto3" json:"issued,omitempty"`
-	Precision        uint64 `protobuf:"varint,4,opt,name=precision,proto3" json:"precision,omitempty"`
+	Amount           uint64    `protobuf:"varint,4,opt,name=amount,proto3" json:"amount,omitempty"`
-	IssuerPlanetmint string `protobuf:"bytes,5,opt,name=issuerPlanetmint,proto3" json:"issuerPlanetmint,omitempty"`
+	Precision        uint64    `protobuf:"varint,5,opt,name=precision,proto3" json:"precision,omitempty"`
-	IssuerLiquid     string `protobuf:"bytes,6,opt,name=issuerLiquid,proto3" json:"issuerLiquid,omitempty"`
+	IssuerPlanetmint string    `protobuf:"bytes,6,opt,name=issuerPlanetmint,proto3" json:"issuerPlanetmint,omitempty"`
-	Cid              string `protobuf:"bytes,7,opt,name=cid,proto3" json:"cid,omitempty"`
+	IssuerLiquid     string    `protobuf:"bytes,7,opt,name=issuerLiquid,proto3" json:"issuerLiquid,omitempty"`
+	MachineId        string    `protobuf:"bytes,8,opt,name=machineId,proto3" json:"machineId,omitempty"`
+	Metadata         *Metadata `protobuf:"bytes,9,opt,name=metadata,proto3" json:"metadata,omitempty"`
 }
 
 func (m *Machine) Reset()         { *m = Machine{} }
 func (m *Machine) String() string { return proto.CompactTextString(m) }
 func (*Machine) ProtoMessage()    {}
 func (*Machine) Descriptor() ([]byte, []int) {
-	return fileDescriptor_1bb279745bef7c4b, []int{0}
+	return fileDescriptor_cd9f258b3d94bc1e, []int{0}
 }
 func (m *Machine) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -86,6 +88,13 @@ func (m *Machine) GetIssued() uint64 {
 	return 0
 }
 
+func (m *Machine) GetAmount() uint64 {
+	if m != nil {
+		return m.Amount
+	}
+	return 0
+}
+
 func (m *Machine) GetPrecision() uint64 {
 	if m != nil {
 		return m.Precision
@@ -107,38 +116,130 @@ func (m *Machine) GetIssuerLiquid() string {
 	return ""
 }
 
-func (m *Machine) GetCid() string {
+func (m *Machine) GetMachineId() string {
 	if m != nil {
-		return m.Cid
+		return m.MachineId
+	}
+	return ""
+}
+
+func (m *Machine) GetMetadata() *Metadata {
+	if m != nil {
+		return m.Metadata
+	}
+	return nil
+}
+
+type Metadata struct {
+	Gps               map[string]string `protobuf:"bytes,1,rep,name=gps,proto3" json:"gps,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Device            map[string]string `protobuf:"bytes,2,rep,name=device,proto3" json:"device,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	AssetDefinition   map[string]string `protobuf:"bytes,3,rep,name=assetDefinition,proto3" json:"assetDefinition,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	AdditionalDataCID string            `protobuf:"bytes,4,opt,name=additionalDataCID,proto3" json:"additionalDataCID,omitempty"`
+}
+
+func (m *Metadata) Reset()         { *m = Metadata{} }
+func (m *Metadata) String() string { return proto.CompactTextString(m) }
+func (*Metadata) ProtoMessage()    {}
+func (*Metadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_cd9f258b3d94bc1e, []int{1}
+}
+func (m *Metadata) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *Metadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_Metadata.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 *Metadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Metadata.Merge(m, src)
+}
+func (m *Metadata) XXX_Size() int {
+	return m.Size()
+}
+func (m *Metadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_Metadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Metadata proto.InternalMessageInfo
+
+func (m *Metadata) GetGps() map[string]string {
+	if m != nil {
+		return m.Gps
+	}
+	return nil
+}
+
+func (m *Metadata) GetDevice() map[string]string {
+	if m != nil {
+		return m.Device
+	}
+	return nil
+}
+
+func (m *Metadata) GetAssetDefinition() map[string]string {
+	if m != nil {
+		return m.AssetDefinition
+	}
+	return nil
+}
+
+func (m *Metadata) GetAdditionalDataCID() string {
+	if m != nil {
+		return m.AdditionalDataCID
 	}
 	return ""
 }
 
 func init() {
 	proto.RegisterType((*Machine)(nil), "planetmintgo.machine.Machine")
+	proto.RegisterType((*Metadata)(nil), "planetmintgo.machine.Metadata")
+	proto.RegisterMapType((map[string]string)(nil), "planetmintgo.machine.Metadata.AssetDefinitionEntry")
+	proto.RegisterMapType((map[string]string)(nil), "planetmintgo.machine.Metadata.DeviceEntry")
+	proto.RegisterMapType((map[string]string)(nil), "planetmintgo.machine.Metadata.GpsEntry")
 }
 
 func init() {
-	proto.RegisterFile("planetmintgo/machine/machine.proto", fileDescriptor_1bb279745bef7c4b)
+	proto.RegisterFile("proto/planetmintgo/machine/machine.proto", fileDescriptor_cd9f258b3d94bc1e)
 }
 
-var fileDescriptor_1bb279745bef7c4b = []byte{
+var fileDescriptor_cd9f258b3d94bc1e = []byte{
-	// 233 bytes of a gzipped FileDescriptorProto
+	// 436 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2a, 0xc8, 0x49, 0xcc,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x41, 0x8b, 0xd3, 0x40,
-	0x4b, 0x2d, 0xc9, 0xcd, 0xcc, 0x2b, 0x49, 0xcf, 0xd7, 0xcf, 0x4d, 0x4c, 0xce, 0xc8, 0xcc, 0x4b,
+	0x14, 0xee, 0x24, 0xdd, 0x6c, 0xf2, 0x2a, 0xb8, 0x0e, 0x45, 0x86, 0x45, 0x43, 0xe8, 0xc5, 0xb0,
-	0x85, 0xd1, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x22, 0xc8, 0x6a, 0xf4, 0xa0, 0x72, 0x4a,
+	0x68, 0x0a, 0xbb, 0xa0, 0xee, 0xde, 0xac, 0x11, 0x59, 0x70, 0x41, 0x72, 0x14, 0x3c, 0x8c, 0xc9,
-	0x67, 0x19, 0xb9, 0xd8, 0x7d, 0x21, 0x6c, 0x21, 0x21, 0x2e, 0x96, 0xbc, 0xc4, 0xdc, 0x54, 0x09,
+	0x58, 0x87, 0x6d, 0x26, 0x31, 0x33, 0x59, 0xec, 0xbf, 0xf0, 0x8f, 0xf8, 0x3f, 0xbc, 0x08, 0x7b,
-	0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x30, 0x5b, 0x48, 0x8c, 0x8b, 0xad, 0x24, 0x33, 0x39, 0x3b,
+	0xf4, 0x28, 0xed, 0x1f, 0x91, 0x4c, 0xa6, 0xed, 0xd6, 0x16, 0x4b, 0x4f, 0x79, 0xef, 0x7b, 0xdf,
-	0xb5, 0x48, 0x82, 0x09, 0x2c, 0x0a, 0xe5, 0x81, 0xc4, 0x33, 0x8b, 0x8b, 0x4b, 0x53, 0x53, 0x24,
+	0xf7, 0x4d, 0xde, 0x9b, 0x79, 0x10, 0x96, 0x55, 0xa1, 0x8a, 0x61, 0x39, 0xa1, 0x82, 0xa9, 0x9c,
-	0x98, 0x15, 0x18, 0x35, 0x58, 0x82, 0xa0, 0x3c, 0x21, 0x19, 0x2e, 0xce, 0x82, 0xa2, 0xd4, 0xe4,
+	0x0b, 0x35, 0x2e, 0x86, 0x39, 0x4d, 0xbf, 0x70, 0xc1, 0x16, 0xdf, 0x48, 0x53, 0x70, 0xff, 0x2e,
-	0xcc, 0xe2, 0xcc, 0xfc, 0x3c, 0x09, 0x16, 0xb0, 0x14, 0x42, 0x40, 0x48, 0x8b, 0x4b, 0x00, 0xac,
+	0x27, 0x32, 0xb5, 0xc1, 0x0f, 0x0b, 0x0e, 0xaf, 0xda, 0x18, 0x63, 0xe8, 0x0a, 0x9a, 0x33, 0x82,
-	0xae, 0x28, 0x00, 0xee, 0x16, 0x09, 0x56, 0xb0, 0xb9, 0x18, 0xe2, 0x42, 0x4a, 0x5c, 0x3c, 0x10,
+	0x02, 0x14, 0x7a, 0x89, 0x8e, 0xf1, 0x43, 0x70, 0x14, 0x4f, 0xaf, 0x59, 0x45, 0x2c, 0x8d, 0x9a,
-	0x31, 0x9f, 0xcc, 0xc2, 0xd2, 0xcc, 0x14, 0x09, 0x36, 0xb0, 0x3a, 0x14, 0x31, 0x21, 0x01, 0x2e,
+	0xac, 0xc1, 0xb9, 0x94, 0x35, 0xcb, 0x88, 0x1d, 0xa0, 0xb0, 0x9b, 0x98, 0xac, 0xc1, 0x69, 0x5e,
-	0xe6, 0xe4, 0xcc, 0x14, 0x09, 0x76, 0xb0, 0x14, 0x88, 0xe9, 0x64, 0x7e, 0xe2, 0x91, 0x1c, 0xe3,
+	0xd4, 0x42, 0x91, 0x6e, 0x8b, 0xb7, 0x19, 0x7e, 0x04, 0x5e, 0x59, 0xb1, 0x94, 0x4b, 0x5e, 0x08,
-	0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c,
+	0x72, 0xa0, 0x4b, 0x2b, 0x00, 0x9f, 0xc0, 0x91, 0xd6, 0x57, 0xef, 0x97, 0xff, 0x48, 0x1c, 0x7d,
-	0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0xb2, 0x08, 0xff, 0xeb, 0xa6, 0xe7, 0xeb, 0x57, 0xc0, 0x83,
+	0xde, 0x06, 0x8e, 0x07, 0x70, 0xaf, 0xc5, 0xde, 0xf1, 0xaf, 0x35, 0xcf, 0xc8, 0xa1, 0xe6, 0xad,
-	0xa9, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x4a, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff,
+	0x61, 0xcd, 0x69, 0xa6, 0xc1, 0xcb, 0x8c, 0xb8, 0x9a, 0xb0, 0x02, 0xf0, 0x05, 0xb8, 0x39, 0x53,
-	0xff, 0x75, 0xea, 0x66, 0x71, 0x4b, 0x01, 0x00, 0x00,
+	0x34, 0xa3, 0x8a, 0x12, 0x2f, 0x40, 0x61, 0xef, 0xd4, 0x8f, 0xb6, 0x0d, 0x27, 0xba, 0x32, 0xac,
+	0x64, 0xc9, 0x1f, 0xfc, 0xb2, 0xc1, 0x5d, 0xc0, 0xf8, 0x1c, 0xec, 0x71, 0x29, 0x09, 0x0a, 0xec,
+	0xb0, 0x77, 0xfa, 0xe4, 0xff, 0x1e, 0xd1, 0xdb, 0x52, 0xbe, 0x11, 0xaa, 0x9a, 0x26, 0x8d, 0x06,
+	0x8f, 0xc0, 0xc9, 0xd8, 0x0d, 0x4f, 0x19, 0xb1, 0xb4, 0xfa, 0x64, 0x87, 0x3a, 0xd6, 0xe4, 0xd6,
+	0xc0, 0x28, 0xf1, 0x47, 0xb8, 0x4f, 0xa5, 0x64, 0x2a, 0x66, 0x9f, 0xb9, 0xe0, 0xaa, 0x99, 0xac,
+	0xad, 0xcd, 0xce, 0x76, 0x98, 0xbd, 0x5a, 0x57, 0xb5, 0xae, 0xff, 0x7a, 0xe1, 0xa7, 0xf0, 0x80,
+	0x66, 0x99, 0x8e, 0xe9, 0x24, 0xa6, 0x8a, 0xbe, 0xbe, 0x8c, 0xf5, 0xad, 0x7a, 0xc9, 0x66, 0xe1,
+	0xf8, 0x39, 0xb8, 0x8b, 0x0e, 0xf1, 0x11, 0xd8, 0xd7, 0x6c, 0x6a, 0xde, 0x51, 0x13, 0xe2, 0x3e,
+	0x1c, 0xdc, 0xd0, 0x49, 0xcd, 0xcc, 0x2b, 0x6a, 0x93, 0x0b, 0xeb, 0x25, 0x3a, 0x3e, 0x87, 0xde,
+	0x9d, 0xde, 0xf6, 0x92, 0x8e, 0xa0, 0xbf, 0xad, 0x93, 0x7d, 0x3c, 0x46, 0x2f, 0x7e, 0xce, 0x7c,
+	0x74, 0x3b, 0xf3, 0xd1, 0x9f, 0x99, 0x8f, 0xbe, 0xcf, 0xfd, 0xce, 0xed, 0xdc, 0xef, 0xfc, 0x9e,
+	0xfb, 0x9d, 0x0f, 0x8f, 0x57, 0x33, 0x7c, 0x36, 0x2e, 0x86, 0xdf, 0x96, 0x6b, 0xa5, 0xa6, 0x25,
+	0x93, 0x9f, 0x1c, 0xbd, 0x55, 0x67, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xde, 0x46, 0x2a, 0xfa,
+	0x81, 0x03, 0x00, 0x00,
 }
 
 func (m *Machine) Marshal() (dAtA []byte, err error) {
@@ -161,30 +262,47 @@ func (m *Machine) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if len(m.Cid) > 0 {
+	if m.Metadata != nil {
-		i -= len(m.Cid)
+		{
-		copy(dAtA[i:], m.Cid)
+			size, err := m.Metadata.MarshalToSizedBuffer(dAtA[:i])
-		i = encodeVarintMachine(dAtA, i, uint64(len(m.Cid)))
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintMachine(dAtA, i, uint64(size))
+		}
 		i--
-		dAtA[i] = 0x3a
+		dAtA[i] = 0x4a
+	}
+	if len(m.MachineId) > 0 {
+		i -= len(m.MachineId)
+		copy(dAtA[i:], m.MachineId)
+		i = encodeVarintMachine(dAtA, i, uint64(len(m.MachineId)))
+		i--
+		dAtA[i] = 0x42
 	}
 	if len(m.IssuerLiquid) > 0 {
 		i -= len(m.IssuerLiquid)
 		copy(dAtA[i:], m.IssuerLiquid)
 		i = encodeVarintMachine(dAtA, i, uint64(len(m.IssuerLiquid)))
 		i--
-		dAtA[i] = 0x32
+		dAtA[i] = 0x3a
 	}
 	if len(m.IssuerPlanetmint) > 0 {
 		i -= len(m.IssuerPlanetmint)
 		copy(dAtA[i:], m.IssuerPlanetmint)
 		i = encodeVarintMachine(dAtA, i, uint64(len(m.IssuerPlanetmint)))
 		i--
-		dAtA[i] = 0x2a
+		dAtA[i] = 0x32
 	}
 	if m.Precision != 0 {
 		i = encodeVarintMachine(dAtA, i, uint64(m.Precision))
 		i--
+		dAtA[i] = 0x28
+	}
+	if m.Amount != 0 {
+		i = encodeVarintMachine(dAtA, i, uint64(m.Amount))
+		i--
 		dAtA[i] = 0x20
 	}
 	if m.Issued != 0 {
@@ -209,6 +327,93 @@ func (m *Machine) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
+func (m *Metadata) 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 *Metadata) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Metadata) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.AdditionalDataCID) > 0 {
+		i -= len(m.AdditionalDataCID)
+		copy(dAtA[i:], m.AdditionalDataCID)
+		i = encodeVarintMachine(dAtA, i, uint64(len(m.AdditionalDataCID)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if len(m.AssetDefinition) > 0 {
+		for k := range m.AssetDefinition {
+			v := m.AssetDefinition[k]
+			baseI := i
+			i -= len(v)
+			copy(dAtA[i:], v)
+			i = encodeVarintMachine(dAtA, i, uint64(len(v)))
+			i--
+			dAtA[i] = 0x12
+			i -= len(k)
+			copy(dAtA[i:], k)
+			i = encodeVarintMachine(dAtA, i, uint64(len(k)))
+			i--
+			dAtA[i] = 0xa
+			i = encodeVarintMachine(dAtA, i, uint64(baseI-i))
+			i--
+			dAtA[i] = 0x1a
+		}
+	}
+	if len(m.Device) > 0 {
+		for k := range m.Device {
+			v := m.Device[k]
+			baseI := i
+			i -= len(v)
+			copy(dAtA[i:], v)
+			i = encodeVarintMachine(dAtA, i, uint64(len(v)))
+			i--
+			dAtA[i] = 0x12
+			i -= len(k)
+			copy(dAtA[i:], k)
+			i = encodeVarintMachine(dAtA, i, uint64(len(k)))
+			i--
+			dAtA[i] = 0xa
+			i = encodeVarintMachine(dAtA, i, uint64(baseI-i))
+			i--
+			dAtA[i] = 0x12
+		}
+	}
+	if len(m.Gps) > 0 {
+		for k := range m.Gps {
+			v := m.Gps[k]
+			baseI := i
+			i -= len(v)
+			copy(dAtA[i:], v)
+			i = encodeVarintMachine(dAtA, i, uint64(len(v)))
+			i--
+			dAtA[i] = 0x12
+			i -= len(k)
+			copy(dAtA[i:], k)
+			i = encodeVarintMachine(dAtA, i, uint64(len(k)))
+			i--
+			dAtA[i] = 0xa
+			i = encodeVarintMachine(dAtA, i, uint64(baseI-i))
+			i--
+			dAtA[i] = 0xa
+		}
+	}
+	return len(dAtA) - i, nil
+}
+
 func encodeVarintMachine(dAtA []byte, offset int, v uint64) int {
 	offset -= sovMachine(v)
 	base := offset
@@ -237,6 +442,9 @@ func (m *Machine) Size() (n int) {
 	if m.Issued != 0 {
 		n += 1 + sovMachine(uint64(m.Issued))
 	}
+	if m.Amount != 0 {
+		n += 1 + sovMachine(uint64(m.Amount))
+	}
 	if m.Precision != 0 {
 		n += 1 + sovMachine(uint64(m.Precision))
 	}
@@ -248,7 +456,48 @@ func (m *Machine) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovMachine(uint64(l))
 	}
-	l = len(m.Cid)
+	l = len(m.MachineId)
+	if l > 0 {
+		n += 1 + l + sovMachine(uint64(l))
+	}
+	if m.Metadata != nil {
+		l = m.Metadata.Size()
+		n += 1 + l + sovMachine(uint64(l))
+	}
+	return n
+}
+
+func (m *Metadata) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if len(m.Gps) > 0 {
+		for k, v := range m.Gps {
+			_ = k
+			_ = v
+			mapEntrySize := 1 + len(k) + sovMachine(uint64(len(k))) + 1 + len(v) + sovMachine(uint64(len(v)))
+			n += mapEntrySize + 1 + sovMachine(uint64(mapEntrySize))
+		}
+	}
+	if len(m.Device) > 0 {
+		for k, v := range m.Device {
+			_ = k
+			_ = v
+			mapEntrySize := 1 + len(k) + sovMachine(uint64(len(k))) + 1 + len(v) + sovMachine(uint64(len(v)))
+			n += mapEntrySize + 1 + sovMachine(uint64(mapEntrySize))
+		}
+	}
+	if len(m.AssetDefinition) > 0 {
+		for k, v := range m.AssetDefinition {
+			_ = k
+			_ = v
+			mapEntrySize := 1 + len(k) + sovMachine(uint64(len(k))) + 1 + len(v) + sovMachine(uint64(len(v)))
+			n += mapEntrySize + 1 + sovMachine(uint64(mapEntrySize))
+		}
+	}
+	l = len(m.AdditionalDataCID)
 	if l > 0 {
 		n += 1 + l + sovMachine(uint64(l))
 	}
@@ -374,6 +623,25 @@ func (m *Machine) Unmarshal(dAtA []byte) error {
 				}
 			}
 		case 4:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType)
+			}
+			m.Amount = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowMachine
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.Amount |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+		case 5:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Precision", wireType)
 			}
@@ -392,7 +660,7 @@ func (m *Machine) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-		case 5:
+		case 6:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field IssuerPlanetmint", wireType)
 			}
@@ -424,7 +692,7 @@ func (m *Machine) Unmarshal(dAtA []byte) error {
 			}
 			m.IssuerPlanetmint = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 6:
+		case 7:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field IssuerLiquid", wireType)
 			}
@@ -456,9 +724,9 @@ func (m *Machine) Unmarshal(dAtA []byte) error {
 			}
 			m.IssuerLiquid = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 7:
+		case 8:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Cid", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field MachineId", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -486,7 +754,506 @@ func (m *Machine) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.Cid = string(dAtA[iNdEx:postIndex])
+			m.MachineId = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 9:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Metadata", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowMachine
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthMachine
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthMachine
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Metadata == nil {
+				m.Metadata = &Metadata{}
+			}
+			if err := m.Metadata.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipMachine(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthMachine
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *Metadata) 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 ErrIntOverflowMachine
+			}
+			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: Metadata: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: Metadata: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Gps", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowMachine
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthMachine
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthMachine
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Gps == nil {
+				m.Gps = make(map[string]string)
+			}
+			var mapkey string
+			var mapvalue string
+			for iNdEx < postIndex {
+				entryPreIndex := iNdEx
+				var wire uint64
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return ErrIntOverflowMachine
+					}
+					if iNdEx >= l {
+						return io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					wire |= uint64(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				fieldNum := int32(wire >> 3)
+				if fieldNum == 1 {
+					var stringLenmapkey uint64
+					for shift := uint(0); ; shift += 7 {
+						if shift >= 64 {
+							return ErrIntOverflowMachine
+						}
+						if iNdEx >= l {
+							return io.ErrUnexpectedEOF
+						}
+						b := dAtA[iNdEx]
+						iNdEx++
+						stringLenmapkey |= uint64(b&0x7F) << shift
+						if b < 0x80 {
+							break
+						}
+					}
+					intStringLenmapkey := int(stringLenmapkey)
+					if intStringLenmapkey < 0 {
+						return ErrInvalidLengthMachine
+					}
+					postStringIndexmapkey := iNdEx + intStringLenmapkey
+					if postStringIndexmapkey < 0 {
+						return ErrInvalidLengthMachine
+					}
+					if postStringIndexmapkey > l {
+						return io.ErrUnexpectedEOF
+					}
+					mapkey = string(dAtA[iNdEx:postStringIndexmapkey])
+					iNdEx = postStringIndexmapkey
+				} else if fieldNum == 2 {
+					var stringLenmapvalue uint64
+					for shift := uint(0); ; shift += 7 {
+						if shift >= 64 {
+							return ErrIntOverflowMachine
+						}
+						if iNdEx >= l {
+							return io.ErrUnexpectedEOF
+						}
+						b := dAtA[iNdEx]
+						iNdEx++
+						stringLenmapvalue |= uint64(b&0x7F) << shift
+						if b < 0x80 {
+							break
+						}
+					}
+					intStringLenmapvalue := int(stringLenmapvalue)
+					if intStringLenmapvalue < 0 {
+						return ErrInvalidLengthMachine
+					}
+					postStringIndexmapvalue := iNdEx + intStringLenmapvalue
+					if postStringIndexmapvalue < 0 {
+						return ErrInvalidLengthMachine
+					}
+					if postStringIndexmapvalue > l {
+						return io.ErrUnexpectedEOF
+					}
+					mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue])
+					iNdEx = postStringIndexmapvalue
+				} else {
+					iNdEx = entryPreIndex
+					skippy, err := skipMachine(dAtA[iNdEx:])
+					if err != nil {
+						return err
+					}
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
+						return ErrInvalidLengthMachine
+					}
+					if (iNdEx + skippy) > postIndex {
+						return io.ErrUnexpectedEOF
+					}
+					iNdEx += skippy
+				}
+			}
+			m.Gps[mapkey] = mapvalue
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Device", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowMachine
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthMachine
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthMachine
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Device == nil {
+				m.Device = make(map[string]string)
+			}
+			var mapkey string
+			var mapvalue string
+			for iNdEx < postIndex {
+				entryPreIndex := iNdEx
+				var wire uint64
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return ErrIntOverflowMachine
+					}
+					if iNdEx >= l {
+						return io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					wire |= uint64(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				fieldNum := int32(wire >> 3)
+				if fieldNum == 1 {
+					var stringLenmapkey uint64
+					for shift := uint(0); ; shift += 7 {
+						if shift >= 64 {
+							return ErrIntOverflowMachine
+						}
+						if iNdEx >= l {
+							return io.ErrUnexpectedEOF
+						}
+						b := dAtA[iNdEx]
+						iNdEx++
+						stringLenmapkey |= uint64(b&0x7F) << shift
+						if b < 0x80 {
+							break
+						}
+					}
+					intStringLenmapkey := int(stringLenmapkey)
+					if intStringLenmapkey < 0 {
+						return ErrInvalidLengthMachine
+					}
+					postStringIndexmapkey := iNdEx + intStringLenmapkey
+					if postStringIndexmapkey < 0 {
+						return ErrInvalidLengthMachine
+					}
+					if postStringIndexmapkey > l {
+						return io.ErrUnexpectedEOF
+					}
+					mapkey = string(dAtA[iNdEx:postStringIndexmapkey])
+					iNdEx = postStringIndexmapkey
+				} else if fieldNum == 2 {
+					var stringLenmapvalue uint64
+					for shift := uint(0); ; shift += 7 {
+						if shift >= 64 {
+							return ErrIntOverflowMachine
+						}
+						if iNdEx >= l {
+							return io.ErrUnexpectedEOF
+						}
+						b := dAtA[iNdEx]
+						iNdEx++
+						stringLenmapvalue |= uint64(b&0x7F) << shift
+						if b < 0x80 {
+							break
+						}
+					}
+					intStringLenmapvalue := int(stringLenmapvalue)
+					if intStringLenmapvalue < 0 {
+						return ErrInvalidLengthMachine
+					}
+					postStringIndexmapvalue := iNdEx + intStringLenmapvalue
+					if postStringIndexmapvalue < 0 {
+						return ErrInvalidLengthMachine
+					}
+					if postStringIndexmapvalue > l {
+						return io.ErrUnexpectedEOF
+					}
+					mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue])
+					iNdEx = postStringIndexmapvalue
+				} else {
+					iNdEx = entryPreIndex
+					skippy, err := skipMachine(dAtA[iNdEx:])
+					if err != nil {
+						return err
+					}
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
+						return ErrInvalidLengthMachine
+					}
+					if (iNdEx + skippy) > postIndex {
+						return io.ErrUnexpectedEOF
+					}
+					iNdEx += skippy
+				}
+			}
+			m.Device[mapkey] = mapvalue
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field AssetDefinition", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowMachine
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthMachine
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthMachine
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.AssetDefinition == nil {
+				m.AssetDefinition = make(map[string]string)
+			}
+			var mapkey string
+			var mapvalue string
+			for iNdEx < postIndex {
+				entryPreIndex := iNdEx
+				var wire uint64
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return ErrIntOverflowMachine
+					}
+					if iNdEx >= l {
+						return io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					wire |= uint64(b&0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				fieldNum := int32(wire >> 3)
+				if fieldNum == 1 {
+					var stringLenmapkey uint64
+					for shift := uint(0); ; shift += 7 {
+						if shift >= 64 {
+							return ErrIntOverflowMachine
+						}
+						if iNdEx >= l {
+							return io.ErrUnexpectedEOF
+						}
+						b := dAtA[iNdEx]
+						iNdEx++
+						stringLenmapkey |= uint64(b&0x7F) << shift
+						if b < 0x80 {
+							break
+						}
+					}
+					intStringLenmapkey := int(stringLenmapkey)
+					if intStringLenmapkey < 0 {
+						return ErrInvalidLengthMachine
+					}
+					postStringIndexmapkey := iNdEx + intStringLenmapkey
+					if postStringIndexmapkey < 0 {
+						return ErrInvalidLengthMachine
+					}
+					if postStringIndexmapkey > l {
+						return io.ErrUnexpectedEOF
+					}
+					mapkey = string(dAtA[iNdEx:postStringIndexmapkey])
+					iNdEx = postStringIndexmapkey
+				} else if fieldNum == 2 {
+					var stringLenmapvalue uint64
+					for shift := uint(0); ; shift += 7 {
+						if shift >= 64 {
+							return ErrIntOverflowMachine
+						}
+						if iNdEx >= l {
+							return io.ErrUnexpectedEOF
+						}
+						b := dAtA[iNdEx]
+						iNdEx++
+						stringLenmapvalue |= uint64(b&0x7F) << shift
+						if b < 0x80 {
+							break
+						}
+					}
+					intStringLenmapvalue := int(stringLenmapvalue)
+					if intStringLenmapvalue < 0 {
+						return ErrInvalidLengthMachine
+					}
+					postStringIndexmapvalue := iNdEx + intStringLenmapvalue
+					if postStringIndexmapvalue < 0 {
+						return ErrInvalidLengthMachine
+					}
+					if postStringIndexmapvalue > l {
+						return io.ErrUnexpectedEOF
+					}
+					mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue])
+					iNdEx = postStringIndexmapvalue
+				} else {
+					iNdEx = entryPreIndex
+					skippy, err := skipMachine(dAtA[iNdEx:])
+					if err != nil {
+						return err
+					}
+					if (skippy < 0) || (iNdEx+skippy) < 0 {
+						return ErrInvalidLengthMachine
+					}
+					if (iNdEx + skippy) > postIndex {
+						return io.ErrUnexpectedEOF
+					}
+					iNdEx += skippy
+				}
+			}
+			m.AssetDefinition[mapkey] = mapvalue
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field AdditionalDataCID", 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.AdditionalDataCID = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex