Skip to content

for java-tron multimodule #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renchenchang merged 4 commits into from
Mar 13, 2020
Merged

for java-tron multimodule #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e85193c
for java-tron multimodule
Yrp Mar 13, 2020
53b796d
spell check
Yrp Mar 13, 2020
ccdb97f
spell check
Yrp Mar 13, 2020
3cd35af
spell check
Yrp Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 32 additions & 11 deletions api/api.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@ syntax = "proto3";
package protocol;

import "core/Tron.proto";
import "core/Contract.proto";
import "google/api/annotations.proto";

import "core/contract/asset_issue_contract.proto";
import "core/contract/account_contract.proto";
import "core/contract/witness_contract.proto";
import "core/contract/balance_contract.proto";
import "core/contract/proposal_contract.proto";
import "core/contract/storage_contract.proto";
import "core/contract/exchange_contract.proto";
import "core/contract/smart_contract.proto";
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
Expand Down Expand Up @@ -630,6 +638,16 @@ service Wallet {
rpc GetNodeInfo (EmptyMessage) returns (NodeInfo) {
};

rpc GetRewardInfo (BytesMessage) returns (NumberMessage) {
};

rpc GetBrokerageInfo (BytesMessage) returns (NumberMessage) {
};

rpc UpdateBrokerage (UpdateBrokerageContract) returns (TransactionExtention) {

};

// for shiededTransaction
rpc CreateShieldedTransaction (PrivateParameters) returns (TransactionExtention) {
};
Expand Down Expand Up @@ -689,14 +707,11 @@ service Wallet {
};
// end for shiededTransaction

rpc GetRewardInfo (BytesMessage) returns (NumberMessage) {
};

rpc GetBrokerageInfo (BytesMessage) returns (NumberMessage) {
rpc CreateCommonTransaction (Transaction) returns (TransactionExtention) {
};

rpc UpdateBrokerage (UpdateBrokerageContract) returns (TransactionExtention) {
};
rpc GetTransactionInfoByBlockNum (NumberMessage) returns (TransactionInfoList) {
}
};

service WalletSolidity {
Expand Down Expand Up @@ -829,7 +844,6 @@ service WalletSolidity {
};
}


rpc GetMerkleTreeVoucherInfo (OutputPointInfo) returns (IncrementalMerkleVoucherInfo) {
}

Expand All @@ -845,15 +859,18 @@ service WalletSolidity {
rpc IsSpend (NoteParameters) returns (SpendResult) {
}

rpc TriggerConstantContract (TriggerSmartContract) returns (TransactionExtention) {
}

rpc GetRewardInfo (BytesMessage) returns (NumberMessage) {
};

rpc GetBrokerageInfo (BytesMessage) returns (NumberMessage) {
};

rpc TriggerConstantContract (TriggerSmartContract) returns (TransactionExtention) {
}

rpc GetTransactionInfoByBlockNum (NumberMessage) returns (TransactionInfoList) {
}

};

service WalletExtension {
Expand Down Expand Up @@ -1291,3 +1308,7 @@ message SpendResult {
bool result = 1;
string message = 2;
}

message TransactionInfoList {
repeated TransactionInfo transactionInfo = 1;
}
1 change: 0 additions & 1 deletion api/zksnark.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ syntax = "proto3";
package protocol;

import "core/Tron.proto";
import "core/Contract.proto";

option java_package = "org.tron.api"; //Specify the name of the package that generated the Java file
option java_outer_classname = "ZksnarkGrpcAPI"; //Specify the class name of the generated Java file
Expand Down
Loading