refactor(common): extract signature size bounds to constants

Federico2014 · Federico2014 · commit 915074587504 · 2026-05-15T14:20:18.000+08:00
diff --git a/chainbase/src/main/java/org/tron/core/capsule/BlockCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/BlockCapsule.java
@@ -186,8 +186,9 @@ public boolean validateSignature(DynamicPropertiesStore dynamicPropertiesStore,
       AccountStore accountStore) throws ValidateSignatureException {
     try {
       ByteString witnessSig = block.getBlockHeader().getWitnessSignature();
-      if (witnessSig.size() < 65 || (dynamicPropertiesStore.getAllowTvmOsaka() == 1
-          && witnessSig.size() != 65)) {
+      if (witnessSig.size() < ChainConstant.MIN_SIGNATURE_SIZE
+          || (dynamicPropertiesStore.getAllowTvmOsaka() == 1
+          && witnessSig.size() > ChainConstant.MAX_SIGNATURE_SIZE)) {
         throw new ValidateSignatureException(
             "Witness signature size is " + witnessSig.size());
       }
diff --git a/chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java
@@ -55,6 +55,7 @@
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.actuator.TransactionFactory;
 import org.tron.core.config.Parameter;
+import org.tron.core.config.Parameter.ChainConstant;
 import org.tron.core.db.TransactionContext;
 import org.tron.core.db.TransactionTrace;
 import org.tron.core.exception.BadItemException;
@@ -242,8 +243,9 @@ public static long checkWeight(Permission permission, List<ByteString> sigs, byt
     }
     HashMap addMap = new HashMap();
     for (ByteString sig : sigs) {
-      if (sig.size() < 65 || (dynamicPropertiesStore.getAllowTvmOsaka() == 1
-          && sig.size() != 65)) {
+      if (sig.size() < ChainConstant.MIN_SIGNATURE_SIZE
+          || (dynamicPropertiesStore.getAllowTvmOsaka() == 1
+          && sig.size() > ChainConstant.MAX_SIGNATURE_SIZE)) {
         throw new SignatureFormatException("Signature size is " + sig.size());
       }
       String base64 = TransactionCapsule.getBase64FromByteString(sig);
diff --git a/common/src/main/java/org/tron/core/config/Parameter.java b/common/src/main/java/org/tron/core/config/Parameter.java
@@ -69,6 +69,8 @@ public class ChainConstant {
     public static final int MAX_VOTE_NUMBER = 30;
     public static final int SOLIDIFIED_THRESHOLD = 70; // 70%
     public static final int PRIVATE_KEY_LENGTH = 64;
+    public static final int MIN_SIGNATURE_SIZE = 65;
+    public static final int MAX_SIGNATURE_SIZE = 68;
     public static final int BLOCK_SIZE = 2_000_000;
     public static final long CLOCK_MAX_DELAY = 3600000; // 3600 * 1000 ms
     public static final int BLOCK_PRODUCE_TIMEOUT_PERCENT = 50; // 50%
diff --git a/consensus/src/main/java/org/tron/consensus/pbft/message/PbftBaseMessage.java b/consensus/src/main/java/org/tron/consensus/pbft/message/PbftBaseMessage.java
@@ -12,6 +12,7 @@
 import org.tron.common.utils.Sha256Hash;
 import org.tron.common.utils.StringUtil;
 import org.tron.core.capsule.TransactionCapsule;
+import org.tron.core.config.Parameter.ChainConstant;
 import org.tron.core.exception.P2pException;
 import org.tron.core.store.DynamicPropertiesStore;
 import org.tron.protos.Protocol.PBFTMessage;
@@ -99,8 +100,9 @@ public DataType getDataType() {
   public void analyzeSignature(DynamicPropertiesStore dynamicPropertiesStore)
       throws SignatureException {
     ByteString signature = getPbftMessage().getSignature();
-    if (signature.size() < 65 || (dynamicPropertiesStore.getAllowTvmOsaka() == 1
-        && signature.size() != 65)) {
+    if (signature.size() < ChainConstant.MIN_SIGNATURE_SIZE
+        || (dynamicPropertiesStore.getAllowTvmOsaka() == 1
+        && signature.size() > ChainConstant.MAX_SIGNATURE_SIZE)) {
       throw new SignatureException("PBFT signature size is " + signature.size());
     }
     byte[] hash = Sha256Hash.hash(true, getPbftMessage().getRawData().toByteArray());
diff --git a/framework/src/main/java/org/tron/core/Wallet.java b/framework/src/main/java/org/tron/core/Wallet.java
@@ -160,6 +160,7 @@
 import org.tron.core.capsule.VotesCapsule;
 import org.tron.core.capsule.WitnessCapsule;
 import org.tron.core.capsule.utils.MarketUtils;
+import org.tron.core.config.Parameter.ChainConstant;
 import org.tron.core.config.args.Args;
 import org.tron.core.db.BandwidthProcessor;
 import org.tron.core.db.BlockIndexStore;
@@ -644,8 +645,9 @@ public TransactionApprovedList getTransactionApprovedList(Transaction trx) {
           byte[] hash = Sha256Hash.hash(CommonParameter
               .getInstance().isECKeyCryptoEngine(), trx.getRawData().toByteArray());
           for (ByteString sig : trx.getSignatureList()) {
-            if (sig.size() < 65 || (chainBaseManager.getDynamicPropertiesStore()
-                .getAllowTvmOsaka() == 1 && sig.size() != 65)) {
+            if (sig.size() < ChainConstant.MIN_SIGNATURE_SIZE
+                || (chainBaseManager.getDynamicPropertiesStore().getAllowTvmOsaka() == 1
+                && sig.size() > ChainConstant.MAX_SIGNATURE_SIZE)) {
               throw new SignatureFormatException(
                   "Signature size is " + sig.size());
             }
diff --git a/framework/src/main/java/org/tron/core/net/messagehandler/PbftDataSyncHandler.java b/framework/src/main/java/org/tron/core/net/messagehandler/PbftDataSyncHandler.java
@@ -26,6 +26,7 @@
 import org.tron.core.ChainBaseManager;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.capsule.TransactionCapsule;
+import org.tron.core.config.Parameter.ChainConstant;
 import org.tron.core.db.PbftSignDataStore;
 import org.tron.core.exception.P2pException;
 import org.tron.core.net.message.TronMessage;
@@ -173,9 +174,9 @@ private class ValidPbftSignTask implements Callable<Boolean> {
     @Override
     public Boolean call() throws Exception {
       try {
-        if (sign.size() < 65
+        if (sign.size() < ChainConstant.MIN_SIGNATURE_SIZE
             || (chainBaseManager.getDynamicPropertiesStore().getAllowTvmOsaka() == 1
-            && sign.size() != 65)) {
+            && sign.size() > ChainConstant.MAX_SIGNATURE_SIZE)) {
           throw new SignatureException("PBFT signature size is " + sign.size());
         }
         byte[] srAddress = ECKey.signatureToAddress(dataHash,
diff --git a/framework/src/main/java/org/tron/core/net/service/relay/RelayService.java b/framework/src/main/java/org/tron/core/net/service/relay/RelayService.java
@@ -24,6 +24,7 @@
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.ChainBaseManager;
 import org.tron.core.capsule.TransactionCapsule;
+import org.tron.core.config.Parameter.ChainConstant;
 import org.tron.core.config.args.Args;
 import org.tron.core.db.Manager;
 import org.tron.core.net.TronNetDelegate;
@@ -153,8 +154,9 @@ public boolean checkHelloMessage(HelloMessage message, Channel channel) {
     boolean flag;
     try {
       ByteString signature = msg.getSignature();
-      if (signature.size() < 65 || (chainBaseManager.getDynamicPropertiesStore()
-          .getAllowTvmOsaka() == 1 && signature.size() != 65)) {
+      if (signature.size() < ChainConstant.MIN_SIGNATURE_SIZE
+          || (chainBaseManager.getDynamicPropertiesStore().getAllowTvmOsaka() == 1
+          && signature.size() > ChainConstant.MAX_SIGNATURE_SIZE)) {
         return false;
       }
       Sha256Hash hash = Sha256Hash.of(CommonParameter
diff --git a/framework/src/test/java/org/tron/core/actuator/utils/TransactionUtilTest.java b/framework/src/test/java/org/tron/core/actuator/utils/TransactionUtilTest.java
@@ -468,7 +468,7 @@ public void getTransactionSignWeightPaddedSigOsakaRejected() {
         .setOwnerAddress(ByteString.copyFrom(owner))
         .setToAddress(ByteString.copyFrom(new byte[21]))
         .build();
-    byte[] paddedSig = new byte[66];
+    byte[] paddedSig = new byte[69];
     paddedSig[64] = 27;
     Transaction transaction = new TransactionCapsule(
         transferContract, ContractType.TransferContract)
diff --git a/framework/src/test/java/org/tron/core/capsule/TransactionCapsuleTest.java b/framework/src/test/java/org/tron/core/capsule/TransactionCapsuleTest.java
@@ -165,7 +165,7 @@ public void checkWeightShortSigRejected() throws Exception {
   public void checkWeightPaddedSigOsakaRejected() throws Exception {
     dbManager.getDynamicPropertiesStore().saveAllowTvmOsaka(1);
     try {
-      List<ByteString> sigs = Collections.singletonList(ByteString.copyFrom(new byte[66]));
+      List<ByteString> sigs = Collections.singletonList(ByteString.copyFrom(new byte[69]));
       TransactionCapsule.checkWeight(singleKeyPermission(), sigs, DUMMY_HASH, null,
           dbManager.getDynamicPropertiesStore());
     } finally {
@@ -176,7 +176,7 @@ public void checkWeightPaddedSigOsakaRejected() throws Exception {
   @Test
   public void checkWeightPaddedSigPreOsaka() {
     dbManager.getDynamicPropertiesStore().saveAllowTvmOsaka(0);
-    List<ByteString> sigs = Collections.singletonList(ByteString.copyFrom(new byte[66]));
+    List<ByteString> sigs = Collections.singletonList(ByteString.copyFrom(new byte[69]));
     try {
       TransactionCapsule.checkWeight(singleKeyPermission(), sigs, DUMMY_HASH, null,
           dbManager.getDynamicPropertiesStore());
diff --git a/framework/src/test/java/org/tron/core/db/TransactionExpireTest.java b/framework/src/test/java/org/tron/core/db/TransactionExpireTest.java
@@ -207,19 +207,19 @@ public void testApprovedListPaddedSigOsakaRejected() {
         new TransactionCapsule(transferContract, ContractType.TransferContract);
     capsule.sign(ByteArray.fromHexString(Args.getLocalWitnesses().getPrivateKey()));
 
-    // Replace the valid 65-byte sig with a 66-byte padded one
+    // Replace the valid 65-byte sig with a 69-byte over-padded one (exceeds MAX_SIGNATURE_SIZE=68)
     byte[] sig65 = capsule.getInstance().getSignature(0).toByteArray();
-    byte[] sig66 = Arrays.copyOf(sig65, 66); // extra zero byte appended
+    byte[] sig69 = Arrays.copyOf(sig65, 69);
     Transaction tx = capsule.getInstance().toBuilder()
-        .clearSignature().addSignature(ByteString.copyFrom(sig66)).build();
+        .clearSignature().addSignature(ByteString.copyFrom(sig69)).build();
 
     dbManager.getDynamicPropertiesStore().saveAllowTvmOsaka(1);
     try {
       TransactionApprovedList result = wallet.getTransactionApprovedList(tx);
-      Assert.assertEquals("Padded sig must be rejected post-Osaka",
+      Assert.assertEquals("Over-padded sig must be rejected post-Osaka",
           TransactionApprovedList.Result.response_code.SIGNATURE_FORMAT_ERROR,
           result.getResult().getCode());
-      Assert.assertTrue(result.getResult().getMessage().contains("66"));
+      Assert.assertTrue(result.getResult().getMessage().contains("69"));
     } finally {
       dbManager.getDynamicPropertiesStore().saveAllowTvmOsaka(0);
     }
diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/PbftDataSyncHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/PbftDataSyncHandlerTest.java
@@ -85,7 +85,7 @@ public void testValidPbftSignPaddedSigOsakaRejected() throws Exception {
         .build();
 
     boolean valid = (boolean) method.invoke(pbftDataSyncHandler, raw,
-        Collections.singletonList(ByteString.copyFrom(new byte[66])),
+        Collections.singletonList(ByteString.copyFrom(new byte[69])),
         Collections.singletonList(ByteString.copyFrom(new byte[21])));
     Assert.assertFalse(valid);
   }
diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/PbftMsgHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/PbftMsgHandlerTest.java
@@ -144,7 +144,7 @@ public void testPbftPaddedSigOsakaRejected() throws Exception {
     SignInterface sign = SignUtils.fromPrivate(Hex.decode(PublicMethod.getRandomPrivateKey()),
         true);
     byte[] sig = sign.Base64toBytes(sign.signHash(Sha256Hash.hash(true, raw.toByteArray())));
-    byte[] paddedSig = Arrays.copyOf(sig, 66);
+    byte[] paddedSig = Arrays.copyOf(sig, 69);
     Protocol.PBFTMessage message = Protocol.PBFTMessage.newBuilder()
         .setRawData(raw)
         .setSignature(ByteString.copyFrom(paddedSig))
@@ -165,7 +165,7 @@ public void testPbftPaddedSigOsakaRejected() throws Exception {
       context.getBean(PbftMsgHandler.class).processMessage(peer, pbftMessage);
       Assert.fail("Padded PBFT signature must be rejected post-Osaka");
     } catch (SignatureException e) {
-      Assert.assertTrue(e.getMessage().contains("PBFT signature size is 66"));
+      Assert.assertTrue(e.getMessage().contains("PBFT signature size is 69"));
     } finally {
       dynamicPropertiesStore.saveAllowTvmOsaka(0);
     }
diff --git a/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java b/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java
@@ -243,7 +243,7 @@ public void testCheckHelloMessagePaddedSigOsakaRejected() {
     byte[] sig = cryptoEngine.Base64toBytes(cryptoEngine.signHash(Sha256Hash.of(CommonParameter
         .getInstance().isECKeyCryptoEngine(), ByteArray.fromLong(helloMessage
         .getTimestamp())).getBytes()));
-    byte[] paddedSig = Arrays.copyOf(sig, 66);
+    byte[] paddedSig = Arrays.copyOf(sig, 69);
     helloMessage.setHelloMessage(helloMessage.getHelloMessage().toBuilder()
         .setAddress(address)
         .setSignature(ByteString.copyFrom(paddedSig))
