This is an automated email from the ASF dual-hosted git repository. cmorris pushed a commit to branch tendermint in repository https://gitbox.apache.org/repos/asf/incubator-milagro-dta.git
commit d36c3ed6be4dc3e7074d3c0ffaf5e0bd4d6f0dd1 Author: Christopher Morris <[email protected]> AuthorDate: Fri Oct 11 10:55:57 2019 +0100 Add OrderReference Signature to Order --- libs/documents/docs.pb.go | 172 +++++++++++++++++++++++--------------------- libs/documents/docs.proto | 13 ++-- pkg/common/common.go | 12 +++- pkg/defaultservice/order.go | 22 +++--- 4 files changed, 120 insertions(+), 99 deletions(-) diff --git a/libs/documents/docs.pb.go b/libs/documents/docs.pb.go index b8fe2ee..a57e80a 100644 --- a/libs/documents/docs.pb.go +++ b/libs/documents/docs.pb.go @@ -5,10 +5,11 @@ package documents import ( fmt "fmt" + math "math" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -420,12 +421,13 @@ type OrderDocument struct { PrincipalCID string `protobuf:"bytes,4,opt,name=PrincipalCID,proto3" json:"PrincipalCID,omitempty"` BeneficiaryCID string `protobuf:"bytes,5,opt,name=BeneficiaryCID,proto3" json:"BeneficiaryCID,omitempty"` Reference string `protobuf:"bytes,6,opt,name=Reference,proto3" json:"Reference,omitempty"` - Timestamp int64 `protobuf:"varint,7,opt,name=Timestamp,proto3" json:"Timestamp,omitempty"` - OrderPart2 *OrderPart2 `protobuf:"bytes,8,opt,name=OrderPart2,proto3" json:"OrderPart2,omitempty"` - OrderPart3 *OrderPart3 `protobuf:"bytes,9,opt,name=OrderPart3,proto3" json:"OrderPart3,omitempty"` - OrderPart4 *OrderPart4 `protobuf:"bytes,10,opt,name=OrderPart4,proto3" json:"OrderPart4,omitempty"` - OrderReqExtension map[string]string `protobuf:"bytes,11,rep,name=OrderReqExtension,proto3" json:"OrderReqExtension,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - OrderSecretReqExtension map[string]string `protobuf:"bytes,12,rep,name=OrderSecretReqExtension,proto3" json:"OrderSecretReqExtension,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + ReferenceSignature []byte `protobuf:"bytes,7,opt,name=ReferenceSignature,proto3" json:"ReferenceSignature,omitempty"` + Timestamp int64 `protobuf:"varint,8,opt,name=Timestamp,proto3" json:"Timestamp,omitempty"` + OrderPart2 *OrderPart2 `protobuf:"bytes,9,opt,name=OrderPart2,proto3" json:"OrderPart2,omitempty"` + OrderPart3 *OrderPart3 `protobuf:"bytes,10,opt,name=OrderPart3,proto3" json:"OrderPart3,omitempty"` + OrderPart4 *OrderPart4 `protobuf:"bytes,11,opt,name=OrderPart4,proto3" json:"OrderPart4,omitempty"` + OrderReqExtension map[string]string `protobuf:"bytes,12,rep,name=OrderReqExtension,proto3" json:"OrderReqExtension,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + OrderSecretReqExtension map[string]string `protobuf:"bytes,13,rep,name=OrderSecretReqExtension,proto3" json:"OrderSecretReqExtension,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -498,6 +500,13 @@ func (m *OrderDocument) GetReference() string { return "" } +func (m *OrderDocument) GetReferenceSignature() []byte { + if m != nil { + return m.ReferenceSignature + } + return nil +} + func (m *OrderDocument) GetTimestamp() int64 { if m != nil { return m.Timestamp @@ -926,78 +935,79 @@ func init() { func init() { proto.RegisterFile("docs.proto", fileDescriptor_2a25dace11219bce) } var fileDescriptor_2a25dace11219bce = []byte{ - // 1160 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xcd, 0x6f, 0x1b, 0x45, - 0x14, 0xc7, 0x1f, 0x71, 0xea, 0x67, 0xd7, 0x75, 0xa6, 0x4e, 0x62, 0x99, 0xa8, 0x89, 0x56, 0x11, - 0x0a, 0x12, 0x71, 0x88, 0xed, 0x44, 0x25, 0xaa, 0x84, 0xb0, 0x1d, 0xc0, 0x94, 0x0f, 0x33, 0x4e, - 0x03, 0x52, 0x95, 0x46, 0x9b, 0xdd, 0x89, 0x33, 0x8a, 0x3d, 0xb3, 0xec, 0x8e, 0x93, 0x5a, 0xc0, - 0x99, 0x03, 0x47, 0xfe, 0x00, 0x24, 0xa4, 0x5e, 0x39, 0x22, 0x71, 0xe7, 0xff, 0x88, 0x14, 0x24, - 0x10, 0x57, 0x4e, 0xdc, 0x40, 0x33, 0xbb, 0xeb, 0xdd, 0x75, 0xec, 0xa4, 0x15, 0x54, 0x22, 0xa7, - 0x79, 0x1f, 0xbf, 0xf7, 0xde, 0xbc, 0xf7, 0x7b, 0x9e, 0x0d, 0x80, 0xc9, 0x0d, 0xa7, 0x6c, 0xd9, - 0x5c, 0x70, 0x94, 0x36, 0xb9, 0x31, 0xe8, 0x13, 0x26, 0x9c, 0xd2, 0x76, 0x97, 0x8a, 0x93, 0xc1, - 0x51, 0xd9, 0xe0, 0xfd, 0x8d, 0xfe, 0x39, 0x15, 0xa7, 0xfc, 0x7c, 0xa3, 0xcb, 0xd7, 0x95, 0xdf, - 0xfa, 0x99, 0xde, 0xa3, 0xa6, 0x2e, 0xb8, 0xed, 0x6c, 0x8c, 0x8e, 0x6e, 0x88, 0xd2, 0x7a, 0x08, - 0xd7, 0xe5, 0x5d, 0xbe, 0xa1, 0xd4, 0x47, 0x83, 0x63, 0x25, 0x29, 0x41, 0x9d, 0x5c, 0x77, 0xed, - 0xdb, 0x18, 0xe4, 0x3a, 0xb4, 0xcb, 0x88, 0xb9, 0xcb, 0xce, 0x48, 0x8f, 0x5b, 0x04, 0xad, 0x42, - 0x5a, 0x6a, 0x74, 0x31, 0xb0, 0x49, 0x31, 0xb6, 0x12, 0x5b, 0xcb, 0xd6, 0x53, 0x97, 0x17, 0xcb, - 0x71, 0xab, 0x80, 0x03, 0x03, 0x7a, 0xcb, 0xf5, 0x22, 0x76, 0xa3, 0xd5, 0x2c, 0xc6, 0x57, 0x62, - 0x6b, 0xe9, 0xfa, 0xab, 0x97, 0x17, 0xcb, 0x8b, 0x30, 0xff, 0xe4, 0xd3, 0xc7, 0x8f, 0x77, 0xf4, - 0x1e, 0x1b, 0xf4, 0x77, 0x0e, 0x0e, 0xbe, 0xac, 0x6d, 0x7d, 0xbd, 0xfa, 0xd5, 0x93, 0x55, 0x1c, - 0x78, 0xa3, 0x22, 0xcc, 0x7e, 0x44, 0x1c, 0x47, 0xef, 0x92, 0x62, 0x42, 0x86, 0xc7, 0xbe, 0xa8, - 0x71, 0xb8, 0x35, 0x2a, 0xe3, 0x75, 0x48, 0xbd, 0x4f, 0x74, 0x93, 0xd8, 0xaa, 0x86, 0x4c, 0x65, - 0xae, 0x3c, 0x6a, 0x4e, 0xd9, 0x35, 0x60, 0xcf, 0x01, 0x21, 0x48, 0xd6, 0xb9, 0x39, 0x54, 0x65, - 0x64, 0xb1, 0x3a, 0xa3, 0x55, 0xb8, 0xbd, 0xcb, 0x0c, 0x7b, 0x68, 0x09, 0x62, 0x2a, 0xa3, 0x9b, - 0x2a, 0xaa, 0xd4, 0x7e, 0x48, 0xf8, 0x59, 0xd0, 0x02, 0xa4, 0x5a, 0xed, 0x77, 0x3b, 0xad, 0xa6, - 0xca, 0x97, 0xc6, 0x9e, 0x24, 0xab, 0xdd, 0x27, 0xb6, 0x43, 0x39, 0x53, 0xf1, 0xe3, 0xd8, 0x17, - 0xd1, 0x1b, 0x70, 0xab, 0xa9, 0x0b, 0xb2, 0x47, 0xfb, 0xee, 0x45, 0x12, 0xf5, 0xfc, 0xe5, 0xc5, - 0x72, 0x36, 0xff, 0xec, 0x9b, 0xdf, 0xfe, 0x98, 0x29, 0x3e, 0xfb, 0xe5, 0xa7, 0xef, 0x86, 0x78, - 0xe4, 0x81, 0x56, 0x20, 0xd3, 0xb6, 0xc9, 0x19, 0xe5, 0x03, 0x47, 0xb6, 0x2c, 0xa9, 0x92, 0x84, - 0x55, 0x48, 0x83, 0xac, 0x2c, 0x6a, 0x6f, 0x68, 0x91, 0x06, 0x37, 0x49, 0x71, 0x46, 0xa5, 0x8b, - 0xe8, 0x64, 0x14, 0x29, 0xfb, 0x15, 0xa5, 0x94, 0x4b, 0x58, 0x85, 0x6a, 0x30, 0x1f, 0xb9, 0xe3, - 0x28, 0xdc, 0xac, 0xf2, 0x9d, 0x6c, 0x44, 0x15, 0x28, 0x44, 0x0c, 0x7e, 0x82, 0x5b, 0x0a, 0x34, - 0xd1, 0x86, 0xd6, 0xe0, 0x4e, 0x44, 0xdf, 0xda, 0x2f, 0xa6, 0x55, 0x93, 0xc7, 0xd5, 0xe8, 0x01, - 0x00, 0x26, 0x06, 0xb5, 0xa8, 0x9c, 0x5e, 0x11, 0x56, 0x12, 0x6b, 0x99, 0x4a, 0x21, 0x34, 0xcf, - 0x91, 0xd1, 0x65, 0xda, 0x49, 0x01, 0x87, 0xfc, 0xb5, 0x1f, 0x63, 0x90, 0x1e, 0x89, 0xe1, 0x79, - 0xc4, 0xa2, 0xf3, 0x58, 0x87, 0xc4, 0x73, 0x92, 0x51, 0xfa, 0x79, 0xe5, 0xeb, 0x96, 0x33, 0xe8, - 0xe9, 0x82, 0x98, 0x0f, 0x89, 0xcf, 0x91, 0x71, 0x35, 0xba, 0x07, 0xd0, 0xa0, 0xd6, 0x09, 0xb1, - 0xf7, 0xc8, 0x53, 0xa1, 0x26, 0x97, 0xc5, 0x21, 0x0d, 0xca, 0x41, 0xbc, 0xb5, 0xaf, 0xc6, 0x95, - 0xc5, 0xf1, 0xd6, 0xbe, 0xf6, 0x57, 0x0c, 0xa0, 0xd5, 0x6c, 0x7a, 0xd7, 0x43, 0xf7, 0x61, 0xf1, - 0x9d, 0x81, 0x38, 0x21, 0x4c, 0x50, 0x43, 0x17, 0x94, 0x33, 0x4c, 0x8e, 0x89, 0x4d, 0x98, 0x41, - 0x3c, 0xaa, 0x4d, 0x33, 0xa3, 0x6d, 0x58, 0xa8, 0x13, 0x46, 0x8e, 0xa9, 0x41, 0x75, 0x7b, 0xb8, - 0xdb, 0x68, 0x0f, 0x8e, 0x7a, 0xd4, 0x90, 0x95, 0xba, 0x54, 0x9f, 0x62, 0x95, 0xe4, 0xef, 0xd0, - 0x53, 0x12, 0xb8, 0x7b, 0xe4, 0x8f, 0x28, 0x15, 0xdf, 0x3e, 0xec, 0x04, 0x4e, 0xee, 0xc5, 0x22, - 0x3a, 0x54, 0x86, 0xb4, 0x64, 0xaf, 0x23, 0xf4, 0xbe, 0xa5, 0x6e, 0x38, 0x89, 0xe4, 0x81, 0x8b, - 0xf6, 0xe7, 0x2c, 0xdc, 0xfe, 0xc4, 0x36, 0x89, 0x3d, 0xba, 0x3d, 0x82, 0xa4, 0x64, 0x99, 0x77, - 0x55, 0x75, 0x46, 0x9f, 0xc1, 0x9d, 0x50, 0xe5, 0xca, 0x2c, 0x2f, 0x94, 0xab, 0xac, 0x87, 0x48, - 0x11, 0x09, 0xe3, 0x4a, 0x63, 0x20, 0x3c, 0x1e, 0x05, 0xbd, 0x06, 0xc9, 0x06, 0xa7, 0xcc, 0x5b, - 0x47, 0x74, 0x79, 0xb1, 0x9c, 0xcb, 0xff, 0xed, 0xff, 0xc5, 0x8a, 0xbf, 0xcf, 0x62, 0x65, 0x47, - 0x6f, 0x43, 0xb6, 0x6d, 0x53, 0x66, 0x50, 0x4b, 0xef, 0x8d, 0xb6, 0xf1, 0x7a, 0xce, 0x44, 0x00, - 0xa8, 0x01, 0xb9, 0x50, 0x6e, 0x19, 0x62, 0xe6, 0xe6, 0x10, 0x63, 0x10, 0xf9, 0x4b, 0x1b, 0x50, - 0x21, 0xa5, 0xf0, 0x8a, 0xff, 0x9f, 0xc7, 0x70, 0x60, 0x88, 0x8e, 0x60, 0xf6, 0xc6, 0x11, 0xa0, - 0x2d, 0x00, 0xd5, 0xac, 0xb6, 0x6e, 0x8b, 0x8a, 0x5a, 0xe0, 0x4c, 0x65, 0x7e, 0xbc, 0xaf, 0xca, - 0x88, 0x43, 0x8e, 0x11, 0x58, 0x55, 0x2d, 0xf2, 0x14, 0x58, 0x35, 0x04, 0xab, 0x46, 0x60, 0xb5, - 0x22, 0x4c, 0x87, 0xd5, 0x42, 0xb0, 0x1a, 0x3a, 0x80, 0x39, 0x25, 0x61, 0xf2, 0xc5, 0xee, 0x53, - 0x41, 0x98, 0xda, 0xe7, 0x8c, 0xfa, 0x61, 0xd8, 0xb8, 0x9e, 0x03, 0x61, 0xc4, 0x2e, 0x13, 0xf6, - 0x10, 0x5f, 0x8d, 0x84, 0x38, 0x2c, 0x2a, 0x65, 0x87, 0x18, 0x36, 0x11, 0x91, 0x24, 0x59, 0x95, - 0x64, 0xeb, 0xfa, 0x24, 0x57, 0x71, 0x6e, 0xaa, 0x69, 0x51, 0x4b, 0x4d, 0x58, 0x98, 0x5c, 0x1d, - 0xca, 0x43, 0xe2, 0x94, 0x0c, 0x3d, 0xfa, 0xcb, 0x23, 0x2a, 0xc0, 0xcc, 0x99, 0xde, 0x1b, 0xb8, - 0x9c, 0x4f, 0x63, 0x57, 0xd8, 0x89, 0xdf, 0x8f, 0x95, 0x3e, 0x80, 0xa5, 0xeb, 0xd2, 0xbf, 0x48, - 0x2c, 0x8d, 0x42, 0x61, 0xd2, 0xce, 0xa0, 0x3b, 0x90, 0x79, 0xc4, 0x1c, 0x8b, 0x18, 0xf4, 0x98, - 0x12, 0x33, 0xff, 0x0a, 0xba, 0x07, 0xa5, 0x90, 0xcf, 0xe1, 0x43, 0xc6, 0xcf, 0xd9, 0xa1, 0x2e, - 0x0e, 0x1d, 0xa1, 0xdb, 0x22, 0x1f, 0x43, 0x2b, 0xb0, 0x14, 0xb6, 0x3f, 0x62, 0xa7, 0xbe, 0x47, - 0x47, 0x79, 0xc4, 0xb5, 0x9f, 0xe3, 0x61, 0xca, 0xa1, 0x37, 0xe1, 0x6e, 0x83, 0xf7, 0xfb, 0x54, - 0xc8, 0x7e, 0x06, 0x3f, 0x2f, 0x6e, 0xd5, 0x93, 0x4c, 0xe8, 0x3d, 0xc8, 0xfb, 0x0f, 0xa1, 0x8a, - 0xf3, 0x9c, 0x3f, 0xe3, 0x57, 0x40, 0xd1, 0x5d, 0x49, 0xdc, 0xbc, 0x2b, 0x75, 0x48, 0x07, 0xcc, - 0x48, 0x2a, 0x66, 0xac, 0x4e, 0x5c, 0x95, 0xf2, 0x18, 0x11, 0x02, 0x58, 0xe9, 0x01, 0xe4, 0xfe, - 0xc5, 0x98, 0x7e, 0x0d, 0xf7, 0xae, 0x2a, 0x9f, 0x1a, 0x4c, 0x4c, 0xd2, 0xb7, 0x84, 0xff, 0xc0, - 0xa5, 0x71, 0x48, 0xf3, 0xdf, 0x75, 0x6a, 0x07, 0x8a, 0xe1, 0xc7, 0xc3, 0x7f, 0xb0, 0x9b, 0xba, - 0xd0, 0xbd, 0xd7, 0x62, 0xaa, 0x3d, 0xda, 0xe5, 0xe4, 0x0b, 0x76, 0x79, 0x66, 0x7a, 0x97, 0xab, - 0x2f, 0xad, 0xcb, 0xdf, 0x87, 0xbb, 0x5c, 0x93, 0xdf, 0x7a, 0xee, 0x8a, 0xf9, 0xdf, 0x7a, 0xae, - 0xf4, 0xff, 0xe7, 0x61, 0xed, 0xa5, 0x75, 0x68, 0x1b, 0x52, 0x6d, 0xde, 0xa3, 0xc6, 0xf0, 0x9a, - 0x0f, 0x2c, 0x04, 0xc9, 0x8f, 0xf5, 0xbe, 0x0f, 0x56, 0x67, 0x6d, 0x13, 0xe6, 0xda, 0x3d, 0x9d, - 0xb2, 0x3d, 0xe2, 0x08, 0xef, 0x33, 0x7e, 0x13, 0x2d, 0x41, 0x5a, 0x1a, 0x05, 0x71, 0xc4, 0xa6, - 0x97, 0x3e, 0x50, 0x68, 0x55, 0xb8, 0xeb, 0xf1, 0x69, 0x1a, 0xa8, 0x32, 0x0e, 0xaa, 0x68, 0x6b, - 0x90, 0xed, 0xd0, 0xbe, 0xd5, 0x23, 0x1d, 0x61, 0x53, 0xd6, 0x95, 0x55, 0x36, 0x38, 0x13, 0x84, - 0xf9, 0x33, 0xf4, 0xc5, 0xa3, 0x94, 0xfa, 0xcf, 0xa6, 0xfa, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x17, 0x99, 0x7b, 0x18, 0x59, 0x0d, 0x00, 0x00, + // 1171 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6f, 0x1b, 0x45, + 0x14, 0xc7, 0x7f, 0xe2, 0xc4, 0xcf, 0xae, 0xeb, 0x4e, 0x9d, 0x64, 0x65, 0xa2, 0x26, 0x5a, 0x45, + 0x28, 0x48, 0xc4, 0x21, 0xb6, 0x13, 0x95, 0xa8, 0x12, 0xc2, 0x76, 0x00, 0x53, 0xfe, 0x98, 0x75, + 0x1a, 0x90, 0xaa, 0x34, 0xda, 0xec, 0x4e, 0x9c, 0x51, 0xbc, 0x33, 0xcb, 0xee, 0x38, 0xa9, 0x05, + 0x9c, 0x39, 0x70, 0xe4, 0x03, 0x20, 0x55, 0xea, 0x95, 0x23, 0x12, 0x77, 0xbe, 0x47, 0xa4, 0x20, + 0x81, 0xf8, 0x06, 0xdc, 0x40, 0x33, 0xbb, 0xeb, 0xdd, 0x75, 0xec, 0xa4, 0x15, 0x54, 0x22, 0xa7, + 0x79, 0x7f, 0x7e, 0xef, 0xbd, 0x79, 0xef, 0xf7, 0x76, 0x1c, 0x00, 0x93, 0x19, 0x6e, 0xc5, 0x76, + 0x18, 0x67, 0x28, 0x6b, 0x32, 0x63, 0x60, 0x61, 0xca, 0xdd, 0xf2, 0x76, 0x8f, 0xf0, 0x93, 0xc1, + 0x51, 0xc5, 0x60, 0xd6, 0x86, 0x75, 0x4e, 0xf8, 0x29, 0x3b, 0xdf, 0xe8, 0xb1, 0x75, 0xe9, 0xb7, + 0x7e, 0xa6, 0xf7, 0x89, 0xa9, 0x73, 0xe6, 0xb8, 0x1b, 0xa3, 0xa3, 0x17, 0xa2, 0xbc, 0x1e, 0xc1, + 0xf5, 0x58, 0x8f, 0x6d, 0x48, 0xf5, 0xd1, 0xe0, 0x58, 0x4a, 0x52, 0x90, 0x27, 0xcf, 0x5d, 0xfd, + 0x3e, 0x01, 0x85, 0x2e, 0xe9, 0x51, 0x6c, 0xee, 0xd2, 0x33, 0xdc, 0x67, 0x36, 0x46, 0xab, 0x90, + 0x15, 0x1a, 0x9d, 0x0f, 0x1c, 0xac, 0x24, 0x56, 0x12, 0x6b, 0xf9, 0x46, 0xe6, 0xf2, 0x62, 0x39, + 0x69, 0x97, 0xb4, 0xd0, 0x80, 0xde, 0xf1, 0xbc, 0xb0, 0xd3, 0x6c, 0xb7, 0x94, 0xe4, 0x4a, 0x62, + 0x2d, 0xdb, 0x78, 0xfd, 0xf2, 0x62, 0x79, 0x11, 0xe6, 0x9f, 0x7c, 0xfe, 0xf8, 0xf1, 0x8e, 0xde, + 0xa7, 0x03, 0x6b, 0xe7, 0xe0, 0xe0, 0xeb, 0xfa, 0xd6, 0xb7, 0xab, 0xdf, 0x3c, 0x59, 0xd5, 0x42, + 0x6f, 0xa4, 0xc0, 0xec, 0x27, 0xd8, 0x75, 0xf5, 0x1e, 0x56, 0x52, 0x22, 0xbc, 0x16, 0x88, 0x2a, + 0x83, 0xb9, 0x51, 0x19, 0x6f, 0x42, 0xe6, 0x43, 0xac, 0x9b, 0xd8, 0x91, 0x35, 0xe4, 0xaa, 0x77, + 0x2a, 0xa3, 0xe6, 0x54, 0x3c, 0x83, 0xe6, 0x3b, 0x20, 0x04, 0xe9, 0x06, 0x33, 0x87, 0xb2, 0x8c, + 0xbc, 0x26, 0xcf, 0x68, 0x15, 0x6e, 0xed, 0x52, 0xc3, 0x19, 0xda, 0x1c, 0x9b, 0xd2, 0xe8, 0xa5, + 0x8a, 0x2b, 0xd5, 0x67, 0xa9, 0x20, 0x0b, 0x5a, 0x80, 0x4c, 0xbb, 0xf3, 0x7e, 0xb7, 0xdd, 0x92, + 0xf9, 0xb2, 0x9a, 0x2f, 0x89, 0x6a, 0xf7, 0xb1, 0xe3, 0x12, 0x46, 0x65, 0xfc, 0xa4, 0x16, 0x88, + 0xe8, 0x2d, 0x98, 0x6b, 0xe9, 0x1c, 0xef, 0x11, 0xcb, 0xbb, 0x48, 0xaa, 0x51, 0xbc, 0xbc, 0x58, + 0xce, 0x17, 0x9f, 0x7f, 0xf7, 0xfb, 0x9f, 0x33, 0xca, 0xf3, 0x5f, 0x7f, 0xfe, 0x61, 0xa8, 0x8d, + 0x3c, 0xd0, 0x0a, 0xe4, 0x3a, 0x0e, 0x3e, 0x23, 0x6c, 0xe0, 0x8a, 0x96, 0xa5, 0x65, 0x92, 0xa8, + 0x0a, 0xa9, 0x90, 0x17, 0x45, 0xed, 0x0d, 0x6d, 0xdc, 0x64, 0x26, 0x56, 0x66, 0x64, 0xba, 0x98, + 0x4e, 0x44, 0x11, 0x72, 0x50, 0x51, 0x46, 0xba, 0x44, 0x55, 0xa8, 0x0e, 0xf3, 0xb1, 0x3b, 0x8e, + 0xc2, 0xcd, 0x4a, 0xdf, 0xc9, 0x46, 0x54, 0x85, 0x52, 0xcc, 0x10, 0x24, 0x98, 0x93, 0xa0, 0x89, + 0x36, 0xb4, 0x06, 0xb7, 0x63, 0xfa, 0xf6, 0xbe, 0x92, 0x95, 0x4d, 0x1e, 0x57, 0xa3, 0x07, 0x00, + 0x1a, 0x36, 0x88, 0x4d, 0xc4, 0xf4, 0x14, 0x58, 0x49, 0xad, 0xe5, 0xaa, 0xa5, 0xc8, 0x3c, 0x47, + 0x46, 0x8f, 0x69, 0x27, 0x25, 0x2d, 0xe2, 0xaf, 0xfe, 0x94, 0x80, 0xec, 0x48, 0x8c, 0xce, 0x23, + 0x11, 0x9f, 0xc7, 0x3a, 0xa4, 0x5e, 0x90, 0x8c, 0xc2, 0xcf, 0x2f, 0x5f, 0xb7, 0xdd, 0x41, 0x5f, + 0xe7, 0xd8, 0x7c, 0x88, 0x03, 0x8e, 0x8c, 0xab, 0xd1, 0x3d, 0x80, 0x26, 0xb1, 0x4f, 0xb0, 0xb3, + 0x87, 0x9f, 0x72, 0x39, 0xb9, 0xbc, 0x16, 0xd1, 0xa0, 0x02, 0x24, 0xdb, 0xfb, 0x72, 0x5c, 0x79, + 0x2d, 0xd9, 0xde, 0x57, 0xff, 0x4a, 0x00, 0xb4, 0x5b, 0x2d, 0xff, 0x7a, 0xe8, 0x3e, 0x2c, 0xbe, + 0x37, 0xe0, 0x27, 0x98, 0x72, 0x62, 0xe8, 0x9c, 0x30, 0xaa, 0xe1, 0x63, 0xec, 0x60, 0x6a, 0x60, + 0x9f, 0x6a, 0xd3, 0xcc, 0x68, 0x1b, 0x16, 0x1a, 0x98, 0xe2, 0x63, 0x62, 0x10, 0xdd, 0x19, 0xee, + 0x36, 0x3b, 0x83, 0xa3, 0x3e, 0x31, 0x44, 0xa5, 0x1e, 0xd5, 0xa7, 0x58, 0x05, 0xf9, 0xbb, 0xe4, + 0x14, 0x87, 0xee, 0x3e, 0xf9, 0x63, 0x4a, 0xc9, 0xb7, 0x8f, 0xbb, 0xa1, 0x93, 0x77, 0xb1, 0x98, + 0x0e, 0x55, 0x20, 0x2b, 0xd8, 0xeb, 0x72, 0xdd, 0xb2, 0xe5, 0x0d, 0x27, 0x91, 0x3c, 0x74, 0x51, + 0x9f, 0xcd, 0xc1, 0xad, 0xcf, 0x1c, 0x13, 0x3b, 0xa3, 0xdb, 0x23, 0x48, 0x0b, 0x96, 0xf9, 0x57, + 0x95, 0x67, 0xf4, 0x05, 0xdc, 0x8e, 0x54, 0x2e, 0xcd, 0xe2, 0x42, 0x85, 0xea, 0x7a, 0x84, 0x14, + 0xb1, 0x30, 0x9e, 0x34, 0x06, 0xd2, 0xc6, 0xa3, 0xa0, 0x37, 0x20, 0xdd, 0x64, 0x84, 0xfa, 0xeb, + 0x88, 0x2e, 0x2f, 0x96, 0x0b, 0xc5, 0xbf, 0x83, 0xbf, 0x84, 0xf2, 0xc7, 0xac, 0x26, 0xed, 0xe8, + 0x5d, 0xc8, 0x77, 0x1c, 0x42, 0x0d, 0x62, 0xeb, 0xfd, 0xd1, 0x36, 0x5e, 0xcf, 0x99, 0x18, 0x00, + 0x35, 0xa1, 0x10, 0xc9, 0x2d, 0x42, 0xcc, 0xdc, 0x1c, 0x62, 0x0c, 0x22, 0xbe, 0xb4, 0x21, 0x15, + 0x32, 0x12, 0x2f, 0xf9, 0xff, 0x65, 0x42, 0x0b, 0x0d, 0xa8, 0x02, 0x68, 0x24, 0x84, 0x1f, 0xe6, + 0x59, 0x39, 0xac, 0x09, 0x96, 0xf8, 0xc8, 0xe6, 0x6e, 0x1c, 0x19, 0xda, 0x02, 0x90, 0xcd, 0xed, + 0xe8, 0x0e, 0xaf, 0xca, 0x0d, 0xce, 0x55, 0xe7, 0xc7, 0xe7, 0x20, 0x8d, 0x5a, 0xc4, 0x31, 0x06, + 0xab, 0x29, 0x30, 0x1d, 0x56, 0x8b, 0xc0, 0x6a, 0x31, 0x58, 0x5d, 0xc9, 0x4d, 0x87, 0xd5, 0x23, + 0xb0, 0x3a, 0x3a, 0x80, 0x3b, 0x52, 0xd2, 0xf0, 0x57, 0xbb, 0x4f, 0x39, 0xa6, 0x72, 0xff, 0xf3, + 0xf2, 0x43, 0xb2, 0x71, 0x3d, 0x67, 0xa2, 0x88, 0x5d, 0xca, 0x9d, 0xa1, 0x76, 0x35, 0x12, 0x62, + 0xb0, 0x28, 0x95, 0x5d, 0x6c, 0x38, 0x98, 0xc7, 0x92, 0xdc, 0x92, 0x49, 0xb6, 0xae, 0x4f, 0x72, + 0x15, 0xe7, 0xa5, 0x9a, 0x16, 0xb5, 0xdc, 0x82, 0x85, 0xc9, 0xd5, 0xa1, 0x22, 0xa4, 0x4e, 0xf1, + 0xd0, 0x5f, 0x17, 0x71, 0x44, 0x25, 0x98, 0x39, 0xd3, 0xfb, 0x03, 0x6f, 0x47, 0xb2, 0x9a, 0x27, + 0xec, 0x24, 0xef, 0x27, 0xca, 0x1f, 0xc1, 0xd2, 0x75, 0xe9, 0x5f, 0x26, 0x96, 0x4a, 0xa0, 0x34, + 0x69, 0xc7, 0xd0, 0x6d, 0xc8, 0x3d, 0xa2, 0xae, 0x8d, 0x0d, 0x72, 0x4c, 0xb0, 0x59, 0x7c, 0x0d, + 0xdd, 0x83, 0x72, 0xc4, 0xe7, 0xf0, 0x21, 0x65, 0xe7, 0xf4, 0x50, 0xe7, 0x87, 0x2e, 0xd7, 0x1d, + 0x5e, 0x4c, 0xa0, 0x15, 0x58, 0x8a, 0xda, 0x1f, 0xd1, 0xd3, 0xc0, 0xa3, 0x2b, 0x3d, 0x92, 0xea, + 0x2f, 0xc9, 0x28, 0xe5, 0xd0, 0xdb, 0x70, 0xb7, 0xc9, 0x2c, 0x8b, 0x70, 0xd1, 0xcf, 0xf0, 0x73, + 0xe4, 0x55, 0x3d, 0xc9, 0x84, 0x3e, 0x80, 0x62, 0xf0, 0x70, 0xca, 0x38, 0x2f, 0xf8, 0xd9, 0xbf, + 0x02, 0x8a, 0xef, 0x4a, 0xea, 0xe6, 0x5d, 0x69, 0x40, 0x36, 0x64, 0x46, 0x5a, 0x32, 0x63, 0x75, + 0xe2, 0xaa, 0x54, 0xc6, 0x88, 0x10, 0xc2, 0xca, 0x0f, 0xa0, 0xf0, 0x2f, 0xc6, 0xf4, 0x5b, 0xb4, + 0x77, 0x35, 0xf1, 0x34, 0x69, 0xd8, 0xc4, 0x96, 0xcd, 0x83, 0x07, 0x31, 0xab, 0x45, 0x34, 0xff, + 0x5d, 0xa7, 0x76, 0x40, 0x89, 0x3e, 0x36, 0xc1, 0x03, 0xdf, 0xd2, 0xb9, 0xee, 0xbf, 0x2e, 0x53, + 0xed, 0xf1, 0x2e, 0xa7, 0x5f, 0xb2, 0xcb, 0x33, 0xd3, 0xbb, 0x5c, 0x7b, 0x65, 0x5d, 0xfe, 0x31, + 0xda, 0xe5, 0xba, 0xf8, 0x6d, 0xe8, 0xad, 0x58, 0xf0, 0xdb, 0xd0, 0x93, 0xfe, 0xff, 0x3c, 0xac, + 0xbf, 0xb2, 0x0e, 0x6d, 0x43, 0xa6, 0xc3, 0xfa, 0xc4, 0x18, 0x5e, 0xf3, 0x83, 0x0c, 0x41, 0xfa, + 0x53, 0xdd, 0x0a, 0xc0, 0xf2, 0xac, 0x6e, 0xc2, 0x9d, 0x4e, 0x5f, 0x27, 0x74, 0x0f, 0xbb, 0xdc, + 0xff, 0xd9, 0xbf, 0x89, 0x96, 0x20, 0x2b, 0x8c, 0x1c, 0xbb, 0x7c, 0xd3, 0x4f, 0x1f, 0x2a, 0xd4, + 0x1a, 0xdc, 0xf5, 0xf9, 0x34, 0x0d, 0x54, 0x1d, 0x07, 0x55, 0xd5, 0x35, 0xc8, 0x77, 0x89, 0x65, + 0xf7, 0x71, 0x97, 0x3b, 0x84, 0xf6, 0x44, 0x95, 0x4d, 0x46, 0x39, 0xa6, 0xc1, 0x0c, 0x03, 0xf1, + 0x28, 0x23, 0xff, 0x13, 0xaa, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x74, 0x10, 0x00, 0x89, + 0x0d, 0x00, 0x00, } diff --git a/libs/documents/docs.proto b/libs/documents/docs.proto index 0abd82c..fcb2b8a 100644 --- a/libs/documents/docs.proto +++ b/libs/documents/docs.proto @@ -106,12 +106,13 @@ message OrderDocument { string PrincipalCID = 4 [(validator.field) = {regex: "^Q[[:alnum:]]{45}$|^$"}]; //empty if ok string BeneficiaryCID = 5 [(validator.field) = {regex: "^Q[[:alnum:]]{45}$|^$"}]; //empty if ok string Reference = 6 [(validator.field) = {string_not_empty:true}]; //an id for this order e.g. walletID - int64 Timestamp = 7 [(validator.field) = {int_gt:1564050341,int_lt:32521429541}]; - OrderPart2 OrderPart2 = 8; - OrderPart3 OrderPart3 = 9; - OrderPart4 OrderPart4 = 10; - map<string, string> OrderReqExtension = 11; - map<string, string> OrderSecretReqExtension = 12; + bytes ReferenceSignature = 7; + int64 Timestamp = 8 [(validator.field) = {int_gt:1564050341,int_lt:32521429541}]; + OrderPart2 OrderPart2 = 9; + OrderPart3 OrderPart3 = 10; + OrderPart4 OrderPart4 = 11; + map<string, string> OrderReqExtension = 12; + map<string, string> OrderSecretReqExtension = 13; } diff --git a/pkg/common/common.go b/pkg/common/common.go index 5a50939..f7b6aa0 100644 --- a/pkg/common/common.go +++ b/pkg/common/common.go @@ -28,6 +28,7 @@ import ( "github.com/apache/incubator-milagro-dta/pkg/tendermint" "github.com/mr-tron/base58" + "github.com/apache/incubator-milagro-dta/libs/crypto" "github.com/apache/incubator-milagro-dta/libs/cryptowallet" "github.com/apache/incubator-milagro-dta/libs/datastore" "github.com/apache/incubator-milagro-dta/libs/documents" @@ -35,7 +36,7 @@ import ( ) // CreateNewDepositOrder - Generate an empty new Deposit Order with random reference -func CreateNewDepositOrder(BeneficiaryIDDocumentCID string, nodeID string, orderType string) (*documents.OrderDoc, error) { +func CreateNewDepositOrder(BeneficiaryIDDocumentCID string, nodeID string, orderType string, blsSK []byte) (*documents.OrderDoc, error) { //Create a reference for this order refBytes, err := cryptowallet.RandomBytes(32) reference := base58.Encode(refBytes[:]) @@ -55,6 +56,15 @@ func CreateNewDepositOrder(BeneficiaryIDDocumentCID string, nodeID string, order order.Type = orderType order.PrincipalCID = nodeID order.Reference = reference + + rc, signature := crypto.BLSSign([]byte(reference), blsSK) + + if rc != 0 { + return &documents.OrderDoc{}, errors.New("Failed to sign order reference") + } + + order.ReferenceSignature = signature + order.BeneficiaryCID = BeneficiaryIDDocumentCID order.Timestamp = time.Now().Unix() return &order, nil diff --git a/pkg/defaultservice/order.go b/pkg/defaultservice/order.go index d5fc403..f613fa8 100644 --- a/pkg/defaultservice/order.go +++ b/pkg/defaultservice/order.go @@ -142,8 +142,18 @@ func (s *Service) Order(req *api.OrderRequest) (string, error) { return "", err } + // BLS key + keyseed, err := s.KeyStore.Get("seed") + if err != nil { + return "", err + } + _, blsSK, err := identity.GenerateBLSKeys(keyseed) + if err != nil { + return "", err + } + //Create Order - order, err := common.CreateNewDepositOrder(beneficiaryIDDocumentCID, nodeID, s.Plugin.Name()) + order, err := common.CreateNewDepositOrder(beneficiaryIDDocumentCID, nodeID, s.Plugin.Name(), blsSK) if err != nil { return "", err } @@ -156,16 +166,6 @@ func (s *Service) Order(req *api.OrderRequest) (string, error) { order.OrderReqExtension[key] = value } - // BLS key - keyseed, err := s.KeyStore.Get("seed") - if err != nil { - return "", err - } - _, blsSK, err := identity.GenerateBLSKeys(keyseed) - if err != nil { - return "", err - } - //Create a new Transaction payload and TX tx, txID, err := common.CreateOrderTX(nodeID, api.TXFulfillRequest, s.Store, blsSK, order, recipientList, s.MasterFiduciaryNodeID()) s.Logger.Debug("Created new %v Tx: %v", api.TXFulfillRequest, txID)
