jokoin

.gitignore

@@ -1,2 +1,7 @@
-target/classes/org/tron/trongrid/ContractEventTriggerEntity.class
-target/classes/org/tron/trongrid/InternalTransactionPojo.class
+target/*
+.idea/*
+troneventquery.iml
+.classpath
+.factorypath
+.settings/*
+.vscode/*

README.md

@@ -34,6 +34,10 @@ Make sure the relative path of config.conf and troneventquery jar. The config.co
 - troneventquery/insertIndex.sh is used to setup mongodb index to speedup query. 	
 (make sure run insertIndex before create collecions)	
 
+ ## Delete expire data	
+- troneventquery/deleteData.sh is used to delete expire data
+- using crontable delete regularly mongodb expire data(if not delete, the database will be too big)
+
 
 ## What is the main HTTP service?
 baseUrl: https://api.tronex.io
@@ -170,7 +174,6 @@ limit: each page size, default is 25
 sort: sort Field, default is sort by timeStamp descending order
 start: start page, default is 1
 
-Note: if developers wants to check whether this event is confirmed or not, they could check the blocknumber is small than the solidified block number(get from url https://api.tronex.io/blocks/latestblockNum). If it is smaller than block number, it is conformed
 
 Example: https://api.tronex.io/events/confirmed?since=1544483426749&limit=1&start=1&sort=timeStamp
 ```
@@ -197,7 +200,7 @@ block: block number, block number >= block will be shown
 
 Example: https://api.tronex.io/blocks?limit=1&sort=timeStamp&start=0&block=0
 ```
-Function: get latest solidified block number
+Function: get latest block number
 ```
 subpath: $baseUrl/blocks/latestSolidifiedBlockNumber
 
@@ -206,3 +209,73 @@ none
 
 Example: https://api.tronex.io/blocks/latestSolidifiedBlockNumber
 ```
+Function: get contract log list
+```
+subpath: $baseUrl/contractlogs
+
+parameters   
+limit: each page size, default is 25
+sort: sort Field, default is sort by timeStamp descending order
+start: start page, default is 1
+block: block number, block number >= block will be shown 
+
+Example: https://api.tronex.io/contractlogs
+```
+Function: get contract log list based on transactionId
+```
+subpath: $baseUrl/contractlogs/transaction/{transactionId}
+
+parameters   
+transactionId
+
+Example: https://api.tronex.io/contractlogs/transaction/{transactionId}
+```
+Function: post abi string and get contract log list based on transactionId(release on 3.6)
+```
+subpath: $baseUrl/contract/transaction/{transactionId}
+
+parameters   
+transactionId
+body:
+abi: user self upload abi
+
+Example: https://api.tronex.io/contract/transaction/{transactionId}
+```
+Function: get contract log list based on contractAddress
+```
+subpath: $baseUrl/contractlogs/contract/{contractAddress}
+
+parameters   
+contractAddress
+
+Example: https://api.tronex.io/contractlogs/contract/{contractAddress}
+```
+Function: post abi string and get contract log list based on contractAddress(release on 3.6)
+```
+subpath: $baseUrl/contract/contractAddress/{contractAddress}
+
+parameters   
+contractAddress
+abi: user self upload abi
+
+Example: https://api.tronex.io/contract/contractAddress/{contractAddress}
+```
+Function: get contract log list based on uniqueId
+```
+subpath: $baseUrl/contractlogs/uniqueId/{uniqueId}
+
+parameters   
+uniqueId
+
+Example: https://api.tronex.io/contractlogs/uniqueId/{uniqueId}
+```
+Function: post abi string and get contract log list based on uniqueId(release on 3.6)
+```
+subpath: $baseUrl/contract/uniqueId/{uniqueId}
+
+parameters   
+uniqueId
+abi: user self upload abi
+
+Example: https://api.tronex.io/contract/uniqueId/{uniqueId}
+```

config.conf

@@ -1,9 +1,9 @@
-mongo.host=47.90.245.68
-mongo.port=27017
+mongo.host=127.0.0.1
+mongo.port=18883
 mongo.dbname=eventlog
 mongo.username=tron
 mongo.password=123456
 
-mongo.connectionsPerHost=8
-mongo.threadsAllowedToBlockForConnectionMultiplier=4
+mongo.connectionsPerHost=200
+mongo.threadsAllowedToBlockForConnectionMultiplier=10
 mongo.deadline=10

deploy.sh

@@ -10,6 +10,12 @@ while true; do
     break
   fi
 done
-nohup java -jar target/troneventquery-1.0.0-SNAPSHOT.jar 2>&1 &
+total=`cat /proc/meminfo  |grep MemTotal |awk -F ' ' '{print $2}'`
+xmx=`echo "$total/1024/1024*0.6" | bc |awk -F. '{print $1"g"}'`
+logtime=`date +%Y-%m-%d_%H-%M-%S`
+ nohup java -Xmx$xmx -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails -Xloggc:./gc.log\
+ -XX:+PrintGCDateStamps -XX:+CMSParallelRemarkEnabled -XX:ReservedCodeCacheSize=256m\
+ -XX:+CMSScavengeBeforeRemark -jar target/troneventquery-1.0.0-SNAPSHOT.jar >> query.log 2>&1 &
+
 sleep 10
 echo "ok!"

pom.xml

@@ -82,17 +82,16 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>3.5.1</version>
+      <version>3.16.1</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>24.1-jre</version>
+      <version>[30.0-jre,)</version>
     </dependency>
 
-
   </dependencies>
 
   <build>

src/main/java/org/tron/common/crypto/Crypto.java

@@ -0,0 +1,83 @@
+package org.tron.common.crypto;
+import static org.tron.common.utils.LogConfig.LOG;
+
+import java.util.regex.Pattern;
+
+public class Crypto {
+
+  private final static long SECRET_KEY = 5658116;
+  private final static String CONVERT_KEY = "DeCATbJIzM";
+  private final static String CONFUSED_WORDS_KEY = "FxYNgq";
+  private final static int LEN_KEY = 32;
+
+
+  static public String encrypt(String str){
+    Long time = new Long(157551410);
+    if(!isNumber(str)){
+      LOG.info("not number");
+      return null;
+    }
+
+    long number = Long.parseLong(str);
+    long newNumber = (number + time) * SECRET_KEY;
+    String[] numArr = String.valueOf(newNumber).split("");
+    String[] initArr = CONVERT_KEY.split("");
+    int len = numArr.length;
+    StringBuffer buffer = new StringBuffer();
+
+    for(int i = 0; i < len; i++){
+      int inx = Integer.parseInt(numArr[i]);
+      buffer.append(initArr[inx]);
+    }
+
+    String[] cwkArr = CONFUSED_WORDS_KEY.split("");
+    if(len < LEN_KEY){
+      int l = LEN_KEY - len;
+      for(int i = 0; i < l; i++){
+        int index = (int)(Math.random()*buffer.length());
+        int inx = (int)(Math.random()*(CONFUSED_WORDS_KEY.length()));
+        buffer.insert(index,cwkArr[inx]);
+      }
+    }
+    String result = buffer.toString();
+    return result;
+  }
+
+  public static int decrypt(String str){
+    Long time = new Long(157551410);
+    if(null == str || "".equals(str)){
+      return 0;
+    }
+    int l = CONFUSED_WORDS_KEY.length();
+    String[] cwkArr = CONFUSED_WORDS_KEY.split("");
+    for(int i = 0; i < l; i++){
+      str = str.replaceAll(cwkArr[i],"");
+    }
+    String[] initArr = str.split("");
+    int len = initArr.length;
+    StringBuffer result = new StringBuffer();
+    for(int i = 0; i < len; i++ ){
+      int k = CONVERT_KEY.indexOf(initArr[i]);
+      if(k == -1){
+        return 0;
+      }
+      result.append(k);
+    }
+    Long number;
+    try {
+      long total = Long.parseLong(result.toString());
+      long sum = total/SECRET_KEY;
+      number = sum - time;
+    } catch (NumberFormatException e) {
+      e.printStackTrace();
+      return 0;
+    }
+    return number.intValue();
+  }
+
+  public static boolean isNumber(String value) {
+    String pattern = "^[0-9]*[1-9][0-9]*$";
+    boolean isMatch = Pattern.matches(pattern, value);
+    return isMatch;
+  }
+}

src/main/java/org/tron/common/crypto/Hash.java

@@ -18,14 +18,15 @@
 
 package org.tron.common.crypto;
 
+import static org.tron.common.utils.LogConfig.LOG;
+
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.Provider;
 import java.security.Security;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.crypto.jce.TronCastleProvider;
 
-@Slf4j(topic = "crypto")
 public class Hash {
 
   private static final Provider CRYPTO_PROVIDER;
@@ -48,7 +49,7 @@ public static byte[] sha3(byte[] input) {
       digest.update(input);
       return digest.digest();
     } catch (NoSuchAlgorithmException e) {
-      log.error("Can't find such algorithm", e);
+      LOG.error("Can't find such algorithm", e);
       throw new RuntimeException(e);
     }
   }

src/main/java/org/tron/common/utils/ByteArray.java

@@ -18,6 +18,8 @@
 
 package org.tron.common.utils;
 
+import static org.tron.common.utils.LogConfig.LOG;
+
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
 import java.io.ByteArrayOutputStream;
@@ -29,7 +31,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.spongycastle.util.encoders.Hex;
 
-@Slf4j(topic = "utils")
 public class ByteArray {
 
   public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
@@ -101,7 +102,7 @@ public static byte[] fromObject(Object obj) {
       objectOutputStream.flush();
       bytes = byteArrayOutputStream.toByteArray();
     } catch (IOException e) {
-      log.error("objectToByteArray failed: " + e.getMessage(), e);
+      LOG.error("objectToByteArray failed: " + e.getMessage(), e);
     }
     return bytes;
   }

src/main/java/org/tron/common/utils/LogConfig.java

@@ -0,0 +1,10 @@
+package org.tron.common.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class LogConfig {
+  public static final Logger LOG = LoggerFactory.getLogger(LogConfig.class);
+}

src/main/java/org/tron/core/Wallet.java

@@ -49,7 +49,7 @@ public static String encode58Check(byte[] input) {
     return Base58.encode(inputCheck);
   }
 
-  private static byte[] decode58Check(String input) {
+  public static byte[] decode58Check(String input) {
     byte[] decodeCheck = Base58.decode(input);
     if (decodeCheck.length <= 4) {
       return null;

src/main/java/org/tron/trongeventquery/TronEventApplication.java

@@ -1,5 +1,8 @@
 package org.tron.trongeventquery;
 
+import static org.tron.common.utils.LogConfig.LOG;
+import static org.tron.trongeventquery.contractevents.ContractEventController.isRunRePushThread;
+
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientOptions;
 import com.mongodb.MongoCredential;
@@ -14,37 +17,23 @@
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
 import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
+
 
 @SpringBootApplication(exclude = {MongoAutoConfiguration.class, MongoDataAutoConfiguration.class})
+@ServletComponentScan("org.tron.trongeventquery.filter") //Scan Filter
 @PropertySource(value = {"file:./config.conf"}, ignoreResourceNotFound = true)
 public class TronEventApplication {
 
   public static void main(String[] args) {
     SpringApplication.run(TronEventApplication.class, args);
+    shutdown();
   }
-
-  @Bean
-  public FilterRegistrationBean corsFilter() {
-    UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-    CorsConfiguration config = new CorsConfiguration();
-    config.setAllowCredentials(true);
-    config.addAllowedOrigin("*");
-    config.addAllowedHeader("*");
-    config.addAllowedMethod("*");
-    source.registerCorsConfiguration("/**", config);
-    FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
-    bean.setOrder(0);
-    return bean;
-  }
-
+
   @Bean
   public MongoTemplate mongoTemplate(
       @Value("${mongo.host}")String mongodbIp, @Value("${mongo.dbname}")String mongodbDbName,
@@ -82,4 +71,11 @@ public void customize(Connector connector) {
     });
     return factory;
   }
+
+  public static void shutdown() {
+    Runnable stopThread =
+        () -> isRunRePushThread.set(false);
+    LOG.info("********register application shutdown hook********");
+    Runtime.getRuntime().addShutdownHook(new Thread(stopThread));
+  }
 }