feat(log): disable log for getMerkleTreeKey

halibobo1205 · Jul 16, 2024 · 0be66bb · 0be66bb
1 parent 5f113c4
commit 0be66bb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/chainbase/src/main/java/org/tron/common/zksnark/JLibrustzcash.java b/chainbase/src/main/java/org/tron/common/zksnark/JLibrustzcash.java
@@ -373,8 +373,10 @@ public static boolean isOpenZen() {
   }
 
   private static void log(int c, byte[] ... params) {
-    GlobalContext.getHeader().ifPresent(header -> logger.info("{}:{}:{}", header, c,
-        Stream.of(params).map(ByteArray::toHexString).collect(Collectors.joining(","))));
+    if (GlobalContext.isLog()) {
+      GlobalContext.getHeader().ifPresent(header -> logger.info("{}:{}:{}", header, c,
+          Stream.of(params).map(ByteArray::toHexString).collect(Collectors.joining(","))));
+    }
   }
 
   private static byte[] l2B(long value) {

diff --git a/chainbase/src/main/java/org/tron/common/zksnark/MerkleContainer.java b/chainbase/src/main/java/org/tron/common/zksnark/MerkleContainer.java
@@ -4,6 +4,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.tron.common.context.GlobalContext;
 import org.tron.core.capsule.IncrementalMerkleTreeCapsule;
 import org.tron.core.capsule.PedersenHashCapsule;
 import org.tron.core.exception.ZksnarkException;
@@ -62,14 +63,18 @@ public void resetCurrentMerkleTree() {
 
   public void saveCurrentMerkleTreeAsBestMerkleTree(long blockNum) throws ZksnarkException {
     IncrementalMerkleTreeContainer treeContainer = getCurrentMerkle();
-    setBestMerkle(blockNum, treeContainer);
-    putMerkleTreeIntoStore(treeContainer.getMerkleTreeKey(), treeContainer.getTreeCapsule());
+    byte[] key = setBestMerkle(blockNum, treeContainer);
+    putMerkleTreeIntoStore(key, treeContainer.getTreeCapsule());
   }
 
-  public void setBestMerkle(long blockNum, IncrementalMerkleTreeContainer treeContainer)
+  public byte[] setBestMerkle(long blockNum, IncrementalMerkleTreeContainer treeContainer)
       throws ZksnarkException {
     incrementalMerkleTreeStore.put(lastTreeKey, treeContainer.getTreeCapsule());
-    merkleTreeIndexStore.put(blockNum, treeContainer.getMerkleTreeKey());
+    GlobalContext.disableLog();
+    byte[] key = treeContainer.getMerkleTreeKey();
+    GlobalContext.enableLog();
+    merkleTreeIndexStore.put(blockNum, key);
+    return key;
   }
 
   public boolean merkleRootExist(byte[] rt) {

diff --git a/common/src/main/java/org/tron/common/context/GlobalContext.java b/common/src/main/java/org/tron/common/context/GlobalContext.java
@@ -6,6 +6,8 @@ public class GlobalContext {
 
   private static final ThreadLocal<Long> HEADER = new ThreadLocal<>();
 
+  private static final ThreadLocal<Boolean> LOG = ThreadLocal.withInitial(() -> true);
+
   private GlobalContext() {
   }
 
@@ -20,4 +22,16 @@ public static void setHeader(long header) {
   public static void removeHeader() {
     HEADER.remove();
   }
+
+  public static boolean isLog() {
+    return LOG.get();
+  }
+
+  public static void enableLog() {
+    LOG.set(true);
+  }
+
+  public static void disableLog() {
+    LOG.set(false);
+  }
 }