Merge pull request tronprotocol#3100 from tronprotocol/hotfix/solidityEventLogContract

Hotfix/solidity event log contract

Author: DorianRust

common/src/main/java/org/tron/common/logsfilter/EventPluginConfig.java

@@ -12,6 +12,8 @@ public class EventPluginConfig {
   public static final String CONTRACTEVENT_TRIGGER_NAME = "contractevent";
   public static final String CONTRACTLOG_TRIGGER_NAME = "contractlog";
   public static final String SOLIDITY_TRIGGER_NAME = "solidity";
+  public static final String SOLIDITY_EVENT_NAME = "solidityevent";
+  public static final String SOLIDITY_LOG_NAME= "soliditylog";
 
   @Getter
   @Setter

common/src/main/java/org/tron/common/logsfilter/trigger/Trigger.java

@@ -10,11 +10,16 @@ public class Trigger {
   public static final int CONTRACTLOG_TRIGGER = 2;
   public static final int CONTRACTEVENT_TRIGGER = 3;
   public static final int SOLIDITY_TRIGGER = 4;
+  public static final int SOLIDITY_EVENT_TRIGGER = 5;
+  public static final int SOLIDITY_LOG_TRIGGER = 6;
+
   public static final String BLOCK_TRIGGER_NAME = "blockTrigger";
   public static final String TRANSACTION_TRIGGER_NAME = "transactionTrigger";
   public static final String CONTRACTLOG_TRIGGER_NAME = "contractLogTrigger";
   public static final String CONTRACTEVENT_TRIGGER_NAME = "contractEventTrigger";
   public static final String SOLIDITY_TRIGGER_NAME = "solidityTrigger";
+  public static final String SOLIDITYLOG_TRIGGER_NAME = "solidityLogTrigger";
+  public static final String SOLIDITYEVENT_TRIGGER_NAME = "solidityEventTrigger";
   @Getter
   @Setter
   protected long timeStamp;

framework/src/main/java/org/tron/common/logsfilter/EventPluginLoader.java

@@ -48,7 +48,11 @@ public class EventPluginLoader {
 
   private boolean contractLogTriggerEnable = false;
 
-  private boolean solidityLogTriggerEnable = true;
+  private boolean solidityEventTriggerEnable = false;
+
+  private boolean solidityLogTriggerEnable = false;
+
+  private boolean solidityTriggerEnable = false;
 
   private FilterQuery filterQuery;
 
@@ -277,13 +281,34 @@ private void setSingleTriggerConfig(TriggerConfig triggerConfig) {
       }
     } else if (EventPluginConfig.SOLIDITY_TRIGGER_NAME
         .equalsIgnoreCase(triggerConfig.getTriggerName())) {
+      if (triggerConfig.isEnabled()) {
+        solidityTriggerEnable = true;
+      } else {
+        solidityTriggerEnable = false;
+      }
+      if (!useNativeQueue) {
+        setPluginTopic(Trigger.SOLIDITY_TRIGGER, triggerConfig.getTopic());
+      }
+    } else if (EventPluginConfig.SOLIDITY_EVENT_NAME
+        .equalsIgnoreCase(triggerConfig.getTriggerName())) {
+      if (triggerConfig.isEnabled()) {
+        solidityEventTriggerEnable = true;
+      } else {
+        solidityEventTriggerEnable = false;
+      }
+
+      if (!useNativeQueue) {
+        setPluginTopic(Trigger.SOLIDITY_EVENT_TRIGGER, triggerConfig.getTopic());
+      }
+    } else if (EventPluginConfig.SOLIDITY_LOG_NAME
+        .equalsIgnoreCase(triggerConfig.getTriggerName())) {
       if (triggerConfig.isEnabled()) {
         solidityLogTriggerEnable = true;
       } else {
         solidityLogTriggerEnable = false;
       }
       if (!useNativeQueue) {
-        setPluginTopic(Trigger.SOLIDITY_TRIGGER, triggerConfig.getTopic());
+        setPluginTopic(Trigger.SOLIDITY_LOG_TRIGGER, triggerConfig.getTopic());
       }
     }
   }
@@ -302,6 +327,14 @@ public synchronized boolean isBlockLogTriggerEnable() {
     return blockLogTriggerEnable;
   }
 
+  public synchronized boolean isSolidityTriggerEnable() {
+    return solidityTriggerEnable;
+  }
+
+  public synchronized boolean isSolidityEventTriggerEnable() {
+    return solidityEventTriggerEnable;
+  }
+
   public synchronized boolean isSolidityLogTriggerEnable() {
     return solidityLogTriggerEnable;
   }
@@ -383,6 +416,26 @@ public void postBlockTrigger(BlockLogTrigger trigger) {
     }
   }
 
+  public void postSolidityLogTrigger(ContractLogTrigger trigger) {
+    if (useNativeQueue) {
+      NativeMessageQueue.getInstance()
+          .publishTrigger(toJsonString(trigger), trigger.getTriggerName());
+    } else {
+      eventListeners.forEach(listener ->
+          listener.handleSolidityLogTrigger(toJsonString(trigger)));
+    }
+  }
+
+  public void postSolidityEventTrigger(ContractEventTrigger trigger) {
+    if (useNativeQueue) {
+      NativeMessageQueue.getInstance()
+          .publishTrigger(toJsonString(trigger), trigger.getTriggerName());
+    } else {
+      eventListeners.forEach(listener ->
+          listener.handleSolidityEventTrigger(toJsonString(trigger)));
+    }
+  }
+
   public void postTransactionTrigger(TransactionLogTrigger trigger) {
     if (useNativeQueue) {
       NativeMessageQueue.getInstance()

framework/src/main/java/org/tron/common/logsfilter/IPluginEventListener.java

@@ -22,4 +22,8 @@ public interface IPluginEventListener extends ExtensionPoint {
   void handleContractEventTrigger(Object trigger);
 
   void handleSolidityTrigger(Object trigger);
+
+  void handleSolidityLogTrigger(Object trigger);
+
+  void handleSolidityEventTrigger(Object trigger);
 }

framework/src/main/java/org/tron/common/logsfilter/capsule/ContractTriggerCapsule.java

@@ -2,9 +2,11 @@
 
 import static org.tron.common.logsfilter.EventPluginLoader.matchFilter;
 
+import java.util.ArrayList;
 import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.pf4j.util.StringUtils;
 import org.spongycastle.util.encoders.Hex;
@@ -14,11 +16,13 @@
 import org.tron.common.logsfilter.trigger.ContractEventTrigger;
 import org.tron.common.logsfilter.trigger.ContractLogTrigger;
 import org.tron.common.logsfilter.trigger.ContractTrigger;
+import org.tron.common.logsfilter.trigger.Trigger;
 import org.tron.common.runtime.vm.DataWord;
 import org.tron.common.runtime.vm.LogInfo;
 import org.tron.core.config.args.Args;
 import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI;
 
+@Slf4j(topic = "DB")
 public class ContractTriggerCapsule extends TriggerCapsule {
 
   @Getter
@@ -88,9 +92,6 @@ public void processTrigger() {
     }
 
     if (isEvent) {
-      if (!EventPluginLoader.getInstance().isContractEventTriggerEnable()) {
-        return;
-      }
       event = new ContractEventTrigger();
       ((ContractEventTrigger) event).setEventSignature(eventSignature);
       ((ContractEventTrigger) event).setEventSignatureFull(eventSignatureFull);
@@ -104,9 +105,6 @@ public void processTrigger() {
       ((ContractEventTrigger) event)
           .setDataMap(ContractEventParserAbi.parseEventData(data, topicList, eventEntry));
     } else {
-      if (!EventPluginLoader.getInstance().isContractLogTriggerEnable()) {
-        return;
-      }
       event = new ContractLogTrigger();
       ((ContractLogTrigger) event).setTopicList(logInfo.getHexTopics());
       ((ContractLogTrigger) event).setData(logInfo.getHexData());
@@ -129,9 +127,24 @@ public void processTrigger() {
 
     if (matchFilter(contractTrigger)) {
       if (isEvent) {
-        EventPluginLoader.getInstance().postContractEventTrigger((ContractEventTrigger) event);
+        if (EventPluginLoader.getInstance().isContractEventTriggerEnable()) {
+          EventPluginLoader.getInstance().postContractEventTrigger((ContractEventTrigger) event);
+        }
+
+        if (EventPluginLoader.getInstance().isSolidityEventTriggerEnable()) {
+          Args.getSolidityContractEventTriggerList().computeIfAbsent(event
+              .getBlockNumber(), listBlk -> new ArrayList<>()).add((ContractEventTrigger) event);
+        }
+
       } else {
-        EventPluginLoader.getInstance().postContractLogTrigger((ContractLogTrigger) event);
+        if (EventPluginLoader.getInstance().isContractLogTriggerEnable()) {
+          EventPluginLoader.getInstance().postContractLogTrigger((ContractLogTrigger) event);
+        }
+
+        if (EventPluginLoader.getInstance().isSolidityLogTriggerEnable()) {
+          Args.getSolidityContractLogTriggerList().computeIfAbsent(event
+              .getBlockNumber(), listBlk -> new ArrayList<>()).add((ContractLogTrigger) event);
+        }
       }
     }
   }

framework/src/main/java/org/tron/common/logsfilter/capsule/SolidityEventCapsule.java

@@ -0,0 +1,21 @@
+package org.tron.common.logsfilter.capsule;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.tron.common.logsfilter.EventPluginLoader;
+import org.tron.common.logsfilter.trigger.ContractEventTrigger;
+
+public class SolidityEventCapsule extends TriggerCapsule {
+  @Getter
+  @Setter
+  private ContractEventTrigger solidityEventTrigger;
+
+  public SolidityEventCapsule(ContractEventTrigger solidityEventTrigger) {
+    this.solidityEventTrigger = solidityEventTrigger;
+  }
+
+  @Override
+  public void processTrigger() {
+    EventPluginLoader.getInstance().postSolidityEventTrigger(solidityEventTrigger);
+  }
+}

framework/src/main/java/org/tron/common/logsfilter/capsule/SolidityLogCapsule.java

@@ -0,0 +1,21 @@
+package org.tron.common.logsfilter.capsule;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.tron.common.logsfilter.EventPluginLoader;
+import org.tron.common.logsfilter.trigger.ContractLogTrigger;
+
+public class SolidityLogCapsule extends TriggerCapsule {
+  @Getter
+  @Setter
+  private ContractLogTrigger solidityLogTrigger;
+
+  public SolidityLogCapsule(ContractLogTrigger solidityLogTrigger) {
+    this.solidityLogTrigger = solidityLogTrigger;
+  }
+
+  @Override
+  public void processTrigger() {
+    EventPluginLoader.getInstance().postSolidityLogTrigger(solidityLogTrigger);
+  }
+}

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -24,13 +24,15 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.tron.common.args.Account;
 import org.tron.common.args.GenesisBlock;
@@ -40,6 +42,9 @@
 import org.tron.common.logsfilter.EventPluginConfig;
 import org.tron.common.logsfilter.FilterQuery;
 import org.tron.common.logsfilter.TriggerConfig;
+import org.tron.common.logsfilter.capsule.ContractTriggerCapsule;
+import org.tron.common.logsfilter.trigger.ContractEventTrigger;
+import org.tron.common.logsfilter.trigger.ContractLogTrigger;
 import org.tron.common.overlay.discover.node.Node;
 import org.tron.common.parameter.CommonParameter;
 import org.tron.common.parameter.RateLimiterInitialization;
@@ -67,6 +72,16 @@ public class Args extends CommonParameter {
   @Setter
   private static LocalWitnesses localWitnesses = new LocalWitnesses();
 
+  @Autowired(required = false)
+  @Getter
+  private static ConcurrentHashMap<Long, List<ContractLogTrigger>>
+      solidityContractLogTriggerList =  new ConcurrentHashMap<>();
+
+  @Autowired(required = false)
+  @Getter
+  private static ConcurrentHashMap<Long, List<ContractEventTrigger>>
+      solidityContractEventTriggerList =  new ConcurrentHashMap<>();
+
   public static void clearParam() {
     PARAMETER.outputDirectory = "output-directory";
     PARAMETER.help = false;