diff --git a/src/main/java/org/tron/core/services/http/HttpSelfFormatFieldName.java b/src/main/java/org/tron/core/services/http/HttpSelfFormatFieldName.java index b62abd32192..c038f4ab956 100644 --- a/src/main/java/org/tron/core/services/http/HttpSelfFormatFieldName.java +++ b/src/main/java/org/tron/core/services/http/HttpSelfFormatFieldName.java @@ -4,213 +4,213 @@ import java.util.Map; public class HttpSelfFormatFieldName { - public static final Map AddressFieldNameMap = new HashMap<>(); - public static final Map NameFieldNameMap = new HashMap<>(); + public static final Map AddressFieldNameMap = new HashMap<>(); + public static final Map NameFieldNameMap = new HashMap<>(); - static { - //***** api.proto ***** - //DelegatedResourceMessage - AddressFieldNameMap.put("protocol.DelegatedResourceMessage.fromAddress", 1); - AddressFieldNameMap.put("protocol.DelegatedResourceMessage.toAddress", 1); - //EasyTransferMessage - AddressFieldNameMap.put("protocol.EasyTransferMessage.toAddress", 1); - //EasyTransferAssetMessage - AddressFieldNameMap.put("protocol.EasyTransferAssetMessage.toAddress", 1); - //EasyTransferByPrivateMessage - AddressFieldNameMap.put("protocol.EasyTransferByPrivateMessage.toAddress", 1); - //EasyTransferAssetByPrivateMessage - AddressFieldNameMap.put("protocol.EasyTransferAssetByPrivateMessage.toAddress", 1); - //TransactionSignWeight - AddressFieldNameMap.put("protocol.TransactionSignWeight.approved_list", 1); - //TransactionApprovedList - AddressFieldNameMap.put("protocol.TransactionApprovedList.approved_list", 1); + static { + //***** api.proto ***** + //DelegatedResourceMessage + AddressFieldNameMap.put("protocol.DelegatedResourceMessage.fromAddress", 1); + AddressFieldNameMap.put("protocol.DelegatedResourceMessage.toAddress", 1); + //EasyTransferMessage + AddressFieldNameMap.put("protocol.EasyTransferMessage.toAddress", 1); + //EasyTransferAssetMessage + AddressFieldNameMap.put("protocol.EasyTransferAssetMessage.toAddress", 1); + //EasyTransferByPrivateMessage + AddressFieldNameMap.put("protocol.EasyTransferByPrivateMessage.toAddress", 1); + //EasyTransferAssetByPrivateMessage + AddressFieldNameMap.put("protocol.EasyTransferAssetByPrivateMessage.toAddress", 1); + //TransactionSignWeight + AddressFieldNameMap.put("protocol.TransactionSignWeight.approved_list", 1); + //TransactionApprovedList + AddressFieldNameMap.put("protocol.TransactionApprovedList.approved_list", 1); - //***** Contract.proto ***** - //AccountCreateContract - AddressFieldNameMap.put("protocol.AccountCreateContract.owner_address", 1); - AddressFieldNameMap.put("protocol.AccountCreateContract.account_address", 1); - //AccountUpdateContract - AddressFieldNameMap.put("protocol.AccountUpdateContract.owner_address", 1); - //SetAccountIdContract - AddressFieldNameMap.put("protocol.SetAccountIdContract.owner_address", 1); - //TransferContract - AddressFieldNameMap.put("protocol.TransferContract.owner_address", 1); - AddressFieldNameMap.put("protocol.TransferContract.to_address", 1); - //CancelDeferredTransactionContract - AddressFieldNameMap.put("protocol.CancelDeferredTransactionContract.ownerAddress", 1); - //TransferAssetContract - AddressFieldNameMap.put("protocol.TransferAssetContract.owner_address", 1); - AddressFieldNameMap.put("protocol.TransferAssetContract.to_address", 1); - //VoteAssetContract - AddressFieldNameMap.put("protocol.VoteAssetContract.owner_address", 1); - AddressFieldNameMap.put("protocol.VoteAssetContract.vote_address", 1); - //VoteWitnessContract - AddressFieldNameMap.put("protocol.VoteWitnessContract.Vote.vote_address", 1); - AddressFieldNameMap.put("protocol.VoteWitnessContract.owner_address", 1); - //UpdateSettingContract - AddressFieldNameMap.put("protocol.UpdateSettingContract.owner_address", 1); - AddressFieldNameMap.put("protocol.UpdateSettingContract.contract_address", 1); - //UpdateEnergyLimitContract - AddressFieldNameMap.put("protocol.UpdateEnergyLimitContract.owner_address", 1); - AddressFieldNameMap.put("protocol.UpdateEnergyLimitContract.contract_address", 1); - //ClearABIContract - AddressFieldNameMap.put("protocol.ClearABIContract.owner_address", 1); - AddressFieldNameMap.put("protocol.ClearABIContract.contract_address", 1); - //WitnessCreateContract - AddressFieldNameMap.put("protocol.WitnessCreateContract.owner_address", 1); - //WitnessUpdateContract - AddressFieldNameMap.put("protocol.WitnessUpdateContract.owner_address", 1); - //AssetIssueContract - AddressFieldNameMap.put("protocol.AssetIssueContract.owner_address", 1); - //ParticipateAssetIssueContract - AddressFieldNameMap.put("protocol.ParticipateAssetIssueContract.owner_address", 1); - AddressFieldNameMap.put("protocol.ParticipateAssetIssueContract.to_address", 1); - //FreezeBalanceContract - AddressFieldNameMap.put("protocol.FreezeBalanceContract.owner_address", 1); - AddressFieldNameMap.put("protocol.FreezeBalanceContract.receiver_address", 1); - //UnfreezeBalanceContract - AddressFieldNameMap.put("protocol.UnfreezeBalanceContract.owner_address", 1); - AddressFieldNameMap.put("protocol.UnfreezeBalanceContract.receiver_address", 1); - //UnfreezeAssetContract - AddressFieldNameMap.put("protocol.UnfreezeAssetContract.owner_address", 1); - //WithdrawBalanceContract - AddressFieldNameMap.put("protocol.WithdrawBalanceContract.owner_address", 1); - //UpdateAssetContract - AddressFieldNameMap.put("protocol.UpdateAssetContract.owner_address", 1); - //ProposalCreateContract - AddressFieldNameMap.put("protocol.ProposalCreateContract.owner_address", 1); - //ProposalApproveContract - AddressFieldNameMap.put("protocol.ProposalApproveContract.owner_address", 1); - //ProposalDeleteContract - AddressFieldNameMap.put("protocol.ProposalDeleteContract.owner_address", 1); - //CreateSmartContract - AddressFieldNameMap.put("protocol.CreateSmartContract.owner_address", 1); - //TriggerSmartContract - AddressFieldNameMap.put("protocol.TriggerSmartContract.owner_address", 1); - AddressFieldNameMap.put("protocol.TriggerSmartContract.contract_address", 1); - //BuyStorageContract - AddressFieldNameMap.put("protocol.BuyStorageContract.owner_address", 1); - //BuyStorageBytesContract - AddressFieldNameMap.put("protocol.BuyStorageBytesContract.owner_address", 1); - //SellStorageContract - AddressFieldNameMap.put("protocol.SellStorageContract.owner_address", 1); - //ExchangeCreateContract - AddressFieldNameMap.put("protocol.ExchangeCreateContract.owner_address", 1); - //ExchangeInjectContract - AddressFieldNameMap.put("protocol.ExchangeInjectContract.owner_address", 1); - //ExchangeWithdrawContract - AddressFieldNameMap.put("protocol.ExchangeWithdrawContract.owner_address", 1); - //ExchangeTransactionContract - AddressFieldNameMap.put("protocol.ExchangeTransactionContract.owner_address", 1); - //AccountPermissionUpdateContract - AddressFieldNameMap.put("protocol.AccountPermissionUpdateContract.owner_address", 1); + //***** Contract.proto ***** + //AccountCreateContract + AddressFieldNameMap.put("protocol.AccountCreateContract.owner_address", 1); + AddressFieldNameMap.put("protocol.AccountCreateContract.account_address", 1); + //AccountUpdateContract + AddressFieldNameMap.put("protocol.AccountUpdateContract.owner_address", 1); + //SetAccountIdContract + AddressFieldNameMap.put("protocol.SetAccountIdContract.owner_address", 1); + //TransferContract + AddressFieldNameMap.put("protocol.TransferContract.owner_address", 1); + AddressFieldNameMap.put("protocol.TransferContract.to_address", 1); + //CancelDeferredTransactionContract + AddressFieldNameMap.put("protocol.CancelDeferredTransactionContract.ownerAddress", 1); + //TransferAssetContract + AddressFieldNameMap.put("protocol.TransferAssetContract.owner_address", 1); + AddressFieldNameMap.put("protocol.TransferAssetContract.to_address", 1); + //VoteAssetContract + AddressFieldNameMap.put("protocol.VoteAssetContract.owner_address", 1); + AddressFieldNameMap.put("protocol.VoteAssetContract.vote_address", 1); + //VoteWitnessContract + AddressFieldNameMap.put("protocol.VoteWitnessContract.Vote.vote_address", 1); + AddressFieldNameMap.put("protocol.VoteWitnessContract.owner_address", 1); + //UpdateSettingContract + AddressFieldNameMap.put("protocol.UpdateSettingContract.owner_address", 1); + AddressFieldNameMap.put("protocol.UpdateSettingContract.contract_address", 1); + //UpdateEnergyLimitContract + AddressFieldNameMap.put("protocol.UpdateEnergyLimitContract.owner_address", 1); + AddressFieldNameMap.put("protocol.UpdateEnergyLimitContract.contract_address", 1); + //ClearABIContract + AddressFieldNameMap.put("protocol.ClearABIContract.owner_address", 1); + AddressFieldNameMap.put("protocol.ClearABIContract.contract_address", 1); + //WitnessCreateContract + AddressFieldNameMap.put("protocol.WitnessCreateContract.owner_address", 1); + //WitnessUpdateContract + AddressFieldNameMap.put("protocol.WitnessUpdateContract.owner_address", 1); + //AssetIssueContract + AddressFieldNameMap.put("protocol.AssetIssueContract.owner_address", 1); + //ParticipateAssetIssueContract + AddressFieldNameMap.put("protocol.ParticipateAssetIssueContract.owner_address", 1); + AddressFieldNameMap.put("protocol.ParticipateAssetIssueContract.to_address", 1); + //FreezeBalanceContract + AddressFieldNameMap.put("protocol.FreezeBalanceContract.owner_address", 1); + AddressFieldNameMap.put("protocol.FreezeBalanceContract.receiver_address", 1); + //UnfreezeBalanceContract + AddressFieldNameMap.put("protocol.UnfreezeBalanceContract.owner_address", 1); + AddressFieldNameMap.put("protocol.UnfreezeBalanceContract.receiver_address", 1); + //UnfreezeAssetContract + AddressFieldNameMap.put("protocol.UnfreezeAssetContract.owner_address", 1); + //WithdrawBalanceContract + AddressFieldNameMap.put("protocol.WithdrawBalanceContract.owner_address", 1); + //UpdateAssetContract + AddressFieldNameMap.put("protocol.UpdateAssetContract.owner_address", 1); + //ProposalCreateContract + AddressFieldNameMap.put("protocol.ProposalCreateContract.owner_address", 1); + //ProposalApproveContract + AddressFieldNameMap.put("protocol.ProposalApproveContract.owner_address", 1); + //ProposalDeleteContract + AddressFieldNameMap.put("protocol.ProposalDeleteContract.owner_address", 1); + //CreateSmartContract + AddressFieldNameMap.put("protocol.CreateSmartContract.owner_address", 1); + //TriggerSmartContract + AddressFieldNameMap.put("protocol.TriggerSmartContract.owner_address", 1); + AddressFieldNameMap.put("protocol.TriggerSmartContract.contract_address", 1); + //BuyStorageContract + AddressFieldNameMap.put("protocol.BuyStorageContract.owner_address", 1); + //BuyStorageBytesContract + AddressFieldNameMap.put("protocol.BuyStorageBytesContract.owner_address", 1); + //SellStorageContract + AddressFieldNameMap.put("protocol.SellStorageContract.owner_address", 1); + //ExchangeCreateContract + AddressFieldNameMap.put("protocol.ExchangeCreateContract.owner_address", 1); + //ExchangeInjectContract + AddressFieldNameMap.put("protocol.ExchangeInjectContract.owner_address", 1); + //ExchangeWithdrawContract + AddressFieldNameMap.put("protocol.ExchangeWithdrawContract.owner_address", 1); + //ExchangeTransactionContract + AddressFieldNameMap.put("protocol.ExchangeTransactionContract.owner_address", 1); + //AccountPermissionUpdateContract + AddressFieldNameMap.put("protocol.AccountPermissionUpdateContract.owner_address", 1); - //***** Tron.proto ***** - //AccountId - AddressFieldNameMap.put("protocol.AccountId.address", 1); - //Vote - AddressFieldNameMap.put("protocol.Vote.vote_address", 1); - //Proposal - AddressFieldNameMap.put("protocol.Proposal.proposer_address", 1); - AddressFieldNameMap.put("protocol.Proposal.approvals", 1); - //Exchange - AddressFieldNameMap.put("protocol.Exchange.creator_address", 1); - //Account - AddressFieldNameMap.put("protocol.Account.address", 1); - //Key - AddressFieldNameMap.put("protocol.Key.address", 1); - //DelegatedResource - AddressFieldNameMap.put("protocol.DelegatedResource.from", 1); - AddressFieldNameMap.put("protocol.DelegatedResource.to", 1); - //Witness - AddressFieldNameMap.put("protocol.Witness.address", 1); - //Votes - AddressFieldNameMap.put("protocol.Votes.address", 1); - //TransactionInfo - AddressFieldNameMap.put("protocol.TransactionInfo.Log.address", 1); - AddressFieldNameMap.put("protocol.TransactionInfo.contract_address", 1); - //DeferredTransaction - AddressFieldNameMap.put("protocol.DeferredTransaction.senderAddress", 1); - AddressFieldNameMap.put("protocol.DeferredTransaction.receiverAddress", 1); - //BlockHeader - AddressFieldNameMap.put("protocol.BlockHeader.raw.witness_address", 1); - //SmartContract - AddressFieldNameMap.put("protocol.SmartContract.origin_address", 1); - AddressFieldNameMap.put("protocol.SmartContract.contract_address", 1); - //InternalTransaction - AddressFieldNameMap.put("protocol.InternalTransaction.caller_address", 1); - AddressFieldNameMap.put("protocol.InternalTransaction.transferTo_address", 1); - //DelegatedResourceAccountIndex - AddressFieldNameMap.put("protocol.DelegatedResourceAccountIndex.account", 1); - AddressFieldNameMap.put("protocol.DelegatedResourceAccountIndex.fromAccounts", 1); - AddressFieldNameMap.put("protocol.DelegatedResourceAccountIndex.toAccounts", 1); + //***** Tron.proto ***** + //AccountId + AddressFieldNameMap.put("protocol.AccountId.address", 1); + //Vote + AddressFieldNameMap.put("protocol.Vote.vote_address", 1); + //Proposal + AddressFieldNameMap.put("protocol.Proposal.proposer_address", 1); + AddressFieldNameMap.put("protocol.Proposal.approvals", 1); + //Exchange + AddressFieldNameMap.put("protocol.Exchange.creator_address", 1); + //Account + AddressFieldNameMap.put("protocol.Account.address", 1); + //Key + AddressFieldNameMap.put("protocol.Key.address", 1); + //DelegatedResource + AddressFieldNameMap.put("protocol.DelegatedResource.from", 1); + AddressFieldNameMap.put("protocol.DelegatedResource.to", 1); + //Witness + AddressFieldNameMap.put("protocol.Witness.address", 1); + //Votes + AddressFieldNameMap.put("protocol.Votes.address", 1); + //TransactionInfo + AddressFieldNameMap.put("protocol.TransactionInfo.Log.address", 1); + AddressFieldNameMap.put("protocol.TransactionInfo.contract_address", 1); + //DeferredTransaction + AddressFieldNameMap.put("protocol.DeferredTransaction.senderAddress", 1); + AddressFieldNameMap.put("protocol.DeferredTransaction.receiverAddress", 1); + //BlockHeader + AddressFieldNameMap.put("protocol.BlockHeader.raw.witness_address", 1); + //SmartContract + AddressFieldNameMap.put("protocol.SmartContract.origin_address", 1); + AddressFieldNameMap.put("protocol.SmartContract.contract_address", 1); + //InternalTransaction + AddressFieldNameMap.put("protocol.InternalTransaction.caller_address", 1); + AddressFieldNameMap.put("protocol.InternalTransaction.transferTo_address", 1); + //DelegatedResourceAccountIndex + AddressFieldNameMap.put("protocol.DelegatedResourceAccountIndex.account", 1); + AddressFieldNameMap.put("protocol.DelegatedResourceAccountIndex.fromAccounts", 1); + AddressFieldNameMap.put("protocol.DelegatedResourceAccountIndex.toAccounts", 1); - //***** api.proto ***** - //Return - NameFieldNameMap.put("protocol.Return.message", 1); - //Address - NameFieldNameMap.put("protocol.Address.host", 1); - //EasyTransferMessage - NameFieldNameMap.put("protocol.EasyTransferMessage.passPhrase", 1); - //EasyTransferAssetMessage - NameFieldNameMap.put("protocol.EasyTransferAssetMessage.passPhrase", 1); + //***** api.proto ***** + //Return + NameFieldNameMap.put("protocol.Return.message", 1); + //Address + NameFieldNameMap.put("protocol.Address.host", 1); + //EasyTransferMessage + NameFieldNameMap.put("protocol.EasyTransferMessage.passPhrase", 1); + //EasyTransferAssetMessage + NameFieldNameMap.put("protocol.EasyTransferAssetMessage.passPhrase", 1); - //***** Contract.proto ***** - //AccountUpdateContract - NameFieldNameMap.put("protocol.AccountUpdateContract.account_name", 1); - //SetAccountIdContract - NameFieldNameMap.put("protocol.SetAccountIdContract.account_id", 1); - //TransferAssetContract - NameFieldNameMap.put("protocol.TransferAssetContract.asset_name", 1); - //WitnessCreateContract - NameFieldNameMap.put("protocol.WitnessCreateContract.url", 1); - //WitnessUpdateContract - NameFieldNameMap.put("protocol.WitnessUpdateContract.update_url", 1); - //AssetIssueContract - NameFieldNameMap.put("protocol.AssetIssueContract.name", 1); - NameFieldNameMap.put("protocol.AssetIssueContract.abbr", 1); - NameFieldNameMap.put("protocol.AssetIssueContract.description", 1); - NameFieldNameMap.put("protocol.AssetIssueContract.url", 1); - //ParticipateAssetIssueContract - NameFieldNameMap.put("protocol.ParticipateAssetIssueContract.asset_name", 1); - //UpdateAssetContract - NameFieldNameMap.put("protocol.UpdateAssetContract.description", 1); - NameFieldNameMap.put("protocol.UpdateAssetContract.url", 1); - //ExchangeCreateContract - NameFieldNameMap.put("protocol.ExchangeCreateContract.first_token_id", 1); - NameFieldNameMap.put("protocol.ExchangeCreateContract.second_token_id", 1); - //ExchangeInjectContract - NameFieldNameMap.put("protocol.ExchangeInjectContract.token_id", 1); - //ExchangeWithdrawContract - NameFieldNameMap.put("protocol.ExchangeWithdrawContract.token_id", 1); - //ExchangeTransactionContract - NameFieldNameMap.put("protocol.ExchangeTransactionContract.token_id", 1); + //***** Contract.proto ***** + //AccountUpdateContract + NameFieldNameMap.put("protocol.AccountUpdateContract.account_name", 1); + //SetAccountIdContract + NameFieldNameMap.put("protocol.SetAccountIdContract.account_id", 1); + //TransferAssetContract + NameFieldNameMap.put("protocol.TransferAssetContract.asset_name", 1); + //WitnessCreateContract + NameFieldNameMap.put("protocol.WitnessCreateContract.url", 1); + //WitnessUpdateContract + NameFieldNameMap.put("protocol.WitnessUpdateContract.update_url", 1); + //AssetIssueContract + NameFieldNameMap.put("protocol.AssetIssueContract.name", 1); + NameFieldNameMap.put("protocol.AssetIssueContract.abbr", 1); + NameFieldNameMap.put("protocol.AssetIssueContract.description", 1); + NameFieldNameMap.put("protocol.AssetIssueContract.url", 1); + //ParticipateAssetIssueContract + NameFieldNameMap.put("protocol.ParticipateAssetIssueContract.asset_name", 1); + //UpdateAssetContract + NameFieldNameMap.put("protocol.UpdateAssetContract.description", 1); + NameFieldNameMap.put("protocol.UpdateAssetContract.url", 1); + //ExchangeCreateContract + NameFieldNameMap.put("protocol.ExchangeCreateContract.first_token_id", 1); + NameFieldNameMap.put("protocol.ExchangeCreateContract.second_token_id", 1); + //ExchangeInjectContract + NameFieldNameMap.put("protocol.ExchangeInjectContract.token_id", 1); + //ExchangeWithdrawContract + NameFieldNameMap.put("protocol.ExchangeWithdrawContract.token_id", 1); + //ExchangeTransactionContract + NameFieldNameMap.put("protocol.ExchangeTransactionContract.token_id", 1); - //***** Tron.proto ***** - //AccountId - NameFieldNameMap.put("protocol.AccountId.name", 1); - //Exchange - NameFieldNameMap.put("protocol.Exchange.first_token_id", 1); - NameFieldNameMap.put("protocol.Exchange.second_token_id", 1); - //Account - NameFieldNameMap.put("protocol.Account.account_name", 1); - NameFieldNameMap.put("protocol.Account.asset_issued_name", 1); - NameFieldNameMap.put("protocol.Account.asset_issued_ID", 1); - NameFieldNameMap.put("protocol.Account.account_id", 1); - //authority - NameFieldNameMap.put("protocol.authority.permission_name", 1); - //Transaction - NameFieldNameMap.put("protocol.Transaction.Contract.ContractName", 1); - //TransactionInfo - NameFieldNameMap.put("protocol.TransactionInfo.resMessage", 1); - } + //***** Tron.proto ***** + //AccountId + NameFieldNameMap.put("protocol.AccountId.name", 1); + //Exchange + NameFieldNameMap.put("protocol.Exchange.first_token_id", 1); + NameFieldNameMap.put("protocol.Exchange.second_token_id", 1); + //Account + NameFieldNameMap.put("protocol.Account.account_name", 1); + NameFieldNameMap.put("protocol.Account.asset_issued_name", 1); + NameFieldNameMap.put("protocol.Account.asset_issued_ID", 1); + NameFieldNameMap.put("protocol.Account.account_id", 1); + //authority + NameFieldNameMap.put("protocol.authority.permission_name", 1); + //Transaction + NameFieldNameMap.put("protocol.Transaction.Contract.ContractName", 1); + //TransactionInfo + NameFieldNameMap.put("protocol.TransactionInfo.resMessage", 1); + } - public static boolean isAddressFormat(final String name) { - return AddressFieldNameMap.containsKey(name); - } + public static boolean isAddressFormat(final String name) { + return AddressFieldNameMap.containsKey(name); + } - public static boolean isNameStringFormat(final String name) { - return NameFieldNameMap.containsKey(name); - } + public static boolean isNameStringFormat(final String name) { + return NameFieldNameMap.containsKey(name); + } } diff --git a/src/main/java/org/tron/core/services/http/TriggerConstantContractServlet.java b/src/main/java/org/tron/core/services/http/TriggerConstantContractServlet.java index 0e7b7160658..039443fcab2 100644 --- a/src/main/java/org/tron/core/services/http/TriggerConstantContractServlet.java +++ b/src/main/java/org/tron/core/services/http/TriggerConstantContractServlet.java @@ -2,11 +2,13 @@ import com.alibaba.fastjson.JSONObject; import com.google.protobuf.ByteString; + import java.io.IOException; import java.util.stream.Collectors; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.spongycastle.util.encoders.Hex; @@ -15,7 +17,6 @@ import org.tron.api.GrpcAPI.Return; import org.tron.api.GrpcAPI.Return.response_code; import org.tron.api.GrpcAPI.TransactionExtention; -import org.tron.common.crypto.Hash; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.TransactionCapsule; @@ -24,8 +25,6 @@ import org.tron.protos.Protocol.Transaction; import org.tron.protos.Protocol.Transaction.Contract.ContractType; -import static org.tron.core.services.http.Util.getVisiblePost; -import static org.tron.core.services.http.Util.setTransactionPermissionId; @Component @Slf4j(topic = "API") @@ -47,18 +46,18 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) String contract = request.getReader().lines() .collect(Collectors.joining(System.lineSeparator())); Util.checkBodySize(contract); - visible = getVisiblePost( contract ); + visible = Util.getVisiblePost(contract); JsonFormat.merge(contract, build, visible); JSONObject jsonObject = JSONObject.parseObject(contract); String selector = jsonObject.getString("function_selector"); String parameter = jsonObject.getString("parameter"); - boolean bHex = true; + boolean hexPara = true; if (jsonObject.containsKey("parameter_string")) { parameter = jsonObject.getString("parameter_string"); - bHex = false; + hexPara = false; } - String data = AbiUtil.parseMethod(selector, parameter, bHex); + String data = AbiUtil.parseMethod(selector, parameter, hexPara); build.setData(ByteString.copyFrom(ByteArray.fromHexString(data))); long feeLimit = jsonObject.getLongValue("fee_limit"); @@ -75,7 +74,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) .triggerConstantContract(build.build(), new TransactionCapsule(txBuilder.build()), trxExtBuilder, retBuilder); - trx = setTransactionPermissionId(jsonObject, trx); + trx = Util.setTransactionPermissionId(jsonObject, trx); trxExtBuilder.setTransaction(trx); retBuilder.setResult(true).setCode(response_code.SUCCESS); } catch (ContractValidateException e) { @@ -86,6 +85,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) .setMessage(ByteString.copyFromUtf8(e.getClass() + " : " + e.getMessage())); } trxExtBuilder.setResult(retBuilder); - response.getWriter().println(Util.printTransactionExtention(trxExtBuilder.build(), visible )); + response.getWriter().println(Util.printTransactionExtention(trxExtBuilder.build(), visible)); } } \ No newline at end of file diff --git a/src/main/java/org/tron/core/services/http/TriggerSmartContractServlet.java b/src/main/java/org/tron/core/services/http/TriggerSmartContractServlet.java index 4f649e08dd8..8a24b8fdd9d 100644 --- a/src/main/java/org/tron/core/services/http/TriggerSmartContractServlet.java +++ b/src/main/java/org/tron/core/services/http/TriggerSmartContractServlet.java @@ -2,11 +2,13 @@ import com.alibaba.fastjson.JSONObject; import com.google.protobuf.ByteString; + import java.io.IOException; import java.util.stream.Collectors; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.spongycastle.util.encoders.Hex; @@ -15,7 +17,6 @@ import org.tron.api.GrpcAPI.Return; import org.tron.api.GrpcAPI.Return.response_code; import org.tron.api.GrpcAPI.TransactionExtention; -import org.tron.common.crypto.Hash; import org.tron.common.utils.ByteArray; import org.tron.core.Wallet; import org.tron.core.capsule.TransactionCapsule; @@ -24,10 +25,6 @@ import org.tron.protos.Protocol.Transaction; import org.tron.protos.Protocol.Transaction.Contract.ContractType; -import static org.tron.core.services.http.Util.getVisible; -import static org.tron.core.services.http.Util.getVisiblePost; -import static org.tron.core.services.http.Util.setTransactionPermissionId; - @Component @Slf4j(topic = "API") @@ -50,17 +47,17 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) String contract = request.getReader().lines() .collect(Collectors.joining(System.lineSeparator())); Util.checkBodySize(contract); - visible = getVisiblePost( contract ); - JsonFormat.merge(contract, build, visible ); + visible = Util.getVisiblePost(contract); + JsonFormat.merge(contract, build, visible); JSONObject jsonObject = JSONObject.parseObject(contract); String selector = jsonObject.getString("function_selector"); String parameter = jsonObject.getString("parameter"); - boolean bHex = true; + boolean hexPara = true; if (jsonObject.containsKey("parameter_string")) { parameter = jsonObject.getString("parameter_string"); - bHex = false; + hexPara = false; } - String data = AbiUtil.parseMethod(selector, parameter, bHex); + String data = AbiUtil.parseMethod(selector, parameter, hexPara); build.setData(ByteString.copyFrom(ByteArray.fromHexString(data))); long feeLimit = jsonObject.getLongValue("fee_limit"); @@ -76,7 +73,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) Transaction trx = wallet .triggerContract(build.build(), new TransactionCapsule(txBuilder.build()), trxExtBuilder, retBuilder); - trx = setTransactionPermissionId(jsonObject, trx); + trx = Util.setTransactionPermissionId(jsonObject, trx); trxExtBuilder.setTransaction(trx); retBuilder.setResult(true).setCode(response_code.SUCCESS); } catch (ContractValidateException e) {