shaozhuguang: Merge branch 'v2.3.4_qc_subscribeTx_ted' into 'v2.3.4_qc' (merge request !186)

17ae02ad · CI Automation · 7c4884c6 · 17ae02ad
Commit 17ae02ad authored 11 months ago by CI Automation
Hide whitespace changes
Inline Side-by-side

Showing with 34 additions and 23 deletions

syscontract/subscribe.pb.go syscontract/subscribe.pb.go +34 -23

No files found.
--- a/syscontract/subscribe.pb.go
+++ b/syscontract/subscribe.pb.go
@@ -89,6 +89,9 @@ const (
 	SubscribeTx_END_BLOCK     SubscribeTx_Parameter = 1
 	SubscribeTx_CONTRACT_NAME SubscribeTx_Parameter = 2
 	SubscribeTx_TX_IDS        SubscribeTx_Parameter = 3
+	SubscribeTx_PRE_ALIAS     SubscribeTx_Parameter = 4
+	SubscribeTx_PRE_TX_ID     SubscribeTx_Parameter = 5
+	SubscribeTx_PRE_ORG_ID    SubscribeTx_Parameter = 6
 )

 var SubscribeTx_Parameter_name = map[int32]string{
@@ -96,6 +99,9 @@ var SubscribeTx_Parameter_name = map[int32]string{
 	1: "END_BLOCK",
 	2: "CONTRACT_NAME",
 	3: "TX_IDS",
+	4: "PRE_ALIAS",
+	5: "PRE_TX_ID",
+	6: "PRE_ORG_ID",
 }

 var SubscribeTx_Parameter_value = map[string]int32{
@@ -103,6 +109,9 @@ var SubscribeTx_Parameter_value = map[string]int32{
 	"END_BLOCK":     1,
 	"CONTRACT_NAME": 2,
 	"TX_IDS":        3,
+	"PRE_ALIAS":     4,
+	"PRE_TX_ID":     5,
+	"PRE_ORG_ID":    6,
 }

 func (x SubscribeTx_Parameter) String() string {
@@ -268,29 +277,31 @@ func init() {
 func init() { proto.RegisterFile("syscontract/subscribe.proto", fileDescriptor_c2445c2204726e6f) }

 var fileDescriptor_c2445c2204726e6f = []byte{
-	// 342 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0xc1, 0x4e, 0xc2, 0x40,
-	0x10, 0x86, 0xdb, 0x12, 0x49, 0x18, 0x04, 0x96, 0x9a, 0x18, 0x13, 0xb5, 0x87, 0x1e, 0x4d, 0x6c,
-	0x13, 0x7d, 0x82, 0xb6, 0xac, 0xa1, 0x8a, 0x2d, 0x69, 0x57, 0x01, 0x0f, 0x36, 0xed, 0xa6, 0xa9,
-	0x04, 0xe9, 0x92, 0x6d, 0x21, 0xfa, 0x16, 0x3e, 0x96, 0x47, 0x8e, 0x1e, 0x0d, 0xbc, 0x88, 0xd1,
-	0x60, 0xa9, 0x7a, 0xf2, 0x38, 0xf3, 0x4f, 0xbe, 0xff, 0x9f, 0xfc, 0x70, 0x98, 0x3d, 0x67, 0x94,
-	0xa5, 0x39, 0x0f, 0x69, 0xae, 0x67, 0xf3, 0x28, 0xa3, 0x7c, 0x1c, 0xc5, 0xda, 0x8c, 0xb3, 0x9c,
-	0xc9, 0xf5, 0x92, 0xa8, 0xde, 0x43, 0xd3, 0xff, 0xd6, 0xcd, 0x47, 0x46, 0x27, 0x6a, 0x0f, 0x6a,
-	0xfd, 0x90, 0x87, 0xd3, 0x38, 0x8f, 0xb9, 0xdc, 0x82, 0xba, 0x4f, 0x0c, 0x8f, 0x04, 0x66, 0xcf,
-	0xb5, 0xae, 0x90, 0x20, 0x37, 0xa0, 0x86, 0x9d, 0xce, 0x66, 0x14, 0xe5, 0x26, 0xc0, 0xc0, 0x26,
-	0xdd, 0xc0, 0x1b, 0xf8, 0x98, 0x20, 0xe9, 0xf3, 0xde, 0x75, 0x7a, 0xa3, 0xa0, 0x8b, 0x8d, 0x0e,
-	0xf6, 0x50, 0x45, 0x1d, 0x41, 0xbd, 0xe0, 0x93, 0x27, 0xf5, 0xf2, 0x3f, 0xf0, 0x36, 0x34, 0x2c,
-	0xd7, 0x21, 0x9e, 0x61, 0x91, 0xc0, 0x31, 0xae, 0x31, 0x92, 0x64, 0x80, 0x2a, 0x19, 0x06, 0x76,
-	0xc7, 0x47, 0x15, 0x95, 0xc2, 0x7e, 0x81, 0xb6, 0x36, 0xff, 0xe0, 0x45, 0x9c, 0xe6, 0xaa, 0x5d,
-	0x76, 0xa9, 0xc1, 0x0e, 0x71, 0xfb, 0xb6, 0x85, 0x84, 0xbf, 0x40, 0xf1, 0x77, 0x06, 0xe9, 0x67,
-	0x86, 0xca, 0xc9, 0x10, 0xda, 0x85, 0xc9, 0xc5, 0x3c, 0xa5, 0xf9, 0x98, 0xa5, 0xf2, 0x1e, 0xb4,
-	0xfc, 0x1b, 0xd3, 0xb7, 0x3c, 0xdb, 0xc4, 0x45, 0x78, 0x04, 0xbb, 0xdb, 0x25, 0x19, 0x22, 0x51,
-	0x3e, 0x82, 0x83, 0xed, 0xa6, 0x30, 0xc6, 0xb7, 0xd8, 0x21, 0x48, 0x32, 0x93, 0xd7, 0x95, 0x22,
-	0x2e, 0x57, 0x8a, 0xf8, 0xbe, 0x52, 0xc4, 0x97, 0xb5, 0x22, 0x2c, 0xd7, 0x8a, 0xf0, 0xb6, 0x56,
-	0x04, 0x38, 0x66, 0x3c, 0xd1, 0xe8, 0x43, 0x38, 0x4e, 0xa7, 0xe1, 0x24, 0xe6, 0xda, 0x2c, 0xd2,
-	0x4a, 0x95, 0xdd, 0x95, 0x25, 0xc6, 0x13, 0x7d, 0x3b, 0xea, 0xb3, 0xe8, 0x34, 0x61, 0xfa, 0xe2,
-	0x4c, 0x2f, 0xdd, 0x47, 0xd5, 0xaf, 0xda, 0xcf, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x19, 0xaf,
-	0xfe, 0xd7, 0x15, 0x02, 0x00, 0x00,
+	// 372 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x6e, 0xa2, 0x50,
+	0x14, 0x86, 0x01, 0x47, 0x13, 0x8f, 0xa3, 0x5e, 0x99, 0x64, 0x32, 0xc9, 0xcc, 0xb0, 0x60, 0x39,
+	0xc9, 0x40, 0x32, 0xf3, 0x04, 0x80, 0xb7, 0x95, 0x94, 0x82, 0x81, 0xdb, 0x6a, 0xbb, 0x28, 0x01,
+	0x42, 0xa8, 0xb1, 0x72, 0xcd, 0x05, 0x8d, 0x7d, 0x82, 0x6e, 0xfb, 0x58, 0x5d, 0xba, 0xec, 0xb2,
+	0xd1, 0x17, 0x69, 0x30, 0x8a, 0xb4, 0x5d, 0x75, 0xf9, 0x9f, 0xff, 0xcf, 0xfd, 0xbf, 0x93, 0x7b,
+	0xe0, 0x67, 0x76, 0x9f, 0x45, 0x34, 0xcd, 0x59, 0x10, 0xe5, 0x6a, 0xb6, 0x08, 0xb3, 0x88, 0x4d,
+	0xc2, 0x58, 0x99, 0x33, 0x9a, 0x53, 0xb1, 0x55, 0x31, 0xe5, 0x1b, 0xe8, 0x78, 0x07, 0x5f, 0xbf,
+	0xa3, 0xd1, 0x54, 0xb6, 0xa0, 0x39, 0x0c, 0x58, 0x30, 0x8b, 0xf3, 0x98, 0x89, 0x5d, 0x68, 0x79,
+	0x44, 0x73, 0x89, 0xaf, 0x5b, 0x8e, 0x71, 0x86, 0x38, 0xb1, 0x0d, 0x4d, 0x6c, 0xf7, 0xf7, 0x92,
+	0x17, 0x3b, 0x00, 0x23, 0x93, 0x0c, 0x7c, 0x77, 0xe4, 0x61, 0x82, 0x84, 0x22, 0xef, 0xd8, 0xd6,
+	0x95, 0x3f, 0xc0, 0x5a, 0x1f, 0xbb, 0xa8, 0x26, 0x3f, 0xf0, 0xd0, 0x2a, 0x0b, 0xc8, 0x4a, 0x5e,
+	0x7d, 0xe6, 0xf5, 0x1e, 0xb4, 0x0d, 0xc7, 0x26, 0xae, 0x66, 0x10, 0xdf, 0xd6, 0xce, 0x31, 0x12,
+	0x44, 0x80, 0x06, 0x19, 0xfb, 0x66, 0xdf, 0x43, 0xb5, 0x22, 0x3d, 0x74, 0xb1, 0xaf, 0x59, 0xa6,
+	0xe6, 0xa1, 0x2f, 0x07, 0xb9, 0xb3, 0x51, 0xbd, 0x40, 0x2b, 0xa4, 0xe3, 0x9e, 0x16, 0xba, 0x21,
+	0x47, 0xf0, 0xbd, 0x04, 0x31, 0xf6, 0xeb, 0xe3, 0x65, 0x9c, 0xe6, 0xb2, 0x59, 0x65, 0x6a, 0x42,
+	0x9d, 0x38, 0x43, 0xd3, 0x40, 0xdc, 0xc7, 0x7a, 0xfe, 0x3d, 0xb1, 0xf0, 0x96, 0xb8, 0xf6, 0x67,
+	0x0c, 0xbd, 0xb2, 0xe4, 0x64, 0x91, 0x46, 0xf9, 0x84, 0xa6, 0xe2, 0x37, 0xe8, 0x7a, 0x17, 0xba,
+	0x67, 0xb8, 0xa6, 0x8e, 0xcb, 0x55, 0x11, 0x7c, 0x3d, 0x0e, 0xc9, 0x18, 0xf1, 0xe2, 0x2f, 0xf8,
+	0x71, 0x9c, 0x94, 0xc5, 0xf8, 0x12, 0xdb, 0x04, 0x09, 0x7a, 0xf2, 0xb4, 0x91, 0xf8, 0xf5, 0x46,
+	0xe2, 0x5f, 0x36, 0x12, 0xff, 0xb8, 0x95, 0xb8, 0xf5, 0x56, 0xe2, 0x9e, 0xb7, 0x12, 0x07, 0xbf,
+	0x29, 0x4b, 0x94, 0xe8, 0x36, 0x98, 0xa4, 0xb3, 0x60, 0x1a, 0x33, 0x65, 0x1e, 0x2a, 0x95, 0x1f,
+	0xbe, 0xae, 0x5a, 0x94, 0x25, 0xea, 0x51, 0xaa, 0xf3, 0xf0, 0x6f, 0x42, 0xd5, 0xe5, 0x3f, 0xb5,
+	0x92, 0x0f, 0x1b, 0xbb, 0x2b, 0xf9, 0xff, 0x1a, 0x00, 0x00, 0xff, 0xff, 0xa0, 0xbb, 0xe6, 0x61,
+	0x44, 0x02, 0x00, 0x00,
 }

 func (m *SubscribeBlock) Marshal() (dAtA []byte, err error) {