Skip to content

Commit fe5eb7c

Browse files
authored
Merge pull request #221 from tronprotocol/release_v4.7.1.1
feat(branch): release v4.7.1.1 merge into master
2 parents 393732a + 4cff2e3 commit fe5eb7c

2 files changed

Lines changed: 0 additions & 121 deletions

File tree

api/api.proto

Lines changed: 0 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -624,68 +624,6 @@ service Wallet {
624624
}
625625
};
626626
}
627-
//Warning: do not invoke this interface provided by others.
628-
//Please use GetTransactionSign2 instead of this function.
629-
rpc GetTransactionSign (TransactionSign) returns (Transaction) {
630-
option (google.api.http) = {
631-
post: "/wallet/gettransactionsign"
632-
body: "*"
633-
additional_bindings {
634-
get: "/wallet/gettransactionsign"
635-
}
636-
};
637-
};
638-
//Warning: do not invoke this interface provided by others.
639-
//Use this function instead of GetTransactionSign.
640-
rpc GetTransactionSign2 (TransactionSign) returns (TransactionExtention) {
641-
};
642-
//Warning: do not invoke this interface provided by others.
643-
rpc CreateAddress (BytesMessage) returns (BytesMessage) {
644-
option (google.api.http) = {
645-
post: "/wallet/createaddress"
646-
body: "*"
647-
additional_bindings {
648-
get: "/wallet/createaddress"
649-
}
650-
};
651-
};
652-
//Warning: do not invoke this interface provided by others.
653-
rpc EasyTransferAsset (EasyTransferAssetMessage) returns (EasyTransferResponse) {
654-
};
655-
//Warning: do not invoke this interface provided by others.
656-
rpc EasyTransferAssetByPrivate (EasyTransferAssetByPrivateMessage) returns (EasyTransferResponse) {
657-
};
658-
//Warning: do not invoke this interface provided by others.
659-
rpc EasyTransfer (EasyTransferMessage) returns (EasyTransferResponse) {
660-
option (google.api.http) = {
661-
post: "/wallet/easytransfer"
662-
body: "*"
663-
additional_bindings {
664-
get: "/wallet/easytransfer"
665-
}
666-
};
667-
};
668-
//Warning: do not invoke this interface provided by others.
669-
rpc EasyTransferByPrivate (EasyTransferByPrivateMessage) returns (EasyTransferResponse) {
670-
option (google.api.http) = {
671-
post: "/wallet/easytransferbyprivate"
672-
body: "*"
673-
additional_bindings {
674-
get: "/wallet/easytransferbyprivate"
675-
}
676-
};
677-
};
678-
//Warning: do not invoke this interface provided by others.
679-
rpc GenerateAddress (EmptyMessage) returns (AddressPrKeyPairMessage) {
680-
681-
option (google.api.http) = {
682-
post: "/wallet/generateaddress"
683-
body: "*"
684-
additional_bindings {
685-
get: "/wallet/generateaddress"
686-
}
687-
};
688-
}
689627

690628
rpc GetTransactionInfoById (BytesMessage) returns (TransactionInfo) {
691629
option (google.api.http) = {
@@ -707,10 +645,6 @@ service Wallet {
707645
};
708646
}
709647

710-
rpc AddSign (TransactionSign) returns (TransactionExtention) {
711-
712-
}
713-
714648
rpc GetTransactionSignWeight (Transaction) returns (TransactionSignWeight) {
715649

716650
}
@@ -968,17 +902,6 @@ service WalletSolidity {
968902
};
969903
}
970904

971-
//Warning: do not invoke this interface provided by others.
972-
rpc GenerateAddress (EmptyMessage) returns (AddressPrKeyPairMessage) {
973-
option (google.api.http) = {
974-
post: "/walletsolidity/generateaddress"
975-
body: "*"
976-
additional_bindings {
977-
get: "/walletsolidity/generateaddress"
978-
}
979-
};
980-
}
981-
982905
rpc GetMerkleTreeVoucherInfo (OutputPointInfo) returns (IncrementalMerkleVoucherInfo) {
983906
}
984907

@@ -1165,7 +1088,6 @@ message GetAvailableUnfreezeCountResponseMessage {
11651088
int64 count = 1;
11661089
}
11671090

1168-
//GetCanDelegatedMaxSize
11691091
message CanDelegatedMaxSizeRequestMessage {
11701092
int32 type = 1;
11711093
bytes owner_address = 2;
@@ -1174,7 +1096,6 @@ message CanDelegatedMaxSizeResponseMessage {
11741096
int64 max_size = 1;
11751097
}
11761098

1177-
//GetCanWithdrawUnfreezeAmount
11781099
message CanWithdrawUnfreezeAmountRequestMessage {
11791100
bytes owner_address = 1;
11801101
int64 timestamp = 2;
@@ -1271,43 +1192,6 @@ message PaginatedMessage {
12711192
int64 limit = 2;
12721193
}
12731194

1274-
message EasyTransferMessage {
1275-
bytes passPhrase = 1;
1276-
bytes toAddress = 2;
1277-
int64 amount = 3;
1278-
}
1279-
1280-
message EasyTransferAssetMessage {
1281-
bytes passPhrase = 1;
1282-
bytes toAddress = 2;
1283-
string assetId = 3;
1284-
int64 amount = 4;
1285-
}
1286-
1287-
message EasyTransferByPrivateMessage {
1288-
bytes privateKey = 1;
1289-
bytes toAddress = 2;
1290-
int64 amount = 3;
1291-
}
1292-
1293-
message EasyTransferAssetByPrivateMessage {
1294-
bytes privateKey = 1;
1295-
bytes toAddress = 2;
1296-
string assetId = 3;
1297-
int64 amount = 4;
1298-
}
1299-
1300-
message EasyTransferResponse {
1301-
Transaction transaction = 1;
1302-
Return result = 2;
1303-
bytes txid = 3; //transaction id = sha256(transaction.rowdata)
1304-
}
1305-
1306-
message AddressPrKeyPairMessage {
1307-
string address = 1;
1308-
string privateKey = 2;
1309-
}
1310-
13111195
message TransactionExtention {
13121196
Transaction transaction = 1;
13131197
bytes txid = 2; //transaction id = sha256(transaction.rowdata)

core/Tron.proto

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -494,11 +494,6 @@ message Transactions {
494494
repeated Transaction transactions = 1;
495495
}
496496

497-
message TransactionSign {
498-
Transaction transaction = 1;
499-
bytes privateKey = 2;
500-
}
501-
502497
message BlockHeader {
503498
message raw {
504499
int64 timestamp = 1;

0 commit comments

Comments
 (0)