diff --git a/api/api.proto b/api/api.proto
index 93be3356a..e7c8376a4 100644
--- a/api/api.proto
+++ b/api/api.proto
@@ -17,7 +17,7 @@ import "core/contract/shield_contract.proto";
 
 option java_package = "org.tron.api"; //Specify the name of the package that generated the Java file
 option java_outer_classname = "GrpcAPI"; //Specify the class name of the generated Java file
-option go_package = "github.com/tronprotocol/grpc-gateway/api";
+option go_package = "github.com/tronprotocol/protocol/blob/master/api";
 
 service Wallet {
 
@@ -71,6 +71,7 @@ service Wallet {
       }
     };
   };
+  
   //Use this function instead of CreateTransaction.
   rpc CreateTransaction2 (TransferContract) returns (TransactionExtention) {
   };
@@ -84,6 +85,7 @@ service Wallet {
       }
     };
   };
+  
   //Please use UpdateAccount2 instead of this function.
   rpc UpdateAccount (AccountUpdateContract) returns (Transaction) {
     option (google.api.http) = {
@@ -95,7 +97,6 @@ service Wallet {
     };
   };
 
-
   rpc SetAccountId (SetAccountIdContract) returns (Transaction) {
     option (google.api.http) = {
       post: "/wallet/setaccountid"
@@ -132,6 +133,7 @@ service Wallet {
   //Use this function instead of VoteWitnessAccount.
   rpc VoteWitnessAccount2 (VoteWitnessContract) returns (TransactionExtention) {
   };
+  
   //Please use CreateAssetIssue2 instead of this function.
   rpc CreateAssetIssue (AssetIssueContract) returns (Transaction) {
     option (google.api.http) = {
@@ -142,9 +144,11 @@ service Wallet {
       }
     };
   };
+  
   //Use this function instead of CreateAssetIssue.
   rpc CreateAssetIssue2 (AssetIssueContract) returns (TransactionExtention) {
   };
+  
   //Please use UpdateWitness2 instead of this function.
   rpc UpdateWitness (WitnessUpdateContract) returns (Transaction) {
     option (google.api.http) = {
@@ -155,9 +159,11 @@ service Wallet {
       }
     };
   };
+  
   //Use this function instead of UpdateWitness.
   rpc UpdateWitness2 (WitnessUpdateContract) returns (TransactionExtention) {
   };
+  
   //Please use CreateAccount2 instead of this function.
   rpc CreateAccount (AccountCreateContract) returns (Transaction) {
     option (google.api.http) = {
@@ -168,6 +174,7 @@ service Wallet {
       }
     };
   };
+  
   //Use this function instead of CreateAccount.
   rpc CreateAccount2 (AccountCreateContract) returns (TransactionExtention) {
   }
@@ -182,9 +189,11 @@ service Wallet {
       }
     };
   };
+  
   //Use this function instead of CreateWitness.
   rpc CreateWitness2 (WitnessCreateContract) returns (TransactionExtention) {
   }
+  
   //Please use TransferAsset2 instead of this function.
   rpc TransferAsset (TransferAssetContract) returns (Transaction) {
     option (google.api.http) = {
@@ -195,9 +204,11 @@ service Wallet {
       }
     };
   }
+  
   //Use this function instead of TransferAsset.
   rpc TransferAsset2 (TransferAssetContract) returns (TransactionExtention) {
   }
+  
   //Please use ParticipateAssetIssue2 instead of this function.
   rpc ParticipateAssetIssue (ParticipateAssetIssueContract) returns (Transaction) {
     option (google.api.http) = {
@@ -208,9 +219,11 @@ service Wallet {
       }
     };
   }
+  
   //Use this function instead of ParticipateAssetIssue.
   rpc ParticipateAssetIssue2 (ParticipateAssetIssueContract) returns (TransactionExtention) {
   }
+  
   //Please use FreezeBalance2 instead of this function.
   rpc FreezeBalance (FreezeBalanceContract) returns (Transaction) {
     option (google.api.http) = {
@@ -221,9 +234,11 @@ service Wallet {
       }
     };
   }
+  
   //Use this function instead of FreezeBalance.
   rpc FreezeBalance2 (FreezeBalanceContract) returns (TransactionExtention) {
   }
+  
   //Please use UnfreezeBalance2 instead of this function.
   rpc UnfreezeBalance (UnfreezeBalanceContract) returns (Transaction) {
     option (google.api.http) = {
@@ -234,9 +249,11 @@ service Wallet {
       }
     };
   }
+  
   //Use this function instead of UnfreezeBalance.
   rpc UnfreezeBalance2 (UnfreezeBalanceContract) returns (TransactionExtention) {
   }
+  
   //Please use UnfreezeAsset2 instead of this function.
   rpc UnfreezeAsset (UnfreezeAssetContract) returns (Transaction) {
     option (google.api.http) = {
@@ -247,9 +264,11 @@ service Wallet {
       }
     };
   }
+  
   //Use this function instead of UnfreezeAsset.
   rpc UnfreezeAsset2 (UnfreezeAssetContract) returns (TransactionExtention) {
   }
+  
   //Please use WithdrawBalance2 instead of this function.
   rpc WithdrawBalance (WithdrawBalanceContract) returns (Transaction) {
     option (google.api.http) = {
@@ -260,9 +279,11 @@ service Wallet {
       }
     };
   }
+  
   //Use this function instead of WithdrawBalance.
   rpc WithdrawBalance2 (WithdrawBalanceContract) returns (TransactionExtention) {
   }
+  
   //Please use UpdateAsset2 instead of this function.
   rpc UpdateAsset (UpdateAssetContract) returns (Transaction) {
     option (google.api.http) = {
@@ -273,6 +294,7 @@ service Wallet {
       }
     };
   }
+  
   //Use this function instead of UpdateAsset.
   rpc UpdateAsset2 (UpdateAssetContract) returns (TransactionExtention) {
   }
@@ -328,7 +350,6 @@ service Wallet {
   rpc GetMarketPairList (EmptyMessage) returns (MarketOrderPairList) {
   }
 
-
   rpc ListNodes (EmptyMessage) returns (NodeList) {
     option (google.api.http) = {
       post: "/wallet/listnodes"
@@ -348,6 +369,7 @@ service Wallet {
       }
     };
   }
+  
   rpc GetAccountNet (Account) returns (AccountNetMessage) {
     option (google.api.http) = {
         post: "/wallet/getaccountnet"
@@ -357,8 +379,10 @@ service Wallet {
         }
       };
   };
+  
   rpc GetAccountResource (Account) returns (AccountResourceMessage) {
   };
+  
   rpc GetAssetIssueByName (BytesMessage) returns (AssetIssueContract) {
     option (google.api.http) = {
       post: "/wallet/getassetissuebyname"
@@ -368,10 +392,13 @@ service Wallet {
       }
     };
   }
+  
   rpc GetAssetIssueListByName (BytesMessage) returns (AssetIssueList) {
   }
+  
   rpc GetAssetIssueById (BytesMessage) returns (AssetIssueContract) {
   }
+  
   //Please use GetNowBlock2 instead of this function.
   rpc GetNowBlock (EmptyMessage) returns (Block) {
     option (google.api.http) = {
@@ -382,9 +409,11 @@ service Wallet {
       }
     };
   }
+  
   //Use this function instead of GetNowBlock.
   rpc GetNowBlock2 (EmptyMessage) returns (BlockExtention) {
   }
+  
   //Please use GetBlockByNum2 instead of this function.
   rpc GetBlockByNum (NumberMessage) returns (Block) {
     option (google.api.http) = {
@@ -395,6 +424,7 @@ service Wallet {
       }
     };
   }
+  
   //Use this function instead of GetBlockByNum.
   rpc GetBlockByNum2 (NumberMessage) returns (BlockExtention) {
   }
@@ -411,6 +441,7 @@ service Wallet {
       }
     };
   }
+  
   //Please use GetBlockByLimitNext2 instead of this function.
   rpc GetBlockByLimitNext (BlockLimit) returns (BlockList) {
     option (google.api.http) = {
@@ -421,9 +452,11 @@ service Wallet {
       }
     };
   }
+  
   //Use this function instead of GetBlockByLimitNext.
   rpc GetBlockByLimitNext2 (BlockLimit) returns (BlockListExtention) {
   }
+  
   //Please use GetBlockByLatestNum2 instead of this function.
   rpc GetBlockByLatestNum (NumberMessage) returns (BlockList) {
     option (google.api.http) = {
@@ -434,9 +467,11 @@ service Wallet {
       }
     };
   }
+  
   //Use this function instead of GetBlockByLatestNum.
   rpc GetBlockByLatestNum2 (NumberMessage) returns (BlockListExtention) {
   }
+  
   rpc GetTransactionById (BytesMessage) returns (Transaction) {
     option (google.api.http) = {
       post: "/wallet/gettransactionbyid"
@@ -475,7 +510,6 @@ service Wallet {
     };
   };
 
-
   rpc GetDelegatedResource (DelegatedResourceMessage) returns (DelegatedResourceList) {
   };
 
@@ -491,6 +525,7 @@ service Wallet {
       }
     };
   };
+  
   rpc GetPaginatedProposalList (PaginatedMessage) returns (ProposalList) {
     option (google.api.http) = {
           post: "/wallet/getpaginatedproposallist"
@@ -500,6 +535,7 @@ service Wallet {
           }
         };
   }
+  
   rpc GetProposalById (BytesMessage) returns (Proposal) {
     option (google.api.http) = {
         post: "/wallet/getproposalbyid"
@@ -519,6 +555,7 @@ service Wallet {
       }
     };
   };
+  
   rpc GetPaginatedExchangeList (PaginatedMessage) returns (ExchangeList) {
     option (google.api.http) = {
           post: "/wallet/getpaginatedexchangelist"
@@ -528,6 +565,7 @@ service Wallet {
           }
         };
   }
+  
   rpc GetExchangeById (BytesMessage) returns (Exchange) {
     option (google.api.http) = {
         post: "/wallet/getexchangebyid"
@@ -557,6 +595,7 @@ service Wallet {
         }
       };
   }
+  
   rpc GetPaginatedAssetIssueList (PaginatedMessage) returns (AssetIssueList) {
     option (google.api.http) = {
         post: "/wallet/getpaginatedassetissuelist"
@@ -567,7 +606,6 @@ service Wallet {
       };
   }
 
-
   rpc TotalTransaction (EmptyMessage) returns (NumberMessage) {
     option (google.api.http) = {
       post: "/wallet/totaltransaction"
@@ -577,6 +615,7 @@ service Wallet {
       }
     };
   }
+  
   rpc GetNextMaintenanceTime (EmptyMessage) returns (NumberMessage) {
     option (google.api.http) = {
       post: "/wallet/getnextmaintenancetime"
@@ -586,6 +625,7 @@ service Wallet {
       }
     };
   }
+  
   //Warning: do not invoke this interface provided by others.
   //Please use GetTransactionSign2 instead of this function.
   rpc GetTransactionSign (TransactionSign) returns (Transaction) {
@@ -597,10 +637,12 @@ service Wallet {
       }
     };
   };
+  
   //Warning: do not invoke this interface provided by others.
   //Use this function instead of GetTransactionSign.
   rpc GetTransactionSign2 (TransactionSign) returns (TransactionExtention) {
   };
+  
   //Warning: do not invoke this interface provided by others.
   rpc CreateAddress (BytesMessage) returns (BytesMessage) {
     option (google.api.http) = {
@@ -611,12 +653,15 @@ service Wallet {
       }
     };
   };
+  
   //Warning: do not invoke this interface provided by others.
   rpc EasyTransferAsset (EasyTransferAssetMessage) returns (EasyTransferResponse) {
   };
+  
   //Warning: do not invoke this interface provided by others.
   rpc EasyTransferAssetByPrivate (EasyTransferAssetByPrivateMessage) returns (EasyTransferResponse) {
   };
+  
   //Warning: do not invoke this interface provided by others.
   rpc EasyTransfer (EasyTransferMessage) returns (EasyTransferResponse) {
     option (google.api.http) = {
@@ -627,6 +672,7 @@ service Wallet {
       }
     };
   };
+  
   //Warning: do not invoke this interface provided by others.
   rpc EasyTransferByPrivate (EasyTransferByPrivateMessage) returns (EasyTransferResponse) {
     option (google.api.http) = {
@@ -637,6 +683,7 @@ service Wallet {
       }
     };
   };
+  
   //Warning: do not invoke this interface provided by others.
   rpc GenerateAddress (EmptyMessage) returns (AddressPrKeyPairMessage) {
 
@@ -670,15 +717,12 @@ service Wallet {
   }
 
   rpc AddSign (TransactionSign) returns (TransactionExtention) {
-
   }
 
   rpc GetTransactionSignWeight (Transaction) returns (TransactionSignWeight) {
-
   }
 
   rpc GetTransactionApprovedList (Transaction) returns (TransactionApprovedList) {
-
   }
 
   rpc GetNodeInfo (EmptyMessage) returns (NodeInfo) {
@@ -691,7 +735,6 @@ service Wallet {
   };
 
   rpc UpdateBrokerage (UpdateBrokerageContract) returns (TransactionExtention) {
-
   };
 
   // for shiededTransaction
@@ -770,8 +813,8 @@ service Wallet {
 
   rpc GetTriggerInputForShieldedTRC20Contract (ShieldedTRC20TriggerContractParameters) returns (BytesMessage) {
   };
+  
   // end for shiededTransaction
-
   rpc CreateCommonTransaction (Transaction) returns (TransactionExtention) {
   };
 
@@ -802,6 +845,7 @@ service WalletSolidity {
       }
     };
   };
+  
   rpc GetAccountById (Account) returns (Account) {
     option (google.api.http) = {
       post: "/walletsolidity/getaccountbyid"
@@ -821,6 +865,7 @@ service WalletSolidity {
       }
     };
   };
+  
   rpc GetAssetIssueList (EmptyMessage) returns (AssetIssueList) {
     option (google.api.http) = {
       post: "/walletsolidity/getassetissuelist"
@@ -830,6 +875,7 @@ service WalletSolidity {
       }
     };
   }
+  
   rpc GetPaginatedAssetIssueList (PaginatedMessage) returns (AssetIssueList) {
     option (google.api.http) = {
         post: "/walletsolidity/getpaginatedassetissuelist"
@@ -842,8 +888,10 @@ service WalletSolidity {
 
   rpc GetAssetIssueByName (BytesMessage) returns (AssetIssueContract) {
   }
+  
   rpc GetAssetIssueListByName (BytesMessage) returns (AssetIssueList) {
   }
+  
   rpc GetAssetIssueById (BytesMessage) returns (AssetIssueContract) {
   }
 
@@ -857,9 +905,11 @@ service WalletSolidity {
       }
     };
   }
+  
   //Use this function instead of GetNowBlock.
   rpc GetNowBlock2 (EmptyMessage) returns (BlockExtention) {
   }
+  
   //Please use GetBlockByNum2 instead of this function.
   rpc GetBlockByNum (NumberMessage) returns (Block) {
     option (google.api.http) = {
@@ -870,6 +920,7 @@ service WalletSolidity {
       }
     };
   }
+  
   //Use this function instead of GetBlockByNum.
   rpc GetBlockByNum2 (NumberMessage) returns (BlockExtention) {
   }
@@ -987,9 +1038,11 @@ service WalletExtension {
       }
     };
   }
+  
   //Use this function instead of GetTransactionsFromThis.
   rpc GetTransactionsFromThis2 (AccountPaginated) returns (TransactionListExtention) {
   }
+  
   //Please use GetTransactionsToThis2 instead of this function.
   rpc GetTransactionsToThis (AccountPaginated) returns (TransactionList) {
     option (google.api.http) = {
@@ -1000,6 +1053,7 @@ service WalletExtension {
       }
     };
   }
+  
   //Use this function instead of GetTransactionsToThis.
   rpc GetTransactionsToThis2 (AccountPaginated) returns (TransactionListExtention) {
   }
@@ -1009,16 +1063,12 @@ service WalletExtension {
 service Database {
   // for tapos
   rpc getBlockReference (EmptyMessage) returns (BlockReference) {
-
   }
   rpc GetDynamicProperties (EmptyMessage) returns (DynamicProperties) {
-
   }
   rpc GetNowBlock (EmptyMessage) returns (Block) {
-
   }
   rpc GetBlockByNum (NumberMessage) returns (Block) {
-
   }
 };
 
@@ -1063,7 +1113,6 @@ message BlockReference {
 
 // the api of tron's network such as node list.
 service Network {
-
 };
 
 message WitnessList {
@@ -1113,34 +1162,42 @@ message Address {
 
 message EmptyMessage {
 }
+
 message NumberMessage {
   int64 num = 1;
 }
+
 message BytesMessage {
   bytes value = 1;
 }
+
 message TimeMessage {
   int64 beginInMilliseconds = 1;
   int64 endInMilliseconds = 2;
 }
+
 message BlockLimit {
   int64 startNum = 1;
   int64 endNum = 2;
 }
+
 message TransactionLimit {
   bytes transactionId = 1;
   int64 limitNum = 2;
 }
+
 message AccountPaginated {
   Account account = 1;
   int64 offset = 2;
   int64 limit = 3;
 }
+
 message TimePaginatedMessage {
   TimeMessage timeMessage = 1;
   int64 offset = 2;
   int64 limit = 3;
 }
+
 //deprecated
 message AccountNetMessage {
   int64 freeNetUsed = 1;
@@ -1152,6 +1209,7 @@ message AccountNetMessage {
   int64 TotalNetLimit = 7;
   int64 TotalNetWeight = 8;
 }
+
 message AccountResourceMessage {
   int64 freeNetUsed = 1;
   int64 freeNetLimit = 2;