Skip to content

Commit 7fe0ed2

Browse files
wangzichichiwangzichichi
authored
Merge pull request tronprotocol#2312 from tronprotocol/hotfix/trace_result_set
Hotfix/trace result set
2 parents bae21f6 + 4da6781 commit 7fe0ed2

File tree

6 files changed

+132
-61
lines changed

6 files changed

+132
-61
lines changed

‎.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ language: java
33
jdk: oraclejdk8
44
addons:
55
ssh_known_hosts:
6-
- 47.94.231.67:22008
7-
- 47.94.231.67:22008
8-
- 47.94.231.67:22008
9-
- 47.94.10.122:22008
10-
- 47.94.10.122:22008
11-
- 47.94.10.122:22008
6+
- 47.93.42.145:22008
7+
- 47.93.42.145:22008
8+
- 47.93.42.145:22008
9+
- 47.93.18.60:22008
10+
- 47.93.18.60:22008
11+
- 47.93.18.60:22008
1212
sonarcloud:
1313
organization: tron-zhaohong
1414
token:

‎deploy.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" ]];then
33
stestlogname="`date +%Y%m%d%H%M%S`_stest.log"
44
stest_server=""
5-
docker_num_in_67=`ssh -p 22008 -t java-tron@47.94.231.67 'docker ps -a | wc -l'`
5+
docker_num_in_67=`ssh -p 22008 -t java-tron@47.93.42.145 'docker ps -a | wc -l'`
66
docker_num_in_67=`echo $docker_num_in_67 | tr -d "\r"`
7-
docker_num_in_122=`ssh -p 22008 -t java-tron@47.94.10.122 'docker ps -a | wc -l'`
7+
docker_num_in_122=`ssh -p 22008 -t java-tron@47.93.18.60 'docker ps -a | wc -l'`
88
docker_num_in_122=`echo $docker_num_in_122 | tr -d "\r"`
99
if [ $docker_num_in_67 -le $docker_num_in_122 ];
1010
then
1111
docker_num=$docker_num_in_67
12-
stest_server=47.94.231.67
12+
stest_server=47.93.42.145
1313
else
1414
docker_num=$docker_num_in_122
15-
stest_server=47.94.10.122
15+
stest_server=47.93.18.60
1616
fi
1717

1818
if [[ ${docker_num} -le 3 ]];

‎src/main/java/org/tron/core/actuator/ProposalCreateActuator.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,9 @@ private void validateValue(Map.Entry<Long, Long> entry) throws ContractValidateE
309309
break;
310310
}
311311
case (26): {
312+
if (!dbManager.getForkController().pass(ForkBlockVersionEnum.VERSION_3_6)) {
313+
throw new ContractValidateException("Bad chain parameter id");
314+
}
312315
if (entry.getValue() != 1) {
313316
throw new ContractValidateException(
314317
"This value[ALLOW_TVM_CONSTANTINOPLE] is only allowed to be 1");

‎src/main/java/org/tron/core/capsule/TransactionCapsule.java

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,29 @@
3232
import java.util.ArrayList;
3333
import java.util.HashMap;
3434
import java.util.List;
35+
import java.util.Objects;
3536
import java.util.concurrent.ExecutorService;
3637
import java.util.concurrent.Executors;
3738
import java.util.concurrent.Future;
3839
import java.util.concurrent.atomic.AtomicInteger;
3940
import lombok.Getter;
4041
import lombok.Setter;
4142
import lombok.extern.slf4j.Slf4j;
43+
import org.apache.commons.lang3.StringUtils;
4244
import org.tron.common.crypto.ECKey;
4345
import org.tron.common.crypto.ECKey.ECDSASignature;
4446
import org.tron.common.overlay.message.Message;
47+
import org.tron.common.runtime.vm.program.Program;
48+
import org.tron.common.runtime.vm.program.Program.BadJumpDestinationException;
49+
import org.tron.common.runtime.vm.program.Program.IllegalOperationException;
50+
import org.tron.common.runtime.vm.program.Program.JVMStackOverFlowException;
51+
import org.tron.common.runtime.vm.program.Program.OutOfEnergyException;
52+
import org.tron.common.runtime.Runtime;
53+
import org.tron.common.runtime.vm.program.Program.OutOfMemoryException;
54+
import org.tron.common.runtime.vm.program.Program.OutOfTimeException;
55+
import org.tron.common.runtime.vm.program.Program.PrecompiledContractException;
56+
import org.tron.common.runtime.vm.program.Program.StackTooLargeException;
57+
import org.tron.common.runtime.vm.program.Program.StackTooSmallException;
4558
import org.tron.common.utils.ByteArray;
4659
import org.tron.common.utils.Sha256Hash;
4760
import org.tron.core.Wallet;
@@ -860,6 +873,61 @@ public String toString() {
860873
return toStringBuff.toString();
861874
}
862875

876+
public void setResult(Runtime runtime) {
877+
RuntimeException exception = runtime.getResult().getException();
878+
if (Objects.isNull(exception) && StringUtils
879+
.isEmpty(runtime.getRuntimeError()) && !runtime.getResult().isRevert()) {
880+
this.setResultCode(contractResult.SUCCESS);
881+
return;
882+
}
883+
if (runtime.getResult().isRevert()) {
884+
this.setResultCode(contractResult.REVERT);
885+
return;
886+
}
887+
if (exception instanceof IllegalOperationException) {
888+
this.setResultCode(contractResult.ILLEGAL_OPERATION);
889+
return;
890+
}
891+
if (exception instanceof OutOfEnergyException) {
892+
this.setResultCode(contractResult.OUT_OF_ENERGY);
893+
return;
894+
}
895+
if (exception instanceof BadJumpDestinationException) {
896+
this.setResultCode(contractResult.BAD_JUMP_DESTINATION);
897+
return;
898+
}
899+
if (exception instanceof OutOfTimeException) {
900+
this.setResultCode(contractResult.OUT_OF_TIME);
901+
return;
902+
}
903+
if (exception instanceof OutOfMemoryException) {
904+
this.setResultCode(contractResult.OUT_OF_MEMORY);
905+
return;
906+
}
907+
if (exception instanceof PrecompiledContractException) {
908+
this.setResultCode(contractResult.PRECOMPILED_CONTRACT);
909+
return;
910+
}
911+
if (exception instanceof StackTooSmallException) {
912+
this.setResultCode(contractResult.STACK_TOO_SMALL);
913+
return;
914+
}
915+
if (exception instanceof StackTooLargeException) {
916+
this.setResultCode(contractResult.STACK_TOO_LARGE);
917+
return;
918+
}
919+
if (exception instanceof JVMStackOverFlowException) {
920+
this.setResultCode(contractResult.JVM_STACK_OVER_FLOW);
921+
return;
922+
}
923+
if (exception instanceof Program.TransferException) {
924+
this.setResultCode(contractResult.TRANSFER_FAILED);
925+
return;
926+
}
927+
this.setResultCode(contractResult.UNKNOWN);
928+
return;
929+
}
930+
863931
public void setResultCode(contractResult code) {
864932
Result ret = Result.newBuilder().setContractRet(code).build();
865933
if (this.transaction.getRetCount() > 0) {

‎src/main/java/org/tron/core/db/Manager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ public boolean processTransaction(final TransactionCapsule trxCap, BlockCapsule
12461246

12471247
trace.finalization();
12481248
if (Objects.nonNull(blockCap) && getDynamicPropertiesStore().supportVM()) {
1249-
trxCap.setResultCode(trace.getReceipt().getResult());
1249+
trxCap.setResult(trace.getRuntime());
12501250
}
12511251
transactionStore.put(trxCap.getTransactionId().getBytes(), trxCap);
12521252

‎src/test/java/stest/tron/wallet/account/WalletTestAccount013.java

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -411,60 +411,60 @@ public void test5DelegateResourceAboutTriggerContract() {
411411
accountForDeployAddress, blockingStubFull);
412412
PublicMethed.waitProduceNextBlock(blockingStubFull);
413413
//Account4 DelegatedResource of Energy to Contract
414-
Assert.assertTrue(PublicMethed.freezeBalanceForReceiver(
414+
Assert.assertFalse(PublicMethed.freezeBalanceForReceiver(
415415
account4DelegatedResourceAddress, freezeAmount, freezeDuration, 1,
416416
ByteString.copyFrom(contractAddress), account4DelegatedResourceKey, blockingStubFull));
417417

418418
//Account4 DelegatedResource Energy to deploy
419-
Assert.assertTrue(PublicMethed.freezeBalanceForReceiver(
420-
account4DelegatedResourceAddress, freezeAmount, freezeDuration, 1,
421-
ByteString.copyFrom(accountForDeployAddress),
422-
account4DelegatedResourceKey, blockingStubFull));
423-
424-
//get Energy of Account013，Account4，Contract before trigger contract
425-
final long account013CurrentEnergyUsed = PublicMethed.getAccountResource(
426-
account013Address, blockingStubFull).getEnergyUsed();
427-
final long account013CurrentBandwidthUsed = PublicMethed.getAccountResource(
428-
account013Address, blockingStubFull).getFreeNetUsed();
429-
final long account4CurrentEnergyUsed = PublicMethed.getAccountResource(
430-
account4DelegatedResourceAddress, blockingStubFull).getEnergyUsed();
431-
final long contractCurrentEnergyUsed = PublicMethed.getAccountResource(
432-
contractAddress, blockingStubFull).getEnergyUsed();
433-
final long deployCurrentEnergyUsed = PublicMethed.getAccountResource(
434-
accountForDeployAddress, blockingStubFull).getEnergyUsed();
435-
436-
//Account013 trigger contract
437-
String txid = PublicMethed.triggerContract(contractAddress,
438-
"add2(uint256)", "1", false,
439-
0, 1000000000L, "0", 0, account013Address, testKeyForAccount013, blockingStubFull);
440-
logger.info(txid);
441-
infoById = PublicMethed.getTransactionInfoById(txid, blockingStubFull);
442-
logger.info(String.valueOf(infoById.get().getResultValue()));
443-
Assert.assertTrue(infoById.get().getResultValue() == 0);
444-
//get transaction info of Energy used and Bandwidth used
445-
final long contractTriggerEnergyUsed = infoById.get().getReceipt().getOriginEnergyUsage();
446-
final long contractTriggerBandwidthUsed = infoById.get().getReceipt().getNetUsage();
447-
448-
//get Energy of Account013，Account4，Contract after trigger contract
449-
final long account013CurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
450-
account013Address, blockingStubFull).getEnergyUsed();
451-
final long account013CurrentBandwidthUsedAfterTrig = PublicMethed.getAccountResource(
452-
account013Address, blockingStubFull).getFreeNetUsed();
453-
final long account4CurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
454-
account4DelegatedResourceAddress, blockingStubFull).getEnergyUsed();
455-
final long contractCurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
456-
contractAddress, blockingStubFull).getEnergyUsed();
457-
final long deployCurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
458-
accountForDeployAddress, blockingStubFull).getEnergyUsed();
459-
//compare energy changed
460-
Assert.assertTrue(account013CurrentEnergyUsed == account013CurrentEnergyUsedAfterTrig);
461-
Assert.assertTrue(account4CurrentEnergyUsed == account4CurrentEnergyUsedAfterTrig);
462-
Assert.assertTrue(contractCurrentEnergyUsed == contractCurrentEnergyUsedAfterTrig);
463-
Assert.assertTrue(deployCurrentEnergyUsed
464-
== deployCurrentEnergyUsedAfterTrig - contractTriggerEnergyUsed);
465-
//compare bandwidth of Account013 before and after trigger contract
466-
Assert.assertTrue(account013CurrentBandwidthUsed
467-
== account013CurrentBandwidthUsedAfterTrig - contractTriggerBandwidthUsed);
419+
// Assert.assertTrue(PublicMethed.freezeBalanceForReceiver(
420+
// account4DelegatedResourceAddress, freezeAmount, freezeDuration, 1,
421+
// ByteString.copyFrom(accountForDeployAddress),
422+
// account4DelegatedResourceKey, blockingStubFull));
423+
//
424+
// //get Energy of Account013，Account4，Contract before trigger contract
425+
// final long account013CurrentEnergyUsed = PublicMethed.getAccountResource(
426+
// account013Address, blockingStubFull).getEnergyUsed();
427+
// final long account013CurrentBandwidthUsed = PublicMethed.getAccountResource(
428+
// account013Address, blockingStubFull).getFreeNetUsed();
429+
// final long account4CurrentEnergyUsed = PublicMethed.getAccountResource(
430+
// account4DelegatedResourceAddress, blockingStubFull).getEnergyUsed();
431+
// final long contractCurrentEnergyUsed = PublicMethed.getAccountResource(
432+
// contractAddress, blockingStubFull).getEnergyUsed();
433+
// final long deployCurrentEnergyUsed = PublicMethed.getAccountResource(
434+
// accountForDeployAddress, blockingStubFull).getEnergyUsed();
435+
//
436+
// //Account013 trigger contract
437+
// String txid = PublicMethed.triggerContract(contractAddress,
438+
// "add2(uint256)", "1", false,
439+
// 0, 1000000000L, "0", 0, account013Address, testKeyForAccount013, blockingStubFull);
440+
// logger.info(txid);
441+
// infoById = PublicMethed.getTransactionInfoById(txid, blockingStubFull);
442+
// logger.info(String.valueOf(infoById.get().getResultValue()));
443+
// Assert.assertTrue(infoById.get().getResultValue() == 0);
444+
// //get transaction info of Energy used and Bandwidth used
445+
// final long contractTriggerEnergyUsed = infoById.get().getReceipt().getOriginEnergyUsage();
446+
// final long contractTriggerBandwidthUsed = infoById.get().getReceipt().getNetUsage();
447+
//
448+
// //get Energy of Account013，Account4，Contract after trigger contract
449+
// final long account013CurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
450+
// account013Address, blockingStubFull).getEnergyUsed();
451+
// final long account013CurrentBandwidthUsedAfterTrig = PublicMethed.getAccountResource(
452+
// account013Address, blockingStubFull).getFreeNetUsed();
453+
// final long account4CurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
454+
// account4DelegatedResourceAddress, blockingStubFull).getEnergyUsed();
455+
// final long contractCurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
456+
// contractAddress, blockingStubFull).getEnergyUsed();
457+
// final long deployCurrentEnergyUsedAfterTrig = PublicMethed.getAccountResource(
458+
// accountForDeployAddress, blockingStubFull).getEnergyUsed();
459+
// //compare energy changed
460+
// Assert.assertTrue(account013CurrentEnergyUsed == account013CurrentEnergyUsedAfterTrig);
461+
// Assert.assertTrue(account4CurrentEnergyUsed == account4CurrentEnergyUsedAfterTrig);
462+
// Assert.assertTrue(contractCurrentEnergyUsed == contractCurrentEnergyUsedAfterTrig);
463+
// Assert.assertTrue(deployCurrentEnergyUsed
464+
// == deployCurrentEnergyUsedAfterTrig - contractTriggerEnergyUsed);
465+
// //compare bandwidth of Account013 before and after trigger contract
466+
// Assert.assertTrue(account013CurrentBandwidthUsed
467+
// == account013CurrentBandwidthUsedAfterTrig - contractTriggerBandwidthUsed);
468468
}
469469

470470
/**

0 commit comments

Comments
 (0)