Skip to content
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

feature: optimize trigger interface #5079

Merged
merged 7 commits into from
Apr 3, 2023
Merged

feature: optimize trigger interface #5079

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b233e3
feat(interface): optimize TriggerSmartContract and TriggerConstantCon…
yanghang8612 Mar 14, 2023
4e3814a
feat(interface): add block number and block hash to the result of cal…
yanghang8612 Mar 17, 2023
998d7fb
fix(interface): some conditions not suitable
yanghang8612 Mar 17, 2023
5c615f7
fix(interface): continue to estimate if runtime exception occurred wh…
yanghang8612 Apr 2, 2023
ad30d13
fix(interface): throw out of time exception in any case
yanghang8612 Apr 2, 2023
6956e37
func(interface): do the same modification for estimate energy
yanghang8612 Apr 3, 2023
5643063
style(http,util): fix sonar check problem
yanghang8612 Apr 3, 2023
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
6 changes: 5 additions & 1 deletion framework/src/main/java/org/tron/core/Wallet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3011,7 +3011,8 @@ public Transaction callConstantContract(TransactionCapsule trxCap,
headBlock = blockCapsuleList.get(0).getInstance();
}

TransactionContext context = new TransactionContext(new BlockCapsule(headBlock), trxCap,
BlockCapsule headBlockCapsule = new BlockCapsule(headBlock);
TransactionContext context = new TransactionContext(headBlockCapsule, trxCap,
StoreFactory.getInstance(), true, false);
VMActuator vmActuator = new VMActuator(true);

Expand All @@ -3028,6 +3029,9 @@ public Transaction callConstantContract(TransactionCapsule trxCap,
TransactionResultCapsule ret = new TransactionResultCapsule();
builder.setEnergyUsed(result.getEnergyUsed());
builder.setEnergyPenalty(result.getEnergyPenaltyTotal());
builder.setBlockNumber(headBlockCapsule.getNum());
builder.setBlockHash(ByteString.copyFrom(headBlockCapsule.getBlockId().getBytes()));
builder.setEnergyPenalty(result.getEnergyPenaltyTotal());
builder.addConstantResult(ByteString.copyFrom(result.getHReturn()));
result.getLogInfoList().forEach(logInfo ->
builder.addLogs(LogInfo.buildLog(logInfo)));
Expand Down
37 changes: 22 additions & 15 deletions framework/src/main/java/org/tron/core/services/http/TriggerConstantContractServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@
@Slf4j(topic = "API")
public class TriggerConstantContractServlet extends RateLimiterServlet {

private final String functionSelector = "function_selector";
private final String OWNER_ADDRESS = "owner_address";
private final String CONTRACT_ADDRESS = "contract_address";
private final String FUNCTION_SELECTOR = "function_selector";
private final String FUNCTION_PARAMETER = "parameter";
private final String CALL_DATA = "data";

@Autowired
private Wallet wallet;
Expand All @@ -37,13 +41,18 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {

protected void validateParameter(String contract) {
JSONObject jsonObject = JSONObject.parseObject(contract);
if (!jsonObject.containsKey("owner_address")
|| StringUtil.isNullOrEmpty(jsonObject.getString("owner_address"))) {
throw new InvalidParameterException("owner_address isn't set.");
if (StringUtil.isNullOrEmpty(jsonObject.getString(OWNER_ADDRESS))) {
throw new InvalidParameterException(OWNER_ADDRESS + " isn't set.");
}
if (!jsonObject.containsKey("contract_address")
|| StringUtil.isNullOrEmpty(jsonObject.getString("contract_address"))) {
throw new InvalidParameterException("contract_address isn't set.");
if (StringUtil.isNullOrEmpty(jsonObject.getString(CONTRACT_ADDRESS))
&& StringUtil.isNullOrEmpty(jsonObject.getString(CALL_DATA))) {
throw new InvalidParameterException("At least one of "
+ CONTRACT_ADDRESS + " and " + CALL_DATA + " must be set.");
}
if (!StringUtil.isNullOrEmpty(jsonObject.getString(FUNCTION_SELECTOR))
^ StringUtil.isNullOrEmpty(jsonObject.getString(CALL_DATA))) {
throw new InvalidParameterException("Only one of "
+ FUNCTION_SELECTOR + " and " + CALL_DATA + " can be set.");
}
}

Expand All @@ -62,17 +71,15 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
JsonFormat.merge(contract, build, visible);
JSONObject jsonObject = JSONObject.parseObject(contract);

boolean isFunctionSelectorSet = jsonObject.containsKey(functionSelector)
&& !StringUtil.isNullOrEmpty(jsonObject.getString(functionSelector));
String data;
boolean isFunctionSelectorSet =
!StringUtil.isNullOrEmpty(jsonObject.getString(FUNCTION_SELECTOR));
if (isFunctionSelectorSet) {
String selector = jsonObject.getString(functionSelector);
String parameter = jsonObject.getString("parameter");
data = Util.parseMethod(selector, parameter);
String selector = jsonObject.getString(FUNCTION_SELECTOR);
String parameter = jsonObject.getString(FUNCTION_PARAMETER);
String data = Util.parseMethod(selector, parameter);
build.setData(ByteString.copyFrom(ByteArray.fromHexString(data)));
} else {
build.setData(ByteString.copyFrom(new byte[0]));
}

TransactionCapsule trxCap = wallet
.createTransactionCapsule(build.build(), ContractType.TriggerSmartContract);

Expand Down
30 changes: 17 additions & 13 deletions framework/src/main/java/org/tron/core/services/http/TriggerSmartContractServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@
@Slf4j(topic = "API")
public class TriggerSmartContractServlet extends RateLimiterServlet {

private final String functionSelector = "function_selector";
private final String OWNER_ADDRESS = "owner_address";
private final String CONTRACT_ADDRESS = "contract_address";
private final String FUNCTION_SELECTOR = "function_selector";
private final String FUNCTION_PARAMETER = "parameter";
private final String CALL_DATA = "data";

@Autowired
private Wallet wallet;
Expand All @@ -37,14 +41,17 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {

protected void validateParameter(String contract) {
JSONObject jsonObject = JSONObject.parseObject(contract);
if (!jsonObject.containsKey("owner_address")
|| StringUtil.isNullOrEmpty(jsonObject.getString("owner_address"))) {
if (StringUtil.isNullOrEmpty(jsonObject.getString(OWNER_ADDRESS))) {
throw new InvalidParameterException("owner_address isn't set.");
}
if (!jsonObject.containsKey("contract_address")
|| StringUtil.isNullOrEmpty(jsonObject.getString("contract_address"))) {
if (StringUtil.isNullOrEmpty(jsonObject.getString(CONTRACT_ADDRESS))) {
throw new InvalidParameterException("contract_address isn't set.");
}
if (!StringUtil.isNullOrEmpty(jsonObject.getString(FUNCTION_SELECTOR))
^ StringUtil.isNullOrEmpty(jsonObject.getString(CALL_DATA))) {
throw new InvalidParameterException("Only one of "
+ FUNCTION_SELECTOR + " and " + CALL_DATA + " can be set.");
}
}

protected void doPost(HttpServletRequest request, HttpServletResponse response)
Expand All @@ -62,16 +69,13 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
JsonFormat.merge(contract, build, visible);
JSONObject jsonObject = JSONObject.parseObject(contract);

boolean isFunctionSelectorSet = jsonObject.containsKey(functionSelector)
&& !StringUtil.isNullOrEmpty(jsonObject.getString(functionSelector));
String data;
boolean isFunctionSelectorSet =
!StringUtil.isNullOrEmpty(jsonObject.getString(FUNCTION_SELECTOR));
if (isFunctionSelectorSet) {
String selector = jsonObject.getString(functionSelector);
String parameter = jsonObject.getString("parameter");
data = Util.parseMethod(selector, parameter);
String selector = jsonObject.getString(FUNCTION_SELECTOR);
String parameter = jsonObject.getString(FUNCTION_PARAMETER);
String data = Util.parseMethod(selector, parameter);
build.setData(ByteString.copyFrom(ByteArray.fromHexString(data)));
} else {
build.setData(ByteString.copyFrom(new byte[0]));
}

build.setCallTokenValue(Util.getJsonLongValue(jsonObject, "call_token_value"));
Expand Down
2 changes: 2 additions & 0 deletions protocol/src/main/protos/api/api.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,6 +1315,8 @@ message TransactionExtention {
repeated TransactionInfo.Log logs = 6;
repeated InternalTransaction internal_transactions = 7;
int64 energy_penalty = 8;
int64 block_number = 9;
bytes block_hash = 10;
}

message EstimateEnergyMessage {
Expand Down