Merge pull request #5022 from halibobo1205/release_v4.7.1

Release v4.7.1

Author: halibobo1205

actuator/src/main/java/org/tron/core/vm/PrecompiledContracts.java

@@ -62,8 +62,10 @@
 import org.tron.core.exception.ZksnarkException;
 import org.tron.core.vm.config.VMConfig;
 import org.tron.core.vm.program.Program;
+import org.tron.core.vm.program.Program.OutOfTimeException;
 import org.tron.core.vm.repository.Repository;
 import org.tron.core.vm.utils.FreezeV2Util;
+import org.tron.core.vm.utils.MUtil;
 import org.tron.core.vm.utils.VoteRewardUtil;
 import org.tron.protos.Protocol;
 import org.tron.protos.Protocol.Permission;
@@ -944,24 +946,33 @@ public Pair<Boolean, byte[]> execute(byte[] rawData) {
             long totalWeight = 0L;
             List<byte[]> executedSignList = new ArrayList<>();
             for (byte[] sign : signatures) {
-              if (ByteArray.matrixContains(executedSignList, sign)) {
-                continue;
-              }
               byte[] recoveredAddr = recoverAddrBySign(sign, hash);
+
+              sign = merge(recoveredAddr, sign);
+              if (ByteArray.matrixContains(executedSignList, recoveredAddr)) {
+                if (ByteArray.matrixContains(executedSignList, sign)) {
+                  continue;
+                }
+                MUtil.checkCPUTime();
+              }
               long weight = TransactionCapsule.getWeight(permission, recoveredAddr);
               if (weight == 0) {
                 //incorrect sign
                 return Pair.of(true, DATA_FALSE);
               }
               totalWeight += weight;
               executedSignList.add(sign);
+              executedSignList.add(recoveredAddr);
             }
 
             if (totalWeight >= permission.getThreshold()) {
               return Pair.of(true, dataOne());
             }
           }
         } catch (Throwable t) {
+          if (t instanceof OutOfTimeException) {
+            throw t;
+          }
           logger.info("ValidateMultiSign error:{}", t.getMessage());
         }
       }

actuator/src/main/java/org/tron/core/vm/utils/MUtil.java

@@ -1,8 +1,11 @@
 package org.tron.core.vm.utils;
 
+import org.tron.common.utils.ForkController;
 import org.tron.core.capsule.AccountCapsule;
+import org.tron.core.config.Parameter;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.core.vm.VMUtils;
+import org.tron.core.vm.program.Program.OutOfTimeException;
 import org.tron.core.vm.repository.Repository;
 import org.tron.protos.Protocol;
 
@@ -55,4 +58,10 @@ public static boolean isNullOrEmpty(String str) {
   public static boolean isNotNullOrEmpty(String str) {
     return !isNullOrEmpty(str);
   }
+
+  public static void checkCPUTime() {
+    if (ForkController.instance().pass(Parameter.ForkBlockVersionEnum.VERSION_4_7_1)) {
+      throw new OutOfTimeException("CPU timeout for 0x0a executing");
+    }
+  }
 }

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;

framework/build.gradle

@@ -48,7 +48,7 @@ dependencies {
 
     compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
 
-    compile group: 'io.github.tronprotocol', name: 'libp2p', version: '0.1.3'
+    compile group: 'io.github.tronprotocol', name: 'libp2p', version: '0.1.4'
 
     compile group: 'com.typesafe', name: 'config', version: '1.3.2'
 

framework/src/main/java/org/tron/core/Wallet.java

@@ -913,6 +913,9 @@ public long calcCanDelegatedEnergyMaxSize(ByteString ownerAddress) {
   }
 
   public DelegatedResourceAccountIndex getDelegatedResourceAccountIndex(ByteString address) {
+    if (address == null || address.size() != DecodeUtil.ADDRESS_SIZE / 2) {
+      return DelegatedResourceAccountIndex.getDefaultInstance();
+    }
     DelegatedResourceAccountIndexCapsule accountIndexCapsule =
         chainBaseManager.getDelegatedResourceAccountIndexStore().getIndex(address.toByteArray());
     if (accountIndexCapsule != null) {
@@ -923,6 +926,9 @@ public DelegatedResourceAccountIndex getDelegatedResourceAccountIndex(ByteString
   }
 
   public DelegatedResourceAccountIndex getDelegatedResourceAccountIndexV2(ByteString address) {
+    if (address == null || address.size() != DecodeUtil.ADDRESS_SIZE / 2) {
+      return DelegatedResourceAccountIndex.getDefaultInstance();
+    }
     DelegatedResourceAccountIndexCapsule accountIndexCapsule = chainBaseManager
         .getDelegatedResourceAccountIndexStore().getV2Index(address.toByteArray());
     if (accountIndexCapsule != null) {