add solidity event

wubinTron · wubinTron · commit 70ffb700d617 · 2020-01-17T15:26:02.000+08:00
diff --git a/api/src/main/java/org/tron/common/logsfilter/IPluginEventListener.java b/api/src/main/java/org/tron/common/logsfilter/IPluginEventListener.java
@@ -20,4 +20,6 @@ public interface IPluginEventListener extends ExtensionPoint {
 
     public void handleContractEventTrigger(Object data);
 
+    public void handleSolidityTrigger(Object trigger);
+
 }
diff --git a/api/src/main/java/org/tron/common/logsfilter/trigger/SolidityTrigger.java b/api/src/main/java/org/tron/common/logsfilter/trigger/SolidityTrigger.java
@@ -0,0 +1,19 @@
+package org.tron.common.logsfilter.trigger;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public class SolidityTrigger extends Trigger {
+  @Getter
+  @Setter
+  private long latestSolidifiedBlockNumber;
+
+  @Override
+  public String toString() {
+    return new StringBuilder().append("triggerName: ").append(getTriggerName())
+        .append("timestamp: ")
+        .append(timeStamp)
+        .append(", latestSolidifiedBlockNumber: ")
+        .append(latestSolidifiedBlockNumber).toString();
+  }
+}
diff --git a/plugins/kafkaplugin/src/main/java/org/tron/eventplugin/Constant.java b/plugins/kafkaplugin/src/main/java/org/tron/eventplugin/Constant.java
@@ -5,11 +5,13 @@ public class Constant {
     public static final int TRANSACTION_TRIGGER = 1;
     public static final int CONTRACTLOG_TRIGGER = 2;
     public static final int CONTRACTEVENT_TRIGGER = 3;
+    public static final int SOLIDITY_TRIGGER = 4;
 
     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";
 
     private Constant(){}
 }
diff --git a/plugins/kafkaplugin/src/main/java/org/tron/eventplugin/KafkaEventListener.java b/plugins/kafkaplugin/src/main/java/org/tron/eventplugin/KafkaEventListener.java
@@ -56,6 +56,15 @@ public void handleTransactionTrigger(Object data) {
         MessageSenderImpl.getInstance().getTriggerQueue().offer((String)data);
     }
 
+    @Override
+    public void handleSolidityTrigger(Object data) {
+        if (Objects.isNull(data)){
+            return;
+        }
+
+        MessageSenderImpl.getInstance().getTriggerQueue().offer((String)data);
+    }
+
     @Override
     public void handleContractLogTrigger(Object data) {
         if (Objects.isNull(data)){
diff --git a/plugins/kafkaplugin/src/main/java/org/tron/eventplugin/MessageSenderImpl.java b/plugins/kafkaplugin/src/main/java/org/tron/eventplugin/MessageSenderImpl.java
@@ -24,6 +24,7 @@ public class MessageSenderImpl{
     private String transactionTopic = "";
     private String contractEventTopic = "";
     private String contractLogTopic = "";
+    private String solidityTopic = "";
 
     private Thread triggerProcessThread;
     private boolean isRunTriggerProcessThread = true;
@@ -75,6 +76,9 @@ else if (triggerType == Constant.CONTRACTEVENT_TRIGGER){
         else if (triggerType == Constant.CONTRACTLOG_TRIGGER){
             contractLogTopic = topic;
         }
+        else if (triggerType == Constant.SOLIDITY_TRIGGER) {
+            solidityTopic = topic;
+        }
     }
 
 
@@ -175,6 +179,13 @@ public void handleContractEventTrigger(Object data) {
         MessageSenderImpl.getInstance().sendKafkaRecord(Constant.CONTRACTEVENT_TRIGGER, contractEventTopic, data);
     }
 
+    public void handleSolidityTrigger(Object data) {
+        if (Objects.isNull(data) || Objects.isNull(solidityTopic)){
+            return;
+        }
+        MessageSenderImpl.getInstance().sendKafkaRecord(Constant.SOLIDITY_TRIGGER, contractEventTopic, data);
+    }
+
     private Runnable triggerProcessLoop =
             () -> {
                 while (isRunTriggerProcessThread) {
@@ -197,6 +208,9 @@ else if (triggerData.contains(Constant.CONTRACTLOG_TRIGGER_NAME)){
                         else if (triggerData.contains(Constant.CONTRACTEVENT_TRIGGER_NAME)){
                             handleContractEventTrigger(triggerData);
                         }
+                        else if (triggerData.contains(Constant.SOLIDITY_TRIGGER_NAME)) {
+                            handleSolidityTrigger(triggerData);
+                        }
                     } catch (InterruptedException ex) {
                         log.info(ex.getMessage());
                         Thread.currentThread().interrupt();
diff --git a/plugins/mongodbplugin/src/main/java/org/tron/eventplugin/Constant.java b/plugins/mongodbplugin/src/main/java/org/tron/eventplugin/Constant.java
@@ -5,11 +5,13 @@ public class Constant {
     public static final int TRANSACTION_TRIGGER = 1;
     public static final int CONTRACTLOG_TRIGGER = 2;
     public static final int CONTRACTEVENT_TRIGGER = 3;
+    public static final int SOLIDITY_TRIGGER = 4;
 
     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";
 
     private Constant(){}
 }
diff --git a/plugins/mongodbplugin/src/main/java/org/tron/eventplugin/MongodbEventListener.java b/plugins/mongodbplugin/src/main/java/org/tron/eventplugin/MongodbEventListener.java
@@ -73,4 +73,13 @@ public void handleContractEventTrigger(Object data) {
 
         MongodbSenderImpl.getInstance().getTriggerQueue().offer((String)data);
     }
+
+    @Override
+    public void handleSolidityTrigger(Object data) {
+        if (Objects.isNull(data)){
+            return;
+        }
+
+        MongodbSenderImpl.getInstance().getTriggerQueue().offer((String)data);
+    }
 }
diff --git a/plugins/mongodbplugin/src/main/java/org/tron/eventplugin/MongodbSenderImpl.java b/plugins/mongodbplugin/src/main/java/org/tron/eventplugin/MongodbSenderImpl.java
@@ -29,6 +29,7 @@ public class MongodbSenderImpl{
     private String transactionTopic = "";
     private String contractEventTopic = "";
     private String contractLogTopic = "";
+    private String solidityTopic = "";
 
     private Thread triggerProcessThread;
     private boolean isRunTriggerProcessThread = true;
@@ -206,6 +207,8 @@ else if (triggerType == Constant.CONTRACTEVENT_TRIGGER){
         }
         else if (triggerType == Constant.CONTRACTLOG_TRIGGER){
             contractLogTopic = topic;
+        } else if (triggerType == Constant.SOLIDITY_TRIGGER) {
+            solidityTopic = topic;
         }
         else {
             return;
@@ -250,6 +253,22 @@ public void run() {
         }
     }
 
+    public void handleSolidityTrigger(Object data) {
+        if (Objects.isNull(data) || Objects.isNull(solidityTopic)){
+            return;
+        }
+
+        MongoTemplate template = mongoTemplateMap.get(solidityTopic);
+        if (Objects.nonNull(template)) {
+            service.execute(new Runnable() {
+                @Override
+                public void run() {
+                    template.addEntity((String)data);
+                }
+            });
+        }
+    }
+
     public void handleContractLogTrigger(Object data) {
         if (Objects.isNull(data) || Objects.isNull(contractLogTopic)){
             return;
@@ -316,6 +335,8 @@ else if (triggerData.contains(Constant.CONTRACTLOG_TRIGGER_NAME)){
                         }
                         else if (triggerData.contains(Constant.CONTRACTEVENT_TRIGGER_NAME)){
                             handleContractEventTrigger(triggerData);
+                        } else if (triggerData.contains(Constant.SOLIDITY_TRIGGER_NAME)) {
+                            handleSolidityTrigger(triggerData);
                         }
                     } catch (InterruptedException ex) {
                         log.info(ex.getMessage());

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,6 @@ public interface IPluginEventListener extends ExtensionPoint {`
`20`	`20`
`21`	`21`	`public void handleContractEventTrigger(Object data);`
`22`	`22`
	`23`	`+ public void handleSolidityTrigger(Object trigger);`
	`24`	`+`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,4 +73,13 @@ public void handleContractEventTrigger(Object data) {`
`73`	`73`
`74`	`74`	`MongodbSenderImpl.getInstance().getTriggerQueue().offer((String)data);`
`75`	`75`	`}`
	`76`	`+`
	`77`	`+ @Override`
	`78`	`+ public void handleSolidityTrigger(Object data) {`
	`79`	`+ if (Objects.isNull(data)){`
	`80`	`+ return;`
	`81`	`+ }`
	`82`	`+`
	`83`	`+ MongodbSenderImpl.getInstance().getTriggerQueue().offer((String)data);`
	`84`	`+ }`
`76`	`85`	`}`