Skip to content

Commit 24ce900

Browse files
committed
fix: remove baiMap
1 parent bfa6d74 commit 24ce900

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

src/main/java/org/tron/common/runtime/RuntimeImpl.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,11 @@
1111
import com.google.protobuf.ByteString;
1212
import java.math.BigInteger;
1313
import java.util.Arrays;
14-
import java.util.HashMap;
1514
import java.util.List;
16-
import java.util.Map;
1715
import java.util.Objects;
1816
import lombok.Getter;
1917
import lombok.Setter;
2018
import lombok.extern.slf4j.Slf4j;
21-
import org.apache.commons.lang3.ArrayUtils;
2219
import org.apache.commons.lang3.StringUtils;
2320
import org.spongycastle.util.encoders.Hex;
2421
import org.tron.common.logsfilter.EventPluginLoader;
@@ -97,7 +94,6 @@ public class RuntimeImpl implements Runtime {
9794
@Setter
9895
private boolean enableEventLinstener;
9996

100-
private Map<String, ABI> abiMap = new HashMap<>();
10197
private LogInfoTriggerParser logInfoTriggerParser;
10298

10399
/**
@@ -454,9 +450,6 @@ private void create()
454450
(EventPluginLoader.getInstance().isContractEventTriggerEnable()
455451
|| EventPluginLoader.getInstance().isContractLogTriggerEnable())
456452
&& isCheckTransaction()) {
457-
this.abiMap
458-
.put(ArrayUtils.isEmpty(contractAddress) ? "" : Wallet.encode58Check(contractAddress),
459-
newSmartContract.getAbi());
460453
logInfoTriggerParser = new LogInfoTriggerParser(blockCap.getNum(), blockCap.getTimeStamp(),
461454
txId, callerAddress);
462455

@@ -662,7 +655,7 @@ public void go() {
662655

663656
if (logInfoTriggerParser != null) {
664657
List<ContractTrigger> triggers = logInfoTriggerParser
665-
.parseLogInfos(program.getResult().getLogInfoList(), this.abiMap, this.deposit);
658+
.parseLogInfos(program.getResult().getLogInfoList(), this.deposit);
666659
program.getResult().setTriggerList(triggers);
667660
}
668661

src/main/java/org/tron/common/runtime/vm/LogInfoTriggerParser.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ public LogInfoTriggerParser(Long blockNum,
3535

3636
}
3737

38-
public List<ContractTrigger> parseLogInfos(List<LogInfo> logInfos, Map<String, ABI> abiMap,
39-
Deposit deposit) {
38+
public List<ContractTrigger> parseLogInfos(List<LogInfo> logInfos, Deposit deposit) {
4039

4140
List<ContractTrigger> list = new LinkedList<>();
4241
if (logInfos == null || logInfos.size() <= 0) {
@@ -54,13 +53,13 @@ public List<ContractTrigger> parseLogInfos(List<LogInfo> logInfos, Map<String, A
5453
if (signMap.get(strContractAddr) != null) {
5554
continue;
5655
}
57-
58-
ABI abi = abiMap.get(strContractAddr);
5956
ContractCapsule contract = deposit.getContract(contractAddress);
60-
if (abi == null) {
61-
abi = (contract == null) ? null : contract.getInstance().getAbi();
57+
if (contract == null) {
58+
signMap.put(strContractAddr, originAddress); // mark as found.
59+
continue;
6260
}
63-
String creatorAddr = (contract == null) ? originAddress : Wallet.encode58Check(
61+
ABI abi = contract.getInstance().getAbi();
62+
String creatorAddr = Wallet.encode58Check(
6463
MUtil.convertToTronAddress(contract.getInstance().getOriginAddress().toByteArray()));
6564
signMap.put(strContractAddr, creatorAddr); // mark as found.
6665

0 commit comments

Comments
 (0)