feat(db): optimize the judgment of node type

Author: halibobo1205

chainbase/src/main/java/org/tron/core/db/BlockStore.java

@@ -23,8 +23,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.tron.common.error.TronDBException;
 import org.tron.common.utils.Sha256Hash;
+import org.tron.core.Constant;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.capsule.BlockCapsule.BlockId;
 import org.tron.core.exception.BadItemException;
@@ -33,6 +33,8 @@
 @Component
 public class BlockStore extends TronStoreWithRevoking<BlockCapsule> {
 
+  private long lowestBlockNum = -1;
+
   @Autowired
   private BlockStore(@Value("block") String dbName) {
     super(dbName);
@@ -60,4 +62,25 @@ private List<BlockCapsule> pack(Set<byte[]> values) {
     blocks.sort(Comparator.comparing(BlockCapsule::getNum));
     return blocks;
   }
+
+  public int getNodeType() {
+    return getLowestBlockNum() > 1 ? Constant.NODE_TYPE_LIGHT_NODE : Constant.NODE_TYPE_FULL_NODE;
+  }
+
+  public boolean isLiteNode() {
+    return getNodeType() == Constant.NODE_TYPE_LIGHT_NODE;
+  }
+
+  /**
+   *  get next block for genesis block 0, TODO 1. auto-pruner, 2. Thread-safe
+   *
+   * @return second block num
+   */
+  public long getLowestBlockNum() {
+    if (lowestBlockNum == -1) {
+      lowestBlockNum = this.getLimitNumber(1, 1).stream()
+              .map(BlockCapsule::getNum).findFirst().orElse(0L);
+    }
+    return lowestBlockNum;
+  }
 }

chainbase/src/main/java/org/tron/core/db/CommonStore.java

@@ -3,16 +3,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
-import org.tron.common.utils.ByteArray;
-import org.tron.core.Constant;
 import org.tron.core.capsule.BytesCapsule;
 
 @Component
 public class CommonStore extends TronDatabase<BytesCapsule> {
 
-  private static final byte[] DB_KEY_LOWEST_BLOCK_NUM = "lowest_block_num".getBytes();
-  private static final byte[] DB_KEY_NODE_TYPE = "node_type".getBytes();
-
   @Autowired
   public CommonStore(ApplicationContext ctx) {
     super("common");
@@ -37,31 +32,4 @@ public BytesCapsule get(byte[] key) {
   public boolean has(byte[] key) {
     return dbSource.getData(key) != null;
   }
-
-  public int getNodeType() {
-    int nodeType = 0;
-    byte[] bytes = get(DB_KEY_NODE_TYPE).getData();
-    if (bytes != null) {
-      nodeType = ByteArray.toInt(bytes);
-    }
-    return nodeType;
-  }
-
-  public void setNodeType(int nodeType) {
-    put(DB_KEY_NODE_TYPE, new BytesCapsule(ByteArray.fromInt(nodeType)));
-  }
-
-  public long getLowestBlockNum() {
-    long lowestBlockNum = 0;
-    byte[] bytes = get(DB_KEY_LOWEST_BLOCK_NUM).getData();
-    if (bytes != null) {
-      lowestBlockNum = ByteArray.toLong(bytes);
-    }
-    return lowestBlockNum;
-  }
-
-  public void setLowestBlockNum(long lowestBlockNum) {
-    put(DB_KEY_LOWEST_BLOCK_NUM, new BytesCapsule(ByteArray.fromLong(lowestBlockNum)));
-  }
-
 }

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -8,6 +8,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+
+import com.google.common.annotations.VisibleForTesting;
 import lombok.Getter;
 import lombok.Setter;
 import org.quartz.CronExpression;
@@ -528,6 +530,7 @@ public class CommonParameter {
 
   @Getter
   @Setter
+  @VisibleForTesting
   public boolean isLiteFullNode = false;
 
   @Getter

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

@@ -221,6 +221,7 @@ public static void clearParam() {
     PARAMETER.allowNewRewardAlgorithm = 0;
     PARAMETER.allowNewReward = 0;
     PARAMETER.memoFee = 0;
+    PARAMETER.isLiteFullNode = false;
   }
 
   /**
@@ -1006,9 +1007,6 @@ public static void setParam(final String[] args, final String confFileName) {
         .getBoolean(Constant.METRICS_PROMETHEUS_ENABLE);
     PARAMETER.metricsPrometheusPort = config.hasPath(Constant.METRICS_PROMETHEUS_PORT) ? config
         .getInt(Constant.METRICS_PROMETHEUS_PORT) : 9527;
-
-    // lite fullnode params
-    PARAMETER.setLiteFullNode(checkIsLiteFullNode());
     PARAMETER.setOpenHistoryQueryWhenLiteFN(
         config.hasPath(Constant.NODE_OPEN_HISTORY_QUERY_WHEN_LITEFN)
             && config.getBoolean(Constant.NODE_OPEN_HISTORY_QUERY_WHEN_LITEFN));
@@ -1506,19 +1504,6 @@ public static void setFullNodeAllowShieldedTransaction(boolean fullNodeAllowShie
     PARAMETER.fullNodeAllowShieldedTransactionArgs = fullNodeAllowShieldedTransaction;
   }
 
-  /**
-   * set isLiteFullNode=true when this node is a lite fullnode.
-   */
-  public static boolean checkIsLiteFullNode() {
-    String infoFile = Paths.get(PARAMETER.outputDirectory,
-        PARAMETER.storage.getDbDirectory(), Constant.INFO_FILE_NAME).toString();
-    if (FileUtil.isExists(infoFile)) {
-      String value = PropUtil.readProperty(infoFile, Constant.SPLIT_BLOCK_NUM);
-      return !"".equals(value) && Long.parseLong(value) > 1;
-    }
-    return false;
-  }
-
   private static void witnessAddressCheck(Config config) {
     if (config.hasPath(Constant.LOCAL_WITNESS_ACCOUNT_ADDRESS)) {
       byte[] bytes = Commons

framework/src/main/java/org/tron/core/db/Manager.java

@@ -511,8 +511,11 @@ public void init() {
 
     long headNum = chainBaseManager.getDynamicPropertiesStore().getLatestBlockHeaderNumber();
     logger.info("Current headNum is: {}.", headNum);
-    int nodeType = chainBaseManager.getCommonStore().getNodeType();
-    logger.info("Node type is: {}.", Constant.NODE_TYPE_LIGHT_NODE == nodeType ? "lite" : "full");
+    boolean isLite = chainBaseManager.getBlockStore().isLiteNode();
+    logger.info("Node type is: {}.", isLite ? "lite" : "full");
+    if (isLite) {
+      logger.info("Lite node lowestNum: {}", chainBaseManager.getBlockStore().getLowestBlockNum());
+    }
     revokingStore.enable();
     validateSignService = Executors
         .newFixedThreadPool(Args.getInstance().getValidateSignThreadNum());

framework/src/main/java/org/tron/core/net/message/handshake/HelloMessage.java

@@ -8,7 +8,7 @@
 import org.tron.core.Constant;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.config.args.Args;
-import org.tron.core.db.CommonStore;
+import org.tron.core.db.BlockStore;
 import org.tron.core.net.message.MessageTypes;
 import org.tron.core.net.message.TronMessage;
 import org.tron.p2p.discover.Node;
@@ -57,11 +57,11 @@ public HelloMessage(Node from, long timestamp, ChainBaseManager chainBaseManager
         .setNumber(hid.getNum())
         .build();
 
-    CommonStore commonStore = chainBaseManager.getCommonStore();
+    BlockStore blockStore = chainBaseManager.getBlockStore();
     long lowestBlockNum = 0;
-    int nodeType = commonStore.getNodeType();
+    int nodeType = blockStore.getNodeType();
     if (nodeType == Constant.NODE_TYPE_LIGHT_NODE) {
-      lowestBlockNum = commonStore.getLowestBlockNum();
+      lowestBlockNum = blockStore.getLowestBlockNum();
     }
 
     Builder builder = Protocol.HelloMessage.newBuilder();

framework/src/main/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptor.java

@@ -8,12 +8,16 @@
 import io.grpc.ServerInterceptor;
 import io.grpc.Status;
 import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.tron.common.parameter.CommonParameter;
+import org.tron.core.db.BlockStore;
 
 @Component
 public class LiteFnQueryGrpcInterceptor implements ServerInterceptor {
-
+  @Autowired
+  private BlockStore blockStore;
   private static final Set<String> filterMethods = Sets.newHashSet();
 
   // for test
@@ -76,7 +80,7 @@ public static Set<String> getFilterMethods() {
   public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call,
       Metadata headers, ServerCallHandler<ReqT, RespT> next) {
     boolean shouldBeFiltered = false;
-    if (CommonParameter.getInstance().isLiteFullNode
+    if ((CommonParameter.getInstance().isLiteFullNode || blockStore.isLiteNode())
             && !CommonParameter.getInstance().openHistoryQueryWhenLiteFN
             && filterMethods.contains(call.getMethodDescriptor().getFullMethodName())) {
       shouldBeFiltered = true;

framework/src/main/java/org/tron/core/services/filter/LiteFnQueryHttpFilter.java

@@ -11,13 +11,18 @@
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.tron.common.parameter.CommonParameter;
+import org.tron.core.db.BlockStore;
 
 @Component
 @Slf4j(topic = "API")
 public class LiteFnQueryHttpFilter implements Filter {
 
+  @Autowired
+  private BlockStore blockStore;
+
   private static Set<String> filterPaths = Sets.newHashSet();
 
   // for test
@@ -107,7 +112,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
                        FilterChain filterChain) throws IOException, ServletException {
     String requestPath = ((HttpServletRequest) servletRequest).getRequestURI();
     boolean shouldBeFiltered = false;
-    if (CommonParameter.getInstance().isLiteFullNode
+    if ((CommonParameter.getInstance().isLiteFullNode || blockStore.isLiteNode())
             && !CommonParameter.getInstance().openHistoryQueryWhenLiteFN
             && filterPaths.contains(requestPath)) {
       shouldBeFiltered = true;

framework/src/main/java/org/tron/tool/litefullnode/LiteFullNodeTool.java

@@ -41,9 +41,6 @@
 @Slf4j(topic = "tool")
 public class LiteFullNodeTool {
 
-  private static final byte[] DB_KEY_LOWEST_BLOCK_NUM = "lowest_block_num".getBytes();
-  private static final byte[] DB_KEY_NODE_TYPE = "node_type".getBytes();
-
   private static final long START_TIME = System.currentTimeMillis() / 1000;
 
   private static long RECENT_BLKS = 65536;
@@ -57,7 +54,6 @@ public class LiteFullNodeTool {
   private static final String BLOCK_DB_NAME = "block";
   private static final String BLOCK_INDEX_DB_NAME = "block-index";
   private static final String TRANS_DB_NAME = "trans";
-  private static final String COMMON_DB_NAME = "common";
   private static final String TRANSACTION_RET_DB_NAME = "transactionRetStore";
   private static final String TRANSACTION_HISTORY_DB_NAME = "transactionHistoryStore";
   private static final String PROPERTIES_DB_NAME = "properties";
@@ -328,10 +324,6 @@ private void fillSnapshotBlockAndTransDb(String sourceDir, String snapshotDir)
         throw new RuntimeException(e.getMessage());
       }
     }
-
-    DBInterface destCommonDb = DbTool.getDB(snapshotDir, COMMON_DB_NAME);
-    destCommonDb.put(DB_KEY_NODE_TYPE, ByteArray.fromInt(Constant.NODE_TYPE_LIGHT_NODE));
-    destCommonDb.put(DB_KEY_LOWEST_BLOCK_NUM, ByteArray.fromLong(startIndex));
     // copy engine.properties for block、block-index、trans from source if exist
     copyEngineIfExist(sourceDir, snapshotDir, BLOCK_DB_NAME, BLOCK_INDEX_DB_NAME, TRANS_DB_NAME);
   }
@@ -487,14 +479,6 @@ private static boolean isEmptyBytes(byte[] b) {
   private void deleteSnapshotFlag(String databaseDir) throws IOException, RocksDBException {
     logger.info("Delete the info file from {}.", databaseDir);
     Files.delete(Paths.get(databaseDir, INFO_FILE_NAME));
-    if (!isLite(databaseDir)) {
-      DBInterface destCommonDb = DbTool.getDB(databaseDir, COMMON_DB_NAME);
-      destCommonDb.delete(DB_KEY_NODE_TYPE);
-      destCommonDb.delete(DB_KEY_LOWEST_BLOCK_NUM);
-      logger.info("Deleted {} and {} from {} to identify this node is a real fullnode.",
-          "node_type", "lowest_block_num", COMMON_DB_NAME);
-    }
-
   }
 
   private void hasEnoughBlock(String sourceDir) throws RocksDBException, IOException {

framework/src/test/java/org/tron/core/db/CommonStoreTest.java

@@ -40,7 +40,7 @@ public class LiteFnQueryHttpFilterTest {
   private Application appTest;
   private CloseableHttpClient httpClient = HttpClients.createDefault();
 
-  private String dbPath = "output_grpc_filter_test";
+  private String dbPath = "output_http_filter_test";
 
   /**
    * init dependencies.

framework/src/test/java/org/tron/core/services/filter/LiteFnQueryHttpFilterTest.java

@@ -41,9 +41,6 @@
         "1:Internal error: exception occurred,please check toolkit.log"})
 public class DbLite implements Callable<Integer> {
 
-  private static final byte[] DB_KEY_LOWEST_BLOCK_NUM = "lowest_block_num".getBytes();
-  private static final byte[] DB_KEY_NODE_TYPE = "node_type".getBytes();
-
   private static final long START_TIME = System.currentTimeMillis() / 1000;
 
   private static long RECENT_BLKS = 65536;
@@ -56,7 +53,6 @@ public class DbLite implements Callable<Integer> {
   private static final String BLOCK_DB_NAME = "block";
   private static final String BLOCK_INDEX_DB_NAME = "block-index";
   private static final String TRANS_DB_NAME = "trans";
-  private static final String COMMON_DB_NAME = "common";
   private static final String TRANSACTION_RET_DB_NAME = "transactionRetStore";
   private static final String TRANSACTION_HISTORY_DB_NAME = "transactionHistoryStore";
   private static final String PROPERTIES_DB_NAME = "properties";
@@ -432,10 +428,6 @@ private void fillSnapshotBlockAndTransDb(String sourceDir, String snapshotDir)
             throw new RuntimeException(e.getMessage());
           }
         });
-
-    DBInterface destCommonDb = DbTool.getDB(snapshotDir, COMMON_DB_NAME);
-    destCommonDb.put(DB_KEY_NODE_TYPE, ByteArray.fromInt(DBUtils.NODE_TYPE_LIGHT_NODE));
-    destCommonDb.put(DB_KEY_LOWEST_BLOCK_NUM, ByteArray.fromLong(startIndex));
     // copy engine.properties for block、block-index、trans from source if exist
     copyEngineIfExist(sourceDir, snapshotDir, BLOCK_DB_NAME, BLOCK_INDEX_DB_NAME, TRANS_DB_NAME);
   }
@@ -636,17 +628,6 @@ private void deleteSnapshotFlag(String databaseDir) throws IOException, RocksDBE
     logger.info("Delete the info file from {}.", databaseDir);
     spec.commandLine().getOut().format("Delete the info file from %s.", databaseDir).println();
     Files.delete(Paths.get(databaseDir, INFO_FILE_NAME));
-    if (!isLite(databaseDir)) {
-      DBInterface destCommonDb = DbTool.getDB(databaseDir, COMMON_DB_NAME);
-      destCommonDb.delete(DB_KEY_NODE_TYPE);
-      destCommonDb.delete(DB_KEY_LOWEST_BLOCK_NUM);
-      logger.info("Deleted {} and {} from {} to identify this node is a real fullnode.",
-          "node_type", "lowest_block_num", COMMON_DB_NAME);
-      spec.commandLine().getOut().format(
-          "Deleted %s and %s from %s to identify this node is a real fullnode.",
-          "node_type", "lowest_block_num", COMMON_DB_NAME).println();
-    }
-
   }
 
   private void deleteBackupArchiveDbs(String liteDir) throws IOException, RocksDBException {