From f9d4ff8ef16a8adaa83dca4113c9622021dc2d51 Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Wed, 19 Feb 2020 11:43:12 +0800 Subject: [PATCH 01/17] #596 add multisignature transaction body --- common/model/transaction.pb.go | 259 ++++++++++++++++++++------------- 1 file changed, 161 insertions(+), 98 deletions(-) diff --git a/common/model/transaction.pb.go b/common/model/transaction.pb.go index 550644ffb..73bc4e0ac 100644 --- a/common/model/transaction.pb.go +++ b/common/model/transaction.pb.go @@ -869,6 +869,64 @@ func (m *ApprovalEscrowTransactionBody) GetTransactionID() int64 { return 0 } +type MultiSignatureTransactionBody struct { + // MultiSignatureInfo represent the information of the multisig-address + MultiSignatureInfo *MultiSignatureInfo `protobuf:"bytes,1,opt,name=MultiSignatureInfo,proto3" json:"MultiSignatureInfo,omitempty"` + // Unsigned transaction bytes that will be executed once the transaction is valid + UnsignedTransactionBytes []byte `protobuf:"bytes,2,opt,name=UnsignedTransactionBytes,proto3" json:"UnsignedTransactionBytes,omitempty"` + // List of participant's signature + Signatures [][]byte `protobuf:"bytes,3,rep,name=Signatures,proto3" json:"Signatures,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *MultiSignatureTransactionBody) Reset() { *m = MultiSignatureTransactionBody{} } +func (m *MultiSignatureTransactionBody) String() string { return proto.CompactTextString(m) } +func (*MultiSignatureTransactionBody) ProtoMessage() {} +func (*MultiSignatureTransactionBody) Descriptor() ([]byte, []int) { + return fileDescriptor_8333001f09b34082, []int{10} +} + +func (m *MultiSignatureTransactionBody) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_MultiSignatureTransactionBody.Unmarshal(m, b) +} +func (m *MultiSignatureTransactionBody) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_MultiSignatureTransactionBody.Marshal(b, m, deterministic) +} +func (m *MultiSignatureTransactionBody) XXX_Merge(src proto.Message) { + xxx_messageInfo_MultiSignatureTransactionBody.Merge(m, src) +} +func (m *MultiSignatureTransactionBody) XXX_Size() int { + return xxx_messageInfo_MultiSignatureTransactionBody.Size(m) +} +func (m *MultiSignatureTransactionBody) XXX_DiscardUnknown() { + xxx_messageInfo_MultiSignatureTransactionBody.DiscardUnknown(m) +} + +var xxx_messageInfo_MultiSignatureTransactionBody proto.InternalMessageInfo + +func (m *MultiSignatureTransactionBody) GetMultiSignatureInfo() *MultiSignatureInfo { + if m != nil { + return m.MultiSignatureInfo + } + return nil +} + +func (m *MultiSignatureTransactionBody) GetUnsignedTransactionBytes() []byte { + if m != nil { + return m.UnsignedTransactionBytes + } + return nil +} + +func (m *MultiSignatureTransactionBody) GetSignatures() [][]byte { + if m != nil { + return m.Signatures + } + return nil +} + // GetTransactionRequest return model.Transaction type GetTransactionRequest struct { // Fetch Transaction by its ID @@ -882,7 +940,7 @@ func (m *GetTransactionRequest) Reset() { *m = GetTransactionRequest{} } func (m *GetTransactionRequest) String() string { return proto.CompactTextString(m) } func (*GetTransactionRequest) ProtoMessage() {} func (*GetTransactionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8333001f09b34082, []int{10} + return fileDescriptor_8333001f09b34082, []int{11} } func (m *GetTransactionRequest) XXX_Unmarshal(b []byte) error { @@ -927,7 +985,7 @@ func (m *GetTransactionsRequest) Reset() { *m = GetTransactionsRequest{} func (m *GetTransactionsRequest) String() string { return proto.CompactTextString(m) } func (*GetTransactionsRequest) ProtoMessage() {} func (*GetTransactionsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8333001f09b34082, []int{11} + return fileDescriptor_8333001f09b34082, []int{12} } func (m *GetTransactionsRequest) XXX_Unmarshal(b []byte) error { @@ -1004,7 +1062,7 @@ func (m *GetTransactionsResponse) Reset() { *m = GetTransactionsResponse func (m *GetTransactionsResponse) String() string { return proto.CompactTextString(m) } func (*GetTransactionsResponse) ProtoMessage() {} func (*GetTransactionsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8333001f09b34082, []int{12} + return fileDescriptor_8333001f09b34082, []int{13} } func (m *GetTransactionsResponse) XXX_Unmarshal(b []byte) error { @@ -1052,7 +1110,7 @@ func (m *PostTransactionRequest) Reset() { *m = PostTransactionRequest{} func (m *PostTransactionRequest) String() string { return proto.CompactTextString(m) } func (*PostTransactionRequest) ProtoMessage() {} func (*PostTransactionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8333001f09b34082, []int{13} + return fileDescriptor_8333001f09b34082, []int{14} } func (m *PostTransactionRequest) XXX_Unmarshal(b []byte) error { @@ -1091,7 +1149,7 @@ func (m *PostTransactionResponse) Reset() { *m = PostTransactionResponse func (m *PostTransactionResponse) String() string { return proto.CompactTextString(m) } func (*PostTransactionResponse) ProtoMessage() {} func (*PostTransactionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8333001f09b34082, []int{14} + return fileDescriptor_8333001f09b34082, []int{15} } func (m *PostTransactionResponse) XXX_Unmarshal(b []byte) error { @@ -1133,7 +1191,7 @@ func (m *SendTransactionRequest) Reset() { *m = SendTransactionRequest{} func (m *SendTransactionRequest) String() string { return proto.CompactTextString(m) } func (*SendTransactionRequest) ProtoMessage() {} func (*SendTransactionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8333001f09b34082, []int{15} + return fileDescriptor_8333001f09b34082, []int{16} } func (m *SendTransactionRequest) XXX_Unmarshal(b []byte) error { @@ -1187,7 +1245,7 @@ func (m *SendTransactionResponse) Reset() { *m = SendTransactionResponse func (m *SendTransactionResponse) String() string { return proto.CompactTextString(m) } func (*SendTransactionResponse) ProtoMessage() {} func (*SendTransactionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8333001f09b34082, []int{16} + return fileDescriptor_8333001f09b34082, []int{17} } func (m *SendTransactionResponse) XXX_Unmarshal(b []byte) error { @@ -1229,7 +1287,7 @@ func (m *RequestBlockTransactionsRequest) Reset() { *m = RequestBlockTra func (m *RequestBlockTransactionsRequest) String() string { return proto.CompactTextString(m) } func (*RequestBlockTransactionsRequest) ProtoMessage() {} func (*RequestBlockTransactionsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8333001f09b34082, []int{17} + return fileDescriptor_8333001f09b34082, []int{18} } func (m *RequestBlockTransactionsRequest) XXX_Unmarshal(b []byte) error { @@ -1285,7 +1343,7 @@ func (m *SendBlockTransactionsRequest) Reset() { *m = SendBlockTransacti func (m *SendBlockTransactionsRequest) String() string { return proto.CompactTextString(m) } func (*SendBlockTransactionsRequest) ProtoMessage() {} func (*SendBlockTransactionsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8333001f09b34082, []int{18} + return fileDescriptor_8333001f09b34082, []int{19} } func (m *SendBlockTransactionsRequest) XXX_Unmarshal(b []byte) error { @@ -1339,7 +1397,7 @@ func (m *SendBlockTransactionsResponse) Reset() { *m = SendBlockTransact func (m *SendBlockTransactionsResponse) String() string { return proto.CompactTextString(m) } func (*SendBlockTransactionsResponse) ProtoMessage() {} func (*SendBlockTransactionsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8333001f09b34082, []int{19} + return fileDescriptor_8333001f09b34082, []int{20} } func (m *SendBlockTransactionsResponse) XXX_Unmarshal(b []byte) error { @@ -1379,7 +1437,7 @@ func (m *GetTransactionMinimumFeeRequest) Reset() { *m = GetTransactionM func (m *GetTransactionMinimumFeeRequest) String() string { return proto.CompactTextString(m) } func (*GetTransactionMinimumFeeRequest) ProtoMessage() {} func (*GetTransactionMinimumFeeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8333001f09b34082, []int{20} + return fileDescriptor_8333001f09b34082, []int{21} } func (m *GetTransactionMinimumFeeRequest) XXX_Unmarshal(b []byte) error { @@ -1419,7 +1477,7 @@ func (m *GetTransactionMinimumFeeResponse) Reset() { *m = GetTransaction func (m *GetTransactionMinimumFeeResponse) String() string { return proto.CompactTextString(m) } func (*GetTransactionMinimumFeeResponse) ProtoMessage() {} func (*GetTransactionMinimumFeeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8333001f09b34082, []int{21} + return fileDescriptor_8333001f09b34082, []int{22} } func (m *GetTransactionMinimumFeeResponse) XXX_Unmarshal(b []byte) error { @@ -1459,6 +1517,7 @@ func init() { proto.RegisterType((*SetupAccountDatasetTransactionBody)(nil), "model.SetupAccountDatasetTransactionBody") proto.RegisterType((*RemoveAccountDatasetTransactionBody)(nil), "model.RemoveAccountDatasetTransactionBody") proto.RegisterType((*ApprovalEscrowTransactionBody)(nil), "model.ApprovalEscrowTransactionBody") + proto.RegisterType((*MultiSignatureTransactionBody)(nil), "model.MultiSignatureTransactionBody") proto.RegisterType((*GetTransactionRequest)(nil), "model.GetTransactionRequest") proto.RegisterType((*GetTransactionsRequest)(nil), "model.GetTransactionsRequest") proto.RegisterType((*GetTransactionsResponse)(nil), "model.GetTransactionsResponse") @@ -1476,90 +1535,94 @@ func init() { func init() { proto.RegisterFile("model/transaction.proto", fileDescriptor_8333001f09b34082) } var fileDescriptor_8333001f09b34082 = []byte{ - // 1351 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0x4f, 0x73, 0xdb, 0x44, - 0x14, 0xb7, 0xe4, 0x38, 0x4d, 0x5e, 0x9c, 0x54, 0xd9, 0x26, 0xf6, 0x92, 0x26, 0x8d, 0x51, 0x93, - 0x8c, 0x49, 0xdb, 0x84, 0x86, 0x4c, 0x81, 0x63, 0xdc, 0xb4, 0x38, 0x43, 0x43, 0xc3, 0x26, 0xf4, - 0xd0, 0x19, 0x0e, 0x8a, 0xbc, 0x8d, 0x35, 0xb5, 0xb4, 0x42, 0x5a, 0xb7, 0x84, 0x32, 0xcc, 0x10, - 0xe0, 0xc0, 0x0c, 0x47, 0x3e, 0x11, 0x33, 0x7c, 0x0b, 0x8e, 0x7c, 0x0c, 0x86, 0x61, 0xb4, 0x2b, - 0xcb, 0x92, 0x2c, 0x5b, 0xa2, 0x5c, 0xb8, 0x78, 0x46, 0xef, 0xbd, 0xfd, 0xbd, 0x3f, 0xfb, 0xf6, - 0xed, 0x6f, 0x0d, 0x75, 0x9b, 0x75, 0x68, 0x6f, 0x97, 0x7b, 0x86, 0xe3, 0x1b, 0x26, 0xb7, 0x98, - 0xb3, 0xe3, 0x7a, 0x8c, 0x33, 0x54, 0x11, 0x8a, 0x95, 0x55, 0xa9, 0x77, 0x3d, 0xc6, 0x5e, 0x3c, - 0x7d, 0xf1, 0xf4, 0xb5, 0x43, 0x3d, 0xbf, 0x6b, 0xb9, 0xd2, 0x68, 0xa5, 0x16, 0x6a, 0x8d, 0x0b, - 0xcb, 0x31, 0x86, 0x8b, 0x57, 0xb0, 0x94, 0x9f, 0x1b, 0xdc, 0xec, 0x12, 0x6a, 0x52, 0xcb, 0xe5, - 0xa1, 0x26, 0xc4, 0x73, 0x58, 0x87, 0x12, 0x7a, 0x61, 0xf9, 0xdc, 0x8b, 0xaf, 0x43, 0x52, 0x4b, - 0x7d, 0xd3, 0x63, 0xaf, 0xa5, 0x4c, 0xff, 0xab, 0x0a, 0x73, 0x67, 0xc3, 0xf0, 0x10, 0x86, 0x6b, - 0xcf, 0xa8, 0xe7, 0x5b, 0xcc, 0xc1, 0x4a, 0x43, 0x69, 0xce, 0x93, 0xc1, 0x27, 0x42, 0xa0, 0x1e, - 0x1d, 0x62, 0xb5, 0xa1, 0x34, 0xcb, 0x2d, 0xf5, 0x7d, 0x85, 0xa8, 0x47, 0x87, 0x68, 0x15, 0xae, - 0xb5, 0x7a, 0xcc, 0x7c, 0x79, 0x74, 0x88, 0xcb, 0x91, 0x62, 0x20, 0x42, 0x35, 0x98, 0x6e, 0x53, - 0xeb, 0xa2, 0xcb, 0xf1, 0x94, 0x80, 0x0a, 0xbf, 0xd0, 0x1e, 0x2c, 0x9d, 0x52, 0xa7, 0x43, 0xbd, - 0x03, 0xd3, 0x64, 0x7d, 0x87, 0x1f, 0x74, 0x3a, 0x1e, 0xf5, 0x7d, 0x5c, 0x69, 0x28, 0xcd, 0x59, - 0x92, 0xa9, 0x43, 0x1f, 0x41, 0x9d, 0x50, 0xd3, 0x72, 0x2d, 0xea, 0xf0, 0xd4, 0xb2, 0x69, 0xb1, - 0x6c, 0x9c, 0x1a, 0x35, 0xe1, 0x7a, 0x2c, 0xc1, 0xb3, 0x4b, 0x97, 0xe2, 0x6b, 0x22, 0x9c, 0xb4, - 0x18, 0x2d, 0x41, 0xf9, 0x31, 0xa5, 0x78, 0x26, 0xca, 0x24, 0xf8, 0x44, 0x0d, 0x98, 0x3d, 0xb3, - 0x6c, 0xea, 0x73, 0xc3, 0x76, 0xf1, 0x6c, 0xa4, 0x1b, 0x0a, 0x53, 0x1e, 0xda, 0x86, 0xdf, 0xc5, - 0xd0, 0x50, 0x9a, 0x55, 0x92, 0x16, 0xa3, 0x7d, 0x58, 0x8e, 0x89, 0x5a, 0xac, 0x73, 0xf9, 0x84, - 0x3a, 0x17, 0xbc, 0x8b, 0xe7, 0x44, 0x44, 0xd9, 0xca, 0xa0, 0x5e, 0x29, 0x45, 0xeb, 0x92, 0x53, - 0x1f, 0x57, 0x85, 0x93, 0x4c, 0x1d, 0xda, 0x06, 0x2d, 0x26, 0x3f, 0x72, 0x3a, 0xf4, 0x6b, 0x3c, - 0x2f, 0x9c, 0x8c, 0xc8, 0xd1, 0xe7, 0xb0, 0x44, 0x6d, 0x97, 0x5f, 0xa6, 0x80, 0xf0, 0x42, 0x43, - 0x69, 0xce, 0xed, 0xdd, 0xdc, 0x11, 0x6d, 0xb3, 0xf3, 0x28, 0xc3, 0xa4, 0x5d, 0x22, 0x99, 0x4b, - 0xd1, 0x97, 0x80, 0x7d, 0xea, 0x74, 0x8e, 0x99, 0x43, 0x47, 0x60, 0xaf, 0x0b, 0xd8, 0xf5, 0x10, - 0xf6, 0x74, 0x8c, 0x59, 0xbb, 0x44, 0xc6, 0x42, 0x20, 0x0f, 0xd6, 0xd3, 0x3d, 0x9e, 0xf6, 0xa2, - 0x09, 0x2f, 0x5b, 0xa1, 0x97, 0xcf, 0x26, 0x5b, 0xb7, 0x4b, 0x24, 0x0f, 0x10, 0xfd, 0xa8, 0xc0, - 0x66, 0xdf, 0xed, 0x18, 0x9c, 0xe6, 0x80, 0xe1, 0x45, 0xe1, 0xfa, 0x6e, 0xe8, 0xfa, 0x8b, 0x22, - 0x6b, 0xda, 0x25, 0x52, 0x0c, 0x5c, 0x84, 0xe1, 0x51, 0x9b, 0xbd, 0xca, 0x0d, 0x03, 0x25, 0xc2, - 0x20, 0x45, 0xd6, 0x04, 0x61, 0x14, 0x02, 0x47, 0xdf, 0x2b, 0xb0, 0x61, 0xf6, 0x0c, 0xcb, 0xce, - 0x8b, 0xe2, 0x86, 0x88, 0xe2, 0x4e, 0x18, 0xc5, 0xc3, 0x02, 0x4b, 0xda, 0x25, 0x52, 0x08, 0x1a, - 0xbd, 0x01, 0xdd, 0xa7, 0xbc, 0xef, 0x86, 0x07, 0xfe, 0xd0, 0xe0, 0x86, 0x4f, 0x79, 0x3a, 0x80, - 0x25, 0x11, 0xc0, 0x7b, 0x51, 0xbb, 0xe5, 0x2d, 0x68, 0x97, 0x48, 0x01, 0x58, 0xf4, 0x1d, 0xdc, - 0x96, 0x95, 0x9a, 0xec, 0x7d, 0x59, 0x78, 0xdf, 0x4e, 0x6c, 0x42, 0x9e, 0xfb, 0x22, 0xc0, 0xa8, - 0x07, 0x6b, 0x86, 0xeb, 0x7a, 0xec, 0x95, 0xd1, 0x7b, 0x24, 0x06, 0x7a, 0xda, 0x73, 0x4d, 0x78, - 0xde, 0x08, 0x3d, 0x1f, 0x4c, 0xb2, 0x6d, 0x97, 0xc8, 0x64, 0x30, 0xb4, 0x0a, 0xb3, 0xa7, 0xd6, - 0x85, 0x63, 0xf0, 0xbe, 0x47, 0x71, 0x5d, 0xcc, 0x9d, 0xa1, 0x00, 0x6d, 0xc2, 0xb4, 0x5c, 0x86, - 0xb1, 0x70, 0x3a, 0x3f, 0x18, 0x19, 0x42, 0x48, 0x42, 0x65, 0x6b, 0x31, 0x31, 0x27, 0x03, 0x5c, - 0xbd, 0x06, 0x4b, 0x59, 0x73, 0x45, 0x7f, 0x00, 0x78, 0xdc, 0x60, 0x40, 0x2b, 0x30, 0x7d, 0x60, - 0x07, 0x95, 0x11, 0x37, 0x94, 0x9c, 0xc6, 0xa1, 0x44, 0xff, 0x5b, 0x81, 0xf5, 0xbc, 0xb6, 0xd9, - 0x80, 0xf9, 0xc0, 0xe4, 0xa4, 0x7f, 0xde, 0xb3, 0xcc, 0x4f, 0xe9, 0xa5, 0x80, 0xa9, 0x92, 0xa4, - 0x10, 0x6d, 0xc1, 0x42, 0xea, 0x9e, 0x51, 0xc5, 0x3d, 0x93, 0x92, 0xa2, 0x7d, 0x98, 0x0b, 0x16, - 0x0e, 0x8c, 0xca, 0xa2, 0x00, 0x28, 0x36, 0x76, 0x42, 0x0d, 0x89, 0x9b, 0xa1, 0x26, 0xcc, 0x3f, - 0x61, 0xe6, 0x4b, 0xda, 0x69, 0x19, 0x3d, 0xc3, 0x31, 0xa9, 0xb8, 0x21, 0x65, 0x2a, 0x49, 0x05, - 0xba, 0x07, 0x95, 0x13, 0xc6, 0x5e, 0x3b, 0xe2, 0x76, 0x9c, 0xdb, 0xab, 0x87, 0xc8, 0x27, 0x29, - 0xca, 0x40, 0xa4, 0x95, 0xfe, 0x87, 0x02, 0x9b, 0x85, 0x26, 0x4e, 0xc1, 0x32, 0xa4, 0xd2, 0x53, - 0xdf, 0x32, 0xbd, 0x72, 0x6e, 0x7a, 0x53, 0x85, 0xd2, 0x3b, 0x86, 0xcd, 0x42, 0x83, 0xac, 0x58, - 0x76, 0xfa, 0x1b, 0xd8, 0x28, 0x32, 0x91, 0x0a, 0xd6, 0x2a, 0xca, 0x45, 0x2d, 0x94, 0xcb, 0x9f, - 0x0a, 0xe8, 0xf9, 0xe3, 0x48, 0xb2, 0x25, 0xce, 0x47, 0xd8, 0x92, 0x32, 0x60, 0x4b, 0xa3, 0xba, - 0x49, 0x6c, 0x49, 0x9d, 0xcc, 0x96, 0x56, 0x60, 0xe6, 0xc4, 0x63, 0x2e, 0xf5, 0xf8, 0xa5, 0xd8, - 0xb4, 0x59, 0x12, 0x7d, 0xa3, 0x25, 0xa8, 0x3c, 0x33, 0x7a, 0x7d, 0xd9, 0xac, 0xb3, 0x44, 0x7e, - 0xa0, 0x5b, 0x30, 0x73, 0xdc, 0x37, 0xbb, 0x01, 0x1d, 0x12, 0x3d, 0x3a, 0x25, 0xb6, 0x39, 0x92, - 0xe9, 0xbf, 0x2b, 0x70, 0xbb, 0xc0, 0xdc, 0xfb, 0xbf, 0xe7, 0xa9, 0x7f, 0x0b, 0x6b, 0x13, 0x87, - 0x28, 0xba, 0x0f, 0x33, 0x03, 0x03, 0x11, 0xf4, 0xc2, 0xde, 0x72, 0x62, 0x0e, 0x0e, 0x94, 0x24, - 0x32, 0x0b, 0xce, 0x49, 0x9c, 0x8d, 0xc5, 0xe9, 0x75, 0x52, 0xa1, 0xdf, 0x81, 0xe5, 0x4f, 0x12, - 0x35, 0x23, 0xf4, 0xab, 0x3e, 0xf5, 0x79, 0x48, 0xcb, 0x95, 0x38, 0x2d, 0xd7, 0x7f, 0x56, 0xa1, - 0x96, 0xb4, 0xf6, 0x07, 0xe6, 0xa3, 0x63, 0x4d, 0xc9, 0x1c, 0x6b, 0x43, 0xee, 0xae, 0x26, 0xb8, - 0xfb, 0x36, 0x2c, 0x44, 0xc4, 0xf7, 0x94, 0x1b, 0x1e, 0x8f, 0x1d, 0xed, 0x94, 0x06, 0x6d, 0x41, - 0x35, 0x92, 0x3c, 0x72, 0x3a, 0xb1, 0x19, 0x97, 0x90, 0x67, 0x31, 0xf4, 0x4a, 0x36, 0x43, 0xbf, - 0x0f, 0x70, 0x12, 0xbd, 0x86, 0x04, 0xf1, 0x9f, 0xdb, 0x5b, 0x1c, 0x1c, 0xb3, 0x48, 0x41, 0x62, - 0x46, 0xfa, 0x4b, 0xa8, 0x8f, 0x94, 0xc2, 0x77, 0x99, 0xe3, 0x53, 0x84, 0xa1, 0x72, 0xc6, 0x78, - 0xb8, 0x5b, 0xb2, 0x6d, 0xa5, 0x00, 0x3d, 0x80, 0x6a, 0x7c, 0x05, 0x56, 0x1b, 0xe5, 0xd8, 0xd8, - 0x8b, 0xef, 0x42, 0xc2, 0x4e, 0x3f, 0x84, 0xda, 0x09, 0xf3, 0xb3, 0xb6, 0x29, 0xc9, 0xc7, 0x25, - 0x7f, 0x97, 0x43, 0x64, 0x44, 0xae, 0x3f, 0x85, 0xfa, 0x08, 0x4a, 0x18, 0xf2, 0x7e, 0xe2, 0xb5, - 0x26, 0x10, 0xb2, 0xe3, 0x8a, 0x9b, 0xe9, 0xbf, 0x28, 0x50, 0x0b, 0xae, 0xd3, 0xff, 0x16, 0x57, - 0x40, 0x02, 0x1e, 0x76, 0x0d, 0x4b, 0xee, 0x50, 0xd0, 0x16, 0x15, 0x32, 0x14, 0x04, 0xbb, 0x28, - 0x5f, 0x6e, 0xc3, 0x29, 0x59, 0x96, 0xaf, 0xa0, 0x94, 0x58, 0x27, 0x50, 0x1f, 0x89, 0x26, 0xcc, - 0xef, 0x43, 0xa8, 0xb6, 0x62, 0xcf, 0xda, 0x30, 0xc1, 0x1b, 0x61, 0x82, 0x71, 0x15, 0x49, 0x18, - 0xea, 0x3f, 0x29, 0xb0, 0x1e, 0xe6, 0x24, 0x9e, 0x9f, 0x63, 0x7a, 0x3f, 0x71, 0xa8, 0x82, 0x4c, - 0xcb, 0xcd, 0x32, 0x49, 0x49, 0x73, 0xf2, 0x9c, 0xf8, 0xe6, 0xd5, 0x7f, 0x55, 0x60, 0x35, 0x48, - 0x6e, 0x6c, 0x10, 0x09, 0x70, 0x25, 0x0d, 0x7e, 0x17, 0x16, 0xe3, 0x8b, 0xe4, 0x7e, 0x04, 0xdd, - 0x57, 0x25, 0xa3, 0x8a, 0x7f, 0x51, 0xf2, 0xe7, 0xb0, 0x36, 0x26, 0xaa, 0xb0, 0xf0, 0x1f, 0xc3, - 0x7c, 0xbc, 0x9e, 0xb2, 0x34, 0x63, 0x2a, 0x9f, 0xb4, 0xd4, 0x8f, 0x61, 0x3d, 0x79, 0xc2, 0x8e, - 0x2d, 0xc7, 0xb2, 0xfb, 0xf6, 0x63, 0x4a, 0xdf, 0xa6, 0xfb, 0xf7, 0xa1, 0x31, 0x1e, 0x2e, 0x8c, - 0x56, 0x93, 0x2f, 0x75, 0x31, 0xf5, 0xc4, 0x2b, 0x7d, 0xfb, 0x37, 0x15, 0x32, 0xde, 0xf3, 0x5a, - 0x9a, 0x5c, 0x6a, 0x25, 0x84, 0xe5, 0xbf, 0x0f, 0x69, 0x6a, 0xa9, 0x29, 0x68, 0x1d, 0x6e, 0x4e, - 0x20, 0x02, 0x9a, 0x8a, 0xb6, 0xe0, 0xdd, 0x5c, 0x6e, 0xa5, 0x5d, 0x09, 0xbb, 0x5c, 0x96, 0xa2, - 0x5d, 0x4d, 0xa1, 0x4d, 0x68, 0xe4, 0xd1, 0x0f, 0xed, 0x6a, 0x1a, 0xe9, 0x70, 0x6b, 0x32, 0x4f, - 0xd0, 0xca, 0x68, 0x23, 0x68, 0xff, 0x89, 0x97, 0xac, 0xf6, 0x83, 0x8a, 0xd6, 0xe0, 0x9d, 0xb1, - 0x77, 0x98, 0x36, 0xd5, 0xda, 0x7e, 0xde, 0xbc, 0xb0, 0x78, 0xb7, 0x7f, 0xbe, 0x63, 0x32, 0x7b, - 0xf7, 0x1b, 0xc6, 0xce, 0x4d, 0xf9, 0x7b, 0xcf, 0x64, 0x1e, 0xdd, 0x35, 0x99, 0x6d, 0x33, 0x67, - 0x57, 0x74, 0xc4, 0xf9, 0xb4, 0xf8, 0xff, 0xe8, 0x83, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd7, - 0x0f, 0x82, 0x8e, 0xe3, 0x12, 0x00, 0x00, + // 1421 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xdf, 0x6f, 0xdb, 0xd4, + 0x17, 0x8f, 0x9d, 0xa6, 0x6b, 0x4f, 0xd2, 0x2e, 0xbd, 0x6b, 0x93, 0xbb, 0xae, 0x5d, 0xf3, 0xf5, + 0xda, 0x2a, 0xdf, 0x6e, 0x6b, 0x59, 0x99, 0xc6, 0xe0, 0xad, 0x59, 0x37, 0x52, 0xb1, 0xb2, 0x72, + 0xdb, 0xed, 0x61, 0x12, 0x0f, 0xae, 0x73, 0x97, 0x58, 0x8b, 0x7d, 0x8d, 0x7d, 0xb3, 0x51, 0x86, + 0x90, 0x18, 0xf0, 0x80, 0xc4, 0x23, 0x7f, 0x11, 0x12, 0xfc, 0x15, 0x3c, 0xf2, 0x67, 0x20, 0x84, + 0x7c, 0x7d, 0xe3, 0xd8, 0x8e, 0x13, 0x9b, 0xf1, 0xc2, 0x8b, 0x25, 0x9f, 0xdf, 0xe7, 0xdc, 0xe3, + 0xcf, 0x3d, 0xc7, 0x50, 0xb7, 0x58, 0x87, 0xf6, 0xf7, 0xb8, 0xab, 0xdb, 0x9e, 0x6e, 0x70, 0x93, + 0xd9, 0xbb, 0x8e, 0xcb, 0x38, 0x43, 0x25, 0xc1, 0x58, 0x5d, 0x0b, 0xf8, 0x8e, 0xcb, 0xd8, 0x8b, + 0x27, 0x2f, 0x9e, 0xbc, 0xb6, 0xa9, 0xeb, 0xf5, 0x4c, 0x27, 0x10, 0x5a, 0xad, 0x49, 0xae, 0xde, + 0x35, 0x6d, 0x7d, 0xa4, 0xbc, 0x8a, 0x03, 0xfa, 0xb9, 0xce, 0x8d, 0x1e, 0xa1, 0x06, 0x35, 0x1d, + 0x2e, 0x39, 0xd2, 0x9e, 0xcd, 0x3a, 0x94, 0xd0, 0xae, 0xe9, 0x71, 0x37, 0xaa, 0x87, 0x02, 0x2e, + 0xf5, 0x0c, 0x97, 0xbd, 0x96, 0xb4, 0xd5, 0x80, 0x66, 0x0d, 0xfa, 0xdc, 0x3c, 0x35, 0xbb, 0xb6, + 0xce, 0x07, 0x2e, 0x0d, 0x78, 0xda, 0x9f, 0x15, 0x28, 0x9f, 0x8d, 0x42, 0x47, 0x18, 0x2e, 0x3d, + 0xa3, 0xae, 0x67, 0x32, 0x1b, 0x2b, 0x0d, 0xa5, 0xb9, 0x40, 0x86, 0xaf, 0x08, 0x81, 0x7a, 0x74, + 0x88, 0xd5, 0x86, 0xd2, 0x2c, 0xb6, 0xd4, 0xf7, 0x14, 0xa2, 0x1e, 0x1d, 0xa2, 0x35, 0xb8, 0xd4, + 0xea, 0x33, 0xe3, 0xe5, 0xd1, 0x21, 0x2e, 0x86, 0x8c, 0x21, 0x09, 0xd5, 0x60, 0xb6, 0x4d, 0xcd, + 0x6e, 0x8f, 0xe3, 0x19, 0x61, 0x4a, 0xbe, 0xa1, 0x7d, 0x58, 0x3e, 0xa5, 0x76, 0x87, 0xba, 0x07, + 0x86, 0xc1, 0x06, 0x36, 0x3f, 0xe8, 0x74, 0x5c, 0xea, 0x79, 0xb8, 0xd4, 0x50, 0x9a, 0xf3, 0x24, + 0x95, 0x87, 0xee, 0x43, 0x9d, 0x50, 0xc3, 0x74, 0x4c, 0x6a, 0xf3, 0x84, 0xda, 0xac, 0x50, 0x9b, + 0xc4, 0x46, 0x4d, 0xb8, 0x1c, 0x49, 0xf0, 0xec, 0xc2, 0xa1, 0xf8, 0x92, 0x08, 0x27, 0x49, 0x46, + 0xcb, 0x50, 0x7c, 0x44, 0x29, 0x9e, 0x0b, 0x33, 0xf1, 0x5f, 0x51, 0x03, 0xe6, 0xcf, 0x4c, 0x8b, + 0x7a, 0x5c, 0xb7, 0x1c, 0x3c, 0x1f, 0xf2, 0x46, 0xc4, 0x84, 0x87, 0xb6, 0xee, 0xf5, 0x30, 0x34, + 0x94, 0x66, 0x85, 0x24, 0xc9, 0xe8, 0x2e, 0xac, 0x44, 0x48, 0x2d, 0xd6, 0xb9, 0x78, 0x4c, 0xed, + 0x2e, 0xef, 0xe1, 0xb2, 0x88, 0x28, 0x9d, 0xe9, 0xd7, 0x2b, 0xc1, 0x68, 0x5d, 0x70, 0xea, 0xe1, + 0x8a, 0x70, 0x92, 0xca, 0x43, 0x3b, 0x50, 0x8d, 0xd0, 0x8f, 0xec, 0x0e, 0xfd, 0x12, 0x2f, 0x08, + 0x27, 0x63, 0x74, 0xf4, 0x19, 0x2c, 0x53, 0xcb, 0xe1, 0x17, 0x09, 0x43, 0x78, 0xb1, 0xa1, 0x34, + 0xcb, 0xfb, 0xd7, 0x76, 0x45, 0xfb, 0xec, 0x3e, 0x4c, 0x11, 0x69, 0x17, 0x48, 0xaa, 0x2a, 0xfa, + 0x1c, 0xb0, 0x47, 0xed, 0xce, 0x31, 0xb3, 0xe9, 0x98, 0xd9, 0xcb, 0xc2, 0xec, 0x86, 0x34, 0x7b, + 0x3a, 0x41, 0xac, 0x5d, 0x20, 0x13, 0x4d, 0x20, 0x17, 0x36, 0x92, 0xfd, 0x9f, 0xf4, 0x52, 0x15, + 0x5e, 0xb6, 0xa5, 0x97, 0x4f, 0xa7, 0x4b, 0xb7, 0x0b, 0x24, 0xcb, 0x20, 0xfa, 0x5e, 0x81, 0xad, + 0x81, 0xd3, 0xd1, 0x39, 0xcd, 0x30, 0x86, 0x97, 0x84, 0xeb, 0x5b, 0xd2, 0xf5, 0xd3, 0x3c, 0x3a, + 0xed, 0x02, 0xc9, 0x67, 0x5c, 0x84, 0xe1, 0x52, 0x8b, 0xbd, 0xca, 0x0c, 0x03, 0xc5, 0xc2, 0x20, + 0x79, 0x74, 0xfc, 0x30, 0x72, 0x19, 0x47, 0xdf, 0x2a, 0xb0, 0x69, 0xf4, 0x75, 0xd3, 0xca, 0x8a, + 0xe2, 0x8a, 0x88, 0xe2, 0xa6, 0x8c, 0xe2, 0x41, 0x0e, 0x95, 0x76, 0x81, 0xe4, 0x32, 0x8d, 0xde, + 0x80, 0xe6, 0x51, 0x3e, 0x70, 0xe4, 0x07, 0x7f, 0xa8, 0x73, 0xdd, 0xa3, 0x3c, 0x19, 0xc0, 0xb2, + 0x08, 0xe0, 0xff, 0x61, 0xbb, 0x65, 0x29, 0xb4, 0x0b, 0x24, 0x87, 0x59, 0xf4, 0x0d, 0xdc, 0x08, + 0x2a, 0x35, 0xdd, 0xfb, 0x8a, 0xf0, 0xbe, 0x13, 0x3b, 0x84, 0x2c, 0xf7, 0x79, 0x0c, 0xa3, 0x3e, + 0xac, 0xeb, 0x8e, 0xe3, 0xb2, 0x57, 0x7a, 0xff, 0xa1, 0x00, 0xfb, 0xa4, 0xe7, 0x9a, 0xf0, 0xbc, + 0x29, 0x3d, 0x1f, 0x4c, 0x93, 0x6d, 0x17, 0xc8, 0x74, 0x63, 0x68, 0x0d, 0xe6, 0xc3, 0x9b, 0x03, + 0xd7, 0x05, 0xee, 0x8c, 0x08, 0x68, 0x0b, 0x66, 0x03, 0x35, 0x8c, 0x85, 0xd3, 0x85, 0x21, 0x64, + 0x08, 0x22, 0x91, 0xcc, 0xd6, 0x52, 0x0c, 0x27, 0x7d, 0xbb, 0x5a, 0x0d, 0x96, 0xd3, 0x70, 0x45, + 0xbb, 0x07, 0x78, 0x12, 0x30, 0xa0, 0x55, 0x98, 0x3d, 0xb0, 0xfc, 0xca, 0x88, 0x1b, 0x2a, 0x40, + 0x63, 0x49, 0xd1, 0xfe, 0x52, 0x60, 0x23, 0xab, 0x6d, 0x36, 0x61, 0xc1, 0x17, 0x39, 0x19, 0x9c, + 0xf7, 0x4d, 0xe3, 0x13, 0x7a, 0x21, 0xcc, 0x54, 0x48, 0x9c, 0x88, 0xb6, 0x61, 0x31, 0x71, 0xcf, + 0xa8, 0xe2, 0x9e, 0x49, 0x50, 0xd1, 0x5d, 0x28, 0xfb, 0x8a, 0x43, 0xa1, 0xa2, 0x28, 0x00, 0x8a, + 0xc0, 0x8e, 0xe4, 0x90, 0xa8, 0x18, 0x6a, 0xc2, 0xc2, 0x63, 0x66, 0xbc, 0xa4, 0x9d, 0x96, 0xde, + 0xd7, 0x6d, 0x83, 0x8a, 0x1b, 0x32, 0x48, 0x25, 0xce, 0x40, 0xb7, 0xa1, 0x74, 0xc2, 0xd8, 0x6b, + 0x5b, 0xdc, 0x8e, 0xe5, 0xfd, 0xba, 0xb4, 0x7c, 0x92, 0x18, 0x27, 0x48, 0x20, 0xa5, 0xfd, 0xae, + 0xc0, 0x56, 0x2e, 0xc4, 0xc9, 0x59, 0x86, 0x44, 0x7a, 0xea, 0x3b, 0xa6, 0x57, 0xcc, 0x4c, 0x6f, + 0x26, 0x57, 0x7a, 0xc7, 0xb0, 0x95, 0x0b, 0xc8, 0xf2, 0x65, 0xa7, 0xbd, 0x81, 0xcd, 0x3c, 0x88, + 0x94, 0xb3, 0x56, 0x61, 0x2e, 0x6a, 0xae, 0x5c, 0xfe, 0x50, 0x40, 0xcb, 0x86, 0xa3, 0x60, 0x5a, + 0xe2, 0x7c, 0x6c, 0x5a, 0x52, 0x86, 0xd3, 0xd2, 0x38, 0x6f, 0xda, 0xb4, 0xa4, 0x4e, 0x9f, 0x96, + 0x56, 0x61, 0xee, 0xc4, 0x65, 0x0e, 0x75, 0xf9, 0x85, 0x38, 0xb4, 0x79, 0x12, 0xbe, 0xa3, 0x65, + 0x28, 0x3d, 0xd3, 0xfb, 0x83, 0xa0, 0x59, 0xe7, 0x49, 0xf0, 0x82, 0xae, 0xc3, 0xdc, 0xf1, 0xc0, + 0xe8, 0xf9, 0xe3, 0x90, 0xe8, 0xd1, 0x19, 0x71, 0xcc, 0x21, 0x4d, 0xfb, 0x55, 0x81, 0x1b, 0x39, + 0x70, 0xef, 0xbf, 0x9e, 0xa7, 0xf6, 0x35, 0xac, 0x4f, 0x05, 0x51, 0x74, 0x07, 0xe6, 0x86, 0x02, + 0x22, 0xe8, 0xc5, 0xfd, 0x95, 0x18, 0x0e, 0x0e, 0x99, 0x24, 0x14, 0xf3, 0xbf, 0x93, 0xe8, 0x34, + 0x16, 0x1d, 0xaf, 0xe3, 0x0c, 0xed, 0x37, 0x05, 0xd6, 0x8f, 0x63, 0x03, 0x7c, 0xd2, 0xfd, 0x11, + 0xa0, 0xb8, 0xc0, 0x91, 0xfd, 0x82, 0x89, 0x40, 0xca, 0xfb, 0x57, 0x65, 0x20, 0xe3, 0x02, 0x24, + 0x45, 0x09, 0x7d, 0x04, 0xf8, 0xa9, 0xed, 0x99, 0x5d, 0x9b, 0x76, 0xa2, 0x5e, 0xc4, 0xd0, 0xa9, + 0x8a, 0xce, 0x9f, 0xc8, 0x47, 0xd7, 0x01, 0x42, 0x63, 0x3e, 0x1c, 0x16, 0x9b, 0x15, 0x12, 0xa1, + 0x68, 0x37, 0x61, 0xe5, 0xe3, 0xd8, 0xe1, 0x13, 0xfa, 0xc5, 0x80, 0x7a, 0x5c, 0xee, 0x17, 0x4a, + 0x74, 0xbf, 0xd0, 0x7e, 0x54, 0xa1, 0x16, 0x97, 0xf6, 0x86, 0xe2, 0xe3, 0xf8, 0xac, 0xa4, 0xe2, + 0xf3, 0x68, 0x09, 0x51, 0x63, 0x4b, 0xc8, 0x0e, 0x2c, 0x86, 0x13, 0xfc, 0x29, 0xd7, 0x5d, 0x1e, + 0xc1, 0xa8, 0x04, 0x07, 0x6d, 0x43, 0x25, 0xa4, 0x3c, 0xb4, 0x3b, 0x11, 0xb0, 0x8e, 0xd1, 0xd3, + 0x56, 0x8d, 0x52, 0xfa, 0xaa, 0x71, 0x07, 0xe0, 0x24, 0x5c, 0xf9, 0xc4, 0x06, 0x53, 0xde, 0x5f, + 0x1a, 0xe2, 0x45, 0xc8, 0x20, 0x11, 0x21, 0xed, 0x25, 0xd4, 0xc7, 0x4a, 0xe1, 0x39, 0xcc, 0xf6, + 0x28, 0xc2, 0x50, 0x3a, 0x63, 0x5c, 0xb6, 0x5d, 0xf0, 0xfd, 0x05, 0x04, 0x74, 0x0f, 0x2a, 0x51, + 0x0d, 0xac, 0x36, 0x8a, 0x11, 0xfc, 0x8e, 0x9e, 0x42, 0x4c, 0x4e, 0x3b, 0x84, 0xda, 0x09, 0xf3, + 0xd2, 0x8e, 0x29, 0xbe, 0x58, 0x04, 0x3d, 0x11, 0xa0, 0xe1, 0x18, 0x5d, 0x7b, 0x02, 0xf5, 0x31, + 0x2b, 0x32, 0xe4, 0xbb, 0xb1, 0xb5, 0x53, 0xb6, 0x69, 0x5a, 0x5c, 0x51, 0x31, 0xed, 0x27, 0x05, + 0x6a, 0xfe, 0x5c, 0xf0, 0xef, 0xe2, 0xf2, 0xa7, 0x99, 0x07, 0x3d, 0xdd, 0x0c, 0x4e, 0xc8, 0x6f, + 0x8b, 0x12, 0x19, 0x11, 0xfc, 0x53, 0x0c, 0x56, 0xd0, 0x11, 0xdc, 0x17, 0x83, 0x75, 0x2e, 0x41, + 0xd6, 0x08, 0xd4, 0xc7, 0xa2, 0x91, 0xf9, 0x7d, 0x00, 0x95, 0x56, 0x64, 0x77, 0x97, 0x09, 0x5e, + 0x91, 0x09, 0x46, 0x59, 0x24, 0x26, 0xa8, 0xfd, 0xa0, 0xc0, 0x86, 0xcc, 0x49, 0xec, 0xd1, 0x13, + 0x7a, 0x3f, 0x86, 0x0e, 0x7e, 0xa6, 0xc5, 0x66, 0x91, 0x24, 0xa8, 0x19, 0x79, 0x4e, 0x5d, 0xde, + 0xb5, 0x9f, 0x15, 0x58, 0xf3, 0x93, 0x9b, 0x18, 0x44, 0xcc, 0xb8, 0x92, 0x34, 0x7e, 0x0b, 0x96, + 0xa2, 0x4a, 0x43, 0xec, 0xf0, 0xd1, 0x60, 0x9c, 0xf1, 0x0f, 0x4a, 0xfe, 0x1c, 0xd6, 0x27, 0x44, + 0x25, 0x0b, 0xff, 0x21, 0x2c, 0x44, 0xeb, 0x19, 0x94, 0x66, 0x42, 0xe5, 0xe3, 0x92, 0xda, 0x31, + 0x6c, 0xc4, 0xbf, 0xb0, 0x63, 0xd3, 0x36, 0xad, 0x81, 0xf5, 0x88, 0xd2, 0x77, 0xe9, 0xfe, 0xfb, + 0xd0, 0x98, 0x6c, 0x4e, 0x46, 0x2b, 0x7f, 0x39, 0x28, 0xb1, 0x5f, 0x0e, 0x3b, 0xbf, 0xa8, 0x90, + 0xf2, 0x73, 0xa2, 0x9a, 0x9c, 0x94, 0xab, 0x05, 0x84, 0x83, 0x5f, 0x29, 0xc9, 0x39, 0xb9, 0xaa, + 0xa0, 0x0d, 0xb8, 0x36, 0x65, 0xaa, 0xa9, 0xaa, 0x68, 0x1b, 0xfe, 0x97, 0x39, 0x28, 0x56, 0xdf, + 0x0a, 0xb9, 0xcc, 0x91, 0xab, 0xfa, 0x76, 0x06, 0x6d, 0x41, 0x23, 0x6b, 0x96, 0xaa, 0xbe, 0x9d, + 0x45, 0x1a, 0x5c, 0x9f, 0x3e, 0xf4, 0x54, 0x8b, 0x68, 0xd3, 0xff, 0x04, 0xa6, 0x4e, 0x0c, 0xd5, + 0xef, 0x54, 0xb4, 0x0e, 0x57, 0x27, 0x5e, 0xc8, 0xd5, 0x99, 0xd6, 0xce, 0xf3, 0x66, 0xd7, 0xe4, + 0xbd, 0xc1, 0xf9, 0xae, 0xc1, 0xac, 0xbd, 0xaf, 0x18, 0x3b, 0x37, 0x82, 0xe7, 0x6d, 0x83, 0xb9, + 0x74, 0xcf, 0x60, 0x96, 0xc5, 0xec, 0x3d, 0xd1, 0x15, 0xe7, 0xb3, 0xe2, 0x67, 0xd8, 0xfb, 0x7f, + 0x07, 0x00, 0x00, 0xff, 0xff, 0xdb, 0xe7, 0x0b, 0xb7, 0xcc, 0x13, 0x00, 0x00, } From d8a7fd1c7103f1c5989a3a463a8156347fbe3686 Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Wed, 19 Feb 2020 14:58:00 +0800 Subject: [PATCH 02/17] #596 add constants for MultiSignature body fields --- common/constant/fieldsSize.go | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/common/constant/fieldsSize.go b/common/constant/fieldsSize.go index e03207f62..cdb1482c3 100644 --- a/common/constant/fieldsSize.go +++ b/common/constant/fieldsSize.go @@ -28,11 +28,18 @@ var ( // DatasetValueLength is max length of string property value in dataset DatasetValueLength uint32 = 4 - EscrowApproverAddressLength uint32 = 4 - EscrowCommissionLength uint32 = 8 - EscrowTimeoutLength uint32 = 8 - EscrowApproval uint32 = 4 - EscrowID uint32 = 8 - EscrowApprovalBytesLength = EscrowApproval + EscrowID - EscrowInstructionLength uint32 = 4 + EscrowApproverAddressLength uint32 = 4 + EscrowCommissionLength uint32 = 8 + EscrowTimeoutLength uint32 = 8 + EscrowApproval uint32 = 4 + EscrowID uint32 = 8 + EscrowApprovalBytesLength = EscrowApproval + EscrowID + EscrowInstructionLength uint32 = 4 + MultiSigAddressLength uint32 = 4 + MultiSigSignatureLength uint32 = 4 + MultiSigNumberOfAddress uint32 = 4 + MultiSigNumberOfSignatures uint32 = 4 + MultiSigUnsignedTxBytesLength uint32 = 4 + MultiSigInfoNonce uint32 = 8 + MultiSigInfoMinSignature uint32 = 4 ) From 7e27313ab0441dad8554e359ef33b71c6a4f4f0d Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Wed, 19 Feb 2020 14:58:31 +0800 Subject: [PATCH 03/17] #596 add multisignature tx body --- common/model/multiSignature.pb.go | 97 +++++++++++++++++++++++++++++++ common/model/transactionBody.go | 1 + 2 files changed, 98 insertions(+) create mode 100644 common/model/multiSignature.pb.go diff --git a/common/model/multiSignature.pb.go b/common/model/multiSignature.pb.go new file mode 100644 index 000000000..69329ebd5 --- /dev/null +++ b/common/model/multiSignature.pb.go @@ -0,0 +1,97 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: model/multiSignature.proto + +package model + +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +type MultiSignatureInfo struct { + MinimumSignatures uint32 `protobuf:"varint,1,opt,name=MinimumSignatures,proto3" json:"MinimumSignatures,omitempty"` + Nonce int64 `protobuf:"varint,2,opt,name=Nonce,proto3" json:"Nonce,omitempty"` + Addresses []string `protobuf:"bytes,3,rep,name=Addresses,proto3" json:"Addresses,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *MultiSignatureInfo) Reset() { *m = MultiSignatureInfo{} } +func (m *MultiSignatureInfo) String() string { return proto.CompactTextString(m) } +func (*MultiSignatureInfo) ProtoMessage() {} +func (*MultiSignatureInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_136af44c597c17ae, []int{0} +} + +func (m *MultiSignatureInfo) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_MultiSignatureInfo.Unmarshal(m, b) +} +func (m *MultiSignatureInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_MultiSignatureInfo.Marshal(b, m, deterministic) +} +func (m *MultiSignatureInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_MultiSignatureInfo.Merge(m, src) +} +func (m *MultiSignatureInfo) XXX_Size() int { + return xxx_messageInfo_MultiSignatureInfo.Size(m) +} +func (m *MultiSignatureInfo) XXX_DiscardUnknown() { + xxx_messageInfo_MultiSignatureInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_MultiSignatureInfo proto.InternalMessageInfo + +func (m *MultiSignatureInfo) GetMinimumSignatures() uint32 { + if m != nil { + return m.MinimumSignatures + } + return 0 +} + +func (m *MultiSignatureInfo) GetNonce() int64 { + if m != nil { + return m.Nonce + } + return 0 +} + +func (m *MultiSignatureInfo) GetAddresses() []string { + if m != nil { + return m.Addresses + } + return nil +} + +func init() { + proto.RegisterType((*MultiSignatureInfo)(nil), "model.MultiSignatureInfo") +} + +func init() { proto.RegisterFile("model/multiSignature.proto", fileDescriptor_136af44c597c17ae) } + +var fileDescriptor_136af44c597c17ae = []byte{ + // 176 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xca, 0xcd, 0x4f, 0x49, + 0xcd, 0xd1, 0xcf, 0x2d, 0xcd, 0x29, 0xc9, 0x0c, 0xce, 0x4c, 0xcf, 0x4b, 0x2c, 0x29, 0x2d, 0x4a, + 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x05, 0xcb, 0x29, 0x55, 0x71, 0x09, 0xf9, 0xa2, + 0x48, 0x7b, 0xe6, 0xa5, 0xe5, 0x0b, 0xe9, 0x70, 0x09, 0xfa, 0x66, 0xe6, 0x65, 0xe6, 0x96, 0xe6, + 0xc2, 0xc5, 0x8b, 0x25, 0x18, 0x15, 0x18, 0x35, 0x78, 0x83, 0x30, 0x25, 0x84, 0x24, 0xb8, 0x58, + 0xfd, 0xf2, 0xf3, 0x92, 0x53, 0x25, 0x98, 0x14, 0x18, 0x35, 0x98, 0x9d, 0x98, 0x0c, 0x18, 0x83, + 0x20, 0x02, 0x42, 0x32, 0x5c, 0x9c, 0x8e, 0x29, 0x29, 0x45, 0xa9, 0xc5, 0xc5, 0xa9, 0xc5, 0x12, + 0xcc, 0x0a, 0xcc, 0x1a, 0x9c, 0x41, 0x08, 0x01, 0x27, 0xad, 0x28, 0x8d, 0xf4, 0xcc, 0x92, 0x8c, + 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xaa, 0xfc, 0xfc, 0xa4, 0x64, 0x08, 0xa9, 0x9b, 0x9c, + 0x5f, 0x94, 0xaa, 0x9f, 0x9c, 0x9f, 0x9b, 0x9b, 0x9f, 0xa7, 0x0f, 0x76, 0x67, 0x12, 0x1b, 0xd8, + 0xd5, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x77, 0x34, 0xa0, 0xc7, 0xd3, 0x00, 0x00, 0x00, +} diff --git a/common/model/transactionBody.go b/common/model/transactionBody.go index 6296e9081..b92efaed5 100644 --- a/common/model/transactionBody.go +++ b/common/model/transactionBody.go @@ -12,3 +12,4 @@ func (*SendMoneyTransactionBody) isTransaction_TransactionBody() {} func (*SetupAccountDatasetTransactionBody) isTransaction_TransactionBody() {} func (*RemoveAccountDatasetTransactionBody) isTransaction_TransactionBody() {} func (*ApprovalEscrowTransactionBody) isTransaction_TransactionBody() {} +func (*MultiSignatureTransactionBody) isTransaction_TransactionBody() {} From 35d8c637e22c3e8e461ac87ac6b61ab9456372ad Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Wed, 19 Feb 2020 14:59:04 +0800 Subject: [PATCH 04/17] #596 add multisignature tx body --- common/model/transaction.pb.go | 200 ++++++++++++++++++--------------- 1 file changed, 108 insertions(+), 92 deletions(-) diff --git a/common/model/transaction.pb.go b/common/model/transaction.pb.go index 73bc4e0ac..aed768ee2 100644 --- a/common/model/transaction.pb.go +++ b/common/model/transaction.pb.go @@ -102,10 +102,11 @@ type Transaction struct { // *Transaction_SetupAccountDatasetTransactionBody // *Transaction_RemoveAccountDatasetTransactionBody // *Transaction_ApprovalEscrowTransactionBody + // *Transaction_MultiSignatureTransactionBody TransactionBody isTransaction_TransactionBody `protobuf_oneof:"TransactionBody"` - Signature []byte `protobuf:"bytes,23,opt,name=Signature,proto3" json:"Signature,omitempty"` + Signature []byte `protobuf:"bytes,24,opt,name=Signature,proto3" json:"Signature,omitempty"` // nullable - Escrow *Escrow `protobuf:"bytes,24,opt,name=Escrow,proto3" json:"Escrow,omitempty"` + Escrow *Escrow `protobuf:"bytes,25,opt,name=Escrow,proto3" json:"Escrow,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -267,6 +268,10 @@ type Transaction_ApprovalEscrowTransactionBody struct { ApprovalEscrowTransactionBody *ApprovalEscrowTransactionBody `protobuf:"bytes,22,opt,name=approvalEscrowTransactionBody,proto3,oneof"` } +type Transaction_MultiSignatureTransactionBody struct { + MultiSignatureTransactionBody *MultiSignatureTransactionBody `protobuf:"bytes,23,opt,name=multiSignatureTransactionBody,proto3,oneof"` +} + func (*Transaction_EmptyTransactionBody) isTransaction_TransactionBody() {} func (*Transaction_SendMoneyTransactionBody) isTransaction_TransactionBody() {} @@ -285,6 +290,8 @@ func (*Transaction_RemoveAccountDatasetTransactionBody) isTransaction_Transactio func (*Transaction_ApprovalEscrowTransactionBody) isTransaction_TransactionBody() {} +func (*Transaction_MultiSignatureTransactionBody) isTransaction_TransactionBody() {} + func (m *Transaction) GetTransactionBody() isTransaction_TransactionBody { if m != nil { return m.TransactionBody @@ -355,6 +362,13 @@ func (m *Transaction) GetApprovalEscrowTransactionBody() *ApprovalEscrowTransact return nil } +func (m *Transaction) GetMultiSignatureTransactionBody() *MultiSignatureTransactionBody { + if x, ok := m.GetTransactionBody().(*Transaction_MultiSignatureTransactionBody); ok { + return x.MultiSignatureTransactionBody + } + return nil +} + func (m *Transaction) GetSignature() []byte { if m != nil { return m.Signature @@ -381,6 +395,7 @@ func (*Transaction) XXX_OneofWrappers() []interface{} { (*Transaction_SetupAccountDatasetTransactionBody)(nil), (*Transaction_RemoveAccountDatasetTransactionBody)(nil), (*Transaction_ApprovalEscrowTransactionBody)(nil), + (*Transaction_MultiSignatureTransactionBody)(nil), } } @@ -1535,94 +1550,95 @@ func init() { func init() { proto.RegisterFile("model/transaction.proto", fileDescriptor_8333001f09b34082) } var fileDescriptor_8333001f09b34082 = []byte{ - // 1421 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xdf, 0x6f, 0xdb, 0xd4, - 0x17, 0x8f, 0x9d, 0xa6, 0x6b, 0x4f, 0xd2, 0x2e, 0xbd, 0x6b, 0x93, 0xbb, 0xae, 0x5d, 0xf3, 0xf5, - 0xda, 0x2a, 0xdf, 0x6e, 0x6b, 0x59, 0x99, 0xc6, 0xe0, 0xad, 0x59, 0x37, 0x52, 0xb1, 0xb2, 0x72, - 0xdb, 0xed, 0x61, 0x12, 0x0f, 0xae, 0x73, 0x97, 0x58, 0x8b, 0x7d, 0x8d, 0x7d, 0xb3, 0x51, 0x86, - 0x90, 0x18, 0xf0, 0x80, 0xc4, 0x23, 0x7f, 0x11, 0x12, 0xfc, 0x15, 0x3c, 0xf2, 0x67, 0x20, 0x84, - 0x7c, 0x7d, 0xe3, 0xd8, 0x8e, 0x13, 0x9b, 0xf1, 0xc2, 0x8b, 0x25, 0x9f, 0xdf, 0xe7, 0xdc, 0xe3, - 0xcf, 0x3d, 0xc7, 0x50, 0xb7, 0x58, 0x87, 0xf6, 0xf7, 0xb8, 0xab, 0xdb, 0x9e, 0x6e, 0x70, 0x93, - 0xd9, 0xbb, 0x8e, 0xcb, 0x38, 0x43, 0x25, 0xc1, 0x58, 0x5d, 0x0b, 0xf8, 0x8e, 0xcb, 0xd8, 0x8b, - 0x27, 0x2f, 0x9e, 0xbc, 0xb6, 0xa9, 0xeb, 0xf5, 0x4c, 0x27, 0x10, 0x5a, 0xad, 0x49, 0xae, 0xde, - 0x35, 0x6d, 0x7d, 0xa4, 0xbc, 0x8a, 0x03, 0xfa, 0xb9, 0xce, 0x8d, 0x1e, 0xa1, 0x06, 0x35, 0x1d, - 0x2e, 0x39, 0xd2, 0x9e, 0xcd, 0x3a, 0x94, 0xd0, 0xae, 0xe9, 0x71, 0x37, 0xaa, 0x87, 0x02, 0x2e, - 0xf5, 0x0c, 0x97, 0xbd, 0x96, 0xb4, 0xd5, 0x80, 0x66, 0x0d, 0xfa, 0xdc, 0x3c, 0x35, 0xbb, 0xb6, - 0xce, 0x07, 0x2e, 0x0d, 0x78, 0xda, 0x9f, 0x15, 0x28, 0x9f, 0x8d, 0x42, 0x47, 0x18, 0x2e, 0x3d, - 0xa3, 0xae, 0x67, 0x32, 0x1b, 0x2b, 0x0d, 0xa5, 0xb9, 0x40, 0x86, 0xaf, 0x08, 0x81, 0x7a, 0x74, - 0x88, 0xd5, 0x86, 0xd2, 0x2c, 0xb6, 0xd4, 0xf7, 0x14, 0xa2, 0x1e, 0x1d, 0xa2, 0x35, 0xb8, 0xd4, - 0xea, 0x33, 0xe3, 0xe5, 0xd1, 0x21, 0x2e, 0x86, 0x8c, 0x21, 0x09, 0xd5, 0x60, 0xb6, 0x4d, 0xcd, - 0x6e, 0x8f, 0xe3, 0x19, 0x61, 0x4a, 0xbe, 0xa1, 0x7d, 0x58, 0x3e, 0xa5, 0x76, 0x87, 0xba, 0x07, - 0x86, 0xc1, 0x06, 0x36, 0x3f, 0xe8, 0x74, 0x5c, 0xea, 0x79, 0xb8, 0xd4, 0x50, 0x9a, 0xf3, 0x24, - 0x95, 0x87, 0xee, 0x43, 0x9d, 0x50, 0xc3, 0x74, 0x4c, 0x6a, 0xf3, 0x84, 0xda, 0xac, 0x50, 0x9b, - 0xc4, 0x46, 0x4d, 0xb8, 0x1c, 0x49, 0xf0, 0xec, 0xc2, 0xa1, 0xf8, 0x92, 0x08, 0x27, 0x49, 0x46, - 0xcb, 0x50, 0x7c, 0x44, 0x29, 0x9e, 0x0b, 0x33, 0xf1, 0x5f, 0x51, 0x03, 0xe6, 0xcf, 0x4c, 0x8b, - 0x7a, 0x5c, 0xb7, 0x1c, 0x3c, 0x1f, 0xf2, 0x46, 0xc4, 0x84, 0x87, 0xb6, 0xee, 0xf5, 0x30, 0x34, - 0x94, 0x66, 0x85, 0x24, 0xc9, 0xe8, 0x2e, 0xac, 0x44, 0x48, 0x2d, 0xd6, 0xb9, 0x78, 0x4c, 0xed, - 0x2e, 0xef, 0xe1, 0xb2, 0x88, 0x28, 0x9d, 0xe9, 0xd7, 0x2b, 0xc1, 0x68, 0x5d, 0x70, 0xea, 0xe1, - 0x8a, 0x70, 0x92, 0xca, 0x43, 0x3b, 0x50, 0x8d, 0xd0, 0x8f, 0xec, 0x0e, 0xfd, 0x12, 0x2f, 0x08, - 0x27, 0x63, 0x74, 0xf4, 0x19, 0x2c, 0x53, 0xcb, 0xe1, 0x17, 0x09, 0x43, 0x78, 0xb1, 0xa1, 0x34, - 0xcb, 0xfb, 0xd7, 0x76, 0x45, 0xfb, 0xec, 0x3e, 0x4c, 0x11, 0x69, 0x17, 0x48, 0xaa, 0x2a, 0xfa, - 0x1c, 0xb0, 0x47, 0xed, 0xce, 0x31, 0xb3, 0xe9, 0x98, 0xd9, 0xcb, 0xc2, 0xec, 0x86, 0x34, 0x7b, - 0x3a, 0x41, 0xac, 0x5d, 0x20, 0x13, 0x4d, 0x20, 0x17, 0x36, 0x92, 0xfd, 0x9f, 0xf4, 0x52, 0x15, - 0x5e, 0xb6, 0xa5, 0x97, 0x4f, 0xa7, 0x4b, 0xb7, 0x0b, 0x24, 0xcb, 0x20, 0xfa, 0x5e, 0x81, 0xad, - 0x81, 0xd3, 0xd1, 0x39, 0xcd, 0x30, 0x86, 0x97, 0x84, 0xeb, 0x5b, 0xd2, 0xf5, 0xd3, 0x3c, 0x3a, - 0xed, 0x02, 0xc9, 0x67, 0x5c, 0x84, 0xe1, 0x52, 0x8b, 0xbd, 0xca, 0x0c, 0x03, 0xc5, 0xc2, 0x20, - 0x79, 0x74, 0xfc, 0x30, 0x72, 0x19, 0x47, 0xdf, 0x2a, 0xb0, 0x69, 0xf4, 0x75, 0xd3, 0xca, 0x8a, - 0xe2, 0x8a, 0x88, 0xe2, 0xa6, 0x8c, 0xe2, 0x41, 0x0e, 0x95, 0x76, 0x81, 0xe4, 0x32, 0x8d, 0xde, - 0x80, 0xe6, 0x51, 0x3e, 0x70, 0xe4, 0x07, 0x7f, 0xa8, 0x73, 0xdd, 0xa3, 0x3c, 0x19, 0xc0, 0xb2, - 0x08, 0xe0, 0xff, 0x61, 0xbb, 0x65, 0x29, 0xb4, 0x0b, 0x24, 0x87, 0x59, 0xf4, 0x0d, 0xdc, 0x08, - 0x2a, 0x35, 0xdd, 0xfb, 0x8a, 0xf0, 0xbe, 0x13, 0x3b, 0x84, 0x2c, 0xf7, 0x79, 0x0c, 0xa3, 0x3e, - 0xac, 0xeb, 0x8e, 0xe3, 0xb2, 0x57, 0x7a, 0xff, 0xa1, 0x00, 0xfb, 0xa4, 0xe7, 0x9a, 0xf0, 0xbc, - 0x29, 0x3d, 0x1f, 0x4c, 0x93, 0x6d, 0x17, 0xc8, 0x74, 0x63, 0x68, 0x0d, 0xe6, 0xc3, 0x9b, 0x03, - 0xd7, 0x05, 0xee, 0x8c, 0x08, 0x68, 0x0b, 0x66, 0x03, 0x35, 0x8c, 0x85, 0xd3, 0x85, 0x21, 0x64, - 0x08, 0x22, 0x91, 0xcc, 0xd6, 0x52, 0x0c, 0x27, 0x7d, 0xbb, 0x5a, 0x0d, 0x96, 0xd3, 0x70, 0x45, - 0xbb, 0x07, 0x78, 0x12, 0x30, 0xa0, 0x55, 0x98, 0x3d, 0xb0, 0xfc, 0xca, 0x88, 0x1b, 0x2a, 0x40, - 0x63, 0x49, 0xd1, 0xfe, 0x52, 0x60, 0x23, 0xab, 0x6d, 0x36, 0x61, 0xc1, 0x17, 0x39, 0x19, 0x9c, - 0xf7, 0x4d, 0xe3, 0x13, 0x7a, 0x21, 0xcc, 0x54, 0x48, 0x9c, 0x88, 0xb6, 0x61, 0x31, 0x71, 0xcf, - 0xa8, 0xe2, 0x9e, 0x49, 0x50, 0xd1, 0x5d, 0x28, 0xfb, 0x8a, 0x43, 0xa1, 0xa2, 0x28, 0x00, 0x8a, - 0xc0, 0x8e, 0xe4, 0x90, 0xa8, 0x18, 0x6a, 0xc2, 0xc2, 0x63, 0x66, 0xbc, 0xa4, 0x9d, 0x96, 0xde, - 0xd7, 0x6d, 0x83, 0x8a, 0x1b, 0x32, 0x48, 0x25, 0xce, 0x40, 0xb7, 0xa1, 0x74, 0xc2, 0xd8, 0x6b, - 0x5b, 0xdc, 0x8e, 0xe5, 0xfd, 0xba, 0xb4, 0x7c, 0x92, 0x18, 0x27, 0x48, 0x20, 0xa5, 0xfd, 0xae, - 0xc0, 0x56, 0x2e, 0xc4, 0xc9, 0x59, 0x86, 0x44, 0x7a, 0xea, 0x3b, 0xa6, 0x57, 0xcc, 0x4c, 0x6f, - 0x26, 0x57, 0x7a, 0xc7, 0xb0, 0x95, 0x0b, 0xc8, 0xf2, 0x65, 0xa7, 0xbd, 0x81, 0xcd, 0x3c, 0x88, - 0x94, 0xb3, 0x56, 0x61, 0x2e, 0x6a, 0xae, 0x5c, 0xfe, 0x50, 0x40, 0xcb, 0x86, 0xa3, 0x60, 0x5a, - 0xe2, 0x7c, 0x6c, 0x5a, 0x52, 0x86, 0xd3, 0xd2, 0x38, 0x6f, 0xda, 0xb4, 0xa4, 0x4e, 0x9f, 0x96, - 0x56, 0x61, 0xee, 0xc4, 0x65, 0x0e, 0x75, 0xf9, 0x85, 0x38, 0xb4, 0x79, 0x12, 0xbe, 0xa3, 0x65, - 0x28, 0x3d, 0xd3, 0xfb, 0x83, 0xa0, 0x59, 0xe7, 0x49, 0xf0, 0x82, 0xae, 0xc3, 0xdc, 0xf1, 0xc0, - 0xe8, 0xf9, 0xe3, 0x90, 0xe8, 0xd1, 0x19, 0x71, 0xcc, 0x21, 0x4d, 0xfb, 0x55, 0x81, 0x1b, 0x39, - 0x70, 0xef, 0xbf, 0x9e, 0xa7, 0xf6, 0x35, 0xac, 0x4f, 0x05, 0x51, 0x74, 0x07, 0xe6, 0x86, 0x02, - 0x22, 0xe8, 0xc5, 0xfd, 0x95, 0x18, 0x0e, 0x0e, 0x99, 0x24, 0x14, 0xf3, 0xbf, 0x93, 0xe8, 0x34, - 0x16, 0x1d, 0xaf, 0xe3, 0x0c, 0xed, 0x37, 0x05, 0xd6, 0x8f, 0x63, 0x03, 0x7c, 0xd2, 0xfd, 0x11, - 0xa0, 0xb8, 0xc0, 0x91, 0xfd, 0x82, 0x89, 0x40, 0xca, 0xfb, 0x57, 0x65, 0x20, 0xe3, 0x02, 0x24, - 0x45, 0x09, 0x7d, 0x04, 0xf8, 0xa9, 0xed, 0x99, 0x5d, 0x9b, 0x76, 0xa2, 0x5e, 0xc4, 0xd0, 0xa9, - 0x8a, 0xce, 0x9f, 0xc8, 0x47, 0xd7, 0x01, 0x42, 0x63, 0x3e, 0x1c, 0x16, 0x9b, 0x15, 0x12, 0xa1, - 0x68, 0x37, 0x61, 0xe5, 0xe3, 0xd8, 0xe1, 0x13, 0xfa, 0xc5, 0x80, 0x7a, 0x5c, 0xee, 0x17, 0x4a, - 0x74, 0xbf, 0xd0, 0x7e, 0x54, 0xa1, 0x16, 0x97, 0xf6, 0x86, 0xe2, 0xe3, 0xf8, 0xac, 0xa4, 0xe2, - 0xf3, 0x68, 0x09, 0x51, 0x63, 0x4b, 0xc8, 0x0e, 0x2c, 0x86, 0x13, 0xfc, 0x29, 0xd7, 0x5d, 0x1e, - 0xc1, 0xa8, 0x04, 0x07, 0x6d, 0x43, 0x25, 0xa4, 0x3c, 0xb4, 0x3b, 0x11, 0xb0, 0x8e, 0xd1, 0xd3, - 0x56, 0x8d, 0x52, 0xfa, 0xaa, 0x71, 0x07, 0xe0, 0x24, 0x5c, 0xf9, 0xc4, 0x06, 0x53, 0xde, 0x5f, - 0x1a, 0xe2, 0x45, 0xc8, 0x20, 0x11, 0x21, 0xed, 0x25, 0xd4, 0xc7, 0x4a, 0xe1, 0x39, 0xcc, 0xf6, - 0x28, 0xc2, 0x50, 0x3a, 0x63, 0x5c, 0xb6, 0x5d, 0xf0, 0xfd, 0x05, 0x04, 0x74, 0x0f, 0x2a, 0x51, - 0x0d, 0xac, 0x36, 0x8a, 0x11, 0xfc, 0x8e, 0x9e, 0x42, 0x4c, 0x4e, 0x3b, 0x84, 0xda, 0x09, 0xf3, - 0xd2, 0x8e, 0x29, 0xbe, 0x58, 0x04, 0x3d, 0x11, 0xa0, 0xe1, 0x18, 0x5d, 0x7b, 0x02, 0xf5, 0x31, - 0x2b, 0x32, 0xe4, 0xbb, 0xb1, 0xb5, 0x53, 0xb6, 0x69, 0x5a, 0x5c, 0x51, 0x31, 0xed, 0x27, 0x05, - 0x6a, 0xfe, 0x5c, 0xf0, 0xef, 0xe2, 0xf2, 0xa7, 0x99, 0x07, 0x3d, 0xdd, 0x0c, 0x4e, 0xc8, 0x6f, - 0x8b, 0x12, 0x19, 0x11, 0xfc, 0x53, 0x0c, 0x56, 0xd0, 0x11, 0xdc, 0x17, 0x83, 0x75, 0x2e, 0x41, - 0xd6, 0x08, 0xd4, 0xc7, 0xa2, 0x91, 0xf9, 0x7d, 0x00, 0x95, 0x56, 0x64, 0x77, 0x97, 0x09, 0x5e, - 0x91, 0x09, 0x46, 0x59, 0x24, 0x26, 0xa8, 0xfd, 0xa0, 0xc0, 0x86, 0xcc, 0x49, 0xec, 0xd1, 0x13, - 0x7a, 0x3f, 0x86, 0x0e, 0x7e, 0xa6, 0xc5, 0x66, 0x91, 0x24, 0xa8, 0x19, 0x79, 0x4e, 0x5d, 0xde, - 0xb5, 0x9f, 0x15, 0x58, 0xf3, 0x93, 0x9b, 0x18, 0x44, 0xcc, 0xb8, 0x92, 0x34, 0x7e, 0x0b, 0x96, - 0xa2, 0x4a, 0x43, 0xec, 0xf0, 0xd1, 0x60, 0x9c, 0xf1, 0x0f, 0x4a, 0xfe, 0x1c, 0xd6, 0x27, 0x44, - 0x25, 0x0b, 0xff, 0x21, 0x2c, 0x44, 0xeb, 0x19, 0x94, 0x66, 0x42, 0xe5, 0xe3, 0x92, 0xda, 0x31, - 0x6c, 0xc4, 0xbf, 0xb0, 0x63, 0xd3, 0x36, 0xad, 0x81, 0xf5, 0x88, 0xd2, 0x77, 0xe9, 0xfe, 0xfb, - 0xd0, 0x98, 0x6c, 0x4e, 0x46, 0x2b, 0x7f, 0x39, 0x28, 0xb1, 0x5f, 0x0e, 0x3b, 0xbf, 0xa8, 0x90, - 0xf2, 0x73, 0xa2, 0x9a, 0x9c, 0x94, 0xab, 0x05, 0x84, 0x83, 0x5f, 0x29, 0xc9, 0x39, 0xb9, 0xaa, - 0xa0, 0x0d, 0xb8, 0x36, 0x65, 0xaa, 0xa9, 0xaa, 0x68, 0x1b, 0xfe, 0x97, 0x39, 0x28, 0x56, 0xdf, - 0x0a, 0xb9, 0xcc, 0x91, 0xab, 0xfa, 0x76, 0x06, 0x6d, 0x41, 0x23, 0x6b, 0x96, 0xaa, 0xbe, 0x9d, - 0x45, 0x1a, 0x5c, 0x9f, 0x3e, 0xf4, 0x54, 0x8b, 0x68, 0xd3, 0xff, 0x04, 0xa6, 0x4e, 0x0c, 0xd5, - 0xef, 0x54, 0xb4, 0x0e, 0x57, 0x27, 0x5e, 0xc8, 0xd5, 0x99, 0xd6, 0xce, 0xf3, 0x66, 0xd7, 0xe4, - 0xbd, 0xc1, 0xf9, 0xae, 0xc1, 0xac, 0xbd, 0xaf, 0x18, 0x3b, 0x37, 0x82, 0xe7, 0x6d, 0x83, 0xb9, - 0x74, 0xcf, 0x60, 0x96, 0xc5, 0xec, 0x3d, 0xd1, 0x15, 0xe7, 0xb3, 0xe2, 0x67, 0xd8, 0xfb, 0x7f, - 0x07, 0x00, 0x00, 0xff, 0xff, 0xdb, 0xe7, 0x0b, 0xb7, 0xcc, 0x13, 0x00, 0x00, + // 1438 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x73, 0xdb, 0xc4, + 0x17, 0xb7, 0xe4, 0x38, 0x4d, 0x9e, 0xed, 0xd4, 0xd9, 0x26, 0xb6, 0x9a, 0x26, 0x8d, 0xbf, 0x6a, + 0x92, 0xf1, 0x37, 0x6d, 0x13, 0x1a, 0x3a, 0xa5, 0x70, 0x8b, 0x9b, 0x16, 0x67, 0x68, 0x68, 0xd8, + 0xa4, 0x3d, 0x74, 0x86, 0x83, 0x22, 0x6f, 0x6d, 0x4d, 0x2d, 0xad, 0x90, 0xd6, 0x2d, 0xa6, 0x0c, + 0x33, 0x14, 0x38, 0x30, 0xc3, 0x91, 0xbf, 0x88, 0x19, 0xf8, 0x2b, 0x38, 0x72, 0xe2, 0x8f, 0x60, + 0x18, 0xad, 0xd6, 0xb2, 0x24, 0xcb, 0x92, 0x28, 0x17, 0x2e, 0x9e, 0xf1, 0xfb, 0xbc, 0x7d, 0x3f, + 0x76, 0x9f, 0x3e, 0xfb, 0xde, 0x42, 0xc3, 0xa4, 0x5d, 0x32, 0xd8, 0x67, 0x8e, 0x66, 0xb9, 0x9a, + 0xce, 0x0c, 0x6a, 0xed, 0xd9, 0x0e, 0x65, 0x14, 0x95, 0x38, 0xb0, 0xb6, 0xee, 0xe3, 0xb6, 0x43, + 0xe9, 0x8b, 0x27, 0x2f, 0x9e, 0xbc, 0xb6, 0x88, 0xe3, 0xf6, 0x0d, 0xdb, 0x57, 0x5a, 0xab, 0x0b, + 0x54, 0xeb, 0x19, 0x96, 0x36, 0x59, 0xbc, 0xa6, 0xf8, 0xf2, 0x0b, 0x8d, 0xe9, 0x7d, 0x4c, 0x74, + 0x62, 0xd8, 0x4c, 0x20, 0xc2, 0x9e, 0x45, 0xbb, 0x04, 0x93, 0x9e, 0xe1, 0x32, 0x27, 0xbc, 0x0e, + 0xf9, 0x28, 0x71, 0x75, 0x87, 0xbe, 0x16, 0xb2, 0x35, 0x5f, 0x66, 0x0e, 0x07, 0xcc, 0x38, 0x33, + 0x7a, 0x96, 0xc6, 0x86, 0x0e, 0xf1, 0x31, 0xf5, 0xcf, 0x2a, 0x94, 0xcf, 0x27, 0xa1, 0x23, 0x05, + 0x2e, 0x3d, 0x23, 0x8e, 0x6b, 0x50, 0x4b, 0x91, 0x9a, 0x52, 0xab, 0x8a, 0xc7, 0x7f, 0x11, 0x02, + 0xf9, 0xf8, 0x48, 0x91, 0x9b, 0x52, 0xab, 0xd8, 0x96, 0xdf, 0x93, 0xb0, 0x7c, 0x7c, 0x84, 0xd6, + 0xe1, 0x52, 0x7b, 0x40, 0xf5, 0x97, 0xc7, 0x47, 0x4a, 0x31, 0x00, 0xc6, 0x22, 0x54, 0x87, 0xf9, + 0x0e, 0x31, 0x7a, 0x7d, 0xa6, 0xcc, 0x71, 0x53, 0xe2, 0x1f, 0x3a, 0x80, 0x95, 0x33, 0x62, 0x75, + 0x89, 0x73, 0xa8, 0xeb, 0x74, 0x68, 0xb1, 0xc3, 0x6e, 0xd7, 0x21, 0xae, 0xab, 0x94, 0x9a, 0x52, + 0x6b, 0x11, 0x27, 0x62, 0xe8, 0x3e, 0x34, 0x30, 0xd1, 0x0d, 0xdb, 0x20, 0x16, 0x8b, 0x2d, 0x9b, + 0xe7, 0xcb, 0x66, 0xc1, 0xa8, 0x05, 0x97, 0x43, 0x09, 0x9e, 0x8f, 0x6c, 0xa2, 0x5c, 0xe2, 0xe1, + 0xc4, 0xc5, 0x68, 0x05, 0x8a, 0x8f, 0x08, 0x51, 0x16, 0x82, 0x4c, 0xbc, 0xbf, 0xa8, 0x09, 0x8b, + 0xe7, 0x86, 0x49, 0x5c, 0xa6, 0x99, 0xb6, 0xb2, 0x18, 0x60, 0x13, 0x61, 0xcc, 0x43, 0x47, 0x73, + 0xfb, 0x0a, 0x34, 0xa5, 0x56, 0x05, 0xc7, 0xc5, 0xe8, 0x2e, 0xac, 0x86, 0x44, 0x6d, 0xda, 0x1d, + 0x3d, 0x26, 0x56, 0x8f, 0xf5, 0x95, 0x32, 0x8f, 0x28, 0x19, 0xf4, 0xf6, 0x2b, 0x06, 0xb4, 0x47, + 0x8c, 0xb8, 0x4a, 0x85, 0x3b, 0x49, 0xc4, 0xd0, 0x2e, 0xd4, 0x42, 0xf2, 0x63, 0xab, 0x4b, 0xbe, + 0x54, 0xaa, 0xdc, 0xc9, 0x94, 0x1c, 0x7d, 0x06, 0x2b, 0xc4, 0xb4, 0xd9, 0x28, 0x66, 0x48, 0x59, + 0x6a, 0x4a, 0xad, 0xf2, 0xc1, 0xb5, 0x3d, 0x5e, 0x3e, 0x7b, 0x0f, 0x13, 0x54, 0x3a, 0x05, 0x9c, + 0xb8, 0x14, 0x7d, 0x0e, 0x8a, 0x4b, 0xac, 0xee, 0x09, 0xb5, 0xc8, 0x94, 0xd9, 0xcb, 0xdc, 0xec, + 0xa6, 0x30, 0x7b, 0x36, 0x43, 0xad, 0x53, 0xc0, 0x33, 0x4d, 0x20, 0x07, 0x36, 0xe3, 0xf5, 0x1f, + 0xf7, 0x52, 0xe3, 0x5e, 0x76, 0x84, 0x97, 0x4f, 0xd3, 0xb5, 0x3b, 0x05, 0x9c, 0x65, 0x10, 0x7d, + 0x2f, 0xc1, 0xf6, 0xd0, 0xee, 0x6a, 0x8c, 0x64, 0x18, 0x53, 0x96, 0xb9, 0xeb, 0x5b, 0xc2, 0xf5, + 0xd3, 0x3c, 0x6b, 0x3a, 0x05, 0x9c, 0xcf, 0x38, 0x0f, 0xc3, 0x21, 0x26, 0x7d, 0x95, 0x19, 0x06, + 0x8a, 0x84, 0x81, 0xf3, 0xac, 0xf1, 0xc2, 0xc8, 0x65, 0x1c, 0x7d, 0x2b, 0xc1, 0x96, 0x3e, 0xd0, + 0x0c, 0x33, 0x2b, 0x8a, 0x2b, 0x3c, 0x8a, 0x9b, 0x22, 0x8a, 0x07, 0x39, 0x96, 0x74, 0x0a, 0x38, + 0x97, 0x69, 0xf4, 0x06, 0x54, 0x97, 0xb0, 0xa1, 0x2d, 0x3e, 0xf8, 0x23, 0x8d, 0x69, 0x2e, 0x61, + 0xf1, 0x00, 0x56, 0x78, 0x00, 0xff, 0x0f, 0xca, 0x2d, 0x6b, 0x41, 0xa7, 0x80, 0x73, 0x98, 0x45, + 0xdf, 0xc0, 0x0d, 0x7f, 0xa7, 0xd2, 0xbd, 0xaf, 0x72, 0xef, 0xbb, 0x91, 0x43, 0xc8, 0x72, 0x9f, + 0xc7, 0x30, 0x1a, 0xc0, 0x86, 0x66, 0xdb, 0x0e, 0x7d, 0xa5, 0x0d, 0x1e, 0x72, 0xb2, 0x8f, 0x7b, + 0xae, 0x73, 0xcf, 0x5b, 0xc2, 0xf3, 0x61, 0x9a, 0x6e, 0xa7, 0x80, 0xd3, 0x8d, 0x79, 0xde, 0xa2, + 0xd7, 0x47, 0xdc, 0x5b, 0x23, 0xe2, 0xed, 0x24, 0x4d, 0xd7, 0xf3, 0x96, 0x6a, 0x0c, 0xad, 0xc3, + 0x62, 0x80, 0x29, 0x0a, 0x67, 0xb9, 0x89, 0x00, 0x6d, 0xc3, 0xbc, 0x1f, 0xa4, 0x72, 0x95, 0x3b, + 0xad, 0x8e, 0x09, 0x8a, 0x0b, 0xb1, 0x00, 0xdb, 0xcb, 0x11, 0x56, 0xf6, 0xec, 0xaa, 0x75, 0x58, + 0x49, 0x62, 0x31, 0xf5, 0x1e, 0x28, 0xb3, 0x68, 0x08, 0xad, 0xc1, 0xfc, 0xa1, 0xe9, 0x9d, 0x03, + 0xbf, 0x0f, 0x7d, 0xee, 0x17, 0x12, 0xf5, 0x2f, 0x09, 0x36, 0xb3, 0x8a, 0x74, 0x0b, 0xaa, 0x9e, + 0xca, 0xe9, 0xf0, 0x62, 0x60, 0xe8, 0x9f, 0x90, 0x11, 0x37, 0x53, 0xc1, 0x51, 0x21, 0xda, 0x81, + 0xa5, 0xd8, 0xad, 0x26, 0xf3, 0x5b, 0x2d, 0x26, 0x45, 0x77, 0xa1, 0xec, 0x2d, 0x1c, 0x2b, 0x15, + 0xf9, 0x06, 0xa0, 0x10, 0xc9, 0x09, 0x04, 0x87, 0xd5, 0x50, 0x0b, 0xaa, 0x8f, 0xa9, 0xfe, 0x92, + 0x74, 0xdb, 0xda, 0x40, 0xb3, 0x74, 0xc2, 0xef, 0x63, 0x3f, 0x95, 0x28, 0x80, 0x6e, 0x43, 0xe9, + 0x94, 0xd2, 0xd7, 0x16, 0xbf, 0x8b, 0xcb, 0x07, 0x0d, 0x61, 0xf9, 0x34, 0xd6, 0xbc, 0x60, 0x5f, + 0x4b, 0xfd, 0x5d, 0x82, 0xed, 0x5c, 0xfc, 0x96, 0x73, 0x1b, 0x62, 0xe9, 0xc9, 0xef, 0x98, 0x5e, + 0x31, 0x33, 0xbd, 0xb9, 0x5c, 0xe9, 0x9d, 0xc0, 0x76, 0x2e, 0xda, 0xcc, 0x97, 0x9d, 0xfa, 0x06, + 0xb6, 0xf2, 0xf0, 0x5f, 0xce, 0xbd, 0x0a, 0x72, 0x91, 0x73, 0xe5, 0xf2, 0x87, 0x04, 0x6a, 0x36, + 0xf9, 0xf9, 0xbd, 0x19, 0x63, 0x53, 0xbd, 0x99, 0x34, 0xee, 0xcd, 0xa6, 0xb1, 0xb4, 0xde, 0x4c, + 0x4e, 0xef, 0xcd, 0xd6, 0x60, 0xe1, 0xd4, 0xa1, 0x36, 0x71, 0xd8, 0x88, 0x1f, 0xda, 0x22, 0x0e, + 0xfe, 0xa3, 0x15, 0x28, 0x3d, 0xd3, 0x06, 0x43, 0xbf, 0x58, 0x17, 0xb1, 0xff, 0x07, 0x5d, 0x87, + 0x85, 0x93, 0xa1, 0xde, 0xf7, 0x9a, 0x2f, 0x5e, 0xa3, 0x73, 0xfc, 0x98, 0x03, 0x99, 0xfa, 0xab, + 0x04, 0x37, 0x72, 0xb0, 0xec, 0x7f, 0x3d, 0x4f, 0xf5, 0x6b, 0xd8, 0x48, 0xa5, 0x6c, 0x74, 0x07, + 0x16, 0xc6, 0x0a, 0x3c, 0xe8, 0xa5, 0x83, 0xd5, 0x08, 0x0f, 0x8e, 0x41, 0x1c, 0xa8, 0x79, 0xdf, + 0x49, 0xb8, 0xf7, 0x0b, 0x37, 0xf3, 0x51, 0x40, 0xfd, 0x4d, 0x82, 0x8d, 0x54, 0x0e, 0x47, 0xc7, + 0x80, 0xa2, 0x0a, 0xc7, 0xd6, 0x0b, 0xca, 0x03, 0x29, 0x1f, 0x5c, 0x4d, 0xbc, 0x05, 0x3c, 0x05, + 0x9c, 0xb0, 0x08, 0x7d, 0x04, 0xca, 0x53, 0xcb, 0x35, 0x7a, 0x16, 0xe9, 0x86, 0xbd, 0xf0, 0x16, + 0x57, 0xe6, 0x95, 0x3f, 0x13, 0x47, 0xd7, 0x01, 0x02, 0x63, 0x1e, 0x1d, 0x16, 0x5b, 0x15, 0x1c, + 0x92, 0xa8, 0x37, 0x61, 0xf5, 0xe3, 0xc8, 0xe1, 0x63, 0xf2, 0xc5, 0x90, 0xb8, 0x4c, 0x4c, 0x33, + 0x52, 0x78, 0x9a, 0x51, 0x7f, 0x94, 0xa1, 0x1e, 0xd5, 0x76, 0xc7, 0xea, 0xd3, 0xfc, 0x2c, 0x25, + 0xf2, 0xf3, 0x64, 0xe4, 0x91, 0x23, 0x23, 0xcf, 0x2e, 0x2c, 0x05, 0xf3, 0xc2, 0x19, 0xd3, 0x1c, + 0x16, 0xe2, 0xa8, 0x18, 0x82, 0x76, 0xa0, 0x12, 0x48, 0x1e, 0x5a, 0xdd, 0x10, 0x59, 0x47, 0xe4, + 0x49, 0x83, 0x4d, 0x29, 0x79, 0xb0, 0xb9, 0x03, 0x70, 0x1a, 0x0c, 0x98, 0x7c, 0x5e, 0x2a, 0x1f, + 0x2c, 0x8f, 0xf9, 0x22, 0x00, 0x70, 0x48, 0x49, 0x7d, 0x09, 0x8d, 0xa9, 0xad, 0x70, 0x6d, 0x6a, + 0xb9, 0x04, 0x29, 0x50, 0x3a, 0xa7, 0x4c, 0x94, 0x9d, 0xff, 0xfd, 0xf9, 0x02, 0x74, 0x0f, 0x2a, + 0xe1, 0x15, 0x8a, 0xdc, 0x2c, 0x86, 0xf8, 0x3b, 0x7c, 0x0a, 0x11, 0x3d, 0xf5, 0x08, 0xea, 0xa7, + 0xd4, 0x4d, 0x3a, 0xa6, 0xe8, 0x18, 0xe3, 0xd7, 0x84, 0xcf, 0x86, 0x53, 0x72, 0xf5, 0x09, 0x34, + 0xa6, 0xac, 0x88, 0x90, 0xef, 0x46, 0x86, 0x5c, 0x51, 0xa6, 0x49, 0x71, 0x85, 0xd5, 0xd4, 0x9f, + 0x24, 0xa8, 0x7b, 0x7d, 0xc1, 0xbf, 0x8b, 0xcb, 0xeb, 0x66, 0x1e, 0xf4, 0x35, 0xc3, 0x3f, 0x21, + 0xaf, 0x2c, 0x4a, 0x78, 0x22, 0xf0, 0x4e, 0xd1, 0x1f, 0x78, 0x27, 0x74, 0x5f, 0xf4, 0x87, 0xc7, + 0x98, 0x58, 0xc5, 0xd0, 0x98, 0x8a, 0x46, 0xe4, 0xf7, 0x01, 0x54, 0xda, 0xa1, 0x97, 0x02, 0x91, + 0xe0, 0x15, 0x91, 0x60, 0x18, 0xc2, 0x11, 0x45, 0xf5, 0x07, 0x09, 0x36, 0x45, 0x4e, 0x7c, 0x6a, + 0x9f, 0x51, 0xfb, 0x11, 0x76, 0xf0, 0x32, 0x2d, 0xb6, 0x8a, 0x38, 0x26, 0xcd, 0xc8, 0x33, 0xf5, + 0xa9, 0x40, 0xfd, 0x59, 0x82, 0x75, 0x2f, 0xb9, 0x99, 0x41, 0x44, 0x8c, 0x4b, 0x71, 0xe3, 0xb7, + 0x60, 0x39, 0xbc, 0x68, 0xcc, 0x1d, 0x1e, 0x1b, 0x4c, 0x03, 0xff, 0x60, 0xcb, 0x9f, 0xc3, 0xc6, + 0x8c, 0xa8, 0xc4, 0xc6, 0x7f, 0x08, 0xd5, 0xf0, 0x7e, 0xfa, 0x5b, 0x33, 0x63, 0xe7, 0xa3, 0x9a, + 0xea, 0x09, 0x6c, 0x46, 0xbf, 0xb0, 0x13, 0xc3, 0x32, 0xcc, 0xa1, 0xf9, 0x88, 0x90, 0x77, 0xa9, + 0xfe, 0xfb, 0xd0, 0x9c, 0x6d, 0x4e, 0x44, 0x2b, 0x1e, 0x38, 0xa4, 0xc8, 0x03, 0xc7, 0xee, 0x2f, + 0x32, 0x24, 0x3c, 0x85, 0xd4, 0xe2, 0x9d, 0x72, 0xad, 0x80, 0x14, 0xff, 0xe1, 0x26, 0xde, 0x27, + 0xd7, 0x24, 0xb4, 0x09, 0xd7, 0x52, 0xba, 0x9a, 0x9a, 0x8c, 0x76, 0xe0, 0x7f, 0x99, 0x8d, 0x62, + 0xed, 0x2d, 0xd7, 0xcb, 0x6c, 0xb9, 0x6a, 0x6f, 0xe7, 0xd0, 0x36, 0x34, 0xb3, 0x7a, 0xa9, 0xda, + 0xdb, 0x79, 0xa4, 0xc2, 0xf5, 0xf4, 0xa6, 0xa7, 0x56, 0x44, 0x5b, 0xde, 0x27, 0x90, 0xda, 0x31, + 0xd4, 0xbe, 0x93, 0xd1, 0x06, 0x5c, 0x9d, 0x79, 0x21, 0xd7, 0xe6, 0xda, 0xbb, 0xcf, 0x5b, 0x3d, + 0x83, 0xf5, 0x87, 0x17, 0x7b, 0x3a, 0x35, 0xf7, 0xbf, 0xa2, 0xf4, 0x42, 0xf7, 0x7f, 0x6f, 0xeb, + 0xd4, 0x21, 0xfb, 0x3a, 0x35, 0x4d, 0x6a, 0xed, 0xf3, 0xaa, 0xb8, 0x98, 0xe7, 0x4f, 0x6f, 0xef, + 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x18, 0x37, 0x31, 0xc5, 0x3a, 0x14, 0x00, 0x00, } From 107c7713b4a6b9ddaf4959d3b8a79ef981957627 Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Wed, 19 Feb 2020 15:11:21 +0800 Subject: [PATCH 05/17] #596 add multisignature tx type skeleton --- common/transaction/multiSignature.go | 147 +++++++++++++++++++++++++++ common/transaction/transaction.go | 15 ++- 2 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 common/transaction/multiSignature.go diff --git a/common/transaction/multiSignature.go b/common/transaction/multiSignature.go new file mode 100644 index 000000000..756f577a6 --- /dev/null +++ b/common/transaction/multiSignature.go @@ -0,0 +1,147 @@ +package transaction + +import ( + "bytes" + + "github.com/zoobc/zoobc-core/common/constant" + "github.com/zoobc/zoobc-core/common/fee" + "github.com/zoobc/zoobc-core/common/model" + "github.com/zoobc/zoobc-core/common/util" +) + +type ( + // MultiSignatureTransaction represent wrapper transaction type that require multiple signer to approve the transcaction + // wrapped + MultiSignatureTransaction struct { + Body *model.MultiSignatureTransactionBody + NormalFee fee.FeeModelInterface + } +) + +func (*MultiSignatureTransaction) ApplyConfirmed(blockTimestamp int64) error { + return nil +} + +func (*MultiSignatureTransaction) ApplyUnconfirmed() error { + return nil +} + +func (*MultiSignatureTransaction) UndoApplyUnconfirmed() error { + return nil +} + +// Validate dbTx specify whether validation should read from transaction state or db state +func (*MultiSignatureTransaction) Validate(dbTx bool) error { + // make sure at least one of 3 optional body field is filled (multisig-info, tx-bytes, signature) + // if signature exist, make sure tx-bytes exist + return nil +} + +func (tx *MultiSignatureTransaction) GetMinimumFee() (int64, error) { + minFee, err := tx.NormalFee.CalculateTxMinimumFee(tx.Body, nil) + if err != nil { + return 0, err + } + return minFee, err +} + +func (*MultiSignatureTransaction) GetAmount() int64 { + return 0 +} + +func (tx *MultiSignatureTransaction) GetSize() uint32 { + var ( + txByteSize, signaturesSize, multisigInfoSize uint32 + ) + + multisigInfo := tx.Body.GetMultiSignatureInfo() + multisigInfoSize += constant.MultiSigInfoMinSignature + multisigInfoSize += constant.MultiSigInfoNonce + for _, v := range multisigInfo.GetAddresses() { + multisigInfoSize += uint32(len([]byte(v))) + } + + txByteSize = uint32(len(tx.Body.GetUnsignedTransactionBytes())) + for _, v := range tx.Body.GetSignatures() { + signaturesSize += uint32(len(v)) + } + return txByteSize + signaturesSize + multisigInfoSize +} + +func (tx *MultiSignatureTransaction) ParseBodyBytes(txBodyBytes []byte) (model.TransactionBodyInterface, error) { + var ( + addresses []string + signatures [][]byte + ) + bufferBytes := bytes.NewBuffer(txBodyBytes) + minSignatures := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigInfoMinSignature))) + nonce := util.ConvertBytesToUint64(bufferBytes.Next(int(constant.MultiSigInfoNonce))) + addressesLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigNumberOfAddress))) + for i := 0; i < int(addressesLength); i++ { + addressLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigAddressLength))) + address, err := util.ReadTransactionBytes(bufferBytes, int(addressLength)) + if err != nil { + return nil, err + } + addresses = append(addresses, string(address)) + } + multisigInfo := &model.MultiSignatureInfo{ + MinimumSignatures: minSignatures, + Nonce: int64(nonce), + Addresses: addresses, + } + unsignedTxLength := util.ConvertUint32ToBytes(tx.Body.GetMultiSignatureInfo().GetMinimumSignatures()) + unsignedTx, err := util.ReadTransactionBytes(bufferBytes, int(unsignedTxLength)) + if err != nil { + return nil, err + } + signaturesLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigNumberOfSignatures))) + for i := 0; i < int(signaturesLength); i++ { + signatureLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigSignatureLength))) + signature, err := util.ReadTransactionBytes(bufferBytes, int(signatureLength)) + if err != nil { + return nil, err + } + signatures = append(signatures, signature) + } + return &model.MultiSignatureTransactionBody{ + MultiSignatureInfo: multisigInfo, + UnsignedTransactionBytes: unsignedTx, + Signatures: signatures, + }, nil +} + +func (tx *MultiSignatureTransaction) GetBodyBytes() []byte { + var ( + buffer = bytes.NewBuffer([]byte{}) + ) + buffer.Write(util.ConvertUint32ToBytes(tx.Body.GetMultiSignatureInfo().GetMinimumSignatures())) + buffer.Write(util.ConvertUint64ToBytes(uint64(tx.Body.GetMultiSignatureInfo().GetNonce()))) + buffer.Write(util.ConvertUint32ToBytes(uint32(len(tx.Body.GetMultiSignatureInfo().GetAddresses())))) + for _, v := range tx.Body.GetMultiSignatureInfo().GetAddresses() { + buffer.Write(util.ConvertUint32ToBytes(uint32(len([]byte(v))))) + buffer.Write([]byte(v)) + } + buffer.Write(util.ConvertUint32ToBytes(uint32(len(tx.Body.GetUnsignedTransactionBytes())))) + buffer.Write(tx.Body.GetUnsignedTransactionBytes()) + buffer.Write(util.ConvertUint32ToBytes(uint32(len(tx.Body.GetSignatures())))) + for _, v := range tx.Body.GetSignatures() { + buffer.Write(util.ConvertUint32ToBytes(uint32(len(v)))) + buffer.Write(v) + } + return buffer.Bytes() +} + +func (tx *MultiSignatureTransaction) GetTransactionBody(transaction *model.Transaction) { + transaction.TransactionBody = &model.Transaction_MultiSignatureTransactionBody{ + MultiSignatureTransactionBody: tx.Body, + } +} + +func (*MultiSignatureTransaction) SkipMempoolTransaction(selectedTransactions []*model.Transaction) (bool, error) { + return false, nil +} + +func (*MultiSignatureTransaction) Escrowable() (EscrowTypeAction, bool) { + return nil, false +} diff --git a/common/transaction/transaction.go b/common/transaction/transaction.go index 3d6339847..e9bc05010 100644 --- a/common/transaction/transaction.go +++ b/common/transaction/transaction.go @@ -224,7 +224,20 @@ func (ts *TypeSwitcher) GetTransactionType(tx *model.Transaction) (TypeAction, e default: return nil, nil } - + case 5: + switch buf[1] { + case 0: + multiSigTransactionBody, err := new(MultiSignatureTransaction).ParseBodyBytes(tx.GetTransactionBodyBytes()) + if err != nil { + return nil, err + } + return &MultiSignatureTransaction{ + Body: multiSigTransactionBody.(*model.MultiSignatureTransactionBody), + NormalFee: fee.NewConstantFeeModel(constant.OneZBC / 100), + }, nil + default: + return nil, nil + } default: return nil, nil } From c9bebf46c26f921a200506fc2b5e0f5b5d48b0ed Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Wed, 19 Feb 2020 15:12:02 +0800 Subject: [PATCH 06/17] #596 add multisig tx type enum --- common/model/transaction.pb.go | 181 +++++++++++++++++---------------- 1 file changed, 93 insertions(+), 88 deletions(-) diff --git a/common/model/transaction.pb.go b/common/model/transaction.pb.go index aed768ee2..9184b00ef 100644 --- a/common/model/transaction.pb.go +++ b/common/model/transaction.pb.go @@ -41,6 +41,8 @@ const ( TransactionType_RemoveAccountDatasetTransaction TransactionType = 259 // in bytes: []byte{4,0,0,0} TransactionType_ApprovalEscrowTransaction TransactionType = 4 + // in bytes: []byte{5,0,0,0} + TransactionType_MultiSignatureTransaction TransactionType = 5 ) var TransactionType_name = map[int32]string{ @@ -53,6 +55,7 @@ var TransactionType_name = map[int32]string{ 3: "SetupAccountDatasetTransaction", 259: "RemoveAccountDatasetTransaction", 4: "ApprovalEscrowTransaction", + 5: "MultiSignatureTransaction", } var TransactionType_value = map[string]int32{ @@ -65,6 +68,7 @@ var TransactionType_value = map[string]int32{ "SetupAccountDatasetTransaction": 3, "RemoveAccountDatasetTransaction": 259, "ApprovalEscrowTransaction": 4, + "MultiSignatureTransaction": 5, } func (x TransactionType) String() string { @@ -1550,95 +1554,96 @@ func init() { func init() { proto.RegisterFile("model/transaction.proto", fileDescriptor_8333001f09b34082) } var fileDescriptor_8333001f09b34082 = []byte{ - // 1438 bytes of a gzipped FileDescriptorProto + // 1444 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x73, 0xdb, 0xc4, - 0x17, 0xb7, 0xe4, 0x38, 0x4d, 0x9e, 0xed, 0xd4, 0xd9, 0x26, 0xb6, 0x9a, 0x26, 0x8d, 0xbf, 0x6a, + 0x17, 0xb7, 0xe4, 0x38, 0x4d, 0x5e, 0xec, 0x54, 0xd9, 0x26, 0xb6, 0x9a, 0x26, 0x8d, 0xbf, 0x6a, 0x92, 0xf1, 0x37, 0x6d, 0x13, 0x1a, 0x3a, 0xa5, 0x70, 0x8b, 0x9b, 0x16, 0x67, 0x68, 0x68, 0xd8, - 0xa4, 0x3d, 0x74, 0x86, 0x83, 0x22, 0x6f, 0x6d, 0x4d, 0x2d, 0xad, 0x90, 0xd6, 0x2d, 0xa6, 0x0c, - 0x33, 0x14, 0x38, 0x30, 0xc3, 0x91, 0xbf, 0x88, 0x19, 0xf8, 0x2b, 0x38, 0x72, 0xe2, 0x8f, 0x60, + 0xa4, 0x3d, 0x74, 0x86, 0x83, 0x22, 0x6f, 0x6d, 0x4d, 0x2d, 0xad, 0x90, 0xd6, 0x2d, 0xa1, 0x0c, + 0x33, 0x14, 0x38, 0x30, 0xc3, 0x91, 0x7f, 0x09, 0xfe, 0x0a, 0x2e, 0xcc, 0x70, 0xe2, 0x8f, 0x60, 0x18, 0xad, 0xd6, 0xb2, 0x24, 0xcb, 0x92, 0x28, 0x17, 0x2e, 0x9e, 0xf1, 0xfb, 0xbc, 0x7d, 0x3f, - 0x76, 0x9f, 0x3e, 0xfb, 0xde, 0x42, 0xc3, 0xa4, 0x5d, 0x32, 0xd8, 0x67, 0x8e, 0x66, 0xb9, 0x9a, - 0xce, 0x0c, 0x6a, 0xed, 0xd9, 0x0e, 0x65, 0x14, 0x95, 0x38, 0xb0, 0xb6, 0xee, 0xe3, 0xb6, 0x43, - 0xe9, 0x8b, 0x27, 0x2f, 0x9e, 0xbc, 0xb6, 0x88, 0xe3, 0xf6, 0x0d, 0xdb, 0x57, 0x5a, 0xab, 0x0b, - 0x54, 0xeb, 0x19, 0x96, 0x36, 0x59, 0xbc, 0xa6, 0xf8, 0xf2, 0x0b, 0x8d, 0xe9, 0x7d, 0x4c, 0x74, - 0x62, 0xd8, 0x4c, 0x20, 0xc2, 0x9e, 0x45, 0xbb, 0x04, 0x93, 0x9e, 0xe1, 0x32, 0x27, 0xbc, 0x0e, - 0xf9, 0x28, 0x71, 0x75, 0x87, 0xbe, 0x16, 0xb2, 0x35, 0x5f, 0x66, 0x0e, 0x07, 0xcc, 0x38, 0x33, - 0x7a, 0x96, 0xc6, 0x86, 0x0e, 0xf1, 0x31, 0xf5, 0xcf, 0x2a, 0x94, 0xcf, 0x27, 0xa1, 0x23, 0x05, - 0x2e, 0x3d, 0x23, 0x8e, 0x6b, 0x50, 0x4b, 0x91, 0x9a, 0x52, 0xab, 0x8a, 0xc7, 0x7f, 0x11, 0x02, - 0xf9, 0xf8, 0x48, 0x91, 0x9b, 0x52, 0xab, 0xd8, 0x96, 0xdf, 0x93, 0xb0, 0x7c, 0x7c, 0x84, 0xd6, - 0xe1, 0x52, 0x7b, 0x40, 0xf5, 0x97, 0xc7, 0x47, 0x4a, 0x31, 0x00, 0xc6, 0x22, 0x54, 0x87, 0xf9, - 0x0e, 0x31, 0x7a, 0x7d, 0xa6, 0xcc, 0x71, 0x53, 0xe2, 0x1f, 0x3a, 0x80, 0x95, 0x33, 0x62, 0x75, - 0x89, 0x73, 0xa8, 0xeb, 0x74, 0x68, 0xb1, 0xc3, 0x6e, 0xd7, 0x21, 0xae, 0xab, 0x94, 0x9a, 0x52, - 0x6b, 0x11, 0x27, 0x62, 0xe8, 0x3e, 0x34, 0x30, 0xd1, 0x0d, 0xdb, 0x20, 0x16, 0x8b, 0x2d, 0x9b, - 0xe7, 0xcb, 0x66, 0xc1, 0xa8, 0x05, 0x97, 0x43, 0x09, 0x9e, 0x8f, 0x6c, 0xa2, 0x5c, 0xe2, 0xe1, - 0xc4, 0xc5, 0x68, 0x05, 0x8a, 0x8f, 0x08, 0x51, 0x16, 0x82, 0x4c, 0xbc, 0xbf, 0xa8, 0x09, 0x8b, - 0xe7, 0x86, 0x49, 0x5c, 0xa6, 0x99, 0xb6, 0xb2, 0x18, 0x60, 0x13, 0x61, 0xcc, 0x43, 0x47, 0x73, - 0xfb, 0x0a, 0x34, 0xa5, 0x56, 0x05, 0xc7, 0xc5, 0xe8, 0x2e, 0xac, 0x86, 0x44, 0x6d, 0xda, 0x1d, - 0x3d, 0x26, 0x56, 0x8f, 0xf5, 0x95, 0x32, 0x8f, 0x28, 0x19, 0xf4, 0xf6, 0x2b, 0x06, 0xb4, 0x47, - 0x8c, 0xb8, 0x4a, 0x85, 0x3b, 0x49, 0xc4, 0xd0, 0x2e, 0xd4, 0x42, 0xf2, 0x63, 0xab, 0x4b, 0xbe, - 0x54, 0xaa, 0xdc, 0xc9, 0x94, 0x1c, 0x7d, 0x06, 0x2b, 0xc4, 0xb4, 0xd9, 0x28, 0x66, 0x48, 0x59, - 0x6a, 0x4a, 0xad, 0xf2, 0xc1, 0xb5, 0x3d, 0x5e, 0x3e, 0x7b, 0x0f, 0x13, 0x54, 0x3a, 0x05, 0x9c, - 0xb8, 0x14, 0x7d, 0x0e, 0x8a, 0x4b, 0xac, 0xee, 0x09, 0xb5, 0xc8, 0x94, 0xd9, 0xcb, 0xdc, 0xec, - 0xa6, 0x30, 0x7b, 0x36, 0x43, 0xad, 0x53, 0xc0, 0x33, 0x4d, 0x20, 0x07, 0x36, 0xe3, 0xf5, 0x1f, - 0xf7, 0x52, 0xe3, 0x5e, 0x76, 0x84, 0x97, 0x4f, 0xd3, 0xb5, 0x3b, 0x05, 0x9c, 0x65, 0x10, 0x7d, - 0x2f, 0xc1, 0xf6, 0xd0, 0xee, 0x6a, 0x8c, 0x64, 0x18, 0x53, 0x96, 0xb9, 0xeb, 0x5b, 0xc2, 0xf5, - 0xd3, 0x3c, 0x6b, 0x3a, 0x05, 0x9c, 0xcf, 0x38, 0x0f, 0xc3, 0x21, 0x26, 0x7d, 0x95, 0x19, 0x06, - 0x8a, 0x84, 0x81, 0xf3, 0xac, 0xf1, 0xc2, 0xc8, 0x65, 0x1c, 0x7d, 0x2b, 0xc1, 0x96, 0x3e, 0xd0, - 0x0c, 0x33, 0x2b, 0x8a, 0x2b, 0x3c, 0x8a, 0x9b, 0x22, 0x8a, 0x07, 0x39, 0x96, 0x74, 0x0a, 0x38, - 0x97, 0x69, 0xf4, 0x06, 0x54, 0x97, 0xb0, 0xa1, 0x2d, 0x3e, 0xf8, 0x23, 0x8d, 0x69, 0x2e, 0x61, - 0xf1, 0x00, 0x56, 0x78, 0x00, 0xff, 0x0f, 0xca, 0x2d, 0x6b, 0x41, 0xa7, 0x80, 0x73, 0x98, 0x45, - 0xdf, 0xc0, 0x0d, 0x7f, 0xa7, 0xd2, 0xbd, 0xaf, 0x72, 0xef, 0xbb, 0x91, 0x43, 0xc8, 0x72, 0x9f, - 0xc7, 0x30, 0x1a, 0xc0, 0x86, 0x66, 0xdb, 0x0e, 0x7d, 0xa5, 0x0d, 0x1e, 0x72, 0xb2, 0x8f, 0x7b, - 0xae, 0x73, 0xcf, 0x5b, 0xc2, 0xf3, 0x61, 0x9a, 0x6e, 0xa7, 0x80, 0xd3, 0x8d, 0x79, 0xde, 0xa2, - 0xd7, 0x47, 0xdc, 0x5b, 0x23, 0xe2, 0xed, 0x24, 0x4d, 0xd7, 0xf3, 0x96, 0x6a, 0x0c, 0xad, 0xc3, - 0x62, 0x80, 0x29, 0x0a, 0x67, 0xb9, 0x89, 0x00, 0x6d, 0xc3, 0xbc, 0x1f, 0xa4, 0x72, 0x95, 0x3b, - 0xad, 0x8e, 0x09, 0x8a, 0x0b, 0xb1, 0x00, 0xdb, 0xcb, 0x11, 0x56, 0xf6, 0xec, 0xaa, 0x75, 0x58, - 0x49, 0x62, 0x31, 0xf5, 0x1e, 0x28, 0xb3, 0x68, 0x08, 0xad, 0xc1, 0xfc, 0xa1, 0xe9, 0x9d, 0x03, - 0xbf, 0x0f, 0x7d, 0xee, 0x17, 0x12, 0xf5, 0x2f, 0x09, 0x36, 0xb3, 0x8a, 0x74, 0x0b, 0xaa, 0x9e, - 0xca, 0xe9, 0xf0, 0x62, 0x60, 0xe8, 0x9f, 0x90, 0x11, 0x37, 0x53, 0xc1, 0x51, 0x21, 0xda, 0x81, - 0xa5, 0xd8, 0xad, 0x26, 0xf3, 0x5b, 0x2d, 0x26, 0x45, 0x77, 0xa1, 0xec, 0x2d, 0x1c, 0x2b, 0x15, - 0xf9, 0x06, 0xa0, 0x10, 0xc9, 0x09, 0x04, 0x87, 0xd5, 0x50, 0x0b, 0xaa, 0x8f, 0xa9, 0xfe, 0x92, - 0x74, 0xdb, 0xda, 0x40, 0xb3, 0x74, 0xc2, 0xef, 0x63, 0x3f, 0x95, 0x28, 0x80, 0x6e, 0x43, 0xe9, - 0x94, 0xd2, 0xd7, 0x16, 0xbf, 0x8b, 0xcb, 0x07, 0x0d, 0x61, 0xf9, 0x34, 0xd6, 0xbc, 0x60, 0x5f, - 0x4b, 0xfd, 0x5d, 0x82, 0xed, 0x5c, 0xfc, 0x96, 0x73, 0x1b, 0x62, 0xe9, 0xc9, 0xef, 0x98, 0x5e, - 0x31, 0x33, 0xbd, 0xb9, 0x5c, 0xe9, 0x9d, 0xc0, 0x76, 0x2e, 0xda, 0xcc, 0x97, 0x9d, 0xfa, 0x06, - 0xb6, 0xf2, 0xf0, 0x5f, 0xce, 0xbd, 0x0a, 0x72, 0x91, 0x73, 0xe5, 0xf2, 0x87, 0x04, 0x6a, 0x36, - 0xf9, 0xf9, 0xbd, 0x19, 0x63, 0x53, 0xbd, 0x99, 0x34, 0xee, 0xcd, 0xa6, 0xb1, 0xb4, 0xde, 0x4c, - 0x4e, 0xef, 0xcd, 0xd6, 0x60, 0xe1, 0xd4, 0xa1, 0x36, 0x71, 0xd8, 0x88, 0x1f, 0xda, 0x22, 0x0e, - 0xfe, 0xa3, 0x15, 0x28, 0x3d, 0xd3, 0x06, 0x43, 0xbf, 0x58, 0x17, 0xb1, 0xff, 0x07, 0x5d, 0x87, - 0x85, 0x93, 0xa1, 0xde, 0xf7, 0x9a, 0x2f, 0x5e, 0xa3, 0x73, 0xfc, 0x98, 0x03, 0x99, 0xfa, 0xab, - 0x04, 0x37, 0x72, 0xb0, 0xec, 0x7f, 0x3d, 0x4f, 0xf5, 0x6b, 0xd8, 0x48, 0xa5, 0x6c, 0x74, 0x07, - 0x16, 0xc6, 0x0a, 0x3c, 0xe8, 0xa5, 0x83, 0xd5, 0x08, 0x0f, 0x8e, 0x41, 0x1c, 0xa8, 0x79, 0xdf, - 0x49, 0xb8, 0xf7, 0x0b, 0x37, 0xf3, 0x51, 0x40, 0xfd, 0x4d, 0x82, 0x8d, 0x54, 0x0e, 0x47, 0xc7, - 0x80, 0xa2, 0x0a, 0xc7, 0xd6, 0x0b, 0xca, 0x03, 0x29, 0x1f, 0x5c, 0x4d, 0xbc, 0x05, 0x3c, 0x05, - 0x9c, 0xb0, 0x08, 0x7d, 0x04, 0xca, 0x53, 0xcb, 0x35, 0x7a, 0x16, 0xe9, 0x86, 0xbd, 0xf0, 0x16, - 0x57, 0xe6, 0x95, 0x3f, 0x13, 0x47, 0xd7, 0x01, 0x02, 0x63, 0x1e, 0x1d, 0x16, 0x5b, 0x15, 0x1c, - 0x92, 0xa8, 0x37, 0x61, 0xf5, 0xe3, 0xc8, 0xe1, 0x63, 0xf2, 0xc5, 0x90, 0xb8, 0x4c, 0x4c, 0x33, - 0x52, 0x78, 0x9a, 0x51, 0x7f, 0x94, 0xa1, 0x1e, 0xd5, 0x76, 0xc7, 0xea, 0xd3, 0xfc, 0x2c, 0x25, - 0xf2, 0xf3, 0x64, 0xe4, 0x91, 0x23, 0x23, 0xcf, 0x2e, 0x2c, 0x05, 0xf3, 0xc2, 0x19, 0xd3, 0x1c, - 0x16, 0xe2, 0xa8, 0x18, 0x82, 0x76, 0xa0, 0x12, 0x48, 0x1e, 0x5a, 0xdd, 0x10, 0x59, 0x47, 0xe4, - 0x49, 0x83, 0x4d, 0x29, 0x79, 0xb0, 0xb9, 0x03, 0x70, 0x1a, 0x0c, 0x98, 0x7c, 0x5e, 0x2a, 0x1f, - 0x2c, 0x8f, 0xf9, 0x22, 0x00, 0x70, 0x48, 0x49, 0x7d, 0x09, 0x8d, 0xa9, 0xad, 0x70, 0x6d, 0x6a, - 0xb9, 0x04, 0x29, 0x50, 0x3a, 0xa7, 0x4c, 0x94, 0x9d, 0xff, 0xfd, 0xf9, 0x02, 0x74, 0x0f, 0x2a, - 0xe1, 0x15, 0x8a, 0xdc, 0x2c, 0x86, 0xf8, 0x3b, 0x7c, 0x0a, 0x11, 0x3d, 0xf5, 0x08, 0xea, 0xa7, - 0xd4, 0x4d, 0x3a, 0xa6, 0xe8, 0x18, 0xe3, 0xd7, 0x84, 0xcf, 0x86, 0x53, 0x72, 0xf5, 0x09, 0x34, - 0xa6, 0xac, 0x88, 0x90, 0xef, 0x46, 0x86, 0x5c, 0x51, 0xa6, 0x49, 0x71, 0x85, 0xd5, 0xd4, 0x9f, - 0x24, 0xa8, 0x7b, 0x7d, 0xc1, 0xbf, 0x8b, 0xcb, 0xeb, 0x66, 0x1e, 0xf4, 0x35, 0xc3, 0x3f, 0x21, - 0xaf, 0x2c, 0x4a, 0x78, 0x22, 0xf0, 0x4e, 0xd1, 0x1f, 0x78, 0x27, 0x74, 0x5f, 0xf4, 0x87, 0xc7, - 0x98, 0x58, 0xc5, 0xd0, 0x98, 0x8a, 0x46, 0xe4, 0xf7, 0x01, 0x54, 0xda, 0xa1, 0x97, 0x02, 0x91, - 0xe0, 0x15, 0x91, 0x60, 0x18, 0xc2, 0x11, 0x45, 0xf5, 0x07, 0x09, 0x36, 0x45, 0x4e, 0x7c, 0x6a, - 0x9f, 0x51, 0xfb, 0x11, 0x76, 0xf0, 0x32, 0x2d, 0xb6, 0x8a, 0x38, 0x26, 0xcd, 0xc8, 0x33, 0xf5, - 0xa9, 0x40, 0xfd, 0x59, 0x82, 0x75, 0x2f, 0xb9, 0x99, 0x41, 0x44, 0x8c, 0x4b, 0x71, 0xe3, 0xb7, - 0x60, 0x39, 0xbc, 0x68, 0xcc, 0x1d, 0x1e, 0x1b, 0x4c, 0x03, 0xff, 0x60, 0xcb, 0x9f, 0xc3, 0xc6, - 0x8c, 0xa8, 0xc4, 0xc6, 0x7f, 0x08, 0xd5, 0xf0, 0x7e, 0xfa, 0x5b, 0x33, 0x63, 0xe7, 0xa3, 0x9a, - 0xea, 0x09, 0x6c, 0x46, 0xbf, 0xb0, 0x13, 0xc3, 0x32, 0xcc, 0xa1, 0xf9, 0x88, 0x90, 0x77, 0xa9, - 0xfe, 0xfb, 0xd0, 0x9c, 0x6d, 0x4e, 0x44, 0x2b, 0x1e, 0x38, 0xa4, 0xc8, 0x03, 0xc7, 0xee, 0x2f, - 0x32, 0x24, 0x3c, 0x85, 0xd4, 0xe2, 0x9d, 0x72, 0xad, 0x80, 0x14, 0xff, 0xe1, 0x26, 0xde, 0x27, - 0xd7, 0x24, 0xb4, 0x09, 0xd7, 0x52, 0xba, 0x9a, 0x9a, 0x8c, 0x76, 0xe0, 0x7f, 0x99, 0x8d, 0x62, - 0xed, 0x2d, 0xd7, 0xcb, 0x6c, 0xb9, 0x6a, 0x6f, 0xe7, 0xd0, 0x36, 0x34, 0xb3, 0x7a, 0xa9, 0xda, - 0xdb, 0x79, 0xa4, 0xc2, 0xf5, 0xf4, 0xa6, 0xa7, 0x56, 0x44, 0x5b, 0xde, 0x27, 0x90, 0xda, 0x31, - 0xd4, 0xbe, 0x93, 0xd1, 0x06, 0x5c, 0x9d, 0x79, 0x21, 0xd7, 0xe6, 0xda, 0xbb, 0xcf, 0x5b, 0x3d, - 0x83, 0xf5, 0x87, 0x17, 0x7b, 0x3a, 0x35, 0xf7, 0xbf, 0xa2, 0xf4, 0x42, 0xf7, 0x7f, 0x6f, 0xeb, - 0xd4, 0x21, 0xfb, 0x3a, 0x35, 0x4d, 0x6a, 0xed, 0xf3, 0xaa, 0xb8, 0x98, 0xe7, 0x4f, 0x6f, 0xef, - 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x18, 0x37, 0x31, 0xc5, 0x3a, 0x14, 0x00, 0x00, + 0x76, 0x9f, 0x3e, 0xfb, 0xde, 0x42, 0xc3, 0xa2, 0x5d, 0x32, 0xd8, 0x63, 0xae, 0x6e, 0x7b, 0xba, + 0xc1, 0x4c, 0x6a, 0xef, 0x3a, 0x2e, 0x65, 0x14, 0x55, 0x38, 0xb0, 0xba, 0x16, 0xe0, 0x8e, 0x4b, + 0xe9, 0x8b, 0x27, 0x2f, 0x9e, 0xbc, 0xb6, 0x89, 0xeb, 0xf5, 0x4d, 0x27, 0x50, 0x5a, 0xad, 0x0b, + 0x54, 0xef, 0x99, 0xb6, 0x3e, 0x5e, 0xbc, 0xaa, 0x06, 0xf2, 0x73, 0x9d, 0x19, 0x7d, 0x4c, 0x0c, + 0x62, 0x3a, 0x4c, 0x20, 0xc2, 0x9e, 0x4d, 0xbb, 0x04, 0x93, 0x9e, 0xe9, 0x31, 0x37, 0xba, 0x0e, + 0x05, 0x28, 0xf1, 0x0c, 0x97, 0xbe, 0x16, 0xb2, 0xd5, 0x40, 0x66, 0x0d, 0x07, 0xcc, 0x3c, 0x35, + 0x7b, 0xb6, 0xce, 0x86, 0x2e, 0x09, 0x30, 0xed, 0xcf, 0x1a, 0x2c, 0x9c, 0x8d, 0x43, 0x47, 0x2a, + 0x5c, 0x7a, 0x46, 0x5c, 0xcf, 0xa4, 0xb6, 0x2a, 0x35, 0xa5, 0x56, 0x0d, 0x8f, 0xfe, 0x22, 0x04, + 0xf2, 0xd1, 0xa1, 0x2a, 0x37, 0xa5, 0x56, 0xb9, 0x2d, 0xbf, 0x27, 0x61, 0xf9, 0xe8, 0x10, 0xad, + 0xc1, 0xa5, 0xf6, 0x80, 0x1a, 0x2f, 0x8f, 0x0e, 0xd5, 0x72, 0x08, 0x8c, 0x44, 0xa8, 0x0e, 0xb3, + 0x1d, 0x62, 0xf6, 0xfa, 0x4c, 0x9d, 0xe1, 0xa6, 0xc4, 0x3f, 0xb4, 0x0f, 0xcb, 0xa7, 0xc4, 0xee, + 0x12, 0xf7, 0xc0, 0x30, 0xe8, 0xd0, 0x66, 0x07, 0xdd, 0xae, 0x4b, 0x3c, 0x4f, 0xad, 0x34, 0xa5, + 0xd6, 0x3c, 0x4e, 0xc5, 0xd0, 0x7d, 0x68, 0x60, 0x62, 0x98, 0x8e, 0x49, 0x6c, 0x96, 0x58, 0x36, + 0xcb, 0x97, 0x4d, 0x83, 0x51, 0x0b, 0x2e, 0x47, 0x12, 0x3c, 0xbb, 0x70, 0x88, 0x7a, 0x89, 0x87, + 0x93, 0x14, 0xa3, 0x65, 0x28, 0x3f, 0x22, 0x44, 0x9d, 0x0b, 0x33, 0xf1, 0xff, 0xa2, 0x26, 0xcc, + 0x9f, 0x99, 0x16, 0xf1, 0x98, 0x6e, 0x39, 0xea, 0x7c, 0x88, 0x8d, 0x85, 0x09, 0x0f, 0x1d, 0xdd, + 0xeb, 0xab, 0xd0, 0x94, 0x5a, 0x55, 0x9c, 0x14, 0xa3, 0xbb, 0xb0, 0x12, 0x11, 0xb5, 0x69, 0xf7, + 0xe2, 0x31, 0xb1, 0x7b, 0xac, 0xaf, 0x2e, 0xf0, 0x88, 0xd2, 0x41, 0x7f, 0xbf, 0x12, 0x40, 0xfb, + 0x82, 0x11, 0x4f, 0xad, 0x72, 0x27, 0xa9, 0x18, 0xda, 0x01, 0x25, 0x22, 0x3f, 0xb2, 0xbb, 0xe4, + 0x4b, 0xb5, 0xc6, 0x9d, 0x4c, 0xc8, 0xd1, 0x67, 0xb0, 0x4c, 0x2c, 0x87, 0x5d, 0x24, 0x0c, 0xa9, + 0x8b, 0x4d, 0xa9, 0xb5, 0xb0, 0x7f, 0x6d, 0x97, 0x97, 0xcf, 0xee, 0xc3, 0x14, 0x95, 0x4e, 0x09, + 0xa7, 0x2e, 0x45, 0x9f, 0x83, 0xea, 0x11, 0xbb, 0x7b, 0x4c, 0x6d, 0x32, 0x61, 0xf6, 0x32, 0x37, + 0xbb, 0x21, 0xcc, 0x9e, 0x4e, 0x51, 0xeb, 0x94, 0xf0, 0x54, 0x13, 0xc8, 0x85, 0x8d, 0x64, 0xfd, + 0x27, 0xbd, 0x28, 0xdc, 0xcb, 0xb6, 0xf0, 0xf2, 0x69, 0xb6, 0x76, 0xa7, 0x84, 0xf3, 0x0c, 0xa2, + 0xef, 0x25, 0xd8, 0x1a, 0x3a, 0x5d, 0x9d, 0x91, 0x1c, 0x63, 0xea, 0x12, 0x77, 0x7d, 0x4b, 0xb8, + 0x7e, 0x5a, 0x64, 0x4d, 0xa7, 0x84, 0x8b, 0x19, 0xe7, 0x61, 0xb8, 0xc4, 0xa2, 0xaf, 0x72, 0xc3, + 0x40, 0xb1, 0x30, 0x70, 0x91, 0x35, 0x7e, 0x18, 0x85, 0x8c, 0xa3, 0x6f, 0x25, 0xd8, 0x34, 0x06, + 0xba, 0x69, 0xe5, 0x45, 0x71, 0x85, 0x47, 0x71, 0x53, 0x44, 0xf1, 0xa0, 0xc0, 0x92, 0x4e, 0x09, + 0x17, 0x32, 0x8d, 0xde, 0x80, 0xe6, 0x11, 0x36, 0x74, 0xc4, 0x07, 0x7f, 0xa8, 0x33, 0xdd, 0x23, + 0x2c, 0x19, 0xc0, 0x32, 0x0f, 0xe0, 0xff, 0x61, 0xb9, 0xe5, 0x2d, 0xe8, 0x94, 0x70, 0x01, 0xb3, + 0xe8, 0x1b, 0xb8, 0x11, 0xec, 0x54, 0xb6, 0xf7, 0x15, 0xee, 0x7d, 0x27, 0x76, 0x08, 0x79, 0xee, + 0x8b, 0x18, 0x46, 0x03, 0x58, 0xd7, 0x1d, 0xc7, 0xa5, 0xaf, 0xf4, 0xc1, 0x43, 0x4e, 0xf6, 0x49, + 0xcf, 0x75, 0xee, 0x79, 0x53, 0x78, 0x3e, 0xc8, 0xd2, 0xed, 0x94, 0x70, 0xb6, 0x31, 0xdf, 0x5b, + 0xfc, 0xfa, 0x48, 0x7a, 0x6b, 0xc4, 0xbc, 0x1d, 0x67, 0xe9, 0xfa, 0xde, 0x32, 0x8d, 0xa1, 0x35, + 0x98, 0x0f, 0x31, 0x55, 0xe5, 0x2c, 0x37, 0x16, 0xa0, 0x2d, 0x98, 0x0d, 0x82, 0x54, 0xaf, 0x72, + 0xa7, 0xb5, 0x11, 0x41, 0x71, 0x21, 0x16, 0x60, 0x7b, 0x29, 0xc6, 0xca, 0xbe, 0x5d, 0xad, 0x0e, + 0xcb, 0x69, 0x2c, 0xa6, 0xdd, 0x03, 0x75, 0x1a, 0x0d, 0xa1, 0x55, 0x98, 0x3d, 0xb0, 0xfc, 0x73, + 0xe0, 0xf7, 0x61, 0xc0, 0xfd, 0x42, 0xa2, 0xfd, 0x25, 0xc1, 0x46, 0x5e, 0x91, 0x6e, 0x42, 0xcd, + 0x57, 0x39, 0x19, 0x9e, 0x0f, 0x4c, 0xe3, 0x13, 0x72, 0xc1, 0xcd, 0x54, 0x71, 0x5c, 0x88, 0xb6, + 0x61, 0x31, 0x71, 0xab, 0xc9, 0xfc, 0x56, 0x4b, 0x48, 0xd1, 0x5d, 0x58, 0xf0, 0x17, 0x8e, 0x94, + 0xca, 0x7c, 0x03, 0x50, 0x84, 0xe4, 0x04, 0x82, 0xa3, 0x6a, 0xa8, 0x05, 0xb5, 0xc7, 0xd4, 0x78, + 0x49, 0xba, 0x6d, 0x7d, 0xa0, 0xdb, 0x06, 0xe1, 0xf7, 0x71, 0x90, 0x4a, 0x1c, 0x40, 0xb7, 0xa1, + 0x72, 0x42, 0xe9, 0x6b, 0x9b, 0xdf, 0xc5, 0x0b, 0xfb, 0x0d, 0x61, 0xf9, 0x24, 0xd1, 0xbc, 0xe0, + 0x40, 0x4b, 0xfb, 0x4d, 0x82, 0xad, 0x42, 0xfc, 0x56, 0x70, 0x1b, 0x12, 0xe9, 0xc9, 0xef, 0x98, + 0x5e, 0x39, 0x37, 0xbd, 0x99, 0x42, 0xe9, 0x1d, 0xc3, 0x56, 0x21, 0xda, 0x2c, 0x96, 0x9d, 0xf6, + 0x06, 0x36, 0x8b, 0xf0, 0x5f, 0xc1, 0xbd, 0x0a, 0x73, 0x91, 0x0b, 0xe5, 0xf2, 0x87, 0x04, 0x5a, + 0x3e, 0xf9, 0x05, 0xbd, 0x19, 0x63, 0x13, 0xbd, 0x99, 0x34, 0xea, 0xcd, 0x26, 0xb1, 0xac, 0xde, + 0x4c, 0xce, 0xee, 0xcd, 0x56, 0x61, 0xee, 0xc4, 0xa5, 0x0e, 0x71, 0xd9, 0x05, 0x3f, 0xb4, 0x79, + 0x1c, 0xfe, 0x47, 0xcb, 0x50, 0x79, 0xa6, 0x0f, 0x86, 0x41, 0xb1, 0xce, 0xe3, 0xe0, 0x0f, 0xba, + 0x0e, 0x73, 0xc7, 0x43, 0xa3, 0xef, 0x37, 0x5f, 0xbc, 0x46, 0x67, 0xf8, 0x31, 0x87, 0x32, 0xed, + 0x17, 0x09, 0x6e, 0x14, 0x60, 0xd9, 0xff, 0x7a, 0x9e, 0xda, 0xd7, 0xb0, 0x9e, 0x49, 0xd9, 0xe8, + 0x0e, 0xcc, 0x8d, 0x14, 0x78, 0xd0, 0x8b, 0xfb, 0x2b, 0x31, 0x1e, 0x1c, 0x81, 0x38, 0x54, 0xf3, + 0xbf, 0x93, 0x68, 0xef, 0x17, 0x6d, 0xe6, 0xe3, 0x80, 0xf6, 0xab, 0x04, 0xeb, 0x99, 0x1c, 0x8e, + 0x8e, 0x00, 0xc5, 0x15, 0x8e, 0xec, 0x17, 0x94, 0x07, 0xb2, 0xb0, 0x7f, 0x35, 0xf5, 0x16, 0xf0, + 0x15, 0x70, 0xca, 0x22, 0xf4, 0x11, 0xa8, 0x4f, 0x6d, 0xcf, 0xec, 0xd9, 0xa4, 0x1b, 0xf5, 0xc2, + 0x5b, 0x5c, 0x99, 0x57, 0xfe, 0x54, 0x1c, 0x5d, 0x07, 0x08, 0x8d, 0xf9, 0x74, 0x58, 0x6e, 0x55, + 0x71, 0x44, 0xa2, 0xdd, 0x84, 0x95, 0x8f, 0x63, 0x87, 0x8f, 0xc9, 0x17, 0x43, 0xe2, 0x31, 0x31, + 0xcd, 0x48, 0xd1, 0x69, 0x46, 0xfb, 0x51, 0x86, 0x7a, 0x5c, 0xdb, 0x1b, 0xa9, 0x4f, 0xf2, 0xb3, + 0x94, 0xca, 0xcf, 0xe3, 0x91, 0x47, 0x8e, 0x8d, 0x3c, 0x3b, 0xb0, 0x18, 0xce, 0x0b, 0xa7, 0x4c, + 0x77, 0x59, 0x84, 0xa3, 0x12, 0x08, 0xda, 0x86, 0x6a, 0x28, 0x79, 0x68, 0x77, 0x23, 0x64, 0x1d, + 0x93, 0xa7, 0x0d, 0x36, 0x95, 0xf4, 0xc1, 0xe6, 0x0e, 0xc0, 0x49, 0x38, 0x60, 0xf2, 0x79, 0x69, + 0x61, 0x7f, 0x69, 0xc4, 0x17, 0x21, 0x80, 0x23, 0x4a, 0xda, 0x4b, 0x68, 0x4c, 0x6c, 0x85, 0xe7, + 0x50, 0xdb, 0x23, 0x48, 0x85, 0xca, 0x19, 0x65, 0xa2, 0xec, 0x82, 0xef, 0x2f, 0x10, 0xa0, 0x7b, + 0x50, 0x8d, 0xae, 0x50, 0xe5, 0x66, 0x39, 0xc2, 0xdf, 0xd1, 0x53, 0x88, 0xe9, 0x69, 0x87, 0x50, + 0x3f, 0xa1, 0x5e, 0xda, 0x31, 0xc5, 0xc7, 0x98, 0xa0, 0x26, 0x02, 0x36, 0x9c, 0x90, 0x6b, 0x4f, + 0xa0, 0x31, 0x61, 0x45, 0x84, 0x7c, 0x37, 0x36, 0xe4, 0x8a, 0x32, 0x4d, 0x8b, 0x2b, 0xaa, 0xa6, + 0xfd, 0x24, 0x41, 0xdd, 0xef, 0x0b, 0xfe, 0x5d, 0x5c, 0x7e, 0x37, 0xf3, 0xa0, 0xaf, 0x9b, 0xc1, + 0x09, 0xf9, 0x65, 0x51, 0xc1, 0x63, 0x81, 0x7f, 0x8a, 0xc1, 0xc0, 0x3b, 0xa6, 0xfb, 0x72, 0x30, + 0x3c, 0x26, 0xc4, 0x1a, 0x86, 0xc6, 0x44, 0x34, 0x22, 0xbf, 0x0f, 0xa0, 0xda, 0x8e, 0xbc, 0x14, + 0x88, 0x04, 0xaf, 0x88, 0x04, 0xa3, 0x10, 0x8e, 0x29, 0x6a, 0x3f, 0x48, 0xb0, 0x21, 0x72, 0xe2, + 0x53, 0xfb, 0x94, 0xda, 0x8f, 0xb1, 0x83, 0x9f, 0x69, 0xb9, 0x55, 0xc6, 0x09, 0x69, 0x4e, 0x9e, + 0x99, 0x4f, 0x05, 0xda, 0xcf, 0x12, 0xac, 0xf9, 0xc9, 0x4d, 0x0d, 0x22, 0x66, 0x5c, 0x4a, 0x1a, + 0xbf, 0x05, 0x4b, 0xd1, 0x45, 0x23, 0xee, 0xf0, 0xd9, 0x60, 0x12, 0xf8, 0x07, 0x5b, 0xfe, 0x1c, + 0xd6, 0xa7, 0x44, 0x25, 0x36, 0xfe, 0x43, 0xa8, 0x45, 0xf7, 0x33, 0xd8, 0x9a, 0x29, 0x3b, 0x1f, + 0xd7, 0xd4, 0x8e, 0x61, 0x23, 0xfe, 0x85, 0x1d, 0x9b, 0xb6, 0x69, 0x0d, 0xad, 0x47, 0x84, 0xbc, + 0x4b, 0xf5, 0xdf, 0x87, 0xe6, 0x74, 0x73, 0x22, 0x5a, 0xf1, 0xc0, 0x21, 0xc5, 0x1e, 0x38, 0x76, + 0x7e, 0x97, 0x21, 0xe5, 0x29, 0x44, 0x49, 0x76, 0xca, 0x4a, 0x09, 0xa9, 0xc1, 0xc3, 0x4d, 0xb2, + 0x4f, 0x56, 0x24, 0xb4, 0x01, 0xd7, 0x32, 0xba, 0x1a, 0x45, 0x46, 0xdb, 0xf0, 0xbf, 0xdc, 0x46, + 0x51, 0x79, 0xcb, 0xf5, 0x72, 0x5b, 0x2e, 0xe5, 0xed, 0x0c, 0xda, 0x82, 0x66, 0x5e, 0x2f, 0xa5, + 0xbc, 0x9d, 0x45, 0x1a, 0x5c, 0xcf, 0x6e, 0x7a, 0x94, 0x32, 0xda, 0xf4, 0x3f, 0x81, 0xcc, 0x8e, + 0x41, 0xf9, 0x4e, 0x46, 0xeb, 0x70, 0x75, 0xea, 0x85, 0xac, 0xcc, 0xf8, 0xf0, 0xd4, 0x0b, 0x53, + 0xa9, 0xb4, 0x77, 0x9e, 0xb7, 0x7a, 0x26, 0xeb, 0x0f, 0xcf, 0x77, 0x0d, 0x6a, 0xed, 0x7d, 0x45, + 0xe9, 0xb9, 0x11, 0xfc, 0xde, 0x36, 0xa8, 0x4b, 0xf6, 0x0c, 0x6a, 0x59, 0xd4, 0xde, 0xe3, 0x45, + 0x73, 0x3e, 0xcb, 0x5f, 0xe6, 0xde, 0xff, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x47, 0xbc, 0x4e, 0xd9, + 0x59, 0x14, 0x00, 0x00, } From d8421caf3d64ecac711e7ebf2a81ff52d127fcae Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Thu, 20 Feb 2020 11:40:57 +0800 Subject: [PATCH 07/17] #596 add command tools for generate multisignature tx and parsing any tx --- cmd/main.go | 8 +++++ cmd/parser/cmd.go | 58 ++++++++++++++++++++++++++++++++++++ cmd/parser/const.go | 7 +++++ cmd/transaction/cmd.go | 28 +++++++++++++++++ cmd/transaction/const.go | 8 +++++ cmd/transaction/generator.go | 50 +++++++++++++++++++++++++++++++ 6 files changed, 159 insertions(+) create mode 100644 cmd/parser/cmd.go create mode 100644 cmd/parser/const.go diff --git a/cmd/main.go b/cmd/main.go index 002903836..5a3ab4e5f 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -7,6 +7,8 @@ import ( "strings" "time" + "github.com/zoobc/zoobc-core/cmd/parser" + "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/zoobc/zoobc-core/cmd/account" @@ -48,6 +50,10 @@ func main() { Use: "generate", Short: "generate command is a parent command for generating stuffs", } + parserCmd = &cobra.Command{ + Use: "parser", + Short: "parse transaction by providing the transaction bytes", + } ) sqliteDbInstance = database.NewSqliteDB() @@ -67,9 +73,11 @@ func main() { rootCmd.AddCommand(generateCmd) rootCmd.AddCommand(genesisblock.Commands()) rootCmd.AddCommand(rollback.Commands(sqliteDB)) + rootCmd.AddCommand(parserCmd) generateCmd.AddCommand(account.Commands()) generateCmd.AddCommand(transaction.Commands(sqliteDB)) generateCmd.AddCommand(block.Commands()) + parserCmd.AddCommand(parser.Commands()) _ = rootCmd.Execute() } diff --git a/cmd/parser/cmd.go b/cmd/parser/cmd.go new file mode 100644 index 000000000..08d467a94 --- /dev/null +++ b/cmd/parser/cmd.go @@ -0,0 +1,58 @@ +package parser + +import ( + "encoding/hex" + "fmt" + "strconv" + "strings" + + "github.com/spf13/cobra" + "github.com/zoobc/zoobc-core/common/transaction" +) + +var ( + /* + Transaction Parser Command + */ + txParserCmd = &cobra.Command{ + Use: "tx", + Short: "parse transaction from its hex representation", + Long: "transaction parser to check the content of you transaction hex", + } +) + +func init() { + txParserCmd.Flags().StringVar(&parserTxHex, "transaction-hex", "", "hex string of the transaction bytes") + txParserCmd.Flags().StringVar(&parserTxBytes, "transaction-bytes", "", "transaction bytes separated by `, `. eg:"+ + "--transaction-bytes='1, 222, 54, 12, 32'") +} + +func Commands() *cobra.Command { + txParserCmd.Run = ParseTransaction + return txParserCmd +} + +func ParseTransaction(*cobra.Command, []string) { + var txBytes []byte + if parserTxHex != "" { + txBytes, _ = hex.DecodeString(parserTxHex) + } else { + txByteCharSlice := strings.Split(parserTxBytes, ", ") + for _, v := range txByteCharSlice { + byteValue, err := strconv.Atoi(v) + if err != nil { + panic("failed to parse transaction bytes") + } + txBytes = append(txBytes, byte(byteValue)) + } + } + tx, err := (&transaction.Util{}).ParseTransactionBytes(txBytes, false) + if err != nil { + panic("error parsing tx" + err.Error()) + } + tx.TransactionBody, err = (&transaction.MultiSignatureTransaction{}).ParseBodyBytes(tx.TransactionBodyBytes) + if err != nil { + panic("error parsing tx body" + err.Error()) + } + fmt.Printf("transaction:\n%v\n", tx) +} diff --git a/cmd/parser/const.go b/cmd/parser/const.go new file mode 100644 index 000000000..a910c55a7 --- /dev/null +++ b/cmd/parser/const.go @@ -0,0 +1,7 @@ +package parser + +var ( + // txParser + parserTxHex string + parserTxBytes string +) diff --git a/cmd/transaction/cmd.go b/cmd/transaction/cmd.go index 7dea7ac2b..c9d2812d8 100644 --- a/cmd/transaction/cmd.go +++ b/cmd/transaction/cmd.go @@ -54,6 +54,12 @@ var ( Short: "transaction sub command used to generate 'escrow approval' transaction", Long: "transaction sub command used to generate 'escrow approval' transaction. required transaction id and approval = true:false", } + multiSigCmd = &cobra.Command{ + Use: "multi-signature", + Short: "transaction sub command used to generate 'multi signature' transaction", + Long: "transaction sub command used to generate 'multi signature' transaction that require multiple account to submit their signature " + + "before it is valid to be executed", + } ) func init() { @@ -124,6 +130,17 @@ func init() { */ escrowApprovalCmd.Flags().Int64Var(&transactionID, "transaction-id", 0, "escrow approval body field which is int64") escrowApprovalCmd.Flags().BoolVar(&approval, "approval", false, "escrow approval body field which is bool") + /* + MultiSig Command + */ + multiSigCmd.Flags().StringSliceVar(&addresses, "addresses", []string{}, "list of participants "+ + "--addresses='address1,address2'") + multiSigCmd.Flags().Int64Var(&nonce, "nonce", 0, "random number / access code for the multisig info") + multiSigCmd.Flags().Uint32Var(&minSignature, "min-signature", 0, "minimum number of signature required for the transaction "+ + "to be valid") + multiSigCmd.Flags().StringVar(&unsignedTxHex, "unsigned-transaction", "", "hex string of the unsigned transaction bytes") + multiSigCmd.Flags().StringSliceVar(&signaturesHex, "signatures", []string{}, "hex string signatures supplied in form of "+ + "--signatures='signature1,signature2'") } // Commands set TXGeneratorCommandsInstance that will used by whole commands @@ -148,6 +165,8 @@ func Commands(sqliteDB *sql.DB) *cobra.Command { txCmd.AddCommand(removeAccountDatasetCmd) escrowApprovalCmd.Run = txGeneratorCommandsInstance.EscrowApprovalProcess() txCmd.AddCommand(escrowApprovalCmd) + multiSigCmd.Run = txGeneratorCommandsInstance.MultiSignatureProcess() + txCmd.AddCommand(multiSigCmd) return txCmd } @@ -258,3 +277,12 @@ func (*TXGeneratorCommands) EscrowApprovalProcess() RunCommand { PrintTx(GenerateSignedTxBytes(tx, senderSeed), outputType) } } + +// MultiSignatureProcess for generate TX MultiSignature type +func (*TXGeneratorCommands) MultiSignatureProcess() RunCommand { + return func(ccmd *cobra.Command, args []string) { + tx := GenerateBasicTransaction(senderSeed, version, timestamp, fee, recipientAccountAddress) + tx = GeneratedMultiSignatureTransaction(tx, minSignature, nonce, unsignedTxHex, signaturesHex, addresses) + PrintTx(GenerateSignedTxBytes(tx, senderSeed), outputType) + } +} diff --git a/cmd/transaction/const.go b/cmd/transaction/const.go index 08b1da4e7..49683a587 100644 --- a/cmd/transaction/const.go +++ b/cmd/transaction/const.go @@ -12,6 +12,7 @@ var ( "setupAccountDataset": {3, 0, 0, 0}, "removeAccountDataset": {3, 1, 0, 0}, "approvalEscrow": {4, 0, 0, 0}, + "multiSignature": {5, 0, 0, 0}, } signature = &crypto.Signature{} @@ -46,4 +47,11 @@ var ( // escrowApproval approval bool transactionID int64 + + // multiSignature + unsignedTxHex string + signaturesHex []string + addresses []string + nonce int64 + minSignature uint32 ) diff --git a/cmd/transaction/generator.go b/cmd/transaction/generator.go index b670854ee..2accc8aa7 100644 --- a/cmd/transaction/generator.go +++ b/cmd/transaction/generator.go @@ -276,6 +276,7 @@ func GenerateSignedTxBytes(tx *model.Transaction, senderSeed string) []byte { senderSeed, ) signedTxBytes, _ := transactionUtil.GetTransactionBytes(tx, true) + fmt.Printf("signedBytes: %v\n", len(signedTxBytes)) return signedTxBytes } @@ -324,3 +325,52 @@ func GenerateEscrowedTransaction( } return tx } + +/* +GeneratedMultiSignatureTransaction inject escrow. Need: + 1. unsignedTxHex + 2. signatures + 3. multisigInfo: + - minSignature + - nonce + - addresses +Invalid escrow validation when those fields has not set +*/ +func GeneratedMultiSignatureTransaction( + tx *model.Transaction, + minSignature uint32, + nonce int64, + unsignedTxHex string, + signatureHexes, addresses []string, +) *model.Transaction { + var ( + signatures [][]byte + ) + unsignedTx, err := hex.DecodeString(unsignedTxHex) + if err != nil { + return nil + } + for _, v := range signatureHexes { + signature, err := hex.DecodeString(v) + if err != nil { + return nil + } + signatures = append(signatures, signature) + } + tx.TransactionType = util.ConvertBytesToUint32(txTypeMap["multiSignature"]) + txBody := &model.MultiSignatureTransactionBody{ + MultiSignatureInfo: &model.MultiSignatureInfo{ + MinimumSignatures: minSignature, + Nonce: nonce, + Addresses: addresses, + }, + UnsignedTransactionBytes: unsignedTx, + Signatures: signatures, + } + tx.TransactionBodyBytes = (&transaction.MultiSignatureTransaction{ + Body: txBody, + }).GetBodyBytes() + fmt.Printf("length: %v\n", len(tx.TransactionBodyBytes)) + tx.TransactionBodyLength = uint32(len(tx.TransactionBodyBytes)) + return tx +} From 77e47e8959b1503e4670f10dce48586620821c2b Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Thu, 20 Feb 2020 11:42:12 +0800 Subject: [PATCH 08/17] #596 basic multisignature parsing functionality --- common/transaction/multiSignature.go | 10 +- common/transaction/multiSignature_test.go | 242 ++++++++++++++++++++++ common/transaction/transactionGeneral.go | 1 - 3 files changed, 248 insertions(+), 5 deletions(-) create mode 100644 common/transaction/multiSignature_test.go diff --git a/common/transaction/multiSignature.go b/common/transaction/multiSignature.go index 756f577a6..909d7c2f5 100644 --- a/common/transaction/multiSignature.go +++ b/common/transaction/multiSignature.go @@ -32,8 +32,6 @@ func (*MultiSignatureTransaction) UndoApplyUnconfirmed() error { // Validate dbTx specify whether validation should read from transaction state or db state func (*MultiSignatureTransaction) Validate(dbTx bool) error { - // make sure at least one of 3 optional body field is filled (multisig-info, tx-bytes, signature) - // if signature exist, make sure tx-bytes exist return nil } @@ -57,12 +55,16 @@ func (tx *MultiSignatureTransaction) GetSize() uint32 { multisigInfo := tx.Body.GetMultiSignatureInfo() multisigInfoSize += constant.MultiSigInfoMinSignature multisigInfoSize += constant.MultiSigInfoNonce + multisigInfoSize += constant.MultiSigNumberOfAddress for _, v := range multisigInfo.GetAddresses() { + multisigInfoSize += constant.MultiSigAddressLength multisigInfoSize += uint32(len([]byte(v))) } - txByteSize = uint32(len(tx.Body.GetUnsignedTransactionBytes())) + txByteSize = constant.MultiSigUnsignedTxBytesLength + uint32(len(tx.Body.GetUnsignedTransactionBytes())) + signaturesSize += constant.MultiSigNumberOfSignatures for _, v := range tx.Body.GetSignatures() { + signaturesSize += constant.MultiSigSignatureLength signaturesSize += uint32(len(v)) } return txByteSize + signaturesSize + multisigInfoSize @@ -90,7 +92,7 @@ func (tx *MultiSignatureTransaction) ParseBodyBytes(txBodyBytes []byte) (model.T Nonce: int64(nonce), Addresses: addresses, } - unsignedTxLength := util.ConvertUint32ToBytes(tx.Body.GetMultiSignatureInfo().GetMinimumSignatures()) + unsignedTxLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigUnsignedTxBytesLength))) unsignedTx, err := util.ReadTransactionBytes(bufferBytes, int(unsignedTxLength)) if err != nil { return nil, err diff --git a/common/transaction/multiSignature_test.go b/common/transaction/multiSignature_test.go new file mode 100644 index 000000000..30d03cbf3 --- /dev/null +++ b/common/transaction/multiSignature_test.go @@ -0,0 +1,242 @@ +package transaction + +import ( + "math/rand" + "reflect" + "testing" + + "github.com/zoobc/zoobc-core/common/constant" + + "github.com/zoobc/zoobc-core/common/fee" + "github.com/zoobc/zoobc-core/common/model" +) + +func TestMultiSignatureTransaction_GetSize(t *testing.T) { + type fields struct { + Body *model.MultiSignatureTransactionBody + NormalFee fee.FeeModelInterface + } + tests := []struct { + name string + fields fields + want uint32 + }{ + { + name: "GetSize-Success-no_addresses-no_signatures-no_transactionBytes", + fields: fields{ + Body: &model.MultiSignatureTransactionBody{ + MultiSignatureInfo: &model.MultiSignatureInfo{ + MinimumSignatures: rand.Uint32(), + Nonce: rand.Int63(), + Addresses: nil, + }, + UnsignedTransactionBytes: nil, + Signatures: nil, + }, + NormalFee: nil, + }, + want: constant.MultiSigInfoMinSignature + constant.MultiSigInfoNonce + constant.MultiSigNumberOfAddress + + constant.MultiSigUnsignedTxBytesLength + constant.MultiSigNumberOfSignatures, + }, + { + name: "GetSize-Success-with_addresses-no_signatures-no_transactionBytes", + fields: fields{ + Body: &model.MultiSignatureTransactionBody{ + MultiSignatureInfo: &model.MultiSignatureInfo{ + MinimumSignatures: rand.Uint32(), + Nonce: rand.Int63(), + Addresses: []string{ + "A", + }, + }, + UnsignedTransactionBytes: nil, + Signatures: nil, + }, + NormalFee: nil, + }, + want: constant.MultiSigInfoMinSignature + constant.MultiSigInfoNonce + constant.MultiSigNumberOfAddress + + constant.MultiSigUnsignedTxBytesLength + constant.MultiSigNumberOfSignatures + + constant.MultiSigAddressLength + uint32(len([]byte("A"))), + }, + { + name: "GetSize-Success-with_addresses-with_signatures-no_transactionBytes", + fields: fields{ + Body: &model.MultiSignatureTransactionBody{ + MultiSignatureInfo: &model.MultiSignatureInfo{ + MinimumSignatures: rand.Uint32(), + Nonce: rand.Int63(), + Addresses: []string{ + "A", + }, + }, + UnsignedTransactionBytes: nil, + Signatures: [][]byte{ + make([]byte, 64), + }, + }, + NormalFee: nil, + }, + want: constant.MultiSigInfoMinSignature + constant.MultiSigInfoNonce + constant.MultiSigNumberOfAddress + + constant.MultiSigUnsignedTxBytesLength + constant.MultiSigNumberOfSignatures + + constant.MultiSigAddressLength + uint32(len([]byte("A"))) + + constant.MultiSigSignatureLength + 64, + }, + { + name: "GetSize-Success-with_addresses-with_signatures-with_transactionBytes", + fields: fields{ + Body: &model.MultiSignatureTransactionBody{ + MultiSignatureInfo: &model.MultiSignatureInfo{ + MinimumSignatures: rand.Uint32(), + Nonce: rand.Int63(), + Addresses: []string{ + "A", + }, + }, + UnsignedTransactionBytes: make([]byte, 120), + Signatures: [][]byte{ + make([]byte, 64), + }, + }, + NormalFee: nil, + }, + want: constant.MultiSigInfoMinSignature + constant.MultiSigInfoNonce + constant.MultiSigNumberOfAddress + + constant.MultiSigNumberOfSignatures + + constant.MultiSigAddressLength + uint32(len([]byte("A"))) + + constant.MultiSigSignatureLength + 64 + + constant.MultiSigUnsignedTxBytesLength + 120, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tx := &MultiSignatureTransaction{ + Body: tt.fields.Body, + NormalFee: tt.fields.NormalFee, + } + if got := tx.GetSize(); got != tt.want { + t.Errorf("GetSize() = %v, want %v", got, tt.want) + } + }) + } +} + +var ( + // mock for GetBodyBytes & ParseBodyBytes + mockMultipleSignatureBody = &model.MultiSignatureTransactionBody{ + MultiSignatureInfo: &model.MultiSignatureInfo{ + MinimumSignatures: 2, + Nonce: 1, + Addresses: []string{ + "A", + "B", + "C", + }, + }, + UnsignedTransactionBytes: make([]byte, 120), + Signatures: [][]byte{ + make([]byte, 64), + make([]byte, 64), + make([]byte, 64), + }, + } + mockMultipleSignatureBodyBytes = []byte{ + 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, 65, 1, 0, 0, 0, 66, 1, 0, 0, 0, 67, + 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, + 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + } + // mock for GetBodyBytes & ParseBodyBytes +) + +func TestMultiSignatureTransaction_GetBodyBytes(t *testing.T) { + type fields struct { + Body *model.MultiSignatureTransactionBody + NormalFee fee.FeeModelInterface + } + tests := []struct { + name string + fields fields + want []byte + }{ + { + name: "GetBodyBytes-Success", + fields: fields{ + Body: nil, + NormalFee: nil, + }, + want: make([]byte, 24), + }, + { + name: "GetBodyBytes-Success-Complete", + fields: fields{ + Body: mockMultipleSignatureBody, + NormalFee: nil, + }, + want: mockMultipleSignatureBodyBytes, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tx := &MultiSignatureTransaction{ + Body: tt.fields.Body, + NormalFee: tt.fields.NormalFee, + } + if got := tx.GetBodyBytes(); !reflect.DeepEqual(got, tt.want) { + t.Errorf("GetBodyBytes() = %v, want %v", got, tt.want) + } + }) + } +} + +func TestMultiSignatureTransaction_ParseBodyBytes(t *testing.T) { + type fields struct { + Body *model.MultiSignatureTransactionBody + NormalFee fee.FeeModelInterface + } + type args struct { + txBodyBytes []byte + } + tests := []struct { + name string + fields fields + args args + want model.TransactionBodyInterface + wantErr bool + }{ + { + name: "ParseBodyBytes-success", + fields: fields{ + Body: nil, + NormalFee: nil, + }, + args: args{ + txBodyBytes: mockMultipleSignatureBodyBytes, + }, + want: mockMultipleSignatureBody, + wantErr: false, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + tx := &MultiSignatureTransaction{ + Body: tt.fields.Body, + NormalFee: tt.fields.NormalFee, + } + got, err := tx.ParseBodyBytes(tt.args.txBodyBytes) + if (err != nil) != tt.wantErr { + t.Errorf("ParseBodyBytes() error = %v, wantErr %v", err, tt.wantErr) + return + } + if !reflect.DeepEqual(got, tt.want) { + t.Errorf("ParseBodyBytes() got = %v, want %v", got, tt.want) + } + }) + } +} diff --git a/common/transaction/transactionGeneral.go b/common/transaction/transactionGeneral.go index c813b04c9..0184495d9 100644 --- a/common/transaction/transactionGeneral.go +++ b/common/transaction/transactionGeneral.go @@ -147,7 +147,6 @@ func (tu *Util) ParseTransactionBytes(transactionBytes []byte, sign bool) (*mode return nil, err } transaction.TransactionBodyLength = util.ConvertBytesToUint32(chunkedBytes) - transaction.TransactionBodyBytes, err = util.ReadTransactionBytes(buffer, int(transaction.TransactionBodyLength)) if err != nil { return nil, err From 4fe2d6eb44ceb4664adc1c9c3a3010c133a835a5 Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Thu, 20 Feb 2020 11:42:30 +0800 Subject: [PATCH 09/17] #596 update schema commit --- common/schema | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/schema b/common/schema index d0dee1f0f..2967ff898 160000 --- a/common/schema +++ b/common/schema @@ -1 +1 @@ -Subproject commit d0dee1f0f2f1403c348014ffebcf1c79885ac3c7 +Subproject commit 2967ff898eaeb7fdc551b6c1be74700584a6a838 From 854b28a87bda03c0aa903351ebb8c511639a651a Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Fri, 21 Feb 2020 09:40:20 +0800 Subject: [PATCH 10/17] #596 add signature info --- common/model/multiSignature.pb.go | 75 ++++++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 12 deletions(-) diff --git a/common/model/multiSignature.pb.go b/common/model/multiSignature.pb.go index 69329ebd5..bb37d98df 100644 --- a/common/model/multiSignature.pb.go +++ b/common/model/multiSignature.pb.go @@ -75,23 +75,74 @@ func (m *MultiSignatureInfo) GetAddresses() []string { return nil } +type SignatureInfo struct { + TransactionHash []byte `protobuf:"bytes,1,opt,name=TransactionHash,proto3" json:"TransactionHash,omitempty"` + Signatures [][]byte `protobuf:"bytes,2,rep,name=Signatures,proto3" json:"Signatures,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SignatureInfo) Reset() { *m = SignatureInfo{} } +func (m *SignatureInfo) String() string { return proto.CompactTextString(m) } +func (*SignatureInfo) ProtoMessage() {} +func (*SignatureInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_136af44c597c17ae, []int{1} +} + +func (m *SignatureInfo) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SignatureInfo.Unmarshal(m, b) +} +func (m *SignatureInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SignatureInfo.Marshal(b, m, deterministic) +} +func (m *SignatureInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_SignatureInfo.Merge(m, src) +} +func (m *SignatureInfo) XXX_Size() int { + return xxx_messageInfo_SignatureInfo.Size(m) +} +func (m *SignatureInfo) XXX_DiscardUnknown() { + xxx_messageInfo_SignatureInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_SignatureInfo proto.InternalMessageInfo + +func (m *SignatureInfo) GetTransactionHash() []byte { + if m != nil { + return m.TransactionHash + } + return nil +} + +func (m *SignatureInfo) GetSignatures() [][]byte { + if m != nil { + return m.Signatures + } + return nil +} + func init() { proto.RegisterType((*MultiSignatureInfo)(nil), "model.MultiSignatureInfo") + proto.RegisterType((*SignatureInfo)(nil), "model.SignatureInfo") } func init() { proto.RegisterFile("model/multiSignature.proto", fileDescriptor_136af44c597c17ae) } var fileDescriptor_136af44c597c17ae = []byte{ - // 176 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xca, 0xcd, 0x4f, 0x49, - 0xcd, 0xd1, 0xcf, 0x2d, 0xcd, 0x29, 0xc9, 0x0c, 0xce, 0x4c, 0xcf, 0x4b, 0x2c, 0x29, 0x2d, 0x4a, - 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x05, 0xcb, 0x29, 0x55, 0x71, 0x09, 0xf9, 0xa2, - 0x48, 0x7b, 0xe6, 0xa5, 0xe5, 0x0b, 0xe9, 0x70, 0x09, 0xfa, 0x66, 0xe6, 0x65, 0xe6, 0x96, 0xe6, - 0xc2, 0xc5, 0x8b, 0x25, 0x18, 0x15, 0x18, 0x35, 0x78, 0x83, 0x30, 0x25, 0x84, 0x24, 0xb8, 0x58, - 0xfd, 0xf2, 0xf3, 0x92, 0x53, 0x25, 0x98, 0x14, 0x18, 0x35, 0x98, 0x9d, 0x98, 0x0c, 0x18, 0x83, - 0x20, 0x02, 0x42, 0x32, 0x5c, 0x9c, 0x8e, 0x29, 0x29, 0x45, 0xa9, 0xc5, 0xc5, 0xa9, 0xc5, 0x12, - 0xcc, 0x0a, 0xcc, 0x1a, 0x9c, 0x41, 0x08, 0x01, 0x27, 0xad, 0x28, 0x8d, 0xf4, 0xcc, 0x92, 0x8c, - 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xaa, 0xfc, 0xfc, 0xa4, 0x64, 0x08, 0xa9, 0x9b, 0x9c, - 0x5f, 0x94, 0xaa, 0x9f, 0x9c, 0x9f, 0x9b, 0x9b, 0x9f, 0xa7, 0x0f, 0x76, 0x67, 0x12, 0x1b, 0xd8, - 0xd5, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x77, 0x34, 0xa0, 0xc7, 0xd3, 0x00, 0x00, 0x00, + // 218 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0xd0, 0x3f, 0x4b, 0x43, 0x31, + 0x14, 0x05, 0x70, 0xf2, 0x42, 0x85, 0x5e, 0x5a, 0xc4, 0x4c, 0x41, 0x44, 0x42, 0xa7, 0x20, 0xda, + 0x08, 0x7e, 0x02, 0x3b, 0xe9, 0x50, 0x87, 0xe8, 0xa2, 0x5b, 0x5e, 0x5e, 0x6c, 0x03, 0x4d, 0xae, + 0xe4, 0xcf, 0xd2, 0x4f, 0x2f, 0xa4, 0xa0, 0xef, 0xe9, 0x72, 0x87, 0xdf, 0x19, 0xce, 0xe5, 0xc0, + 0x65, 0xc0, 0xc1, 0x1d, 0x54, 0xa8, 0x87, 0xe2, 0x5f, 0xfd, 0x2e, 0x9a, 0x52, 0x93, 0x5b, 0x7f, + 0x25, 0x2c, 0xc8, 0x66, 0x2d, 0x5b, 0x1d, 0x81, 0x6d, 0x27, 0xf1, 0x73, 0xfc, 0x44, 0x76, 0x0b, + 0x17, 0x5b, 0x1f, 0x7d, 0xa8, 0xe1, 0xc7, 0x33, 0x27, 0x82, 0xc8, 0xa5, 0xfe, 0x1f, 0x30, 0x0e, + 0xb3, 0x17, 0x8c, 0xd6, 0xf1, 0x4e, 0x10, 0x49, 0x37, 0xdd, 0x3d, 0xd1, 0x27, 0x60, 0x57, 0x30, + 0x7f, 0x1c, 0x86, 0xe4, 0x72, 0x76, 0x99, 0x53, 0x41, 0xe5, 0x5c, 0xff, 0xc2, 0xea, 0x1d, 0x96, + 0xd3, 0x5a, 0x09, 0xe7, 0x6f, 0xc9, 0xc4, 0x6c, 0x6c, 0xf1, 0x18, 0x9f, 0x4c, 0xde, 0xb7, 0xd2, + 0x85, 0xfe, 0xcb, 0xec, 0x1a, 0x60, 0xf4, 0x59, 0x27, 0xa8, 0x5c, 0xe8, 0x91, 0x6c, 0x6e, 0x3e, + 0xe4, 0xce, 0x97, 0x7d, 0xed, 0xd7, 0x16, 0x83, 0x3a, 0x22, 0xf6, 0xf6, 0x74, 0xef, 0x2c, 0x26, + 0xa7, 0x2c, 0x86, 0x80, 0x51, 0xb5, 0x09, 0xfa, 0xb3, 0x36, 0xc8, 0xc3, 0x77, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x13, 0x42, 0x1e, 0x63, 0x2e, 0x01, 0x00, 0x00, } From 06e8b049450a78bec15c784ad247702a61d1285f Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Fri, 21 Feb 2020 09:46:16 +0800 Subject: [PATCH 11/17] #596 change signature structure --- common/model/multiSignature.pb.go | 46 +++++++++++++++++-------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/common/model/multiSignature.pb.go b/common/model/multiSignature.pb.go index bb37d98df..51c572328 100644 --- a/common/model/multiSignature.pb.go +++ b/common/model/multiSignature.pb.go @@ -76,11 +76,11 @@ func (m *MultiSignatureInfo) GetAddresses() []string { } type SignatureInfo struct { - TransactionHash []byte `protobuf:"bytes,1,opt,name=TransactionHash,proto3" json:"TransactionHash,omitempty"` - Signatures [][]byte `protobuf:"bytes,2,rep,name=Signatures,proto3" json:"Signatures,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + TransactionHash []byte `protobuf:"bytes,1,opt,name=TransactionHash,proto3" json:"TransactionHash,omitempty"` + Signatures map[string][]byte `protobuf:"bytes,2,rep,name=Signatures,proto3" json:"Signatures,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:"-"` } func (m *SignatureInfo) Reset() { *m = SignatureInfo{} } @@ -115,7 +115,7 @@ func (m *SignatureInfo) GetTransactionHash() []byte { return nil } -func (m *SignatureInfo) GetSignatures() [][]byte { +func (m *SignatureInfo) GetSignatures() map[string][]byte { if m != nil { return m.Signatures } @@ -125,24 +125,28 @@ func (m *SignatureInfo) GetSignatures() [][]byte { func init() { proto.RegisterType((*MultiSignatureInfo)(nil), "model.MultiSignatureInfo") proto.RegisterType((*SignatureInfo)(nil), "model.SignatureInfo") + proto.RegisterMapType((map[string][]byte)(nil), "model.SignatureInfo.SignaturesEntry") } func init() { proto.RegisterFile("model/multiSignature.proto", fileDescriptor_136af44c597c17ae) } var fileDescriptor_136af44c597c17ae = []byte{ - // 218 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0xd0, 0x3f, 0x4b, 0x43, 0x31, - 0x14, 0x05, 0x70, 0xf2, 0x42, 0x85, 0x5e, 0x5a, 0xc4, 0x4c, 0x41, 0x44, 0x42, 0xa7, 0x20, 0xda, - 0x08, 0x7e, 0x02, 0x3b, 0xe9, 0x50, 0x87, 0xe8, 0xa2, 0x5b, 0x5e, 0x5e, 0x6c, 0x03, 0x4d, 0xae, - 0xe4, 0xcf, 0xd2, 0x4f, 0x2f, 0xa4, 0xa0, 0xef, 0xe9, 0x72, 0x87, 0xdf, 0x19, 0xce, 0xe5, 0xc0, - 0x65, 0xc0, 0xc1, 0x1d, 0x54, 0xa8, 0x87, 0xe2, 0x5f, 0xfd, 0x2e, 0x9a, 0x52, 0x93, 0x5b, 0x7f, - 0x25, 0x2c, 0xc8, 0x66, 0x2d, 0x5b, 0x1d, 0x81, 0x6d, 0x27, 0xf1, 0x73, 0xfc, 0x44, 0x76, 0x0b, - 0x17, 0x5b, 0x1f, 0x7d, 0xa8, 0xe1, 0xc7, 0x33, 0x27, 0x82, 0xc8, 0xa5, 0xfe, 0x1f, 0x30, 0x0e, - 0xb3, 0x17, 0x8c, 0xd6, 0xf1, 0x4e, 0x10, 0x49, 0x37, 0xdd, 0x3d, 0xd1, 0x27, 0x60, 0x57, 0x30, - 0x7f, 0x1c, 0x86, 0xe4, 0x72, 0x76, 0x99, 0x53, 0x41, 0xe5, 0x5c, 0xff, 0xc2, 0xea, 0x1d, 0x96, - 0xd3, 0x5a, 0x09, 0xe7, 0x6f, 0xc9, 0xc4, 0x6c, 0x6c, 0xf1, 0x18, 0x9f, 0x4c, 0xde, 0xb7, 0xd2, - 0x85, 0xfe, 0xcb, 0xec, 0x1a, 0x60, 0xf4, 0x59, 0x27, 0xa8, 0x5c, 0xe8, 0x91, 0x6c, 0x6e, 0x3e, - 0xe4, 0xce, 0x97, 0x7d, 0xed, 0xd7, 0x16, 0x83, 0x3a, 0x22, 0xf6, 0xf6, 0x74, 0xef, 0x2c, 0x26, - 0xa7, 0x2c, 0x86, 0x80, 0x51, 0xb5, 0x09, 0xfa, 0xb3, 0x36, 0xc8, 0xc3, 0x77, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x13, 0x42, 0x1e, 0x63, 0x2e, 0x01, 0x00, 0x00, + // 270 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x41, 0x4b, 0xc3, 0x30, + 0x14, 0xc7, 0x49, 0xcb, 0x84, 0x3e, 0x37, 0xa6, 0xc1, 0x43, 0x19, 0x1e, 0xca, 0xf0, 0x10, 0x44, + 0x5b, 0xd1, 0x8b, 0x08, 0x1e, 0x1c, 0x0a, 0x7a, 0x98, 0x87, 0xe8, 0xc9, 0x5b, 0x9b, 0xc6, 0x2d, + 0xd8, 0xe4, 0x49, 0x92, 0x0a, 0xdb, 0x87, 0xf3, 0xb3, 0x89, 0x29, 0xb8, 0x75, 0x5e, 0x42, 0xde, + 0xef, 0x47, 0xf2, 0x7f, 0xef, 0xc1, 0x44, 0x63, 0x2d, 0x9b, 0x42, 0xb7, 0x8d, 0x57, 0x2f, 0x6a, + 0x61, 0x4a, 0xdf, 0x5a, 0x99, 0x7f, 0x5a, 0xf4, 0x48, 0x07, 0xc1, 0x4d, 0xd7, 0x40, 0xe7, 0x3d, + 0xfd, 0x64, 0xde, 0x91, 0x9e, 0xc1, 0xe1, 0x5c, 0x19, 0xa5, 0x5b, 0xfd, 0xc7, 0x5d, 0x4a, 0x32, + 0xc2, 0x46, 0xfc, 0xbf, 0xa0, 0x29, 0x0c, 0x9e, 0xd1, 0x08, 0x99, 0x46, 0x19, 0x61, 0xf1, 0x2c, + 0xba, 0x20, 0xbc, 0x03, 0xf4, 0x18, 0x92, 0xbb, 0xba, 0xb6, 0xd2, 0x39, 0xe9, 0xd2, 0x38, 0x8b, + 0x59, 0xc2, 0x37, 0x60, 0xfa, 0x4d, 0x60, 0xd4, 0xcf, 0x65, 0x30, 0x7e, 0xb5, 0xa5, 0x71, 0xa5, + 0xf0, 0x0a, 0xcd, 0x63, 0xe9, 0x96, 0x21, 0x75, 0xc8, 0x77, 0x31, 0xbd, 0x07, 0xd8, 0x6a, 0x2d, + 0xca, 0x62, 0xb6, 0x7f, 0x79, 0x92, 0x87, 0x99, 0xf2, 0xde, 0x9f, 0x9b, 0xca, 0x3d, 0x18, 0x6f, + 0x57, 0x7c, 0xeb, 0xdd, 0xe4, 0x16, 0xc6, 0x3b, 0x9a, 0x1e, 0x40, 0xfc, 0x21, 0x57, 0x21, 0x36, + 0xe1, 0xbf, 0x57, 0x7a, 0x04, 0x83, 0xaf, 0xb2, 0x69, 0xbb, 0xf1, 0x86, 0xbc, 0x2b, 0x6e, 0xa2, + 0x6b, 0x32, 0x3b, 0x7d, 0x63, 0x0b, 0xe5, 0x97, 0x6d, 0x95, 0x0b, 0xd4, 0xc5, 0x1a, 0xb1, 0x12, + 0xdd, 0x79, 0x2e, 0xd0, 0xca, 0x42, 0xa0, 0xd6, 0x68, 0x8a, 0xd0, 0x54, 0xb5, 0x17, 0xd6, 0x7e, + 0xf5, 0x13, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xa0, 0xec, 0xdf, 0x94, 0x01, 0x00, 0x00, } From bbf994ca259e57e9d38851f3aaacde67e3944d6c Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Fri, 21 Feb 2020 09:49:08 +0800 Subject: [PATCH 12/17] #596 update signature structure to use map ; --- common/model/transaction.pb.go | 198 ++++++++++++++++----------------- 1 file changed, 99 insertions(+), 99 deletions(-) diff --git a/common/model/transaction.pb.go b/common/model/transaction.pb.go index 9184b00ef..80519d09a 100644 --- a/common/model/transaction.pb.go +++ b/common/model/transaction.pb.go @@ -893,11 +893,11 @@ type MultiSignatureTransactionBody struct { MultiSignatureInfo *MultiSignatureInfo `protobuf:"bytes,1,opt,name=MultiSignatureInfo,proto3" json:"MultiSignatureInfo,omitempty"` // Unsigned transaction bytes that will be executed once the transaction is valid UnsignedTransactionBytes []byte `protobuf:"bytes,2,opt,name=UnsignedTransactionBytes,proto3" json:"UnsignedTransactionBytes,omitempty"` - // List of participant's signature - Signatures [][]byte `protobuf:"bytes,3,rep,name=Signatures,proto3" json:"Signatures,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // List of participantAddress-participantSignature with its tx hash + SignatureInfo *SignatureInfo `protobuf:"bytes,3,opt,name=SignatureInfo,proto3" json:"SignatureInfo,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *MultiSignatureTransactionBody) Reset() { *m = MultiSignatureTransactionBody{} } @@ -939,9 +939,9 @@ func (m *MultiSignatureTransactionBody) GetUnsignedTransactionBytes() []byte { return nil } -func (m *MultiSignatureTransactionBody) GetSignatures() [][]byte { +func (m *MultiSignatureTransactionBody) GetSignatureInfo() *SignatureInfo { if m != nil { - return m.Signatures + return m.SignatureInfo } return nil } @@ -1554,96 +1554,96 @@ func init() { func init() { proto.RegisterFile("model/transaction.proto", fileDescriptor_8333001f09b34082) } var fileDescriptor_8333001f09b34082 = []byte{ - // 1444 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x73, 0xdb, 0xc4, - 0x17, 0xb7, 0xe4, 0x38, 0x4d, 0x5e, 0xec, 0x54, 0xd9, 0x26, 0xb6, 0x9a, 0x26, 0x8d, 0xbf, 0x6a, - 0x92, 0xf1, 0x37, 0x6d, 0x13, 0x1a, 0x3a, 0xa5, 0x70, 0x8b, 0x9b, 0x16, 0x67, 0x68, 0x68, 0xd8, - 0xa4, 0x3d, 0x74, 0x86, 0x83, 0x22, 0x6f, 0x6d, 0x4d, 0x2d, 0xad, 0x90, 0xd6, 0x2d, 0xa1, 0x0c, - 0x33, 0x14, 0x38, 0x30, 0xc3, 0x91, 0x7f, 0x09, 0xfe, 0x0a, 0x2e, 0xcc, 0x70, 0xe2, 0x8f, 0x60, - 0x18, 0xad, 0xd6, 0xb2, 0x24, 0xcb, 0x92, 0x28, 0x17, 0x2e, 0x9e, 0xf1, 0xfb, 0xbc, 0x7d, 0x3f, - 0x76, 0x9f, 0x3e, 0xfb, 0xde, 0x42, 0xc3, 0xa2, 0x5d, 0x32, 0xd8, 0x63, 0xae, 0x6e, 0x7b, 0xba, - 0xc1, 0x4c, 0x6a, 0xef, 0x3a, 0x2e, 0x65, 0x14, 0x55, 0x38, 0xb0, 0xba, 0x16, 0xe0, 0x8e, 0x4b, - 0xe9, 0x8b, 0x27, 0x2f, 0x9e, 0xbc, 0xb6, 0x89, 0xeb, 0xf5, 0x4d, 0x27, 0x50, 0x5a, 0xad, 0x0b, - 0x54, 0xef, 0x99, 0xb6, 0x3e, 0x5e, 0xbc, 0xaa, 0x06, 0xf2, 0x73, 0x9d, 0x19, 0x7d, 0x4c, 0x0c, - 0x62, 0x3a, 0x4c, 0x20, 0xc2, 0x9e, 0x4d, 0xbb, 0x04, 0x93, 0x9e, 0xe9, 0x31, 0x37, 0xba, 0x0e, - 0x05, 0x28, 0xf1, 0x0c, 0x97, 0xbe, 0x16, 0xb2, 0xd5, 0x40, 0x66, 0x0d, 0x07, 0xcc, 0x3c, 0x35, - 0x7b, 0xb6, 0xce, 0x86, 0x2e, 0x09, 0x30, 0xed, 0xcf, 0x1a, 0x2c, 0x9c, 0x8d, 0x43, 0x47, 0x2a, - 0x5c, 0x7a, 0x46, 0x5c, 0xcf, 0xa4, 0xb6, 0x2a, 0x35, 0xa5, 0x56, 0x0d, 0x8f, 0xfe, 0x22, 0x04, - 0xf2, 0xd1, 0xa1, 0x2a, 0x37, 0xa5, 0x56, 0xb9, 0x2d, 0xbf, 0x27, 0x61, 0xf9, 0xe8, 0x10, 0xad, - 0xc1, 0xa5, 0xf6, 0x80, 0x1a, 0x2f, 0x8f, 0x0e, 0xd5, 0x72, 0x08, 0x8c, 0x44, 0xa8, 0x0e, 0xb3, - 0x1d, 0x62, 0xf6, 0xfa, 0x4c, 0x9d, 0xe1, 0xa6, 0xc4, 0x3f, 0xb4, 0x0f, 0xcb, 0xa7, 0xc4, 0xee, - 0x12, 0xf7, 0xc0, 0x30, 0xe8, 0xd0, 0x66, 0x07, 0xdd, 0xae, 0x4b, 0x3c, 0x4f, 0xad, 0x34, 0xa5, - 0xd6, 0x3c, 0x4e, 0xc5, 0xd0, 0x7d, 0x68, 0x60, 0x62, 0x98, 0x8e, 0x49, 0x6c, 0x96, 0x58, 0x36, - 0xcb, 0x97, 0x4d, 0x83, 0x51, 0x0b, 0x2e, 0x47, 0x12, 0x3c, 0xbb, 0x70, 0x88, 0x7a, 0x89, 0x87, - 0x93, 0x14, 0xa3, 0x65, 0x28, 0x3f, 0x22, 0x44, 0x9d, 0x0b, 0x33, 0xf1, 0xff, 0xa2, 0x26, 0xcc, - 0x9f, 0x99, 0x16, 0xf1, 0x98, 0x6e, 0x39, 0xea, 0x7c, 0x88, 0x8d, 0x85, 0x09, 0x0f, 0x1d, 0xdd, - 0xeb, 0xab, 0xd0, 0x94, 0x5a, 0x55, 0x9c, 0x14, 0xa3, 0xbb, 0xb0, 0x12, 0x11, 0xb5, 0x69, 0xf7, - 0xe2, 0x31, 0xb1, 0x7b, 0xac, 0xaf, 0x2e, 0xf0, 0x88, 0xd2, 0x41, 0x7f, 0xbf, 0x12, 0x40, 0xfb, - 0x82, 0x11, 0x4f, 0xad, 0x72, 0x27, 0xa9, 0x18, 0xda, 0x01, 0x25, 0x22, 0x3f, 0xb2, 0xbb, 0xe4, - 0x4b, 0xb5, 0xc6, 0x9d, 0x4c, 0xc8, 0xd1, 0x67, 0xb0, 0x4c, 0x2c, 0x87, 0x5d, 0x24, 0x0c, 0xa9, - 0x8b, 0x4d, 0xa9, 0xb5, 0xb0, 0x7f, 0x6d, 0x97, 0x97, 0xcf, 0xee, 0xc3, 0x14, 0x95, 0x4e, 0x09, - 0xa7, 0x2e, 0x45, 0x9f, 0x83, 0xea, 0x11, 0xbb, 0x7b, 0x4c, 0x6d, 0x32, 0x61, 0xf6, 0x32, 0x37, - 0xbb, 0x21, 0xcc, 0x9e, 0x4e, 0x51, 0xeb, 0x94, 0xf0, 0x54, 0x13, 0xc8, 0x85, 0x8d, 0x64, 0xfd, - 0x27, 0xbd, 0x28, 0xdc, 0xcb, 0xb6, 0xf0, 0xf2, 0x69, 0xb6, 0x76, 0xa7, 0x84, 0xf3, 0x0c, 0xa2, - 0xef, 0x25, 0xd8, 0x1a, 0x3a, 0x5d, 0x9d, 0x91, 0x1c, 0x63, 0xea, 0x12, 0x77, 0x7d, 0x4b, 0xb8, - 0x7e, 0x5a, 0x64, 0x4d, 0xa7, 0x84, 0x8b, 0x19, 0xe7, 0x61, 0xb8, 0xc4, 0xa2, 0xaf, 0x72, 0xc3, - 0x40, 0xb1, 0x30, 0x70, 0x91, 0x35, 0x7e, 0x18, 0x85, 0x8c, 0xa3, 0x6f, 0x25, 0xd8, 0x34, 0x06, - 0xba, 0x69, 0xe5, 0x45, 0x71, 0x85, 0x47, 0x71, 0x53, 0x44, 0xf1, 0xa0, 0xc0, 0x92, 0x4e, 0x09, - 0x17, 0x32, 0x8d, 0xde, 0x80, 0xe6, 0x11, 0x36, 0x74, 0xc4, 0x07, 0x7f, 0xa8, 0x33, 0xdd, 0x23, - 0x2c, 0x19, 0xc0, 0x32, 0x0f, 0xe0, 0xff, 0x61, 0xb9, 0xe5, 0x2d, 0xe8, 0x94, 0x70, 0x01, 0xb3, - 0xe8, 0x1b, 0xb8, 0x11, 0xec, 0x54, 0xb6, 0xf7, 0x15, 0xee, 0x7d, 0x27, 0x76, 0x08, 0x79, 0xee, - 0x8b, 0x18, 0x46, 0x03, 0x58, 0xd7, 0x1d, 0xc7, 0xa5, 0xaf, 0xf4, 0xc1, 0x43, 0x4e, 0xf6, 0x49, - 0xcf, 0x75, 0xee, 0x79, 0x53, 0x78, 0x3e, 0xc8, 0xd2, 0xed, 0x94, 0x70, 0xb6, 0x31, 0xdf, 0x5b, - 0xfc, 0xfa, 0x48, 0x7a, 0x6b, 0xc4, 0xbc, 0x1d, 0x67, 0xe9, 0xfa, 0xde, 0x32, 0x8d, 0xa1, 0x35, - 0x98, 0x0f, 0x31, 0x55, 0xe5, 0x2c, 0x37, 0x16, 0xa0, 0x2d, 0x98, 0x0d, 0x82, 0x54, 0xaf, 0x72, - 0xa7, 0xb5, 0x11, 0x41, 0x71, 0x21, 0x16, 0x60, 0x7b, 0x29, 0xc6, 0xca, 0xbe, 0x5d, 0xad, 0x0e, - 0xcb, 0x69, 0x2c, 0xa6, 0xdd, 0x03, 0x75, 0x1a, 0x0d, 0xa1, 0x55, 0x98, 0x3d, 0xb0, 0xfc, 0x73, - 0xe0, 0xf7, 0x61, 0xc0, 0xfd, 0x42, 0xa2, 0xfd, 0x25, 0xc1, 0x46, 0x5e, 0x91, 0x6e, 0x42, 0xcd, - 0x57, 0x39, 0x19, 0x9e, 0x0f, 0x4c, 0xe3, 0x13, 0x72, 0xc1, 0xcd, 0x54, 0x71, 0x5c, 0x88, 0xb6, - 0x61, 0x31, 0x71, 0xab, 0xc9, 0xfc, 0x56, 0x4b, 0x48, 0xd1, 0x5d, 0x58, 0xf0, 0x17, 0x8e, 0x94, - 0xca, 0x7c, 0x03, 0x50, 0x84, 0xe4, 0x04, 0x82, 0xa3, 0x6a, 0xa8, 0x05, 0xb5, 0xc7, 0xd4, 0x78, - 0x49, 0xba, 0x6d, 0x7d, 0xa0, 0xdb, 0x06, 0xe1, 0xf7, 0x71, 0x90, 0x4a, 0x1c, 0x40, 0xb7, 0xa1, - 0x72, 0x42, 0xe9, 0x6b, 0x9b, 0xdf, 0xc5, 0x0b, 0xfb, 0x0d, 0x61, 0xf9, 0x24, 0xd1, 0xbc, 0xe0, - 0x40, 0x4b, 0xfb, 0x4d, 0x82, 0xad, 0x42, 0xfc, 0x56, 0x70, 0x1b, 0x12, 0xe9, 0xc9, 0xef, 0x98, - 0x5e, 0x39, 0x37, 0xbd, 0x99, 0x42, 0xe9, 0x1d, 0xc3, 0x56, 0x21, 0xda, 0x2c, 0x96, 0x9d, 0xf6, - 0x06, 0x36, 0x8b, 0xf0, 0x5f, 0xc1, 0xbd, 0x0a, 0x73, 0x91, 0x0b, 0xe5, 0xf2, 0x87, 0x04, 0x5a, - 0x3e, 0xf9, 0x05, 0xbd, 0x19, 0x63, 0x13, 0xbd, 0x99, 0x34, 0xea, 0xcd, 0x26, 0xb1, 0xac, 0xde, - 0x4c, 0xce, 0xee, 0xcd, 0x56, 0x61, 0xee, 0xc4, 0xa5, 0x0e, 0x71, 0xd9, 0x05, 0x3f, 0xb4, 0x79, - 0x1c, 0xfe, 0x47, 0xcb, 0x50, 0x79, 0xa6, 0x0f, 0x86, 0x41, 0xb1, 0xce, 0xe3, 0xe0, 0x0f, 0xba, - 0x0e, 0x73, 0xc7, 0x43, 0xa3, 0xef, 0x37, 0x5f, 0xbc, 0x46, 0x67, 0xf8, 0x31, 0x87, 0x32, 0xed, - 0x17, 0x09, 0x6e, 0x14, 0x60, 0xd9, 0xff, 0x7a, 0x9e, 0xda, 0xd7, 0xb0, 0x9e, 0x49, 0xd9, 0xe8, - 0x0e, 0xcc, 0x8d, 0x14, 0x78, 0xd0, 0x8b, 0xfb, 0x2b, 0x31, 0x1e, 0x1c, 0x81, 0x38, 0x54, 0xf3, - 0xbf, 0x93, 0x68, 0xef, 0x17, 0x6d, 0xe6, 0xe3, 0x80, 0xf6, 0xab, 0x04, 0xeb, 0x99, 0x1c, 0x8e, - 0x8e, 0x00, 0xc5, 0x15, 0x8e, 0xec, 0x17, 0x94, 0x07, 0xb2, 0xb0, 0x7f, 0x35, 0xf5, 0x16, 0xf0, - 0x15, 0x70, 0xca, 0x22, 0xf4, 0x11, 0xa8, 0x4f, 0x6d, 0xcf, 0xec, 0xd9, 0xa4, 0x1b, 0xf5, 0xc2, - 0x5b, 0x5c, 0x99, 0x57, 0xfe, 0x54, 0x1c, 0x5d, 0x07, 0x08, 0x8d, 0xf9, 0x74, 0x58, 0x6e, 0x55, - 0x71, 0x44, 0xa2, 0xdd, 0x84, 0x95, 0x8f, 0x63, 0x87, 0x8f, 0xc9, 0x17, 0x43, 0xe2, 0x31, 0x31, - 0xcd, 0x48, 0xd1, 0x69, 0x46, 0xfb, 0x51, 0x86, 0x7a, 0x5c, 0xdb, 0x1b, 0xa9, 0x4f, 0xf2, 0xb3, - 0x94, 0xca, 0xcf, 0xe3, 0x91, 0x47, 0x8e, 0x8d, 0x3c, 0x3b, 0xb0, 0x18, 0xce, 0x0b, 0xa7, 0x4c, - 0x77, 0x59, 0x84, 0xa3, 0x12, 0x08, 0xda, 0x86, 0x6a, 0x28, 0x79, 0x68, 0x77, 0x23, 0x64, 0x1d, - 0x93, 0xa7, 0x0d, 0x36, 0x95, 0xf4, 0xc1, 0xe6, 0x0e, 0xc0, 0x49, 0x38, 0x60, 0xf2, 0x79, 0x69, - 0x61, 0x7f, 0x69, 0xc4, 0x17, 0x21, 0x80, 0x23, 0x4a, 0xda, 0x4b, 0x68, 0x4c, 0x6c, 0x85, 0xe7, - 0x50, 0xdb, 0x23, 0x48, 0x85, 0xca, 0x19, 0x65, 0xa2, 0xec, 0x82, 0xef, 0x2f, 0x10, 0xa0, 0x7b, - 0x50, 0x8d, 0xae, 0x50, 0xe5, 0x66, 0x39, 0xc2, 0xdf, 0xd1, 0x53, 0x88, 0xe9, 0x69, 0x87, 0x50, - 0x3f, 0xa1, 0x5e, 0xda, 0x31, 0xc5, 0xc7, 0x98, 0xa0, 0x26, 0x02, 0x36, 0x9c, 0x90, 0x6b, 0x4f, - 0xa0, 0x31, 0x61, 0x45, 0x84, 0x7c, 0x37, 0x36, 0xe4, 0x8a, 0x32, 0x4d, 0x8b, 0x2b, 0xaa, 0xa6, - 0xfd, 0x24, 0x41, 0xdd, 0xef, 0x0b, 0xfe, 0x5d, 0x5c, 0x7e, 0x37, 0xf3, 0xa0, 0xaf, 0x9b, 0xc1, - 0x09, 0xf9, 0x65, 0x51, 0xc1, 0x63, 0x81, 0x7f, 0x8a, 0xc1, 0xc0, 0x3b, 0xa6, 0xfb, 0x72, 0x30, - 0x3c, 0x26, 0xc4, 0x1a, 0x86, 0xc6, 0x44, 0x34, 0x22, 0xbf, 0x0f, 0xa0, 0xda, 0x8e, 0xbc, 0x14, - 0x88, 0x04, 0xaf, 0x88, 0x04, 0xa3, 0x10, 0x8e, 0x29, 0x6a, 0x3f, 0x48, 0xb0, 0x21, 0x72, 0xe2, - 0x53, 0xfb, 0x94, 0xda, 0x8f, 0xb1, 0x83, 0x9f, 0x69, 0xb9, 0x55, 0xc6, 0x09, 0x69, 0x4e, 0x9e, - 0x99, 0x4f, 0x05, 0xda, 0xcf, 0x12, 0xac, 0xf9, 0xc9, 0x4d, 0x0d, 0x22, 0x66, 0x5c, 0x4a, 0x1a, - 0xbf, 0x05, 0x4b, 0xd1, 0x45, 0x23, 0xee, 0xf0, 0xd9, 0x60, 0x12, 0xf8, 0x07, 0x5b, 0xfe, 0x1c, - 0xd6, 0xa7, 0x44, 0x25, 0x36, 0xfe, 0x43, 0xa8, 0x45, 0xf7, 0x33, 0xd8, 0x9a, 0x29, 0x3b, 0x1f, - 0xd7, 0xd4, 0x8e, 0x61, 0x23, 0xfe, 0x85, 0x1d, 0x9b, 0xb6, 0x69, 0x0d, 0xad, 0x47, 0x84, 0xbc, - 0x4b, 0xf5, 0xdf, 0x87, 0xe6, 0x74, 0x73, 0x22, 0x5a, 0xf1, 0xc0, 0x21, 0xc5, 0x1e, 0x38, 0x76, - 0x7e, 0x97, 0x21, 0xe5, 0x29, 0x44, 0x49, 0x76, 0xca, 0x4a, 0x09, 0xa9, 0xc1, 0xc3, 0x4d, 0xb2, - 0x4f, 0x56, 0x24, 0xb4, 0x01, 0xd7, 0x32, 0xba, 0x1a, 0x45, 0x46, 0xdb, 0xf0, 0xbf, 0xdc, 0x46, - 0x51, 0x79, 0xcb, 0xf5, 0x72, 0x5b, 0x2e, 0xe5, 0xed, 0x0c, 0xda, 0x82, 0x66, 0x5e, 0x2f, 0xa5, - 0xbc, 0x9d, 0x45, 0x1a, 0x5c, 0xcf, 0x6e, 0x7a, 0x94, 0x32, 0xda, 0xf4, 0x3f, 0x81, 0xcc, 0x8e, - 0x41, 0xf9, 0x4e, 0x46, 0xeb, 0x70, 0x75, 0xea, 0x85, 0xac, 0xcc, 0xf8, 0xf0, 0xd4, 0x0b, 0x53, - 0xa9, 0xb4, 0x77, 0x9e, 0xb7, 0x7a, 0x26, 0xeb, 0x0f, 0xcf, 0x77, 0x0d, 0x6a, 0xed, 0x7d, 0x45, - 0xe9, 0xb9, 0x11, 0xfc, 0xde, 0x36, 0xa8, 0x4b, 0xf6, 0x0c, 0x6a, 0x59, 0xd4, 0xde, 0xe3, 0x45, - 0x73, 0x3e, 0xcb, 0x5f, 0xe6, 0xde, 0xff, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x47, 0xbc, 0x4e, 0xd9, - 0x59, 0x14, 0x00, 0x00, + // 1449 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0x4f, 0x6f, 0xdb, 0xc6, + 0x12, 0x17, 0x29, 0xcb, 0xb1, 0x47, 0x92, 0x23, 0x6f, 0x64, 0x89, 0x71, 0xec, 0x58, 0x8f, 0xb1, + 0x0d, 0x3d, 0x27, 0xb1, 0x5f, 0xfc, 0x82, 0x34, 0xcd, 0xcd, 0x8a, 0x93, 0xca, 0x68, 0xdc, 0xb8, + 0x6b, 0x27, 0x87, 0x00, 0x3d, 0xd0, 0xd4, 0x46, 0x22, 0x22, 0x71, 0x59, 0x72, 0x95, 0xd4, 0x4d, + 0x51, 0xa0, 0x69, 0x7b, 0x28, 0xd0, 0x63, 0xbf, 0x52, 0xbf, 0x45, 0x2f, 0x2d, 0x7a, 0xea, 0x87, + 0x28, 0x0a, 0x2e, 0x57, 0x12, 0x97, 0xa2, 0x48, 0x36, 0xbd, 0xf4, 0x22, 0x40, 0xf3, 0x9b, 0x9d, + 0x3f, 0xbb, 0xc3, 0xdf, 0xce, 0x2c, 0xd4, 0x07, 0xb4, 0x43, 0xfa, 0x7b, 0xcc, 0x35, 0x6c, 0xcf, + 0x30, 0x99, 0x45, 0xed, 0x5d, 0xc7, 0xa5, 0x8c, 0xa2, 0x02, 0x07, 0x56, 0xd7, 0x02, 0xdc, 0x71, + 0x29, 0x7d, 0xf9, 0xf4, 0xe5, 0xd3, 0x37, 0x36, 0x71, 0xbd, 0x9e, 0xe5, 0x04, 0x4a, 0xab, 0x35, + 0x81, 0x1a, 0x5d, 0xcb, 0x36, 0x26, 0x8b, 0x57, 0xb5, 0x40, 0x7e, 0x6e, 0x30, 0xb3, 0x87, 0x89, + 0x49, 0x2c, 0x87, 0x09, 0x44, 0xd8, 0xb3, 0x69, 0x87, 0x60, 0xd2, 0xb5, 0x3c, 0xe6, 0x86, 0xd7, + 0xa1, 0x00, 0x25, 0x9e, 0xe9, 0xd2, 0x37, 0x42, 0xb6, 0x1a, 0xc8, 0x06, 0xc3, 0x3e, 0xb3, 0x4e, + 0xad, 0xae, 0x6d, 0xb0, 0xa1, 0x4b, 0x02, 0x4c, 0xff, 0xa3, 0x0c, 0xc5, 0xb3, 0x49, 0xe8, 0x48, + 0x83, 0x4b, 0xcf, 0x89, 0xeb, 0x59, 0xd4, 0xd6, 0x94, 0x86, 0xd2, 0x2c, 0xe3, 0xd1, 0x5f, 0x84, + 0x40, 0x3d, 0x3a, 0xd4, 0xd4, 0x86, 0xd2, 0xcc, 0xb7, 0xd4, 0xff, 0x29, 0x58, 0x3d, 0x3a, 0x44, + 0x6b, 0x70, 0xa9, 0xd5, 0xa7, 0xe6, 0xab, 0xa3, 0x43, 0x2d, 0x3f, 0x06, 0x46, 0x22, 0x54, 0x83, + 0xf9, 0x36, 0xb1, 0xba, 0x3d, 0xa6, 0xcd, 0x71, 0x53, 0xe2, 0x1f, 0xda, 0x87, 0xea, 0x29, 0xb1, + 0x3b, 0xc4, 0x3d, 0x30, 0x4d, 0x3a, 0xb4, 0xd9, 0x41, 0xa7, 0xe3, 0x12, 0xcf, 0xd3, 0x0a, 0x0d, + 0xa5, 0xb9, 0x88, 0x63, 0x31, 0x74, 0x1f, 0xea, 0x98, 0x98, 0x96, 0x63, 0x11, 0x9b, 0x45, 0x96, + 0xcd, 0xf3, 0x65, 0xb3, 0x60, 0xd4, 0x84, 0xcb, 0xa1, 0x04, 0xcf, 0x2e, 0x1c, 0xa2, 0x5d, 0xe2, + 0xe1, 0x44, 0xc5, 0xa8, 0x0a, 0xf9, 0xc7, 0x84, 0x68, 0x0b, 0xe3, 0x4c, 0xfc, 0xbf, 0xa8, 0x01, + 0x8b, 0x67, 0xd6, 0x80, 0x78, 0xcc, 0x18, 0x38, 0xda, 0xe2, 0x18, 0x9b, 0x08, 0x23, 0x1e, 0xda, + 0x86, 0xd7, 0xd3, 0xa0, 0xa1, 0x34, 0x4b, 0x38, 0x2a, 0x46, 0x77, 0x61, 0x25, 0x24, 0x6a, 0xd1, + 0xce, 0xc5, 0x13, 0x62, 0x77, 0x59, 0x4f, 0x2b, 0xf2, 0x88, 0xe2, 0x41, 0x7f, 0xbf, 0x22, 0x40, + 0xeb, 0x82, 0x11, 0x4f, 0x2b, 0x71, 0x27, 0xb1, 0x18, 0xda, 0x81, 0x4a, 0x48, 0x7e, 0x64, 0x77, + 0xc8, 0x17, 0x5a, 0x99, 0x3b, 0x99, 0x92, 0xa3, 0x4f, 0xa1, 0x4a, 0x06, 0x0e, 0xbb, 0x88, 0x18, + 0xd2, 0x96, 0x1a, 0x4a, 0xb3, 0xb8, 0x7f, 0x6d, 0x97, 0x97, 0xcf, 0xee, 0xa3, 0x18, 0x95, 0x76, + 0x0e, 0xc7, 0x2e, 0x45, 0x9f, 0x81, 0xe6, 0x11, 0xbb, 0x73, 0x4c, 0x6d, 0x32, 0x65, 0xf6, 0x32, + 0x37, 0xbb, 0x21, 0xcc, 0x9e, 0xce, 0x50, 0x6b, 0xe7, 0xf0, 0x4c, 0x13, 0xc8, 0x85, 0x8d, 0x68, + 0xfd, 0x47, 0xbd, 0x54, 0xb8, 0x97, 0x6d, 0xe1, 0xe5, 0x93, 0x64, 0xed, 0x76, 0x0e, 0xa7, 0x19, + 0x44, 0xdf, 0x29, 0xb0, 0x35, 0x74, 0x3a, 0x06, 0x23, 0x29, 0xc6, 0xb4, 0x65, 0xee, 0xfa, 0x96, + 0x70, 0xfd, 0x2c, 0xcb, 0x9a, 0x76, 0x0e, 0x67, 0x33, 0xce, 0xc3, 0x70, 0xc9, 0x80, 0xbe, 0x4e, + 0x0d, 0x03, 0x49, 0x61, 0xe0, 0x2c, 0x6b, 0xfc, 0x30, 0x32, 0x19, 0x47, 0xdf, 0x28, 0xb0, 0x69, + 0xf6, 0x0d, 0x6b, 0x90, 0x16, 0xc5, 0x15, 0x1e, 0xc5, 0x4d, 0x11, 0xc5, 0xc3, 0x0c, 0x4b, 0xda, + 0x39, 0x9c, 0xc9, 0x34, 0x7a, 0x0b, 0xba, 0x47, 0xd8, 0xd0, 0x11, 0x1f, 0xfc, 0xa1, 0xc1, 0x0c, + 0x8f, 0xb0, 0x68, 0x00, 0x55, 0x1e, 0xc0, 0x7f, 0xc7, 0xe5, 0x96, 0xb6, 0xa0, 0x9d, 0xc3, 0x19, + 0xcc, 0xa2, 0xaf, 0xe1, 0x46, 0xb0, 0x53, 0xc9, 0xde, 0x57, 0xb8, 0xf7, 0x1d, 0xe9, 0x10, 0xd2, + 0xdc, 0x67, 0x31, 0x8c, 0xfa, 0xb0, 0x6e, 0x38, 0x8e, 0x4b, 0x5f, 0x1b, 0xfd, 0x47, 0x9c, 0xec, + 0xa3, 0x9e, 0x6b, 0xdc, 0xf3, 0xa6, 0xf0, 0x7c, 0x90, 0xa4, 0xdb, 0xce, 0xe1, 0x64, 0x63, 0xbe, + 0x37, 0xf9, 0xfa, 0x88, 0x7a, 0xab, 0x4b, 0xde, 0x8e, 0x93, 0x74, 0x7d, 0x6f, 0x89, 0xc6, 0xd0, + 0x1a, 0x2c, 0x8e, 0x31, 0x4d, 0xe3, 0x2c, 0x37, 0x11, 0xa0, 0x2d, 0x98, 0x0f, 0x82, 0xd4, 0xae, + 0x72, 0xa7, 0xe5, 0x11, 0x41, 0x71, 0x21, 0x16, 0x60, 0x6b, 0x59, 0x62, 0x65, 0xdf, 0xae, 0x5e, + 0x83, 0x6a, 0x1c, 0x8b, 0xe9, 0xf7, 0x40, 0x9b, 0x45, 0x43, 0x68, 0x15, 0xe6, 0x0f, 0x06, 0xfe, + 0x39, 0xf0, 0xfb, 0x30, 0xe0, 0x7e, 0x21, 0xd1, 0xff, 0x54, 0x60, 0x23, 0xad, 0x48, 0x37, 0xa1, + 0xec, 0xab, 0x9c, 0x0c, 0xcf, 0xfb, 0x96, 0xf9, 0x31, 0xb9, 0xe0, 0x66, 0x4a, 0x58, 0x16, 0xa2, + 0x6d, 0x58, 0x8a, 0xdc, 0x6a, 0x2a, 0xbf, 0xd5, 0x22, 0x52, 0x74, 0x17, 0x8a, 0xfe, 0xc2, 0x91, + 0x52, 0x9e, 0x6f, 0x00, 0x0a, 0x91, 0x9c, 0x40, 0x70, 0x58, 0x0d, 0x35, 0xa1, 0xfc, 0x84, 0x9a, + 0xaf, 0x48, 0xa7, 0x65, 0xf4, 0x0d, 0xdb, 0x24, 0xfc, 0x3e, 0x0e, 0x52, 0x91, 0x01, 0x74, 0x1b, + 0x0a, 0x27, 0x94, 0xbe, 0xb1, 0xf9, 0x5d, 0x5c, 0xdc, 0xaf, 0x0b, 0xcb, 0x27, 0x91, 0xe6, 0x05, + 0x07, 0x5a, 0xfa, 0x2f, 0x0a, 0x6c, 0x65, 0xe2, 0xb7, 0x8c, 0xdb, 0x10, 0x49, 0x4f, 0x7d, 0xcf, + 0xf4, 0xf2, 0xa9, 0xe9, 0xcd, 0x65, 0x4a, 0xef, 0x18, 0xb6, 0x32, 0xd1, 0x66, 0xb6, 0xec, 0xf4, + 0xb7, 0xb0, 0x99, 0x85, 0xff, 0x32, 0xee, 0xd5, 0x38, 0x17, 0x35, 0x53, 0x2e, 0xbf, 0x2b, 0xa0, + 0xa7, 0x93, 0x5f, 0xd0, 0x9b, 0x31, 0x36, 0xd5, 0x9b, 0x29, 0xa3, 0xde, 0x6c, 0x1a, 0x4b, 0xea, + 0xcd, 0xd4, 0xe4, 0xde, 0x6c, 0x15, 0x16, 0x4e, 0x5c, 0xea, 0x10, 0x97, 0x5d, 0xf0, 0x43, 0x5b, + 0xc4, 0xe3, 0xff, 0xa8, 0x0a, 0x85, 0xe7, 0x46, 0x7f, 0x18, 0x14, 0xeb, 0x22, 0x0e, 0xfe, 0xa0, + 0xeb, 0xb0, 0x70, 0x3c, 0x34, 0x7b, 0x7e, 0xf3, 0xc5, 0x6b, 0x74, 0x8e, 0x1f, 0xf3, 0x58, 0xa6, + 0xff, 0xac, 0xc0, 0x8d, 0x0c, 0x2c, 0xfb, 0x6f, 0xcf, 0x53, 0xff, 0x0a, 0xd6, 0x13, 0x29, 0x1b, + 0xdd, 0x81, 0x85, 0x91, 0x02, 0x0f, 0x7a, 0x69, 0x7f, 0x45, 0xe2, 0xc1, 0x11, 0x88, 0xc7, 0x6a, + 0xfe, 0x77, 0x12, 0xee, 0xfd, 0xc2, 0xcd, 0xbc, 0x0c, 0xe8, 0xbf, 0x29, 0xb0, 0x9e, 0xc8, 0xe1, + 0xe8, 0x08, 0x90, 0xac, 0x70, 0x64, 0xbf, 0xa4, 0x3c, 0x90, 0xe2, 0xfe, 0xd5, 0xd8, 0x5b, 0xc0, + 0x57, 0xc0, 0x31, 0x8b, 0xd0, 0x03, 0xd0, 0x9e, 0xd9, 0x9e, 0xd5, 0xb5, 0x49, 0x27, 0xec, 0x85, + 0xb7, 0xb8, 0x2a, 0xaf, 0xfc, 0x99, 0x38, 0x7a, 0x00, 0x65, 0x39, 0x82, 0x80, 0x11, 0xab, 0xa3, + 0xdb, 0x5e, 0x72, 0x2e, 0xab, 0xea, 0x37, 0x61, 0xe5, 0x23, 0xa9, 0x30, 0x30, 0xf9, 0x7c, 0x48, + 0x3c, 0x26, 0x26, 0x1d, 0x25, 0x3c, 0xe9, 0xe8, 0x3f, 0xa8, 0x50, 0x93, 0xb5, 0xbd, 0x91, 0xfa, + 0x34, 0x77, 0x2b, 0xb1, 0xdc, 0x3d, 0x19, 0x87, 0x54, 0x69, 0x1c, 0xda, 0x81, 0xa5, 0xf1, 0x2c, + 0x71, 0xca, 0x0c, 0x97, 0x85, 0xf8, 0x2b, 0x82, 0xa0, 0x6d, 0x28, 0x8d, 0x25, 0x8f, 0xec, 0x4e, + 0x88, 0xc8, 0x25, 0x79, 0xdc, 0xd0, 0x53, 0x88, 0x1f, 0x7a, 0xee, 0x00, 0x9c, 0x8c, 0x87, 0x4f, + 0x3e, 0x4b, 0x15, 0xf7, 0x97, 0x47, 0x5c, 0x32, 0x06, 0x70, 0x48, 0x49, 0x7f, 0x05, 0xf5, 0xa9, + 0xad, 0xf0, 0x1c, 0x6a, 0x7b, 0x04, 0x69, 0x50, 0x38, 0xa3, 0x4c, 0x94, 0x64, 0xf0, 0x6d, 0x06, + 0x02, 0x74, 0x0f, 0x4a, 0xe1, 0x15, 0x9a, 0xda, 0xc8, 0x87, 0xb8, 0x3d, 0x7c, 0x0a, 0x92, 0x9e, + 0x7e, 0x08, 0xb5, 0x13, 0xea, 0xc5, 0x1d, 0x93, 0x3c, 0xe2, 0x04, 0xf5, 0x12, 0x30, 0xe5, 0x94, + 0x5c, 0x7f, 0x0a, 0xf5, 0x29, 0x2b, 0x22, 0xe4, 0xbb, 0xd2, 0x00, 0x2c, 0x4a, 0x38, 0x2e, 0xae, + 0xb0, 0x9a, 0xfe, 0xa3, 0x02, 0x35, 0xbf, 0x67, 0xf8, 0x67, 0x71, 0xf9, 0x9d, 0xce, 0xc3, 0x9e, + 0x61, 0x05, 0x27, 0xe4, 0x97, 0x45, 0x01, 0x4f, 0x04, 0xfe, 0x29, 0x06, 0xc3, 0xf0, 0xe4, 0x2a, + 0xc8, 0x07, 0x83, 0x65, 0x44, 0xac, 0x63, 0xa8, 0x4f, 0x45, 0x23, 0xf2, 0xfb, 0x00, 0x4a, 0xad, + 0xd0, 0x2b, 0x82, 0x48, 0xf0, 0x8a, 0x48, 0x30, 0x0c, 0x61, 0x49, 0x51, 0xff, 0x5e, 0x81, 0x0d, + 0x91, 0x13, 0x9f, 0xe8, 0x67, 0xd4, 0xbe, 0xc4, 0x1c, 0x7e, 0xa6, 0xf9, 0x66, 0x1e, 0x47, 0xa4, + 0x29, 0x79, 0x26, 0x3e, 0x23, 0xe8, 0x3f, 0x29, 0xb0, 0xe6, 0x27, 0x37, 0x33, 0x08, 0xc9, 0xb8, + 0x12, 0x35, 0x7e, 0x0b, 0x96, 0xc3, 0x8b, 0x46, 0xbc, 0x92, 0x6f, 0x96, 0xf0, 0x34, 0xf0, 0x37, + 0xb6, 0xfc, 0x05, 0xac, 0xcf, 0x88, 0x4a, 0x6c, 0xfc, 0x87, 0x50, 0x0e, 0xef, 0x67, 0xb0, 0x35, + 0x33, 0x76, 0x5e, 0xd6, 0xd4, 0x8f, 0x61, 0x43, 0xfe, 0xc2, 0x8e, 0x2d, 0xdb, 0x1a, 0x0c, 0x07, + 0x8f, 0x09, 0x79, 0x9f, 0xea, 0xbf, 0x0f, 0x8d, 0xd9, 0xe6, 0x44, 0xb4, 0xe2, 0xf1, 0x43, 0x91, + 0x1e, 0x3f, 0x76, 0x7e, 0x55, 0x21, 0xe6, 0x99, 0xa4, 0x12, 0xed, 0xa2, 0x2b, 0x39, 0xa4, 0x05, + 0x8f, 0x3a, 0xd1, 0x1e, 0xba, 0xa2, 0xa0, 0x0d, 0xb8, 0x96, 0xd0, 0xf1, 0x54, 0x54, 0xb4, 0x0d, + 0xff, 0x49, 0x6d, 0x22, 0x2b, 0xef, 0xb8, 0x5e, 0x6a, 0x3b, 0x56, 0x79, 0x37, 0x87, 0xb6, 0xa0, + 0x91, 0xd6, 0x67, 0x55, 0xde, 0xcd, 0x23, 0x1d, 0xae, 0x27, 0x37, 0x44, 0x95, 0x3c, 0xda, 0xf4, + 0x3f, 0x81, 0xc4, 0x6e, 0xa2, 0xf2, 0xad, 0x8a, 0xd6, 0xe1, 0xea, 0xcc, 0xcb, 0xba, 0x32, 0xe7, + 0xc3, 0x33, 0x2f, 0xd3, 0x4a, 0xa1, 0xb5, 0xf3, 0xa2, 0xd9, 0xb5, 0x58, 0x6f, 0x78, 0xbe, 0x6b, + 0xd2, 0xc1, 0xde, 0x97, 0x94, 0x9e, 0x9b, 0xc1, 0xef, 0x6d, 0x93, 0xba, 0x64, 0xcf, 0xa4, 0x83, + 0x01, 0xb5, 0xf7, 0x78, 0xd1, 0x9c, 0xcf, 0xf3, 0x57, 0xbb, 0xff, 0xff, 0x15, 0x00, 0x00, 0xff, + 0xff, 0x5e, 0x24, 0x3a, 0xdd, 0x75, 0x14, 0x00, 0x00, } From 77293731385b5811c3f87999dc8ac0562f177db0 Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Fri, 21 Feb 2020 15:15:31 +0800 Subject: [PATCH 13/17] #596 adjust cmd tools to new multisig byte structure --- cmd/transaction/cmd.go | 14 ++++++--- cmd/transaction/const.go | 11 ++++---- cmd/transaction/generator.go | 55 ++++++++++++++++++++++++++---------- 3 files changed, 56 insertions(+), 24 deletions(-) diff --git a/cmd/transaction/cmd.go b/cmd/transaction/cmd.go index c9d2812d8..1d930a5c1 100644 --- a/cmd/transaction/cmd.go +++ b/cmd/transaction/cmd.go @@ -2,6 +2,7 @@ package transaction import ( "database/sql" + "fmt" "time" "github.com/spf13/cobra" @@ -139,8 +140,9 @@ func init() { multiSigCmd.Flags().Uint32Var(&minSignature, "min-signature", 0, "minimum number of signature required for the transaction "+ "to be valid") multiSigCmd.Flags().StringVar(&unsignedTxHex, "unsigned-transaction", "", "hex string of the unsigned transaction bytes") - multiSigCmd.Flags().StringSliceVar(&signaturesHex, "signatures", []string{}, "hex string signatures supplied in form of "+ - "--signatures='signature1,signature2'") + multiSigCmd.Flags().StringVar(&txHash, "transaction-hash", "", "hash of transaction being signed by address-signature list (hex)") + multiSigCmd.Flags().StringSliceVar(&addressSignatures, "address-signatures", []string{}, "address-signature list "+ + "--address-signatures='address1-signature1,address2-signature2'") } // Commands set TXGeneratorCommandsInstance that will used by whole commands @@ -282,7 +284,11 @@ func (*TXGeneratorCommands) EscrowApprovalProcess() RunCommand { func (*TXGeneratorCommands) MultiSignatureProcess() RunCommand { return func(ccmd *cobra.Command, args []string) { tx := GenerateBasicTransaction(senderSeed, version, timestamp, fee, recipientAccountAddress) - tx = GeneratedMultiSignatureTransaction(tx, minSignature, nonce, unsignedTxHex, signaturesHex, addresses) - PrintTx(GenerateSignedTxBytes(tx, senderSeed), outputType) + tx = GeneratedMultiSignatureTransaction(tx, minSignature, nonce, unsignedTxHex, txHash, addressSignatures, addresses) + if tx == nil { + fmt.Printf("fail to generate transaction, please check the provided parameter") + } else { + PrintTx(GenerateSignedTxBytes(tx, senderSeed), outputType) + } } } diff --git a/cmd/transaction/const.go b/cmd/transaction/const.go index 49683a587..5dd3189e0 100644 --- a/cmd/transaction/const.go +++ b/cmd/transaction/const.go @@ -49,9 +49,10 @@ var ( transactionID int64 // multiSignature - unsignedTxHex string - signaturesHex []string - addresses []string - nonce int64 - minSignature uint32 + unsignedTxHex string + addressSignatures []string + txHash string + addresses []string + nonce int64 + minSignature uint32 ) diff --git a/cmd/transaction/generator.go b/cmd/transaction/generator.go index 2accc8aa7..09fffdf5d 100644 --- a/cmd/transaction/generator.go +++ b/cmd/transaction/generator.go @@ -340,32 +340,57 @@ func GeneratedMultiSignatureTransaction( tx *model.Transaction, minSignature uint32, nonce int64, - unsignedTxHex string, - signatureHexes, addresses []string, + unsignedTxHex, txHash string, + addressSignatures, addresses []string, ) *model.Transaction { var ( - signatures [][]byte + signatures = make(map[string][]byte) + signatureInfo *model.SignatureInfo + unsignedTx []byte + multiSigInfo *model.MultiSignatureInfo + err error ) - unsignedTx, err := hex.DecodeString(unsignedTxHex) - if err != nil { - return nil + if minSignature > 0 && len(addresses) > 0 { + multiSigInfo = &model.MultiSignatureInfo{ + MinimumSignatures: minSignature, + Nonce: nonce, + Addresses: addresses, + } } - for _, v := range signatureHexes { - signature, err := hex.DecodeString(v) + if unsignedTxHex != "" { + unsignedTx, err = hex.DecodeString(unsignedTxHex) if err != nil { return nil } - signatures = append(signatures, signature) } + + if txHash != "" { + transactionHash, err := hex.DecodeString(txHash) + if err != nil { + return nil + } + for _, v := range addressSignatures { + asig := strings.Split(v, "-") + if len(asig) < 2 { + return nil + } + signature, err := hex.DecodeString(asig[1]) + if err != nil { + return nil + } + signatures[asig[0]] = signature + } + signatureInfo = &model.SignatureInfo{ + TransactionHash: transactionHash, + Signatures: signatures, + } + } + tx.TransactionType = util.ConvertBytesToUint32(txTypeMap["multiSignature"]) txBody := &model.MultiSignatureTransactionBody{ - MultiSignatureInfo: &model.MultiSignatureInfo{ - MinimumSignatures: minSignature, - Nonce: nonce, - Addresses: addresses, - }, + MultiSignatureInfo: multiSigInfo, UnsignedTransactionBytes: unsignedTx, - Signatures: signatures, + SignatureInfo: signatureInfo, } tx.TransactionBodyBytes = (&transaction.MultiSignatureTransaction{ Body: txBody, From 30a399ce1bed82cae6bc848073f76084bdaff459 Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Fri, 21 Feb 2020 15:17:28 +0800 Subject: [PATCH 14/17] #596 update multisig transaction bytes --- common/constant/fieldsSize.go | 37 +++--- common/transaction/multiSignature.go | 141 +++++++++++++++------- common/transaction/multiSignature_test.go | 49 ++++---- 3 files changed, 146 insertions(+), 81 deletions(-) diff --git a/common/constant/fieldsSize.go b/common/constant/fieldsSize.go index cdb1482c3..8d7c3b058 100644 --- a/common/constant/fieldsSize.go +++ b/common/constant/fieldsSize.go @@ -28,18 +28,27 @@ var ( // DatasetValueLength is max length of string property value in dataset DatasetValueLength uint32 = 4 - EscrowApproverAddressLength uint32 = 4 - EscrowCommissionLength uint32 = 8 - EscrowTimeoutLength uint32 = 8 - EscrowApproval uint32 = 4 - EscrowID uint32 = 8 - EscrowApprovalBytesLength = EscrowApproval + EscrowID - EscrowInstructionLength uint32 = 4 - MultiSigAddressLength uint32 = 4 - MultiSigSignatureLength uint32 = 4 - MultiSigNumberOfAddress uint32 = 4 - MultiSigNumberOfSignatures uint32 = 4 - MultiSigUnsignedTxBytesLength uint32 = 4 - MultiSigInfoNonce uint32 = 8 - MultiSigInfoMinSignature uint32 = 4 + EscrowApproverAddressLength uint32 = 4 + EscrowCommissionLength uint32 = 8 + EscrowTimeoutLength uint32 = 8 + EscrowApproval uint32 = 4 + EscrowID uint32 = 8 + EscrowApprovalBytesLength = EscrowApproval + EscrowID + EscrowInstructionLength uint32 = 4 + MultisigFieldLength uint32 = 4 + // MultiSigFieldMissing indicate fields is missing, no need to read the bytes + MultiSigFieldMissing uint32 = 0 + // MultiSigFieldPresent indicate fields is present, parse the byte accordingly + MultiSigFieldPresent uint32 = 1 + MultiSigAddressLength uint32 = 4 + MultiSigSignatureLength uint32 = 4 + MultiSigSignatureAddressLength uint32 = 4 + MultiSigNumberOfAddress uint32 = 4 + MultiSigNumberOfSignatures uint32 = 4 + MultiSigUnsignedTxBytesLength uint32 = 4 + MultiSigInfoSize uint32 = 4 + MultiSigInfoSignatureInfoSize uint32 = 4 + MultiSigInfoNonce uint32 = 8 + MultiSigInfoMinSignature uint32 = 4 + MultiSigTransactionHash uint32 = 32 ) diff --git a/common/transaction/multiSignature.go b/common/transaction/multiSignature.go index 909d7c2f5..1d65c22ba 100644 --- a/common/transaction/multiSignature.go +++ b/common/transaction/multiSignature.go @@ -51,65 +51,101 @@ func (tx *MultiSignatureTransaction) GetSize() uint32 { var ( txByteSize, signaturesSize, multisigInfoSize uint32 ) - + // MultisigInfo multisigInfo := tx.Body.GetMultiSignatureInfo() - multisigInfoSize += constant.MultiSigInfoMinSignature - multisigInfoSize += constant.MultiSigInfoNonce - multisigInfoSize += constant.MultiSigNumberOfAddress - for _, v := range multisigInfo.GetAddresses() { - multisigInfoSize += constant.MultiSigAddressLength - multisigInfoSize += uint32(len([]byte(v))) + multisigInfoSize += constant.MultisigFieldLength + if multisigInfo != nil { + multisigInfoSize += constant.MultiSigInfoMinSignature + multisigInfoSize += constant.MultiSigInfoNonce + multisigInfoSize += constant.MultiSigNumberOfAddress + for _, v := range multisigInfo.GetAddresses() { + multisigInfoSize += constant.MultiSigAddressLength + multisigInfoSize += uint32(len([]byte(v))) + } } - + // TransactionBytes txByteSize = constant.MultiSigUnsignedTxBytesLength + uint32(len(tx.Body.GetUnsignedTransactionBytes())) - signaturesSize += constant.MultiSigNumberOfSignatures - for _, v := range tx.Body.GetSignatures() { - signaturesSize += constant.MultiSigSignatureLength - signaturesSize += uint32(len(v)) + // SignatureInfo + signaturesSize += constant.MultisigFieldLength + if tx.Body.GetSignatureInfo() != nil { + signaturesSize += constant.MultiSigTransactionHash + signaturesSize += constant.MultiSigNumberOfSignatures + for address, sig := range tx.Body.SignatureInfo.Signatures { + signaturesSize += constant.MultiSigSignatureAddressLength + signaturesSize += uint32(len([]byte(address))) + signaturesSize += constant.MultiSigSignatureLength + signaturesSize += uint32(len(sig)) + } } + return txByteSize + signaturesSize + multisigInfoSize } func (tx *MultiSignatureTransaction) ParseBodyBytes(txBodyBytes []byte) (model.TransactionBodyInterface, error) { var ( - addresses []string - signatures [][]byte + addresses []string + signatures = make(map[string][]byte) + multisigInfo *model.MultiSignatureInfo + signatureInfo *model.SignatureInfo ) bufferBytes := bytes.NewBuffer(txBodyBytes) - minSignatures := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigInfoMinSignature))) - nonce := util.ConvertBytesToUint64(bufferBytes.Next(int(constant.MultiSigInfoNonce))) - addressesLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigNumberOfAddress))) - for i := 0; i < int(addressesLength); i++ { - addressLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigAddressLength))) - address, err := util.ReadTransactionBytes(bufferBytes, int(addressLength)) - if err != nil { - return nil, err + // MultisigInfo + multisigInfoPresent := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultisigFieldLength))) + if multisigInfoPresent == constant.MultiSigFieldPresent { + minSignatures := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigInfoMinSignature))) + nonce := util.ConvertBytesToUint64(bufferBytes.Next(int(constant.MultiSigInfoNonce))) + addressesLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigNumberOfAddress))) + for i := 0; i < int(addressesLength); i++ { + addressLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigAddressLength))) + address, err := util.ReadTransactionBytes(bufferBytes, int(addressLength)) + if err != nil { + return nil, err + } + addresses = append(addresses, string(address)) + } + multisigInfo = &model.MultiSignatureInfo{ + MinimumSignatures: minSignatures, + Nonce: int64(nonce), + Addresses: addresses, } - addresses = append(addresses, string(address)) - } - multisigInfo := &model.MultiSignatureInfo{ - MinimumSignatures: minSignatures, - Nonce: int64(nonce), - Addresses: addresses, } + // TransactionBytes unsignedTxLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigUnsignedTxBytesLength))) unsignedTx, err := util.ReadTransactionBytes(bufferBytes, int(unsignedTxLength)) if err != nil { return nil, err } - signaturesLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigNumberOfSignatures))) - for i := 0; i < int(signaturesLength); i++ { - signatureLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigSignatureLength))) - signature, err := util.ReadTransactionBytes(bufferBytes, int(signatureLength)) + // SignatureInfo + signatureInfoPresent := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultisigFieldLength))) + if signatureInfoPresent == constant.MultiSigFieldPresent { + transactionHash, err := util.ReadTransactionBytes(bufferBytes, int(constant.MultiSigTransactionHash)) if err != nil { return nil, err } - signatures = append(signatures, signature) + signaturesLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigNumberOfSignatures))) + for i := 0; i < int(signaturesLength); i++ { + addressLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigAddressLength))) + address, err := util.ReadTransactionBytes(bufferBytes, int(addressLength)) + if err != nil { + return nil, err + } + signatureLength := util.ConvertBytesToUint32(bufferBytes.Next(int(constant.MultiSigSignatureLength))) + signature, err := util.ReadTransactionBytes(bufferBytes, int(signatureLength)) + if err != nil { + return nil, err + } + signatures[string(address)] = signature + } + signatureInfo = &model.SignatureInfo{ + TransactionHash: transactionHash, + Signatures: signatures, + } } + return &model.MultiSignatureTransactionBody{ MultiSignatureInfo: multisigInfo, UnsignedTransactionBytes: unsignedTx, - Signatures: signatures, + SignatureInfo: signatureInfo, }, nil } @@ -117,20 +153,37 @@ func (tx *MultiSignatureTransaction) GetBodyBytes() []byte { var ( buffer = bytes.NewBuffer([]byte{}) ) - buffer.Write(util.ConvertUint32ToBytes(tx.Body.GetMultiSignatureInfo().GetMinimumSignatures())) - buffer.Write(util.ConvertUint64ToBytes(uint64(tx.Body.GetMultiSignatureInfo().GetNonce()))) - buffer.Write(util.ConvertUint32ToBytes(uint32(len(tx.Body.GetMultiSignatureInfo().GetAddresses())))) - for _, v := range tx.Body.GetMultiSignatureInfo().GetAddresses() { - buffer.Write(util.ConvertUint32ToBytes(uint32(len([]byte(v))))) - buffer.Write([]byte(v)) + // Multisig Info + if tx.Body.GetMultiSignatureInfo() != nil { + buffer.Write(util.ConvertUint32ToBytes(constant.MultiSigFieldPresent)) + buffer.Write(util.ConvertUint32ToBytes(tx.Body.GetMultiSignatureInfo().GetMinimumSignatures())) + buffer.Write(util.ConvertUint64ToBytes(uint64(tx.Body.GetMultiSignatureInfo().GetNonce()))) + buffer.Write(util.ConvertUint32ToBytes(uint32(len(tx.Body.GetMultiSignatureInfo().GetAddresses())))) + for _, v := range tx.Body.GetMultiSignatureInfo().GetAddresses() { + buffer.Write(util.ConvertUint32ToBytes(uint32(len([]byte(v))))) + buffer.Write([]byte(v)) + } + } else { + buffer.Write(util.ConvertUint32ToBytes(constant.MultiSigFieldMissing)) } + // Transaction Bytes buffer.Write(util.ConvertUint32ToBytes(uint32(len(tx.Body.GetUnsignedTransactionBytes())))) buffer.Write(tx.Body.GetUnsignedTransactionBytes()) - buffer.Write(util.ConvertUint32ToBytes(uint32(len(tx.Body.GetSignatures())))) - for _, v := range tx.Body.GetSignatures() { - buffer.Write(util.ConvertUint32ToBytes(uint32(len(v)))) - buffer.Write(v) + // SignatureInfo + if tx.Body.GetSignatureInfo() != nil { + buffer.Write(util.ConvertUint32ToBytes(constant.MultiSigFieldPresent)) + buffer.Write(tx.Body.GetSignatureInfo().GetTransactionHash()) + buffer.Write(util.ConvertUint32ToBytes(uint32(len(tx.Body.GetSignatureInfo().GetSignatures())))) + for address, sig := range tx.Body.GetSignatureInfo().GetSignatures() { + buffer.Write(util.ConvertUint32ToBytes(uint32(len([]byte(address))))) + buffer.Write([]byte(address)) + buffer.Write(util.ConvertUint32ToBytes(uint32(len(sig)))) + buffer.Write(sig) + } + } else { + buffer.Write(util.ConvertUint32ToBytes(constant.MultiSigFieldMissing)) } + return buffer.Bytes() } diff --git a/common/transaction/multiSignature_test.go b/common/transaction/multiSignature_test.go index 30d03cbf3..fc64412f2 100644 --- a/common/transaction/multiSignature_test.go +++ b/common/transaction/multiSignature_test.go @@ -31,7 +31,7 @@ func TestMultiSignatureTransaction_GetSize(t *testing.T) { Addresses: nil, }, UnsignedTransactionBytes: nil, - Signatures: nil, + SignatureInfo: nil, }, NormalFee: nil, }, @@ -50,7 +50,7 @@ func TestMultiSignatureTransaction_GetSize(t *testing.T) { }, }, UnsignedTransactionBytes: nil, - Signatures: nil, + SignatureInfo: nil, }, NormalFee: nil, }, @@ -70,8 +70,11 @@ func TestMultiSignatureTransaction_GetSize(t *testing.T) { }, }, UnsignedTransactionBytes: nil, - Signatures: [][]byte{ - make([]byte, 64), + SignatureInfo: &model.SignatureInfo{ + TransactionHash: make([]byte, constant.MultiSigTransactionHash), + Signatures: map[string][]byte{ + "A": make([]byte, 64), + }, }, }, NormalFee: nil, @@ -93,8 +96,11 @@ func TestMultiSignatureTransaction_GetSize(t *testing.T) { }, }, UnsignedTransactionBytes: make([]byte, 120), - Signatures: [][]byte{ - make([]byte, 64), + SignatureInfo: &model.SignatureInfo{ + TransactionHash: make([]byte, constant.MultiSigTransactionHash), + Signatures: map[string][]byte{ + "A": make([]byte, 64), + }, }, }, NormalFee: nil, @@ -132,25 +138,22 @@ var ( }, }, UnsignedTransactionBytes: make([]byte, 120), - Signatures: [][]byte{ - make([]byte, 64), - make([]byte, 64), - make([]byte, 64), + SignatureInfo: &model.SignatureInfo{ + TransactionHash: make([]byte, constant.MultiSigTransactionHash), + Signatures: map[string][]byte{ + "A": make([]byte, 64), + }, }, } mockMultipleSignatureBodyBytes = []byte{ - 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, 65, 1, 0, 0, 0, 66, 1, 0, 0, 0, 67, - 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, - 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 1, 0, 0, 0, 65, 1, 0, 0, 0, 66, 1, 0, 0, 0, + 67, 120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 65, 64, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, } // mock for GetBodyBytes & ParseBodyBytes ) @@ -171,7 +174,7 @@ func TestMultiSignatureTransaction_GetBodyBytes(t *testing.T) { Body: nil, NormalFee: nil, }, - want: make([]byte, 24), + want: make([]byte, 12), }, { name: "GetBodyBytes-Success-Complete", From 655e6444a2c31c6aff77042066095429ae0fc420 Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Fri, 21 Feb 2020 15:27:54 +0800 Subject: [PATCH 15/17] #596 fix tests --- common/constant/fieldsSize.go | 2 +- common/transaction/multiSignature_test.go | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/common/constant/fieldsSize.go b/common/constant/fieldsSize.go index 8d7c3b058..549f1011e 100644 --- a/common/constant/fieldsSize.go +++ b/common/constant/fieldsSize.go @@ -37,7 +37,7 @@ var ( EscrowInstructionLength uint32 = 4 MultisigFieldLength uint32 = 4 // MultiSigFieldMissing indicate fields is missing, no need to read the bytes - MultiSigFieldMissing uint32 = 0 + MultiSigFieldMissing uint32 // MultiSigFieldPresent indicate fields is present, parse the byte accordingly MultiSigFieldPresent uint32 = 1 MultiSigAddressLength uint32 = 4 diff --git a/common/transaction/multiSignature_test.go b/common/transaction/multiSignature_test.go index fc64412f2..6fd7f4952 100644 --- a/common/transaction/multiSignature_test.go +++ b/common/transaction/multiSignature_test.go @@ -35,8 +35,8 @@ func TestMultiSignatureTransaction_GetSize(t *testing.T) { }, NormalFee: nil, }, - want: constant.MultiSigInfoMinSignature + constant.MultiSigInfoNonce + constant.MultiSigNumberOfAddress + - constant.MultiSigUnsignedTxBytesLength + constant.MultiSigNumberOfSignatures, + want: constant.MultisigFieldLength + constant.MultiSigInfoMinSignature + constant.MultiSigInfoNonce + + constant.MultiSigNumberOfAddress + constant.MultiSigUnsignedTxBytesLength + constant.MultisigFieldLength, }, { name: "GetSize-Success-with_addresses-no_signatures-no_transactionBytes", @@ -54,8 +54,8 @@ func TestMultiSignatureTransaction_GetSize(t *testing.T) { }, NormalFee: nil, }, - want: constant.MultiSigInfoMinSignature + constant.MultiSigInfoNonce + constant.MultiSigNumberOfAddress + - constant.MultiSigUnsignedTxBytesLength + constant.MultiSigNumberOfSignatures + + want: constant.MultisigFieldLength + constant.MultiSigInfoMinSignature + constant.MultiSigInfoNonce + + constant.MultiSigNumberOfAddress + constant.MultiSigUnsignedTxBytesLength + constant.MultisigFieldLength + constant.MultiSigAddressLength + uint32(len([]byte("A"))), }, { @@ -79,9 +79,10 @@ func TestMultiSignatureTransaction_GetSize(t *testing.T) { }, NormalFee: nil, }, - want: constant.MultiSigInfoMinSignature + constant.MultiSigInfoNonce + constant.MultiSigNumberOfAddress + - constant.MultiSigUnsignedTxBytesLength + constant.MultiSigNumberOfSignatures + - constant.MultiSigAddressLength + uint32(len([]byte("A"))) + + want: constant.MultisigFieldLength + constant.MultiSigInfoMinSignature + constant.MultiSigInfoNonce + + constant.MultiSigNumberOfAddress + constant.MultiSigAddressLength + uint32(len([]byte("A"))) + + constant.MultiSigUnsignedTxBytesLength + constant.MultisigFieldLength + constant.MultiSigTransactionHash + + constant.MultiSigNumberOfSignatures + constant.MultiSigAddressLength + uint32(len([]byte("A"))) + constant.MultiSigSignatureLength + 64, }, { @@ -105,8 +106,9 @@ func TestMultiSignatureTransaction_GetSize(t *testing.T) { }, NormalFee: nil, }, - want: constant.MultiSigInfoMinSignature + constant.MultiSigInfoNonce + constant.MultiSigNumberOfAddress + - constant.MultiSigNumberOfSignatures + + want: constant.MultisigFieldLength + constant.MultiSigInfoMinSignature + constant.MultiSigInfoNonce + + constant.MultiSigNumberOfAddress + constant.MultiSigAddressLength + uint32(len([]byte("A"))) + + constant.MultisigFieldLength + constant.MultiSigTransactionHash + constant.MultiSigNumberOfSignatures + constant.MultiSigAddressLength + uint32(len([]byte("A"))) + constant.MultiSigSignatureLength + 64 + constant.MultiSigUnsignedTxBytesLength + 120, From 7b18516218194dcd316924673d28ddf62fe54179 Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Mon, 24 Feb 2020 08:40:52 +0800 Subject: [PATCH 16/17] #596 fix typo in cmd description --- cmd/main.go | 2 +- cmd/parser/cmd.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 5a3ab4e5f..08de6d015 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -52,7 +52,7 @@ func main() { } parserCmd = &cobra.Command{ Use: "parser", - Short: "parse transaction by providing the transaction bytes", + Short: "parse data to understandable struct", } ) diff --git a/cmd/parser/cmd.go b/cmd/parser/cmd.go index 08d467a94..c65a425a1 100644 --- a/cmd/parser/cmd.go +++ b/cmd/parser/cmd.go @@ -17,7 +17,7 @@ var ( txParserCmd = &cobra.Command{ Use: "tx", Short: "parse transaction from its hex representation", - Long: "transaction parser to check the content of you transaction hex", + Long: "transaction parser to check the content of your transaction hex", } ) From a0b6ef88837c72d6765bb0cf35a282b488f1a694 Mon Sep 17 00:00:00 2001 From: andy-shi88 Date: Mon, 24 Feb 2020 08:41:40 +0800 Subject: [PATCH 17/17] #596 update schema --- common/schema | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/schema b/common/schema index 2967ff898..1977851c3 160000 --- a/common/schema +++ b/common/schema @@ -1 +1 @@ -Subproject commit 2967ff898eaeb7fdc551b6c1be74700584a6a838 +Subproject commit 1977851c3802e00e9c6db6dd43e4be90cd1d5233