Merge pull request #2813 from tronprotocol/release_3.6.6_fix_rename

change rootConstantCall to constantCall

Author: taihaofu

src/main/java/org/tron/common/runtime/RuntimeImpl.java

@@ -565,7 +565,7 @@ private void call()
               tokenValue, tokenId, blockCap.getInstance(), deposit, vmStartInUs,
               vmShouldEndInUs, energyLimit);
       if (isConstantCall) {
-        programInvoke.setRootConstantCall();
+        programInvoke.setConstantCall();
       }
       this.vm = new VM(config);
       rootInternalTransaction = new InternalTransaction(trx, trxType);

src/main/java/org/tron/common/runtime/vm/PrecompiledContracts.java

@@ -353,11 +353,11 @@ private static boolean validateV(byte[] v) {
 
   /**
    * Computes modular exponentiation on big numbers
-   *
+   * <p>
    * format of data[] array: [length_of_BASE] [length_of_EXPONENT] [length_of_MODULUS] [BASE]
    * [EXPONENT] [MODULUS] where every length is a 32-byte left-padded integer representing the
    * number of bytes. Call data is assumed to be infinitely right-padded with zero bytes.
-   *
+   * <p>
    * Returns an output as a byte array with the same length as the modulus
    */
   public static class ModExp extends PrecompiledContract {
@@ -470,11 +470,11 @@ private BigInteger parseArg(byte[] data, int offset, int len) {
 
   /**
    * Computes point addition on Barreto–Naehrig curve. See {@link BN128Fp} for details<br/> <br/>
-   *
+   * <p>
    * input data[]:<br/> two points encoded as (x, y), where x and y are 32-byte left-padded
    * integers,<br/> if input is shorter than expected, it's assumed to be right-padded with zero
    * bytes<br/> <br/>
-   *
+   * <p>
    * output:<br/> resulting point (x', y'), where x and y encoded as 32-byte left-padded
    * integers<br/>
    */
@@ -517,11 +517,11 @@ public Pair<Boolean, byte[]> execute(byte[] data) {
   /**
    * Computes multiplication of scalar value on a point belonging to Barreto–Naehrig curve. See
    * {@link BN128Fp} for details<br/> <br/>
-   *
+   * <p>
    * input data[]:<br/> point encoded as (x, y) is followed by scalar s, where x, y and s are
    * 32-byte left-padded integers,<br/> if input is shorter than expected, it's assumed to be
    * right-padded with zero bytes<br/> <br/>
-   *
+   * <p>
    * output:<br/> resulting point (x', y'), where x and y encoded as 32-byte left-padded
    * integers<br/>
    */
@@ -557,15 +557,15 @@ public Pair<Boolean, byte[]> execute(byte[] data) {
 
   /**
    * Computes pairing check. <br/> See {@link PairingCheck} for details.<br/> <br/>
-   *
+   * <p>
    * Input data[]: <br/> an array of points (a1, b1, ... , ak, bk), <br/> where "ai" is a point of
    * {@link BN128Fp} curve and encoded as two 32-byte left-padded integers (x; y) <br/> "bi" is a
    * point of {@link BN128G2} curve and encoded as four 32-byte left-padded integers {@code (ai + b;
    * ci + d)}, each coordinate of the point is a big-endian {@link } number, so {@code b} precedes
    * {@code a} in the encoding: {@code (b, a; d, c)} <br/> thus each pair (ai, bi) has 192 bytes
    * length, if 192 is not a multiple of {@code data.length} then execution fails <br/> the number
    * of pairs is derived from input length by dividing it by 192 (the length of a pair) <br/> <br/>
-   *
+   * <p>
    * output: <br/> pairing product which is either 0 or 1, encoded as 32-byte left-padded integer
    * <br/>
    */
@@ -648,7 +648,6 @@ private Pair<BN128G1, BN128G2> decodePair(byte[] in, int offset) {
   }
 
 
-
   public static class ValidateMultiSign extends PrecompiledContract {
 
     private static final int ENGERYPERSIGN = 1500;
@@ -716,6 +715,7 @@ public Pair<Boolean, byte[]> execute(byte[] rawData) {
 
 
   public static class BatchValidateSign extends PrecompiledContract {
+
     private static final ExecutorService workers;
     private static final int ENGERYPERSIGN = 1500;
     private static final int MAX_SIZE = 16;
@@ -779,7 +779,7 @@ private Pair<Boolean, byte[]> doExecute(byte[] data)
       }
       byte[] res = new byte[WORD_SIZE];
       if (isConstantCall()) {
-        //for static call not use thread pool to avoid potential effect
+        //for constant call not use thread pool to avoid potential effect
         for (int i = 0; i < cnt; i++) {
           if (DataWord
               .equalAddressByteArray(addresses[i], recoverAddrBySign(signatures[i], hash))) {
@@ -816,7 +816,6 @@ private Pair<Boolean, byte[]> doExecute(byte[] data)
     }
 
 
-
   }
 
   private static byte[] recoverAddrBySign(byte[] sign, byte[] hash) {

src/main/java/org/tron/common/runtime/vm/program/Program.java

@@ -537,8 +537,8 @@ this, new DataWord(newAddress), getContractAddress(), value, new DataWord(0),
         new DataWord(0),
         newBalance, null, deposit, false, byTestingSuite(), vmStartInUs,
         getVmShouldEndInUs(), energyLimit.longValueSafe());
-    if (isRootConstantCall()) {
-      programInvoke.setRootConstantCall();
+    if (isConstantCall()) {
+      programInvoke.setConstantCall();
     }
     ProgramResult createResult = ProgramResult.createEmpty();
 
@@ -755,8 +755,8 @@ this, new DataWord(contextAddress),
           !isTokenTransfer ? new DataWord(0) : msg.getTokenId(),
           contextBalance, data, deposit, msg.getType().callIsStatic() || isStaticCall(),
           byTestingSuite(), vmStartInUs, getVmShouldEndInUs(), msg.getEnergy().longValueSafe());
-      if (isRootConstantCall()) {
-        programInvoke.setRootConstantCall();
+      if (isConstantCall()) {
+        programInvoke.setConstantCall();
       }
       VM vm = new VM(config);
       Program program = new Program(programCode, programInvoke, internalTx, config,
@@ -1055,8 +1055,8 @@ public boolean isStaticCall() {
     return invoke.isStaticCall();
   }
 
-  public boolean isRootConstantCall() {
-    return invoke.isRootConstantCall();
+  public boolean isConstantCall() {
+    return invoke.isConstantCall();
   }
 
   public ProgramResult getResult() {
@@ -1461,7 +1461,7 @@ public void callToPrecompiledAddress(MessageCall msg,
       // this is the depositImpl, not contractState as above
       contract.setDeposit(deposit);
       contract.setResult(this.result);
-      contract.setConstantCall(isRootConstantCall());
+      contract.setConstantCall(isConstantCall());
       contract.setVmShouldEndInUs(getVmShouldEndInUs());
       Pair<Boolean, byte[]> out = contract.execute(data);
 

src/main/java/org/tron/common/runtime/vm/program/invoke/ProgramInvoke.java

@@ -73,7 +73,7 @@ public interface ProgramInvoke {
 
   BlockCapsule getBlockByNum(int index);
 
-  void setRootConstantCall();
+  void setConstantCall();
 
-  boolean isRootConstantCall();
+  boolean isConstantCall();
 }

src/main/java/org/tron/common/runtime/vm/program/invoke/ProgramInvokeImpl.java

@@ -56,7 +56,7 @@ public class ProgramInvokeImpl implements ProgramInvoke {
   private boolean byTestingSuite = false;
   private int callDeep = 0;
   private boolean isStaticCall = false;
-  private boolean isRootConstantCall = false;
+  private boolean isConstantCall = false;
 
   public ProgramInvokeImpl(DataWord address, DataWord origin, DataWord caller, DataWord balance,
       DataWord callValue, DataWord tokenValue, DataWord tokenId, byte[] msgData,
@@ -382,13 +382,13 @@ public BlockCapsule getBlockByNum(int index) {
   }
 
   @Override
-  public void setRootConstantCall() {
-    isRootConstantCall = true;
+  public void setConstantCall() {
+    isConstantCall = true;
   }
 
   @Override
-  public boolean isRootConstantCall() {
-    return isRootConstantCall;
+  public boolean isConstantCall() {
+    return isConstantCall;
   }
 
 }

src/main/java/org/tron/common/runtime/vm/program/invoke/ProgramInvokeMockImpl.java

@@ -50,6 +50,8 @@ public class ProgramInvokeMockImpl implements ProgramInvoke {
 
   private boolean isConstantCall;
 
+  private boolean isStaticCall;
+
   public ProgramInvokeMockImpl(byte[] msgDataRaw) {
     this();
     this.msgData = Arrays.clone(msgDataRaw);
@@ -225,7 +227,7 @@ public void setOwnerAddress(byte[] ownerAddress) {
 
   @Override
   public boolean isStaticCall() {
-    return isConstantCall;
+    return isStaticCall;
   }
 
   @Override
@@ -252,12 +254,13 @@ public BlockCapsule getBlockByNum(int index) {
   }
 
   @Override
-  public void setRootConstantCall() {
+  public void setConstantCall() {
+    isConstantCall = true;
   }
 
   @Override
-  public boolean isRootConstantCall() {
-    return false;
+  public boolean isConstantCall() {
+    return isConstantCall;
   }
 
   @Override