Skip to content

Commit 2ed23bb

Browse files
committed
set contract result
1 parent c4a1e8e commit 2ed23bb

File tree

1 file changed

+17
-4
lines changed

1 file changed

+17
-4
lines changed

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

Lines changed: 17 additions & 4 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;
@@ -200,10 +213,10 @@ public void resetResult() {
200213
}
201214
}
202215

203-
public void setResult(TransactionResultCapsule transactionResultCapsule) {
204-
this.transaction = this.getInstance().toBuilder().addRet(transactionResultCapsule.getInstance())
205-
.build();
206-
}
216+
// public void setResult(TransactionResultCapsule transactionResultCapsule) {
217+
// this.transaction = this.getInstance().toBuilder().addRet(transactionResultCapsule.getInstance())
218+
// .build();
219+
// }
207220

208221
public void setReference(long blockNum, byte[] blockHash) {
209222
byte[] refBlockNum = ByteArray.fromLong(blockNum);

0 commit comments

Comments
 (0)