diff --git a/types/result.go b/types/result.go index 17c272f8d..305fe9287 100644 --- a/types/result.go +++ b/types/result.go @@ -26,6 +26,38 @@ func (res Result) Error() string { return fmt.Sprintf("TMSP error code:%v, data:%X, log:%v", res.Code, res.Data, res.Log) } +func (res Result) PrependLog(log string) Result { + return Result{ + Code: res.Code, + Data: res.Data, + Log: log + ";" + res.Log, + } +} + +func (res Result) AppendLog(log string) Result { + return Result{ + Code: res.Code, + Data: res.Data, + Log: res.Log + ";" + log, + } +} + +func (res Result) SetLog(log string) Result { + return Result{ + Code: res.Code, + Data: res.Data, + Log: log, + } +} + +func (res Result) SetData(data []byte) Result { + return Result{ + Code: res.Code, + Data: data, + Log: res.Log, + } +} + //---------------------------------------- func NewResultOK(data []byte, log string) Result { diff --git a/types/types.pb.go b/types/types.pb.go index 8c8a370ea..41323e726 100644 --- a/types/types.pb.go +++ b/types/types.pb.go @@ -88,12 +88,17 @@ const ( CodeType_InsufficientFunds CodeType = 5 CodeType_UnknownRequest CodeType = 6 // Reserved for basecoin, 100 ~ 199 - CodeType_BaseEncodingError CodeType = 101 - CodeType_BaseBadNonce CodeType = 102 - CodeType_BaseUnknownAccount CodeType = 103 - CodeType_BaseUnauthorized CodeType = 104 - CodeType_BaseInsufficientFunds CodeType = 105 - CodeType_BaseInsufficientFees CodeType = 106 + CodeType_BaseDuplicateAddress CodeType = 101 + CodeType_BaseEncodingError CodeType = 102 + CodeType_BaseInsufficientFees CodeType = 103 + CodeType_BaseInsufficientFunds CodeType = 104 + CodeType_BaseInsufficientGasPrice CodeType = 105 + CodeType_BaseInvalidAddress CodeType = 106 + CodeType_BaseInvalidAmount CodeType = 107 + CodeType_BaseInvalidPubKey CodeType = 108 + CodeType_BaseInvalidSequence CodeType = 109 + CodeType_BaseInvalidSignature CodeType = 110 + CodeType_BaseUnknownPubKey CodeType = 111 // Reserved for governance, 200 ~ 299 CodeType_GovUnknownEntity CodeType = 201 CodeType_GovUnknownGroup CodeType = 202 @@ -115,12 +120,17 @@ var CodeType_name = map[int32]string{ 4: "Unauthorized", 5: "InsufficientFunds", 6: "UnknownRequest", - 101: "BaseEncodingError", - 102: "BaseBadNonce", - 103: "BaseUnknownAccount", - 104: "BaseUnauthorized", - 105: "BaseInsufficientFunds", - 106: "BaseInsufficientFees", + 101: "BaseDuplicateAddress", + 102: "BaseEncodingError", + 103: "BaseInsufficientFees", + 104: "BaseInsufficientFunds", + 105: "BaseInsufficientGasPrice", + 106: "BaseInvalidAddress", + 107: "BaseInvalidAmount", + 108: "BaseInvalidPubKey", + 109: "BaseInvalidSequence", + 110: "BaseInvalidSignature", + 111: "BaseUnknownPubKey", 201: "GovUnknownEntity", 202: "GovUnknownGroup", 203: "GovUnknownProposal", @@ -133,29 +143,34 @@ var CodeType_name = map[int32]string{ 210: "GovInvalidVotingPower", } var CodeType_value = map[string]int32{ - "OK": 0, - "InternalError": 1, - "EncodingError": 2, - "BadNonce": 3, - "Unauthorized": 4, - "InsufficientFunds": 5, - "UnknownRequest": 6, - "BaseEncodingError": 101, - "BaseBadNonce": 102, - "BaseUnknownAccount": 103, - "BaseUnauthorized": 104, - "BaseInsufficientFunds": 105, - "BaseInsufficientFees": 106, - "GovUnknownEntity": 201, - "GovUnknownGroup": 202, - "GovUnknownProposal": 203, - "GovDuplicateGroup": 204, - "GovDuplicateMember": 205, - "GovDuplicateProposal": 206, - "GovDuplicateVote": 207, - "GovInvalidMember": 208, - "GovInvalidVote": 209, - "GovInvalidVotingPower": 210, + "OK": 0, + "InternalError": 1, + "EncodingError": 2, + "BadNonce": 3, + "Unauthorized": 4, + "InsufficientFunds": 5, + "UnknownRequest": 6, + "BaseDuplicateAddress": 101, + "BaseEncodingError": 102, + "BaseInsufficientFees": 103, + "BaseInsufficientFunds": 104, + "BaseInsufficientGasPrice": 105, + "BaseInvalidAddress": 106, + "BaseInvalidAmount": 107, + "BaseInvalidPubKey": 108, + "BaseInvalidSequence": 109, + "BaseInvalidSignature": 110, + "BaseUnknownPubKey": 111, + "GovUnknownEntity": 201, + "GovUnknownGroup": 202, + "GovUnknownProposal": 203, + "GovDuplicateGroup": 204, + "GovDuplicateMember": 205, + "GovDuplicateProposal": 206, + "GovDuplicateVote": 207, + "GovInvalidMember": 208, + "GovInvalidVote": 209, + "GovInvalidVotingPower": 210, } func (x CodeType) String() string { @@ -224,46 +239,49 @@ func init() { } var fileDescriptor0 = []byte{ - // 652 bytes of a gzipped FileDescriptorProto + // 703 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xcb, 0x52, 0xdb, 0x4a, - 0x10, 0xbd, 0x63, 0xcb, 0xc6, 0x6e, 0x83, 0x19, 0x0f, 0xf6, 0xc5, 0xf7, 0xae, 0x28, 0x52, 0x95, - 0xa2, 0x58, 0x90, 0x14, 0x59, 0x65, 0x09, 0x8e, 0xa1, 0x5c, 0x14, 0x8f, 0x28, 0xc0, 0x5e, 0x48, - 0x6d, 0x4b, 0xb1, 0x98, 0x51, 0xa4, 0x11, 0xe0, 0xac, 0xf2, 0x3d, 0xf9, 0x81, 0x7c, 0x41, 0x16, - 0x79, 0x3f, 0xbe, 0x28, 0x3d, 0x92, 0x6c, 0x4c, 0x58, 0x64, 0x91, 0x8d, 0x6b, 0xce, 0xe9, 0xe9, - 0xd3, 0xe7, 0xb4, 0xa6, 0x0c, 0x2d, 0x3d, 0x89, 0x30, 0x79, 0x94, 0xfd, 0x6e, 0x45, 0xb1, 0xd2, - 0x4a, 0x54, 0x32, 0xb0, 0xfe, 0x8e, 0xc1, 0x82, 0x8d, 0xaf, 0x52, 0x4c, 0xb4, 0x78, 0x08, 0x96, - 0x21, 0xbb, 0x6c, 0x8d, 0x6d, 0x34, 0xb7, 0xc5, 0x56, 0x7e, 0xfd, 0x10, 0x93, 0xc4, 0x19, 0xe1, - 0x29, 0x01, 0x3b, 0xab, 0x0b, 0x01, 0x96, 0xe7, 0x68, 0xa7, 0x5b, 0xa2, 0x7b, 0x8b, 0x76, 0x76, - 0x16, 0x1c, 0xca, 0x63, 0x9c, 0x74, 0xcb, 0x44, 0xd5, 0x6d, 0x73, 0x14, 0x6d, 0xa8, 0x5c, 0x39, - 0x61, 0x8a, 0x5d, 0x2b, 0xe3, 0x72, 0x20, 0x1e, 0x03, 0xd0, 0x21, 0xa0, 0x1e, 0x15, 0x27, 0xdd, - 0xca, 0x5a, 0x79, 0xa3, 0xb1, 0xcd, 0x8b, 0x49, 0xe7, 0xd3, 0x82, 0x3d, 0x77, 0x47, 0xfc, 0x0b, - 0x55, 0x1f, 0x83, 0x91, 0xaf, 0xbb, 0x55, 0x12, 0xb2, 0xec, 0x02, 0xad, 0xbf, 0x67, 0x50, 0xb3, - 0x31, 0x89, 0x94, 0x4c, 0xf0, 0xaf, 0xac, 0x3f, 0x00, 0xcb, 0x55, 0x1e, 0x66, 0xde, 0x9b, 0xdb, - 0xcb, 0x45, 0x6f, 0x8f, 0xa8, 0xbc, 0xd1, 0x14, 0x4d, 0x1a, 0x8c, 0x63, 0x15, 0x4f, 0xd3, 0x64, - 0xc0, 0xa4, 0x0e, 0xd5, 0x88, 0x62, 0x64, 0xa9, 0xe9, 0xf8, 0x5b, 0xbe, 0xea, 0x9f, 0xf3, 0xad, - 0x3f, 0x85, 0xfa, 0xac, 0x60, 0xc2, 0x46, 0xe9, 0xc5, 0x01, 0x6d, 0x92, 0x65, 0x0e, 0x0b, 0x64, - 0xc6, 0x47, 0xea, 0x1a, 0xe3, 0xcc, 0xb8, 0x65, 0xe7, 0x60, 0xf3, 0x2d, 0x83, 0xc6, 0x5c, 0x46, - 0xb1, 0x0c, 0x8d, 0xa3, 0x34, 0x0c, 0x0b, 0x8a, 0xff, 0x23, 0x6a, 0x60, 0xf5, 0x5d, 0x5f, 0x71, - 0x26, 0xea, 0x50, 0xd9, 0x0b, 0xd3, 0xc4, 0xe7, 0x25, 0x43, 0x0e, 0xe4, 0x50, 0xf1, 0xb2, 0x58, - 0x82, 0xfa, 0x0b, 0xd4, 0xc7, 0x91, 0x0e, 0x94, 0xe4, 0x96, 0x81, 0xfd, 0x1b, 0x17, 0x73, 0x58, - 0x11, 0x8b, 0x50, 0xdb, 0x89, 0x22, 0x94, 0xde, 0xe9, 0x0d, 0x6f, 0x89, 0x06, 0x2c, 0xf4, 0x7c, - 0x74, 0xc7, 0x04, 0x68, 0x8b, 0x50, 0xed, 0xa9, 0xcb, 0xcb, 0x40, 0xf3, 0x15, 0xa3, 0xfc, 0x3c, - 0xc5, 0x78, 0xc2, 0xdb, 0x46, 0x60, 0x20, 0x03, 0xdd, 0xf3, 0x9d, 0x40, 0xf2, 0x8e, 0x11, 0xe8, - 0x4b, 0x6f, 0x37, 0x54, 0xee, 0x98, 0xaf, 0x6e, 0xbe, 0xb1, 0xa0, 0x36, 0x5d, 0xaa, 0xa8, 0x42, - 0xe9, 0xf8, 0x80, 0x0c, 0xb6, 0x60, 0x69, 0x20, 0x35, 0xc6, 0xd2, 0x09, 0xfb, 0x66, 0xa3, 0xe4, - 0x94, 0xa8, 0xbe, 0xa4, 0x9d, 0x07, 0x72, 0x94, 0x53, 0x25, 0x23, 0xb4, 0xeb, 0x78, 0x47, 0x4a, - 0xba, 0x48, 0xae, 0x39, 0x2c, 0x9e, 0x49, 0x27, 0xd5, 0xbe, 0x8a, 0x83, 0xd7, 0xe8, 0x91, 0xf1, - 0x0e, 0xb4, 0x06, 0x32, 0x49, 0x87, 0xc3, 0xc0, 0x0d, 0x50, 0xea, 0xbd, 0x54, 0x7a, 0x09, 0x05, - 0x10, 0xd0, 0x3c, 0x93, 0x63, 0xa9, 0xae, 0x65, 0xf1, 0xc2, 0x79, 0xd5, 0x5c, 0xdd, 0x75, 0x12, - 0xbc, 0x3b, 0x01, 0x8d, 0xa6, 0xa1, 0x67, 0x53, 0x86, 0xf4, 0x25, 0x84, 0x61, 0x0a, 0x81, 0x1d, - 0xd7, 0x55, 0xa9, 0xd4, 0x7c, 0x44, 0x5f, 0x82, 0xe7, 0xfc, 0x9c, 0x03, 0x5f, 0xfc, 0x07, 0x1d, - 0xc3, 0xde, 0x77, 0x11, 0x88, 0x2e, 0xb4, 0xef, 0x95, 0x10, 0x13, 0xfe, 0x92, 0xbc, 0xf0, 0x7d, - 0x75, 0x55, 0x4c, 0xe8, 0x4b, 0x1d, 0xe8, 0x09, 0xff, 0xc0, 0x68, 0xc2, 0xf2, 0x2d, 0xbd, 0x1f, - 0xab, 0x34, 0xe2, 0x1f, 0x99, 0x58, 0x05, 0x71, 0xcb, 0x9e, 0xc4, 0x2a, 0x52, 0x89, 0x13, 0xf2, - 0x4f, 0x8c, 0x8c, 0xb6, 0xa8, 0xf0, 0x2c, 0x8d, 0xc2, 0xc0, 0x75, 0x34, 0xe6, 0x0d, 0x9f, 0xa7, - 0x0d, 0x33, 0xfe, 0x10, 0x2f, 0x2f, 0x30, 0xe6, 0x5f, 0x18, 0x79, 0x6d, 0xcf, 0x17, 0x66, 0x5a, - 0x5f, 0x59, 0xe1, 0x68, 0x56, 0x3a, 0x57, 0x1a, 0xf9, 0xb7, 0x29, 0x3d, 0x90, 0xd9, 0xab, 0x2d, - 0x84, 0xbe, 0x33, 0xb1, 0x02, 0xcd, 0x5b, 0x3a, 0xbb, 0xfb, 0x83, 0x89, 0xff, 0xa1, 0x73, 0x87, - 0xa4, 0x25, 0x9f, 0x98, 0xc7, 0xca, 0x7f, 0xb2, 0x8b, 0x6a, 0xf6, 0xd7, 0xf3, 0xe4, 0x57, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x9d, 0x98, 0x5a, 0xc8, 0x8f, 0x04, 0x00, 0x00, + 0x10, 0xbd, 0xb2, 0x65, 0x63, 0xb7, 0xc1, 0x8c, 0x07, 0xfb, 0xa2, 0x7b, 0x2b, 0x0b, 0x8a, 0x54, + 0xa5, 0x28, 0x16, 0x24, 0x45, 0x56, 0x59, 0x82, 0x63, 0x28, 0x17, 0x05, 0x38, 0xe2, 0xb1, 0x17, + 0x52, 0xdb, 0x52, 0x2c, 0xcf, 0x28, 0xd2, 0x08, 0x70, 0xbe, 0x20, 0xdf, 0x92, 0x1f, 0xc8, 0x17, + 0x64, 0x91, 0xf7, 0xe3, 0x8b, 0x32, 0x33, 0x92, 0x6c, 0x43, 0x16, 0x59, 0x64, 0x43, 0x4d, 0x9f, + 0x33, 0x7d, 0xfa, 0x9c, 0xd6, 0x60, 0x68, 0x89, 0x69, 0x84, 0xc9, 0x63, 0xfd, 0x77, 0x27, 0x8a, + 0xb9, 0xe0, 0xb4, 0xa2, 0x8b, 0xcd, 0x77, 0x06, 0x2c, 0xd9, 0xf8, 0x2a, 0xc5, 0x44, 0xd0, 0x47, + 0x60, 0x2a, 0xd0, 0x32, 0x36, 0x8c, 0xad, 0xe6, 0x2e, 0xdd, 0xc9, 0xae, 0x1f, 0x63, 0x92, 0x38, + 0x23, 0x3c, 0x97, 0x85, 0xad, 0x79, 0x4a, 0xc1, 0xf4, 0x1c, 0xe1, 0x58, 0x25, 0x79, 0x6f, 0xd9, + 0xd6, 0x67, 0x4a, 0xa0, 0x3c, 0xc6, 0xa9, 0x55, 0x96, 0x50, 0xdd, 0x56, 0x47, 0xda, 0x86, 0xca, + 0xb5, 0x13, 0xa6, 0x68, 0x99, 0x1a, 0xcb, 0x0a, 0xfa, 0x04, 0x40, 0x1e, 0x02, 0xd9, 0xc3, 0xe3, + 0xc4, 0xaa, 0x6c, 0x94, 0xb7, 0x1a, 0xbb, 0x24, 0x9f, 0x74, 0x59, 0x10, 0xf6, 0xc2, 0x1d, 0xfa, + 0x2f, 0x54, 0x7d, 0x0c, 0x46, 0xbe, 0xb0, 0xaa, 0x52, 0xc8, 0xb4, 0xf3, 0x6a, 0xf3, 0xbd, 0x01, + 0x35, 0x1b, 0x93, 0x88, 0xb3, 0x04, 0xff, 0xca, 0xfa, 0x43, 0x30, 0x5d, 0xee, 0xa1, 0xf6, 0xde, + 0xdc, 0x5d, 0xcd, 0x7b, 0xbb, 0x12, 0xca, 0x1a, 0x15, 0xa9, 0xd2, 0x60, 0x1c, 0xf3, 0xb8, 0x48, + 0xa3, 0x0b, 0x95, 0x3a, 0xe4, 0x23, 0x19, 0x43, 0xa7, 0x96, 0xc7, 0x7b, 0xf9, 0xaa, 0x7f, 0xce, + 0xb7, 0xf9, 0x0c, 0xea, 0x33, 0x42, 0x85, 0x8d, 0xd2, 0xab, 0x23, 0xb9, 0x49, 0x43, 0x3b, 0xcc, + 0x2b, 0x35, 0x3e, 0xe2, 0x37, 0x18, 0x6b, 0xe3, 0xa6, 0x9d, 0x15, 0xdb, 0x6f, 0x0d, 0x68, 0x2c, + 0x64, 0xa4, 0xab, 0xd0, 0x38, 0x49, 0xc3, 0x30, 0x87, 0xc8, 0x3f, 0xb4, 0x06, 0x66, 0xcf, 0xf5, + 0x39, 0x31, 0x68, 0x1d, 0x2a, 0x07, 0x61, 0x9a, 0xf8, 0xa4, 0xa4, 0xc0, 0x3e, 0x1b, 0x72, 0x52, + 0xa6, 0x2b, 0x50, 0x3f, 0x43, 0x71, 0x1a, 0x89, 0x80, 0x33, 0x62, 0xaa, 0xb2, 0x77, 0xeb, 0x62, + 0x56, 0x56, 0xe8, 0x32, 0xd4, 0xf6, 0xa2, 0x08, 0x99, 0x77, 0x7e, 0x4b, 0x5a, 0xb4, 0x01, 0x4b, + 0x5d, 0x1f, 0xdd, 0xb1, 0x2c, 0xe4, 0x16, 0xa1, 0xda, 0xe5, 0x93, 0x49, 0x20, 0xc8, 0x9a, 0x52, + 0x7e, 0x91, 0x62, 0x3c, 0x25, 0x6d, 0x25, 0xd0, 0x67, 0x81, 0xe8, 0xfa, 0x4e, 0xc0, 0x48, 0x47, + 0x09, 0xf4, 0x98, 0xb7, 0x1f, 0x72, 0x77, 0x4c, 0xd6, 0xb7, 0xdf, 0x54, 0xa0, 0x56, 0x2c, 0x95, + 0x56, 0xa1, 0x74, 0x7a, 0x24, 0x0d, 0xb6, 0x60, 0xa5, 0xcf, 0x04, 0xc6, 0xcc, 0x09, 0x7b, 0x6a, + 0xa3, 0xd2, 0xa9, 0x84, 0x7a, 0x4c, 0xee, 0x3c, 0x60, 0xa3, 0x0c, 0x2a, 0x29, 0xa1, 0x7d, 0xc7, + 0x3b, 0xe1, 0xcc, 0x45, 0xe9, 0x9a, 0xc0, 0xf2, 0x05, 0x73, 0x52, 0xe1, 0xf3, 0x38, 0x78, 0x8d, + 0x9e, 0x34, 0xde, 0x81, 0x56, 0x9f, 0x25, 0xe9, 0x70, 0x18, 0xb8, 0x01, 0x32, 0x71, 0x90, 0x32, + 0x2f, 0x91, 0x01, 0x28, 0x34, 0x2f, 0xd8, 0x98, 0xf1, 0x1b, 0x96, 0xbf, 0x70, 0x52, 0xa5, 0x16, + 0xb4, 0xf7, 0x9d, 0x04, 0x9f, 0xa7, 0x51, 0x18, 0xb8, 0x8e, 0xc0, 0x3d, 0xcf, 0x8b, 0xe5, 0xba, + 0x08, 0x2a, 0x11, 0xc5, 0xdc, 0x9d, 0x3d, 0x2c, 0x1a, 0xee, 0xe8, 0x23, 0x26, 0x64, 0x44, 0xff, + 0x83, 0xce, 0x6f, 0x8c, 0x9e, 0xec, 0xd3, 0x07, 0x60, 0xdd, 0xa7, 0x0e, 0x9d, 0x64, 0x10, 0x07, + 0x32, 0x40, 0x20, 0x3f, 0x32, 0xcd, 0x58, 0xfd, 0x0a, 0x0a, 0x07, 0x2f, 0x0b, 0x07, 0x05, 0x3e, + 0xe1, 0x29, 0x13, 0x64, 0x7c, 0x0f, 0x1e, 0xe8, 0x07, 0x41, 0x42, 0xba, 0x0e, 0x6b, 0x0b, 0xf0, + 0x99, 0x4a, 0xa8, 0xf6, 0x33, 0x99, 0x3b, 0xce, 0x88, 0x60, 0xc4, 0x1c, 0x91, 0xc6, 0x48, 0x58, + 0xa1, 0x94, 0x2f, 0x25, 0x57, 0xe2, 0x12, 0x26, 0x87, 0xfc, 0x3a, 0x47, 0x7b, 0x4c, 0x04, 0x62, + 0x4a, 0x3e, 0x18, 0xf2, 0xcd, 0xad, 0xce, 0xe1, 0xc3, 0x98, 0xa7, 0x11, 0xf9, 0x68, 0xc8, 0xb1, + 0x74, 0x8e, 0x0e, 0x62, 0x1e, 0xf1, 0xc4, 0x09, 0xc9, 0x27, 0x43, 0xa6, 0x6a, 0x49, 0x62, 0xb6, + 0xd8, 0xac, 0xe1, 0x73, 0xd1, 0x30, 0xc3, 0x8f, 0x71, 0x72, 0x85, 0x31, 0xf9, 0x62, 0xc8, 0xfd, + 0xb5, 0x17, 0x89, 0x99, 0xd6, 0x57, 0x23, 0x77, 0x34, 0xa3, 0x2e, 0xb9, 0x40, 0xf2, 0xad, 0x80, + 0xf3, 0x60, 0xb9, 0xd0, 0x77, 0x83, 0xae, 0x41, 0x73, 0x0e, 0xeb, 0xbb, 0x3f, 0x0c, 0xfa, 0x3f, + 0x74, 0xee, 0x80, 0xf2, 0x93, 0x0e, 0xd4, 0x3f, 0x0d, 0xf9, 0x69, 0x5c, 0x55, 0xf5, 0x4f, 0xe0, + 0xd3, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x92, 0xa5, 0x2c, 0x76, 0x17, 0x05, 0x00, 0x00, } diff --git a/types/types.proto b/types/types.proto index 8716e6cb3..5a7a226f7 100644 --- a/types/types.proto +++ b/types/types.proto @@ -38,12 +38,17 @@ enum CodeType { UnknownRequest = 6; // Reserved for basecoin, 100 ~ 199 - BaseEncodingError = 101; - BaseBadNonce = 102; - BaseUnknownAccount = 103; - BaseUnauthorized = 104; - BaseInsufficientFunds = 105; - BaseInsufficientFees = 106; + BaseDuplicateAddress = 101; + BaseEncodingError = 102; + BaseInsufficientFees = 103; + BaseInsufficientFunds = 104; + BaseInsufficientGasPrice = 105; + BaseInvalidAddress = 106; + BaseInvalidAmount = 107; + BaseInvalidPubKey = 108; + BaseInvalidSequence = 109; + BaseInvalidSignature = 110; + BaseUnknownPubKey = 111; // Reserved for governance, 200 ~ 299 GovUnknownEntity = 201;