perf(net): skip wire-byte rewrite when sanitize is a no-op

Author: halibobo1205

chainbase/src/main/java/org/tron/core/capsule/BlockCapsule.java

@@ -329,11 +329,11 @@ public boolean hasWitnessSignature() {
     return !getInstance().getBlockHeader().getWitnessSignature().isEmpty();
   }
 
-  public void sanitize() {
+  public boolean sanitize() {
     boolean blockHasUnknown = !this.block.getUnknownFields().asMap().isEmpty();
     boolean headerHasUnknown = !this.block.getBlockHeader().getUnknownFields().asMap().isEmpty();
     if (!blockHasUnknown && !headerHasUnknown) {
-      return;
+      return false;
     }
     UnknownFieldSet empty = UnknownFieldSet.getDefaultInstance();
     Block.Builder builder = this.block.toBuilder();
@@ -346,6 +346,7 @@ public void sanitize() {
           .build());
     }
     this.block = builder.build();
+    return true;
   }
 
   @Override

chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java

@@ -495,12 +495,14 @@ public static boolean validateSignature(Transaction transaction,
     return false;
   }
 
-  public void sanitize() {
-    if (!this.transaction.getUnknownFields().asMap().isEmpty()) {
-      this.transaction = transaction.toBuilder()
-          .setUnknownFields(UnknownFieldSet.getDefaultInstance())
-          .build();
+  public boolean sanitize() {
+    if (this.transaction.getUnknownFields().asMap().isEmpty()) {
+      return false;
     }
+    this.transaction = this.transaction.toBuilder()
+        .setUnknownFields(UnknownFieldSet.getDefaultInstance())
+        .build();
+    return true;
   }
 
   public void resetResult() {

framework/src/main/java/org/tron/core/net/message/adv/BlockMessage.java

@@ -29,8 +29,9 @@ public BlockMessage(BlockCapsule block) {
   }
 
   public void sanitize() {
-    this.block.sanitize();
-    this.data = this.block.getData();
+    if (this.block.sanitize()) {
+      this.data = this.block.getData();
+    }
   }
 
   public BlockId getBlockId() {

framework/src/test/java/org/tron/core/net/message/adv/SanitizeUnknownFieldsTest.java

@@ -2,7 +2,9 @@
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import com.google.protobuf.ByteString;
@@ -67,7 +69,7 @@ public void blockCapsuleSanitizeStripsBlockLevelUnknownFields() {
     BlockCapsule capsule = new BlockCapsule(padded);
     long originalSize = capsule.getData().length;
 
-    capsule.sanitize();
+    assertTrue("sanitize() should report it mutated the capsule", capsule.sanitize());
 
     assertTrue("Block-level unknown fields should be stripped",
         capsule.getInstance().getUnknownFields().asMap().isEmpty());
@@ -85,7 +87,7 @@ public void blockCapsuleSanitizeStripsBlockHeaderOuterUnknownFields() {
     BlockCapsule capsule = new BlockCapsule(padded);
     long originalSize = capsule.getData().length;
 
-    capsule.sanitize();
+    assertTrue("sanitize() should report it mutated the capsule", capsule.sanitize());
 
     assertTrue("BlockHeader outer unknown fields should be stripped",
         capsule.getInstance().getBlockHeader().getUnknownFields().asMap().isEmpty());
@@ -109,11 +111,14 @@ public void blockCapsuleSanitizePreservesBlockHeaderRawData() {
   public void blockCapsuleSanitizeIsNoOpOnCleanBlock() {
     Block clean = sampleBlock();
     BlockCapsule capsule = new BlockCapsule(clean);
-    byte[] before = capsule.getData();
+    Block beforeInstance = capsule.getInstance();
+    byte[] beforeData = capsule.getData();
 
-    capsule.sanitize();
+    assertFalse("sanitize() should report no-op on a clean block", capsule.sanitize());
 
-    assertArrayEquals("Clean block should pass through unchanged", before, capsule.getData());
+    assertSame("Underlying Block reference should not be rebuilt",
+        beforeInstance, capsule.getInstance());
+    assertArrayEquals("Clean block should pass through unchanged", beforeData, capsule.getData());
   }
 
   // ---- TransactionCapsule.sanitize ----
@@ -124,7 +129,7 @@ public void transactionCapsuleSanitizeStripsTopLevelUnknownFields() {
     TransactionCapsule capsule = new TransactionCapsule(padded);
     long originalSize = capsule.getData().length;
 
-    capsule.sanitize();
+    assertTrue("sanitize() should report it mutated the capsule", capsule.sanitize());
 
     assertTrue("Transaction-level unknown fields should be stripped",
         capsule.getInstance().getUnknownFields().asMap().isEmpty());
@@ -149,11 +154,14 @@ public void transactionCapsuleSanitizePreservesTransactionId() {
   public void transactionCapsuleSanitizeIsNoOpOnCleanTransaction() {
     Transaction clean = sampleTransaction();
     TransactionCapsule capsule = new TransactionCapsule(clean);
-    byte[] before = capsule.getData();
+    Transaction beforeInstance = capsule.getInstance();
+    byte[] beforeData = capsule.getData();
 
-    capsule.sanitize();
+    assertFalse("sanitize() should report no-op on a clean transaction", capsule.sanitize());
 
-    assertArrayEquals(before, capsule.getData());
+    assertSame("Underlying Transaction reference should not be rebuilt",
+        beforeInstance, capsule.getInstance());
+    assertArrayEquals(beforeData, capsule.getData());
   }
 
   // ---- BlockMessage.sanitize ----
@@ -177,4 +185,16 @@ public void blockMessageSanitizeUpdatesBothCapsuleAndWireBytes() throws Exceptio
     assertNotEquals("msg.data should no longer match the padded wire bytes",
         paddedBytes.length, msg.getData().length);
   }
+
+  @Test
+  public void blockMessageSanitizeSkipsDataRewriteOnCleanBlock() throws Exception {
+    byte[] cleanBytes = sampleBlock().toByteArray();
+    BlockMessage msg = new BlockMessage(cleanBytes);
+    byte[] before = msg.getData();
+
+    msg.sanitize();
+
+    assertSame("msg.data should not be rewritten on the no-op path",
+        before, msg.getData());
+  }
 }