Merge pull request tronprotocol#4462 from tronprotocol/release_v4.5.1

merge release v4.5.1 to master

Author: forfreeday

actuator/src/main/java/org/tron/core/actuator/VMActuator.java

@@ -384,6 +384,9 @@ private void create()
           .createProgramInvoke(TrxType.TRX_CONTRACT_CREATION_TYPE, executorType, trx,
               tokenValue, tokenId, blockCap.getInstance(), rootRepository, vmStartInUs,
               vmShouldEndInUs, energyLimit);
+      if (isConstantCall) {
+        programInvoke.setConstantCall();
+      }
       this.program = new Program(ops, contractAddress, programInvoke, rootInternalTx);
       if (VMConfig.allowTvmCompatibleEvm()) {
         this.program.setContractVersion(1);

actuator/src/main/java/org/tron/core/vm/program/Program.java

@@ -170,8 +170,14 @@ public void setNonce(long nonceValue) {
   }
 
   public ProgramPrecompile getProgramPrecompile() {
+    if (isConstantCall()) {
+      if (programPrecompile == null) {
+        programPrecompile = ProgramPrecompile.compile(ops);
+      }
+      return programPrecompile;
+    }
     if (programPrecompile == null) {
-      Key key = getCodeHashKey();
+      Key key = getJumpDestAnalysisCacheKey();
       if (programPrecompileLRUMap.containsKey(key)) {
         programPrecompile = programPrecompileLRUMap.get(key);
       } else {
@@ -1056,9 +1062,8 @@ public byte[] getCodeHash() {
     return codeHash;
   }
 
-  private Key getCodeHashKey() {
-    byte[] codeHash = getCodeHash();
-    return Key.create(codeHash);
+  private Key getJumpDestAnalysisCacheKey() {
+    return Key.create(ByteUtil.merge(codeAddress, getCodeHash()));
   }
 
   public byte[] getContextAddress() {

framework/src/main/java/org/tron/program/Version.java

@@ -4,7 +4,7 @@ public class Version {
 
   public static final String VERSION_NAME = "GreatVoyage-v4.4.6-241-g7045f0659";
   public static final String VERSION_CODE = "16928";
-  private static final String VERSION = "4.5.0";
+  private static final String VERSION = "4.5.1";
 
   public static String getVersion() {
     return VERSION;