Merge pull request #419 from tronprotocol/release_4.1.3

sean-liu55 · web-flow · commit 75cfdf374a5f · 2021-03-17T18:07:11.000+08:00
Release 4.1.3
diff --git a/src/main/protos/core/Tron.proto b/src/main/protos/core/Tron.proto
@@ -148,9 +148,6 @@ message Account {
   Permission owner_permission = 31;
   Permission witness_permission = 32;
   repeated Permission active_permission = 33;
-
-  //vote power,include frozen bandwidth and frozen energy
-  int64 vote_power_413 = 60;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -148,9 +148,6 @@ message Account {`
`148`	`148`	`Permission owner_permission = 31;`
`149`	`149`	`Permission witness_permission = 32;`
`150`	`150`	`repeated Permission active_permission = 33;`
`151`		`-`
`152`		`- //vote power,include frozen bandwidth and frozen energy`
`153`		`- int64 vote_power_413 = 60;`
`154`	`151`	`}`
`155`	`152`
`156`	`153`