Merge pull request #3 from halibobo1205/feat/opt-sig

feature(consensus): optimize signatures

Author: halibobo1205

chainbase/src/main/java/org/tron/common/utils/ForkController.java

@@ -44,6 +44,9 @@ public boolean pass(ForkBlockVersionEnum forkBlockVersionEnum) {
   }
 
   public synchronized boolean pass(int version) {
+    if (manager == null) {
+      throw new IllegalStateException("not inited");
+    }
     if (version > ForkBlockVersionEnum.VERSION_4_0.getValue()) {
       return passNew(version);
     } else {

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

@@ -46,9 +46,11 @@
 import org.tron.common.overlay.message.Message;
 import org.tron.common.parameter.CommonParameter;
 import org.tron.common.utils.ByteArray;
+import org.tron.common.utils.ForkController;
 import org.tron.common.utils.ReflectUtils;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.actuator.TransactionFactory;
+import org.tron.core.config.Parameter;
 import org.tron.core.db.TransactionContext;
 import org.tron.core.db.TransactionTrace;
 import org.tron.core.exception.BadItemException;
@@ -213,6 +215,11 @@ public static long getWeight(Permission permission, byte[] address) {
     return 0;
   }
 
+  /**
+   *  make sure ForkController.init(ChainBaseManager) is invoked before invoke this method.
+   *
+   *  @see ForkController#init(org.tron.core.ChainBaseManager)
+   */
   public static long checkWeight(Permission permission, List<ByteString> sigs, byte[] hash,
       List<ByteString> approveList)
       throws SignatureException, PermissionException, SignatureFormatException {
@@ -237,6 +244,9 @@ public static long checkWeight(Permission permission, List<ByteString> sigs, byt
             ByteArray.toHexString(sig.toByteArray()) + " is signed by " + encode58Check(address)
                 + " but it is not contained of permission.");
       }
+      if (ForkController.instance().pass(Parameter.ForkBlockVersionEnum.VERSION_4_7_1)) {
+        base64 = encode58Check(address);
+      }
       if (addMap.containsKey(base64)) {
         throw new PermissionException(encode58Check(address) + " has signed twice!");
       }

common/src/main/java/org/tron/core/config/Parameter.java

@@ -20,7 +20,8 @@ public enum ForkBlockVersionEnum {
     VERSION_4_4(23, 1596780000000L, 80),
     VERSION_4_5(24, 1596780000000L, 80),
     VERSION_4_6(25, 1596780000000L, 80),
-    VERSION_4_7(26, 1596780000000L, 80);
+    VERSION_4_7(26, 1596780000000L, 80),
+    VERSION_4_7_1(27, 1596780000000L, 80);
     // if add a version, modify BLOCK_VERSION simultaneously
 
     @Getter
@@ -69,7 +70,7 @@ public class ChainConstant {
     public static final int SINGLE_REPEAT = 1;
     public static final int BLOCK_FILLED_SLOTS_NUMBER = 128;
     public static final int MAX_FROZEN_NUMBER = 1;
-    public static final int BLOCK_VERSION = 26;
+    public static final int BLOCK_VERSION = 27;
     public static final long FROZEN_PERIOD = 86_400_000L;
     public static final long DELEGATE_PERIOD = 3 * 86_400_000L;
     public static final long TRX_PRECISION = 1000_000L;