Merge branch 'develop' into remove_header

tronprotocol · Apr 12, 2018 · 1033d54 · 1033d54
2 parents 0ef1de2 + c56402e
commit 1033d54
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/api/api.proto b/api/api.proto
@@ -84,11 +84,21 @@ service Wallet {
 
   }
 };
+
 // the api of tron's db
 service Database {
   // for tapos
   rpc getBlockReference (EmptyMessage) returns (BlockReference) {
 
+  }
+  rpc GetDynamicProperties (EmptyMessage) returns (DynamicProperties) {
+
+  }
+  rpc GetNowBlock (EmptyMessage) returns (Block) {
+
+  }
+  rpc GetBlockByNum (NumberMessage) returns (Block) {
+
   }
 };
 

diff --git a/core/Tron.proto b/core/Tron.proto
@@ -182,6 +182,11 @@ message Items {
   repeated Transaction transactions = 4;
 }
 
+// DynamicProperties
+message DynamicProperties {
+  int64 last_solidity_block_num = 1;
+}
+
 enum ReasonCode {
   REQUESTED = 0;
   TCP_ERROR = 1;