Skip to content

Commit cf87486

Browse files
authored
Merge pull request #634 from tronprotocol/feat/deprecated_api
feat(api): remove insecure APIs
2 parents 3b8f49f + def16e3 commit cf87486

File tree

14 files changed

+34
-669
lines changed

14 files changed

+34
-669
lines changed

README.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ For more information on a specific command, just type the command on terminal wh
7070
| [BroadcastTransaction](#Some-others) | [ChangePassword](#Wallet-related-commands)| [CreateProposal](#How-to-initiate-a-proposal)
7171
| [DeleteProposal](#Cancel-the-created-proposal) | [DeployContract](#How-to-use-smart-contract) | [ExchangeCreate](#How-to-trade-on-the-exchange) |
7272
| [ExchangeInject](#How-to-trade-on-the-exchange) | [ExchangeTransaction](#How-to-trade-on-the-exchange) | [ExchangeWithdraw](#How-to-trade-on-the-exchange) |
73-
| [FreezeBalance](#How-to-delegate-resourcee) | [GenerateAddress](#Account-related-commands) | [GenerateShieldedTRC20Address](#How-to-transfer-shielded-TRC20-token)|
73+
| [FreezeBalance](#How-to-delegate-resourcee) |[GetCanWithdrawUnfreezeAmount](#How-to-freezev2)| [GenerateShieldedTRC20Address](#How-to-transfer-shielded-TRC20-token)|
7474
| [GetAccount](#Account-related-commands) |[GetAccountNet](#Account-related-commands) | [GetAccountResource](#Account-related-commands) |
7575
| [GetAddress](#Account-related-commands) | [GetAkFromAsk](#How-to-transfer-shielded-TRC20-token) |[GetAssetIssueByAccount](#How-to-issue-TRC10-tokens) |
7676
| [GetAssetIssueById](#How-to-issue-TRC10-tokens) | [GetAssetIssueByName](#How-to-issue-TRC10-tokens) |[GetAssetIssueListByName](#How-to-issue-TRC10-tokens) |
7777
| [GetBalance](#Account-related-commands) | [GetBlock](#How-to-get-block-information) |[GetBlockById](#How-to-get-block-information) |
7878
| [GetBlockByLatestNum](#How-to-get-block-information) | [GetBlockByLimitNext](#How-to-get-block-information) | [GetBrokerage](#Brokerage) |
7979
| [GetContract](#How-to-use-smart-contracts) | [GetDelegatedResource](#How-to-delegate-resource) |[GetDelegatedResourceAccountIndex](#How-to-delegate-resource) |
80-
| [GetDiversifier](#How-to-transfer-shielded-TRC20-token)| [GetExpandedSpendingKey](#How-to-transfer-shielded-TRC20-token)| [GetIncomingViewingKey](#How-to-transfer-shielded-TRC20-token) |
81-
| [GetMarketOrderByAccount](#How-to-use-tron-dex-to-sell-asset)| [GetMarketOrderById](#How-to-use-tron-dex-to-sell-asset)| [GetMarketOrderListByPair](#How-to-use-tron-dex-to-sell-asset) |
80+
| [GetDiversifier](#How-to-transfer-shielded-TRC20-token)| [GetExpandedSpendingKey](#How-to-transfer-shielded-TRC20-token)| [GetIncomingViewingKey](#How-to-transfer-shielded-TRC20-token) |
81+
| [GetMarketOrderByAccount](#How-to-use-tron-dex-to-sell-asset)| [GetMarketOrderById](#How-to-use-tron-dex-to-sell-asset)| [GetMarketOrderListByPair](#How-to-use-tron-dex-to-sell-asset) |
8282
| [GetMarketPairList](#How-to-use-tron-dex-to-sell-asset)| [GetMarketPriceByPair](#How-to-use-tron-dex-to-sell-asset)| [GetNextMaintenanceTime](#Some-others) |
8383
| [GetNkFromNsk](#How-to-transfer-shielded-TRC20-token) | [GetProposal](#Get-proposal-information) | [GetShieldedPaymentAddress](#How-to-transfer-shielded-TRC20-token)|
8484
| [GetSpendingKey](#How-to-transfer-shielded-TRC20-token) | [GetReward](#Brokerage) | [GetTransactionApprovedList](#How-to-use-the-multi-signature-feature-of-wallet-cli) |
@@ -98,7 +98,7 @@ For more information on a specific command, just type the command on terminal wh
9898
| [UpdateAccountPermission](#How-to-use-the-multi-signature-feature-of-wallet-cli) | [VoteWitness](#How-to-vote) | [FreezeBalanceV2](#How-to-freezev2) |
9999
| [UnfreezeBalanceV2](#How-to-freezev2) | [DelegateResource](#How-to-freezev2) | [UnDelegateResource](#How-to-freezev2) |
100100
| [WithdrawExpireUnfreeze](#How-to-freezev2) | [GetDelegatedResourceV2](#How-to-freezev2) | [GetDelegatedResourceAccountIndexV2](#How-to-freezev2) |
101-
| [GetCanDelegatedMaxSize](#How-to-freezev2) | [GetAvailableUnfreezeCount](#How-to-freezev2) | [GetCanWithdrawUnfreezeAmount](#How-to-freezev2) |
101+
| [GetCanDelegatedMaxSize](#How-to-freezev2) | [GetAvailableUnfreezeCount](#How-to-freezev2) | |
102102

103103
Type any one of the listed commands, to display how-to tips.
104104

@@ -1458,9 +1458,6 @@ as: 721d63b074f18d41c147e04c952ec93467777a30b6f16745bc47a8eae5076545
14581458
14591459
## Account related commands
14601460

1461-
**GenerateAddress**
1462-
> Generate an address and print out the public and private keys
1463-
14641461
**GetAccount**
14651462
> Get account information based on address
14661463

src/main/java/org/tron/common/utils/HttpSelfFormatFieldName.java

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ public class HttpSelfFormatFieldName {
1313
//DelegatedResourceMessage
1414
AddressFieldNameMap.put("protocol.DelegatedResourceMessage.fromAddress", 1);
1515
AddressFieldNameMap.put("protocol.DelegatedResourceMessage.toAddress", 1);
16-
//EasyTransferMessage
17-
AddressFieldNameMap.put("protocol.EasyTransferMessage.toAddress", 1);
18-
//EasyTransferAssetMessage
19-
AddressFieldNameMap.put("protocol.EasyTransferAssetMessage.toAddress", 1);
20-
//EasyTransferByPrivateMessage
21-
AddressFieldNameMap.put("protocol.EasyTransferByPrivateMessage.toAddress", 1);
22-
//EasyTransferAssetByPrivateMessage
23-
AddressFieldNameMap.put("protocol.EasyTransferAssetByPrivateMessage.toAddress", 1);
2416
//TransactionSignWeight
2517
AddressFieldNameMap.put("protocol.TransactionSignWeight.approved_list", 1);
2618
//TransactionApprovedList
@@ -31,6 +23,30 @@ public class HttpSelfFormatFieldName {
3123
//PrivateParametersWithoutAsk
3224
AddressFieldNameMap.put("protocol.PrivateParametersWithoutAsk.transparent_from_address", 1);
3325
AddressFieldNameMap.put("protocol.PrivateParametersWithoutAsk.transparent_to_address", 1);
26+
//PrivateShieldedTRC20Parameters
27+
AddressFieldNameMap.put(
28+
"protocol.PrivateShieldedTRC20Parameters.transparent_to_address", 1);
29+
AddressFieldNameMap.put(
30+
"protocol.PrivateShieldedTRC20Parameters.shielded_TRC20_contract_address", 1);
31+
//PrivateShieldedTRC20ParametersWithoutAsk
32+
AddressFieldNameMap.put(
33+
"protocol.PrivateShieldedTRC20ParametersWithoutAsk.transparent_to_address", 1);
34+
AddressFieldNameMap.put(
35+
"protocol.PrivateShieldedTRC20ParametersWithoutAsk.shielded_TRC20_contract_address", 1);
36+
//IvkDecryptTRC20Parameters
37+
AddressFieldNameMap.put(
38+
"protocol.IvkDecryptTRC20Parameters.shielded_TRC20_contract_address", 1);
39+
//OvkDecryptTRC20Parameters
40+
AddressFieldNameMap.put(
41+
"protocol.OvkDecryptTRC20Parameters.shielded_TRC20_contract_address", 1);
42+
//NfTRC20Parameters
43+
AddressFieldNameMap.put(
44+
"protocol.NfTRC20Parameters.shielded_TRC20_contract_address", 1);
45+
//ShieldedTRC20TriggerContractParameters
46+
AddressFieldNameMap.put(
47+
"protocol.ShieldedTRC20TriggerContractParameters.transparent_to_address", 1);
48+
AddressFieldNameMap.put(
49+
"protocol.DecryptNotesTRC20.NoteTx.transparent_to_address", 1);
3450

3551
//***** Contract.proto *****
3652
//AccountCreateContract
@@ -111,10 +127,11 @@ public class HttpSelfFormatFieldName {
111127
AddressFieldNameMap.put("protocol.ExchangeTransactionContract.owner_address", 1);
112128
//AccountPermissionUpdateContract
113129
AddressFieldNameMap.put("protocol.AccountPermissionUpdateContract.owner_address", 1);
130+
//UpdateBrokerageContract
131+
AddressFieldNameMap.put("protocol.UpdateBrokerageContract.owner_address", 1);
114132
//ShieldedTransferContract
115133
AddressFieldNameMap.put("protocol.ShieldedTransferContract.transparent_from_address", 1);
116134
AddressFieldNameMap.put("protocol.ShieldedTransferContract.transparent_to_address", 1);
117-
118135
//FreezeBalanceV2Contract
119136
AddressFieldNameMap.put("protocol.FreezeBalanceV2Contract.owner_address", 1);
120137
//UnfreezeBalanceV2Contract
@@ -171,15 +188,14 @@ public class HttpSelfFormatFieldName {
171188
AddressFieldNameMap.put("protocol.DelegatedResourceAccountIndex.fromAccounts", 1);
172189
AddressFieldNameMap.put("protocol.DelegatedResourceAccountIndex.toAccounts", 1);
173190

191+
AddressFieldNameMap.put("protocol.AccountIdentifier.address", 1);
192+
AddressFieldNameMap.put("protocol.TransactionBalanceTrace.Operation.address", 1);
193+
174194
//***** api.proto *****
175195
//Return
176196
NameFieldNameMap.put("protocol.Return.message", 1);
177197
//Address
178198
NameFieldNameMap.put("protocol.Address.host", 1);
179-
//EasyTransferMessage
180-
NameFieldNameMap.put("protocol.EasyTransferMessage.passPhrase", 1);
181-
//EasyTransferAssetMessage
182-
NameFieldNameMap.put("protocol.EasyTransferAssetMessage.passPhrase", 1);
183199
//Note
184200
NameFieldNameMap.put("protocol.Note.memo", 1);
185201

@@ -232,6 +248,7 @@ public class HttpSelfFormatFieldName {
232248
//TransactionInfo
233249
NameFieldNameMap.put("protocol.TransactionInfo.resMessage", 1);
234250

251+
//***** market.proto *****
235252
// MarketSellAssetContract
236253
AddressFieldNameMap.put("protocol.MarketSellAssetContract.owner_address", 1);
237254
NameFieldNameMap.put("protocol.MarketSellAssetContract.sell_token_id", 1);

src/main/java/org/tron/demo/EasyTransferAssetByPrivateDemo.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/main/java/org/tron/demo/EasyTransferAssetDemo.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/main/java/org/tron/demo/EasyTransferByPrivateDemo.java

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/main/java/org/tron/demo/EasyTransferDemo.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/main/java/org/tron/demo/MultiSignDemo.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)