Merge pull request #251 from halibobo1205/release_4.8.1

sync with java-tron 4.8.1

Author: kuny0707

api/api.proto

@@ -499,6 +499,8 @@ service Wallet {
     };
   };
 
+  rpc GetPaginatedNowWitnessList (PaginatedMessage) returns (WitnessList) {
+  };
 
   rpc GetDelegatedResource (DelegatedResourceMessage) returns (DelegatedResourceList) {
   };
@@ -808,6 +810,10 @@ service WalletSolidity {
       }
     };
   };
+
+  rpc GetPaginatedNowWitnessList (PaginatedMessage) returns (WitnessList) {
+  };
+
   rpc GetAssetIssueList (EmptyMessage) returns (AssetIssueList) {
     option (google.api.http) = {
       post: "/walletsolidity/getassetissuelist"

core/Discover.proto

@@ -11,6 +11,7 @@ message Endpoint {
   bytes address = 1;
   int32 port = 2;
   bytes nodeId = 3;
+  bytes addressIpv6 = 4;
 }
 
 message PingMessage {

core/Tron.proto

@@ -132,7 +132,7 @@ message ChainParameters {
 message Account {
   /* frozen balance */
   message Frozen {
-    int64 frozen_balance = 1; // the frozen trx balance
+    int64 frozen_balance = 1; // the frozen trx or asset balance
     int64 expire_time = 2; // the expire time
   }
   // account nick name
@@ -407,6 +407,7 @@ message Transaction {
       UNKNOWN = 13;
       TRANSFER_FAILED = 14;
       INVALID_CODE = 15;
+      // please fill in the order according to the serial number
     }
     int64 fee = 1;
     code ret = 2;

core/contract/asset_issue_contract.proto

@@ -10,15 +10,15 @@ message AssetIssueContract {
   string id = 41;
 
   message FrozenSupply {
-    int64 frozen_amount = 1;
+    int64 frozen_amount = 1; // asset amount
     int64 frozen_days = 2;
   }
   bytes owner_address = 1;
   bytes name = 2;
   bytes abbr = 3;
   int64 total_supply = 4;
   repeated FrozenSupply frozen_supply = 5;
-  int32 trx_num = 6;
+  int32 trx_num = 6; // The fields trx_num and num define the exchange rate: num tokens can be purchased with trx_num TRX. This avoids using decimals.
   int32 precision = 7;
   int32 num = 8;
   int64 start_time = 9;

core/contract/smart_contract.proto

@@ -101,4 +101,4 @@ message SmartContractDataWrapper {
   SmartContract smart_contract = 1;
   bytes runtimecode = 2;
   ContractState contract_state = 3;
-}
+}