dev-release4.7.1

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");
+    }
+  }
 }

build.gradle

@@ -1,82 +1,84 @@
-allprojects {
-    version = "1.0.0"
-    apply plugin: "java"
-}
-
-subprojects {
-    apply plugin: "java"
-    apply plugin: "jacoco"
-    apply plugin: "maven"
-    apply plugin: "maven-publish"
-
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-
-    [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
-
-    buildscript {
-        repositories {
-            mavenCentral()
-            maven {
-                url "https://plugins.gradle.org/m2/"
-            }
-        }
-        dependencies {
-            classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.1'
-            classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
-        }
-    }
-
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        maven { url 'https://repo.spring.io/plugins-release' }
-    }
-
-    dependencies {
-        compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
-        compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'
-        compile "org.slf4j:jcl-over-slf4j:1.7.25"
-        compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.9'
-        compileOnly 'org.projectlombok:lombok:1.18.12'
-        annotationProcessor 'org.projectlombok:lombok:1.18.12'
-        testCompileOnly 'org.projectlombok:lombok:1.18.12'
-        testAnnotationProcessor 'org.projectlombok:lombok:1.18.12'
-        compile group: 'com.google.guava', name: 'guava', version: '24.1-jre'
-        compile "com.google.code.findbugs:jsr305:3.0.0"
-        compile group: 'org.springframework', name: 'spring-context', version: '5.3.18'
-        compile group: 'org.springframework', name: 'spring-tx', version: '5.3.18'
-        compile "org.apache.commons:commons-lang3:3.4"
-        compile group: 'org.apache.commons', name: 'commons-math', version: '2.2'
-        compile "org.apache.commons:commons-collections4:4.1"
-        compile group: 'joda-time', name: 'joda-time', version: '2.3'
-
-    }
-
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier = "sources"
-        from sourceSets.main.allSource
-    }
-
-
-    tasks.withType(AbstractArchiveTask) {
-        preserveFileTimestamps = false
-        reproducibleFileOrder = true
-    }
-
-    configurations.all {
-        resolutionStrategy {
-            force group: 'com.google.guava', name: 'guava', version: '30.1-jre'
-        }
-    }
-}
-
-task copyToParent(type: Copy) {
-    into "$buildDir/libs"
-    subprojects {
-        from tasks.withType(Jar)
-    }
-}
-
-build.finalizedBy(copyToParent)
-
+allprojects {
+    version = "1.0.0"
+    apply plugin: "java"
+}
+
+subprojects {
+    apply plugin: "java"
+    apply plugin: "jacoco"
+    apply plugin: "maven"
+    apply plugin: "maven-publish"
+
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+
+    [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+
+    buildscript {
+        repositories {
+            mavenCentral()
+            maven { url 'https://jitpack.io' }
+            maven {
+                url "https://plugins.gradle.org/m2/"
+            }
+        }
+        dependencies {
+            classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.1'
+            classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
+        }
+    }
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven { url 'https://repo.spring.io/plugins-release' }
+        maven { url 'https://jitpack.io' }
+    }
+
+    dependencies {
+        compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+        compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'
+        compile "org.slf4j:jcl-over-slf4j:1.7.25"
+        compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.9'
+        compileOnly 'org.projectlombok:lombok:1.18.12'
+        annotationProcessor 'org.projectlombok:lombok:1.18.12'
+        testCompileOnly 'org.projectlombok:lombok:1.18.12'
+        testAnnotationProcessor 'org.projectlombok:lombok:1.18.12'
+        compile group: 'com.google.guava', name: 'guava', version: '24.1-jre'
+        compile "com.google.code.findbugs:jsr305:3.0.0"
+        compile group: 'org.springframework', name: 'spring-context', version: '5.3.18'
+        compile group: 'org.springframework', name: 'spring-tx', version: '5.3.18'
+        compile "org.apache.commons:commons-lang3:3.4"
+        compile group: 'org.apache.commons', name: 'commons-math', version: '2.2'
+        compile "org.apache.commons:commons-collections4:4.1"
+        compile group: 'joda-time', name: 'joda-time', version: '2.3'
+
+    }
+
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier = "sources"
+        from sourceSets.main.allSource
+    }
+
+
+    tasks.withType(AbstractArchiveTask) {
+        preserveFileTimestamps = false
+        reproducibleFileOrder = true
+    }
+
+    configurations.all {
+        resolutionStrategy {
+            force group: 'com.google.guava', name: 'guava', version: '30.1-jre'
+        }
+    }
+}
+
+task copyToParent(type: Copy) {
+    into "$buildDir/libs"
+    subprojects {
+        from tasks.withType(Jar)
+    }
+}
+
+build.finalizedBy(copyToParent)
+

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/ChainBaseManager.java

@@ -4,6 +4,7 @@
 
 import com.google.protobuf.ByteString;
 import java.util.List;
+import javax.annotation.PostConstruct;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -236,6 +237,14 @@ public class ChainBaseManager {
   @Autowired
   private DbStatService dbStatService;
 
+  @Getter
+  @Setter
+  private NodeType nodeType;
+
+  @Getter
+  @Setter
+  private long lowestBlockNum = -1; // except num = 0.
+
   public void closeOneStore(ITronChainBase database) {
     logger.info("******** Begin to close {}. ********",  database.getName());
     try {
@@ -414,5 +423,28 @@ public static synchronized void init(ChainBaseManager manager) {
     AssetUtil.setAccountAssetStore(manager.getAccountAssetStore());
     AssetUtil.setDynamicPropertiesStore(manager.getDynamicPropertiesStore());
   }
+
+  @PostConstruct
+  private void init() {
+    this.lowestBlockNum = this.blockIndexStore.getLimitNumber(1, 1).stream()
+            .map(BlockId::getNum).findFirst().orElse(0L);
+    this.nodeType = getLowestBlockNum() > 1 ? NodeType.LITE : NodeType.FULL;
+  }
+
+  public boolean isLiteNode() {
+    return getNodeType() == NodeType.LITE;
+  }
+
+  public enum  NodeType  {
+    FULL(0),
+    LITE(1);
+
+    @Getter
+    private final int type;
+
+    NodeType(int type) {
+      this.type = type;
+    }
+  }
 }
 

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!");
       }

chainbase/src/main/java/org/tron/core/db/BlockIndexStore.java

@@ -1,6 +1,10 @@
 package org.tron.core.db;
 
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -12,6 +16,7 @@
 import org.tron.core.exception.ItemNotFoundException;
 
 @Component
+@Slf4j(topic = "DB")
 public class BlockIndexStore extends TronStoreWithRevoking<BytesCapsule> {
 
 
@@ -44,4 +49,17 @@ public BytesCapsule get(byte[] key)
     }
     return new BytesCapsule(value);
   }
-}
+
+  public List<BlockId> getLimitNumber(long startNumber, long limit) {
+    return pack(revokingDB.getValuesNext(ByteArray.fromLong(startNumber), limit));
+  }
+
+  private List<BlockId> pack(Set<byte[]> values) {
+    List<BlockId> blocks = new ArrayList<>();
+    for (byte[] bytes : values) {
+      blocks.add(new BlockId(Sha256Hash.wrap(bytes)));
+    }
+    blocks.sort(Comparator.comparing(BlockId::getNum));
+    return blocks;
+  }
+}