Merge pull request #4292 from tronprotocol/release_v4.4.4

Release v4.4.4 to master

Author: forfreeday

.travis.yml

@@ -4,8 +4,8 @@ java-tron is an open source project.
 
 It is the work of contributors. We appreciate your help!
 
-Here are instructions to get you started. They are not perfect, so
-please let us know if anything feels wrong or incomplete.
+Here are instructions to get started. They are not perfect,
+please let us know if you see any improvements, thanks. 
 
 ## Contribution guidelines
 First of all, java-tron follows GitFlow, the branches description in the java-tron project are listed as follow:
@@ -14,7 +14,7 @@ First of all, java-tron follows GitFlow, the branches description in the java-tr
 This branch contains the latest code released to the production environment. It can only be merged, and can not be modified directly in this branch.
 
 - ``develop`` branch:
-This branch is the main development branch. It contains the complete code that is going to release. It can only be merged, and can not be modified directly in this branch.
+This branch is the main development branch. It contains the complete code that is going to be released. It can only be merged, and can not be modified directly in this branch.
 
 - ``feature`` branch:
 This branch is used to develop new features. It is created based on ``develop`` branch. Once the development is finished, it should be merged into ``develop`` branch, and then delete the branch.
@@ -25,59 +25,50 @@ This is the branch that is going to be released. It is created based on ``develo
 - ``hotfix`` branch:
 This branch is used to fix a bug when an online bug is found. It is created based on ``master`` branch. When bug fix is done, it should be merged into ``master`` branch(as a new release) and ``develop`` and then delete the branch. branch.
 
-### Pull requests
+## Pull requests
 
 If you'd like to contribute to java-tron, you should follow the steps below:
-- **Fork** a repository from **tronprotocol/java-tron** allows you to freely experiment with changes without affecting the original project
-- **Fix** some code and **Commit** your modified code.
-- **Send** a Pull Request（PR）for the maintainers to review and merge into the main code base.
+- **Fork** a repository from **tronprotocol/java-tron** and working there without affecting the original project.
+- **Finish** your code modification and **Commit** your changes to your own repository.
+- **Submit** a Pull Request（PR）from your own repository to **tronprotocol/java-tron**. 
   *notice*：When you create a new PR，please choose the **tronprotocol/java-tron** as the base repository and choose **your fork/java-tron** as the head repository.
-  And you must choose **develop** as the base repository branch, which means we will merge the PR into our **develop** branch when reviewed and approved.
+  And you must choose **develop** as the base repository branch, which means we will merge the PR into our **develop** branch after reviewed and approved.
   Additionally, if you are writing a new feature, please ensure you add appropriate test cases under ``/src/test``.
 
-After the PR is checked by our Sonar check procedure and Travis CI continuous-integration check procedure automaticly,
-we maintainers will review the code changed and give some advices for modifying if necessary.Once approved,
-we will close the PR and merge into the protocol/java-tron's develop branch.
+The Sonar check and Travis CI continuous-integration check will be triggerred automatically after PR submitted, once all check passed, **java-tron** maintainers will review the PR and give feedback for modifying if necessary. Once approved, we will close the PR and merge it into the `develop` branch.
 
-We are always happy to receive pull requests, and do our best to
-review them as fast as possible. Not sure if that typo is worth a pull
-request? Do it! We would appreciate it.
 
-If your pull request is not accepted on the first try, don't be
-discouraged as it can be a possible oversight. Please explain your code as
-detailed as possible to make it easier for us to understand.
+We are always happy to receive pull requests, and do our best to review them as fast as possible. Not sure if A typo is worth a pull request? Do it! We would appreciate it.
 
-Please make sure your contributions adhere to our coding guidelines:
+If your pull request is not accepted on the first attempt, please don’t get discouraged, as this may be an oversight. Please explain your code as much as possible to make it easier for us to understand.
 
-- Code must be documented adhering to the [Google Style](https://google.github.io/styleguide/javaguide.html)
+Please make sure your commit follows below coding guidelines:
+
+- Code must be conformed to the [Google Style](https://google.github.io/styleguide/javaguide.html)
 - Code must pass Sonar detection.
-- Pull requests need to be based on and opened against the develop branch.
+- Pull requests must be based on the `develop` branch.
 - Commit messages should be started with verb, and the first letter should be a lowercase.The length of commit message
-must be limited in 50 words.
-### Create issues
+must be less than 50 words.
+
+## Create issues
 
-Any significant improvement should be documented as [a GitHub
-issue](https://github.com/tronprotocol/java-tron/issues) before anyone
-starts working on it.
+Any significant improvement must be documented in [a GitHub issue](https://github.com/tronprotocol/java-tron/issues)  before working on it.
 
-When filing an issue, make sure to answer these three questions:
+When start an issue, make sure to answer these three questions:
 
 - What did you do?
 - What did you expect to see?
 - What did you see instead?
 
-### Please check existing issues and docs first!
+## Please check existing issues and docs first!
 
-Please take a moment to check that your bug report or improvement proposal
-doesn't already exist. If it does, please add a quick "+1" or "I have this problem too".
+Please take a moment to check that your bug report or improvement proposal doesn't already exist. If it does, please add a quick "+1" or "I have this problem too". 
 This will help prioritize the most common problems and requests.
 
-## Community Developers Incentives Programme
+## Community Developers Incentives Programme(Paused)
 
 Bonus point applies in TRON incentives programme. Developers can earn points by contributing to TRON.
 
-You can find your points ranking at  [Tronscan](https://tronscan.org/#/developersreward).
-
 The Top 5 scored developers (for every month, quarter and year) can win a cash reward.
 
 For more details, please visit [Incentives Policy](https://tronprotocol.github.io/documentation-en/developers/incentives/).

CONTRIBUTING.md

@@ -21,7 +21,7 @@ RUN set -o errexit -o nounset \
     && cd $TMP_DIR \
     && git clone https://github.com/tronprotocol/java-tron.git \
     && cd java-tron \
-    && git checkout docker \
+    && git checkout master \
     && ./gradlew build -x test \
     && cd build/distributions \
     && unzip -o java-tron-1.0.0.zip \

Dockerfile

@@ -34,6 +34,7 @@
 import org.tron.core.utils.TransactionUtil;
 import org.tron.core.vm.EnergyCost;
 import org.tron.core.vm.LogInfoTriggerParser;
+import org.tron.core.vm.OperationRegistry;
 import org.tron.core.vm.VM;
 import org.tron.core.vm.VMConstant;
 import org.tron.core.vm.VMUtils;
@@ -80,7 +81,7 @@ public class VMActuator implements Actuator2 {
 
   @Getter
   @Setter
-  private boolean isConstantCall = false;
+  private boolean isConstantCall;
 
   @Setter
   private boolean enableEventListener;
@@ -108,8 +109,10 @@ public void validate(Object object) throws ContractValidateException {
       throw new RuntimeException("TransactionContext is null");
     }
 
-    //Load Config
+    // Load Config
     ConfigLoader.load(context.getStoreFactory());
+    // Warm up registry class
+    OperationRegistry.init();
     trx = context.getTrxCap().getInstance();
     blockCap = context.getBlockCap();
     if (VMConfig.allowTvmFreeze() && context.getTrxCap().getTrxTrace() != null) {
@@ -169,7 +172,7 @@ public void execute(Object object) throws ContractExeException {
           throw e;
         }
 
-        VM.play(program);
+        VM.play(program, OperationRegistry.getTable(OperationRegistry.Version.TRON_V1));
         result = program.getResult();
 
         if (TrxType.TRX_CONTRACT_CREATION_TYPE == trxType && !result.isRevert()) {
@@ -335,8 +338,8 @@ private void create()
       long feeLimit = trx.getRawData().getFeeLimit();
       if (feeLimit < 0 || feeLimit > rootRepository.getDynamicPropertiesStore().getMaxFeeLimit()) {
         logger.info("invalid feeLimit {}", feeLimit);
-        throw new ContractValidateException(
-            "feeLimit must be >= 0 and <= " + rootRepository.getDynamicPropertiesStore().getMaxFeeLimit());
+        throw new ContractValidateException("feeLimit must be >= 0 and <= "
+            + rootRepository.getDynamicPropertiesStore().getMaxFeeLimit());
       }
       AccountCapsule creator = rootRepository
           .getAccount(newSmartContract.getOriginAddress().toByteArray());
@@ -466,8 +469,8 @@ private void call()
       long feeLimit = trx.getRawData().getFeeLimit();
       if (feeLimit < 0 || feeLimit > rootRepository.getDynamicPropertiesStore().getMaxFeeLimit()) {
         logger.info("invalid feeLimit {}", feeLimit);
-        throw new ContractValidateException(
-            "feeLimit must be >= 0 and <= " + rootRepository.getDynamicPropertiesStore().getMaxFeeLimit());
+        throw new ContractValidateException("feeLimit must be >= 0 and <= "
+            + rootRepository.getDynamicPropertiesStore().getMaxFeeLimit());
       }
       AccountCapsule caller = rootRepository.getAccount(callerAddress);
       long energyLimit;
@@ -670,7 +673,8 @@ public long getTotalEnergyLimitWithFixRatio(AccountCapsule creator, AccountCapsu
     } else {
       if (consumeUserResourcePercent < VMConstant.ONE_HUNDRED) {
         // creatorEnergyLimit =
-        // min(callerEnergyLimit * (100 - percent) / percent, creatorLeftFrozenEnergy, originEnergyLimit)
+        // min(callerEnergyLimit * (100 - percent) / percent,
+        //   creatorLeftFrozenEnergy, originEnergyLimit)
 
         creatorEnergyLimit = min(
             BigInteger.valueOf(callerEnergyLimit)

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

@@ -49,35 +49,35 @@ public class EnergyCost {
   private static final long STOP = 0;
   private static final long CREATE_DATA = 200;
 
-  public static long getZeroTierCost(Program program) {
+  public static long getZeroTierCost(Program ignored) {
     return ZERO_TIER;
   }
 
-  public static long getVeryLowTierCost(Program program) {
+  public static long getVeryLowTierCost(Program ignored) {
     return VERY_LOW_TIER;
   }
 
-  public static long getLowTierCost(Program program) {
+  public static long getLowTierCost(Program ignored) {
     return LOW_TIER;
   }
 
-  public static long getMidTierCost(Program program) {
+  public static long getMidTierCost(Program ignored) {
     return MID_TIER;
   }
 
-  public static long getBaseTierCost(Program program) {
+  public static long getBaseTierCost(Program ignored) {
     return BASE_TIER;
   }
 
-  public static long getExtTierCost(Program program) {
+  public static long getExtTierCost(Program ignored) {
     return EXT_TIER;
   }
 
-  public static long getHighTierCost(Program program) {
+  public static long getHighTierCost(Program ignored) {
     return HIGH_TIER;
   }
 
-  public static long getSpecialTierCost(Program program) {
+  public static long getSpecialTierCost(Program ignored) {
     return SPECIAL_TIER;
   }
 
@@ -92,8 +92,8 @@ public static long getExpCost(Program program) {
     return EXP_ENERGY  + EXP_BYTE_ENERGY * bytesOccupied;
   }
 
-  public static long getExtCodeSizeCost(Program program) {
-     return EXT_CODE_SIZE;
+  public static long getExtCodeSizeCost(Program ignored) {
+    return EXT_CODE_SIZE;
   }
 
   public static long getSha3Cost(Program program) {
@@ -143,7 +143,7 @@ public static long getExtCodeCopyCost(Program program) {
     return energyCost;
   }
 
-  public static long getExtCodeHashCost(Program program) {
+  public static long getExtCodeHashCost(Program ignored) {
     return EXT_CODE_HASH;
   }
 
@@ -174,7 +174,7 @@ public static long getMStore8Cost(Program program) {
     return energyCost;
   }
 
-  public static long getSloadCost(Program program) {
+  public static long getSloadCost(Program ignored) {
     return SLOAD;
   }
 
@@ -237,11 +237,11 @@ public static long getLogCost(Program program) {
     return energyCost;
   }
 
-  public static long getSuicideCost(Program program) {
+  public static long getSuicideCost(Program ignored) {
     return SUICIDE;
   }
 
-  public static long getBalanceCost(Program program) {
+  public static long getBalanceCost(Program ignored) {
     return BALANCE;
   }
 
@@ -255,11 +255,11 @@ public static long getFreezeCost(Program program) {
     return FREEZE;
   }
 
-  public static long getUnfreezeCost(Program program) {
+  public static long getUnfreezeCost(Program ignored) {
     return UNFREEZE;
   }
 
-  public static long getFreezeExpireTimeCost(Program program) {
+  public static long getFreezeExpireTimeCost(Program ignored) {
     return FREEZE_EXPIRE_TIME;
   }
 
@@ -285,7 +285,7 @@ public static long getVoteWitnessCost(Program program) {
             ? amountArrayMemoryNeeded : witnessArrayMemoryNeeded), 0, Op.VOTEWITNESS);
   }
 
-  public static long getWithdrawRewardCost(Program program) {
+  public static long getWithdrawRewardCost(Program ignored) {
     return WITHDRAW_REWARD;
   }
 

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

@@ -0,0 +1,28 @@
+package org.tron.core.vm;
+
+import java.util.Arrays;
+
+public class JumpTable {
+
+  private static final Operation UNDEFINED =
+      new Operation(
+          -1, 0, 0,
+          p -> 0L,
+          p -> { },
+          () -> false);
+
+  private final Operation[] table = new Operation[256];
+
+  public JumpTable() {
+    // fill all op slots to undefined
+    Arrays.fill(table, UNDEFINED);
+  }
+  
+  public Operation get(int op) {
+    return table[op];
+  }
+
+  public void set(Operation op) {
+    table[op.getOpcode()] = op;
+  }
+}