Merge pull request #718 from tronprotocol/master

forfreeday · web-flow · commit 0d4e9a084b51 · 2024-03-15T19:08:09.000+08:00
feat(merge): master into develop
diff --git a/src/main/protos/api/api.proto b/src/main/protos/api/api.proto
@@ -1051,6 +1051,8 @@ message Return {
     SERVER_BUSY = 9;
     NO_CONNECTION = 10;
     NOT_ENOUGH_EFFECTIVE_CONNECTION = 11;
+    BLOCK_UNSOLIDIFIED = 12;
+
     OTHER_ERROR = 20;
   }
 
diff --git a/src/main/protos/core/Tron.proto b/src/main/protos/core/Tron.proto
@@ -626,6 +626,7 @@ message HelloMessage {
   bytes signature = 8;
   int32 nodeType = 9;
   int64 lowestBlockNum = 10;
+  bytes codeVersion = 11;
 }
 
 message InternalTransaction {

Original file line number	Diff line number	Diff line change
`@@ -1051,6 +1051,8 @@ message Return {`
`1051`	`1051`	`SERVER_BUSY = 9;`
`1052`	`1052`	`NO_CONNECTION = 10;`
`1053`	`1053`	`NOT_ENOUGH_EFFECTIVE_CONNECTION = 11;`
	`1054`	`+ BLOCK_UNSOLIDIFIED = 12;`
	`1055`	`+`
`1054`	`1056`	`OTHER_ERROR = 20;`
`1055`	`1057`	`}`
`1056`	`1058`
Original file line number	Diff line number	Diff line change
`@@ -626,6 +626,7 @@ message HelloMessage {`
`626`	`626`	`bytes signature = 8;`
`627`	`627`	`int32 nodeType = 9;`
`628`	`628`	`int64 lowestBlockNum = 10;`
	`629`	`+ bytes codeVersion = 11;`
`629`	`630`	`}`
`630`	`631`
`631`	`632`	`message InternalTransaction {`