Merge pull request grpc-ecosystem#42 from tronprotocol/add_witness_co…

…mmittee Add witness committee
tronprotocol · May 9, 2018 · cf23e93 · cf23e93
2 parents cc24179 + 3913331
commit cf23e93
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/api/api.proto b/api/api.proto
@@ -29,9 +29,7 @@ service Wallet {
     };
   };
 
-
-
-rpc BroadcastTransaction (Transaction) returns (Return) {
+  rpc BroadcastTransaction (Transaction) returns (Return) {
     option (google.api.http) = {
       post: "/wallet/broadcasttransaction"
       body: "*"
@@ -46,7 +44,6 @@ rpc BroadcastTransaction (Transaction) returns (Return) {
         get: "/wallet/listaccount"
       }
     };
-
   };
 
   rpc UpdateAccount (AccountUpdateContract) returns (Transaction) {

diff --git a/core/Tron.proto b/core/Tron.proto
@@ -22,15 +22,16 @@ message AccountId {
   bytes address = 2;
 }
 
+// vote message
+message Vote {
+  // the super rep address
+  bytes vote_address = 1;
+  // the vote num to this super rep.
+  int64 vote_count = 2;
+}
+
 // Account
 message Account {
-  // vote message
-  message Vote {
-    // the super rep address
-    bytes vote_address = 1;
-    // the vote num to this super rep.
-    int64 vote_count = 2;
-  }
   // frozen balance
   message Frozen {
     // the frozen trx balance
@@ -64,6 +65,8 @@ message Account {
   int64 latest_withdraw_time = 12;
   // not used so far
   bytes code = 13;
+  bool is_witness = 14;
+  bool is_committee = 15;
 }
 
 message acuthrity {
@@ -89,6 +92,13 @@ message Witness {
   bool isJobs = 9;
 }
 
+// Vote Change
+message Votes {
+  bytes address = 1;
+  repeated Vote old_votes = 2;
+  repeated Vote new_votes = 3;
+}
+
 // Transcation
 
 message TXOutput {