event parse

event abi

Author: llwslc

build.gradle

@@ -117,6 +117,7 @@ dependencies {
     compile group: 'com.google.guava', name: 'guava', version: '24.1-jre'
 
     compile group: 'com.google.protobuf', name: 'protobuf-java', version: '3.4.0'
+    compile group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.4.0'
 
     compile "org.iq80.leveldb:leveldb:0.7"
 

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

@@ -32,20 +32,24 @@ public static Map<String, String> parseTopics(List<byte[]> topicList, JSONObject
 
     // in case indexed topics doesn't match
     if (topicsMatched(topicList, entry)) {
-      for (int i = 0; i < inputs.size(); ++i) {
-        JSONObject param = inputs.getJSONObject(i);
-        Boolean indexed = param.getBoolean(INDEXED);
-        if (indexed == null || !indexed) {
-          continue;
-        }
-        if (index >= topicList.size()) {
-          break;
-        }
-        String str = parseTopic(topicList.get(index++), param.getString("type"));
-        if (StringUtils.isNotNullOrEmpty(param.getString("name"))) {
-          map.put(param.getString("name"), str);
+      if (inputs != null) {
+        for (int i = 0; i < inputs.size(); ++i) {
+          JSONObject param = inputs.getJSONObject(i);
+          if (param != null) {
+            Boolean indexed = param.getBoolean(INDEXED);
+            if (indexed == null || !indexed) {
+              continue;
+            }
+            if (index >= topicList.size()) {
+              break;
+            }
+            String str = parseTopic(topicList.get(index++), param.getString("type"));
+            if (StringUtils.isNotNullOrEmpty(param.getString("name"))) {
+              map.put(param.getString("name"), str);
+            }
+            map.put("" + i, str);
+          }
         }
-        map.put("" + i, str);
       }
     } else {
       for (int i = 1; i < topicList.size(); ++i) {
@@ -82,21 +86,22 @@ public static Map<String, String> parseEventData(byte[] data,
       if (inputs != null) {
         for (Integer i = 0; i < inputs.size(); ++i) {
           JSONObject param = inputs.getJSONObject(i);
-          Boolean indexed = param.getBoolean(INDEXED);
-          if (indexed != null && indexed) {
-            continue;
-          }
+          if (param != null) {
+            Boolean indexed = param.getBoolean(INDEXED);
+            if (indexed != null && indexed) {
+              continue;
+            }
 
-          if (startIndex == 0) {
-            startIndex = i;
-          }
+            if (startIndex == 0) {
+              startIndex = i;
+            }
 
-          String str = parseDataBytes(data, param.getString("type"), index++);
-          if (StringUtils.isNotNullOrEmpty(param.getString("name"))) {
-            map.put(param.getString("name"), str);
+            String str = parseDataBytes(data, param.getString("type"), index++);
+            if (StringUtils.isNotNullOrEmpty(param.getString("name"))) {
+              map.put(param.getString("name"), str);
+            }
+            map.put("" + i, str);
           }
-          map.put("" + i, str);
-
         }
       } else {
         map.put("0", Hex.toHexString(data));
@@ -115,14 +120,17 @@ private static boolean topicsMatched(List<byte[]> topicList, JSONObject entry) {
     }
     int inputSize = 1;
     JSONArray inputs = entry.getJSONArray(INPUTS);
-    for (int i = 0; i < inputs.size(); i++) {
-      JSONObject param = inputs.getJSONObject(i);
-      Boolean indexed = param.getBoolean(INDEXED);
-      if (indexed != null && indexed) {
-        inputSize++;
+    if (inputs != null) {
+      for (int i = 0; i < inputs.size(); i++) {
+        JSONObject param = inputs.getJSONObject(i);
+        if (param != null) {
+          Boolean indexed = param.getBoolean(INDEXED);
+          if (indexed != null && indexed) {
+            inputSize++;
+          }
+        }
       }
     }
     return inputSize == topicList.size();
   }
-
 }

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

@@ -1,9 +1,12 @@
 package org.tron.common.runtime.vm;
 
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.util.JsonFormat;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.spongycastle.util.encoders.Hex;
@@ -12,9 +15,9 @@
 import org.tron.common.storage.Deposit;
 import org.tron.core.Wallet;
 import org.tron.core.capsule.ContractCapsule;
-import org.tron.core.services.http.JsonFormat;
 import org.tron.protos.Protocol.SmartContract.ABI;
 
+@Slf4j
 public class LogInfoTriggerParser {
 
   private Long blockNum;
@@ -64,7 +67,13 @@ public List<ContractTrigger> parseLogInfos(List<LogInfo> logInfos, Deposit depos
       signMap.put(strContractAddr, creatorAddr); // mark as found.
 
       if (abi != null && abi.getEntrysCount() > 0) {
-        abiMap.put(strContractAddr, JsonFormat.printToString(abi, false));
+        try {
+          abiMap
+              .put(strContractAddr, JsonFormat.printer().includingDefaultValueFields().print(abi));
+        } catch (InvalidProtocolBufferException e) {
+          abiMap.put(strContractAddr, "");
+          logger.info("abi to json empty:" + txId, e);
+        }
       } else {
         abiMap.put(strContractAddr, "");
       }

src/main/java/org/tron/common/runtime/vm/program/Program.java

@@ -1414,7 +1414,7 @@ public void callToPrecompiledAddress(MessageCall msg,
         && senderAddress != contextAddress && msg.getEndowment().value().longValueExact() > 0) {
       if (!isTokenTransfer) {
         try {
-          tranzsfer(deposit, senderAddress, contextAddress,
+          transfer(deposit, senderAddress, contextAddress,
               msg.getEndowment().value().longValueExact());
         } catch (ContractValidateException e) {
           throw new BytecodeExecutionException("transfer failure");