Feature/v3.6.5 create account when transfer

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

@@ -92,7 +92,7 @@ public class RuntimeImpl implements Runtime {
 
   @Getter
   @Setter
-  private boolean isStaticCall = false;
+  private boolean isConstantCall = false;
 
   @Setter
   private boolean enableEventLinstener;
@@ -136,9 +136,9 @@ public RuntimeImpl(TransactionTrace trace, BlockCapsule block, Deposit deposit,
    * For constant trx with latest blockCap.
    */
   public RuntimeImpl(Transaction tx, BlockCapsule block, DepositImpl deposit,
-      ProgramInvokeFactory programInvokeFactory, boolean isStaticCall) {
+      ProgramInvokeFactory programInvokeFactory, boolean isConstantCall) {
     this(tx, block, deposit, programInvokeFactory);
-    this.isStaticCall = isStaticCall;
+    this.isConstantCall = isConstantCall;
   }
 
   private RuntimeImpl(Transaction tx, BlockCapsule block, DepositImpl deposit,
@@ -546,7 +546,7 @@ private void call()
       }
       AccountCapsule caller = this.deposit.getAccount(callerAddress);
       long energyLimit;
-      if (isStaticCall) {
+      if (isConstantCall) {
         energyLimit = Constant.ENERGY_LIMIT_IN_CONSTANT_TX;
       } else {
         AccountCapsule creator = this.deposit
@@ -564,8 +564,8 @@ private void call()
           .createProgramInvoke(TrxType.TRX_CONTRACT_CALL_TYPE, executorType, trx,
               tokenValue, tokenId, blockCap.getInstance(), deposit, vmStartInUs,
               vmShouldEndInUs, energyLimit);
-      if (isStaticCall) {
-        programInvoke.setStaticCall();
+      if (isConstantCall) {
+        programInvoke.setConstantCall();
       }
       this.vm = new VM(config);
       rootInternalTransaction = new InternalTransaction(trx, trxType);
@@ -616,14 +616,18 @@ public void go() {
         vm.play(program);
         result = program.getResult();
 
-        if (isStaticCall) {
+        if (isConstantCall) {
           long callValue = TransactionCapsule.getCallValue(trx.getRawData().getContract(0));
           long callTokenValue = TransactionCapsule
               .getCallTokenValue(trx.getRawData().getContract(0));
           if (callValue > 0 || callTokenValue > 0) {
             runtimeError = "constant cannot set call value or call token value.";
             result.rejectInternalTransactions();
           }
+          if (result.getException() != null) {
+            runtimeError = result.getException().getMessage();
+            result.rejectInternalTransactions();
+          }
           return;
         }
 
@@ -702,7 +706,7 @@ public void go() {
       }
       logger.info("runtime result is :{}", result.getException().getMessage());
     }
-    if (!isStaticCall) {
+    if (!isConstantCall) {
       trace.setBill(result.getEnergyUsed());
     }
   }

src/main/java/org/tron/common/runtime/utils/MUtil.java

@@ -58,13 +58,4 @@ public static byte[] convertToTronAddress(byte[] address) {
     }
     return address;
   }
-
-  public static byte[] allZero32TronAddress() {
-    byte[] newAddress = new byte[32];
-    byte[] temp = new byte[]{Wallet.getAddressPreFixByte()};
-    System.arraycopy(temp, 0, newAddress, 11, temp.length);
-
-    return newAddress;
-  }
-
 }

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

@@ -521,4 +521,19 @@ public static DataWord[] parseArray(byte[] data) {
     }
     return words;
   }
+
+  public static boolean equalAddressByteArray(byte[] arr1, byte[] arr2){
+    if (arr1 == arr2)
+      return true;
+    if (arr1==null || arr2==null || arr1.length < 20 || arr2.length < 20)
+      return false;
+
+    int i = arr1.length - 20;
+    int j = arr2.length - 20;
+
+    for (; i < arr1.length && j < arr2.length; i++, j++)
+      if (arr1[i] != arr2[j])
+        return false;
+    return true;
+  }
 }

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

@@ -276,6 +276,7 @@ public int getEXT_CODE_HASH() {
     return EXT_CODE_HASH;
   }
 
+
   private static EnergyCost instance = null;
 
   public static EnergyCost getInstance() {

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

@@ -50,6 +50,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.spongycastle.util.encoders.Hex;
 import org.tron.common.crypto.ECKey;
@@ -60,7 +61,6 @@
 import org.tron.common.crypto.zksnark.Fp;
 import org.tron.common.crypto.zksnark.PairingCheck;
 import org.tron.common.runtime.config.VMConfig;
-import org.tron.common.runtime.utils.MUtil;
 import org.tron.common.runtime.vm.program.Program;
 import org.tron.common.runtime.vm.program.ProgramResult;
 import org.tron.common.storage.Deposit;
@@ -227,7 +227,7 @@ public ProgramResult getResult() {
 
     @Setter
     @Getter
-    private boolean isStaticCall;
+    private boolean isConstantCall;
 
     @Getter
     @Setter
@@ -683,7 +683,7 @@ public long getEnergyForData(byte[] data) {
     @Override
     public Pair<Boolean, byte[]> execute(byte[] data) {
 
-      if (isStaticCall()) {
+      if (isConstantCall()) {
         return Pair.of(true, new DataWord(0).getData());
       }
       if (data == null || data.length != 2 * DataWord.WORD_SIZE) {
@@ -880,7 +880,7 @@ public long getEnergyForData(byte[] data) {
     @Override
     public Pair<Boolean, byte[]> execute(byte[] data) {
 
-      if (isStaticCall()) {
+      if (isConstantCall()) {
         return Pair.of(true, new DataWord(0).getData());
       }
 
@@ -946,7 +946,7 @@ public long getEnergyForData(byte[] data) {
     @Override
     public Pair<Boolean, byte[]> execute(byte[] data) {
 
-      if (isStaticCall()) {
+      if (isConstantCall()) {
         return Pair.of(true, new DataWord(0).getData());
       }
 
@@ -1022,7 +1022,7 @@ public long getEnergyForData(byte[] data) {
     @Override
     public Pair<Boolean, byte[]> execute(byte[] data) {
 
-      if (isStaticCall()) {
+      if (isConstantCall()) {
         return Pair.of(true, new DataWord(0).getData());
       }
 
@@ -1107,7 +1107,7 @@ public long getEnergyForData(byte[] data) {
     @Override
     public Pair<Boolean, byte[]> execute(byte[] data) {
 
-      if (isStaticCall()) {
+      if (isConstantCall()) {
         return Pair.of(true, new DataWord(0).getData());
       }
 
@@ -1331,7 +1331,6 @@ public Pair<Boolean, byte[]> execute(byte[] data) {
   public static class MultiValidateSign extends PrecompiledContract {
     private static final ExecutorService workers;
     private static final int ENGERYPERSIGN = 1500;
-    private static final byte[] ZEROADDR = MUtil.allZero32TronAddress();
     private static final byte[] EMPTYADDR = new byte[DataWord.WORD_SIZE];
 
     static {
@@ -1361,6 +1360,7 @@ public ValidateSignResult call() {
     @Data
     @AllArgsConstructor
     private static class ValidateSignResult {
+
       private Boolean res;
       private int nonce;
     }
@@ -1395,7 +1395,7 @@ private Pair<Boolean, byte[]> doExecute(byte[] data)
       }
       int min = Math.min(cnt, DataWord.WORD_SIZE);
       byte[] res = new byte[DataWord.WORD_SIZE];
-      if (isStaticCall()) {
+      if (isConstantCall()) {
         //for static call not use thread pool to avoid potential effect
         for (int i = 0; i < min; i++) {
           if (validSign(signatures[i], hash, addresses[i])) {
@@ -1412,7 +1412,8 @@ private Pair<Boolean, byte[]> doExecute(byte[] data)
               .submit(new ValidateSignTask(countDownLatch, hash, signatures[i], addresses[i], i));
           futures.add(future);
         }
-        boolean withNoTimeout = countDownLatch.await(getCPUTimeLeftInUs() * 1000, TimeUnit.NANOSECONDS);
+        boolean withNoTimeout = countDownLatch
+            .await(getCPUTimeLeftInUs() * 1000, TimeUnit.NANOSECONDS);
 
         if (!withNoTimeout) {
           logger.info("MultiValidateSign timeout");
@@ -1433,9 +1434,9 @@ private static boolean validSign(byte[] sign, byte[] hash, byte[] address) {
       byte v;
       byte[] r;
       byte[] s;
-      DataWord out = null;
-      if (sign.length < 65 || Arrays.equals(ZEROADDR, address)
-          || Arrays.equals(EMPTYADDR, address)) {
+      byte[] out = null;
+      if (ArrayUtils.isEmpty(sign) || sign.length < 65
+          || DataWord.equalAddressByteArray(EMPTYADDR, address)) {
         return false;
       }
       try {
@@ -1447,13 +1448,12 @@ private static boolean validSign(byte[] sign, byte[] hash, byte[] address) {
         }
         ECKey.ECDSASignature signature = ECKey.ECDSASignature.fromComponents(r, s, v);
         if (signature.validateComponents()) {
-          out = new DataWord(ECKey.signatureToAddress(hash, signature));
+          out = ECKey.signatureToAddress(hash, signature);
         }
       } catch (Throwable any) {
         logger.info("ECRecover error", any.getMessage());
       }
-      return out != null && Arrays.equals(new DataWord(address).getLast20Bytes(),
-          out.getLast20Bytes());
+      return DataWord.equalAddressByteArray(address, out);
     }
 
     private static byte[][] extractBytes32Array(DataWord[] words, int offset) {

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

@@ -1074,7 +1074,7 @@ public void step(Program program) {
         case LOG3:
         case LOG4: {
 
-          if (program.isStaticCall()) {
+          if (program.isConstantCall()) {
             throw new Program.StaticCallModificationException();
           }
           DataWord address = program.getContractAddress();
@@ -1152,7 +1152,7 @@ public void step(Program program) {
         }
         break;
         case SSTORE: {
-          if (program.isStaticCall()) {
+          if (program.isConstantCall()) {
             throw new Program.StaticCallModificationException();
           }
 
@@ -1283,7 +1283,7 @@ public void step(Program program) {
         }
         break;
         case CREATE: {
-          if (program.isStaticCall()) {
+          if (program.isConstantCall()) {
             throw new Program.StaticCallModificationException();
           }
           DataWord value = program.stackPop();
@@ -1295,7 +1295,7 @@ public void step(Program program) {
         }
         break;
         case CREATE2: {
-          if (program.isStaticCall()) {
+          if (program.isConstantCall()) {
             throw new Program.StaticCallModificationException();
           }
           DataWord value = program.stackPop();
@@ -1330,7 +1330,7 @@ public void step(Program program) {
             value = DataWord.ZERO;
           }
 
-          if (program.isStaticCall() && (op == CALL || op == CALLTOKEN) && !value.isZero()) {
+          if (program.isConstantCall() && (op == CALL || op == CALLTOKEN) && !value.isZero()) {
             throw new Program.StaticCallModificationException();
           }
 
@@ -1409,7 +1409,7 @@ public void step(Program program) {
           break;
         }
         case SUICIDE: {
-          if (program.isStaticCall()) {
+          if (program.isConstantCall()) {
             throw new Program.StaticCallModificationException();
           }
 
@@ -1427,7 +1427,6 @@ public void step(Program program) {
         default:
           break;
       }
-
       program.setPreviouslyExecutedOp(op.val());
     } catch (RuntimeException e) {
       logger.info("VM halted: [{}]", e.getMessage());

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

@@ -54,6 +54,11 @@ public Manager getDbManager() {
     return deposit.getDbManager();
   }
 
+  @Override
+  public AccountCapsule createNormalAccount(byte[] address) {
+    return deposit.createNormalAccount(address);
+  }
+
   @Override
   public void setProgramListener(ProgramListener listener) {
     this.programListener = listener;

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

@@ -701,6 +701,7 @@ public void callToAddress(MessageCall msg) {
           msg.getEndowment().getNoLeadZeroesData());
     } else if (!ArrayUtils.isEmpty(senderAddress) && !ArrayUtils.isEmpty(contextAddress)
         && senderAddress != contextAddress && endowment > 0) {
+      createAccountIfNotExist(deposit, contextAddress);
       if (!isTokenTransfer) {
         try {
           TransferActuator
@@ -749,7 +750,7 @@ this, new DataWord(contextAddress),
           !isTokenTransfer ? callValue : new DataWord(0),
           !isTokenTransfer ? new DataWord(0) : callValue,
           !isTokenTransfer ? new DataWord(0) : msg.getTokenId(),
-          contextBalance, data, deposit, msg.getType().callIsStatic() || isStaticCall(),
+          contextBalance, data, deposit, msg.getType().callIsStatic() || isConstantCall(),
           byTestingSuite(), vmStartInUs, getVmShouldEndInUs(), msg.getEnergy().longValueSafe());
       VM vm = new VM(config);
       Program program = new Program(programCode, programInvoke, internalTx, config,
@@ -1044,8 +1045,8 @@ public DataWord getDifficulty() {
     return invoke.getDifficulty().clone();
   }
 
-  public boolean isStaticCall() {
-    return invoke.isStaticCall();
+  public boolean isConstantCall() {
+    return invoke.isConstantCall();
   }
 
   public ProgramResult getResult() {
@@ -1450,7 +1451,7 @@ public void callToPrecompiledAddress(MessageCall msg,
       // this is the depositImpl, not contractState as above
       contract.setDeposit(deposit);
       contract.setResult(this.result);
-      contract.setStaticCall(isStaticCall());
+      contract.setConstantCall(isConstantCall());
       contract.setVmShouldEndInUs(getVmShouldEndInUs());
       Pair<Boolean, byte[]> out = contract.execute(data);
 
@@ -1779,4 +1780,14 @@ public long getVmStartInUs() {
   private boolean isContractExist(AccountCapsule existingAddr, Deposit deposit) {
     return deposit.getContract(existingAddr.getAddress().toByteArray()) != null;
   }
+
+  private void createAccountIfNotExist(Deposit deposit, byte[] contextAddress) {
+    if (VMConfig.allowTvmSolidity059()) {
+      //after solidity059 proposal , allow contract transfer trc10 or trx to non-exist address(would create one)
+      AccountCapsule sender = deposit.getAccount(contextAddress);
+      if (sender == null) {
+        deposit.createNormalAccount(contextAddress);
+      }
+    }
+  }
 }

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

@@ -63,15 +63,15 @@ public interface ProgramInvoke {
 
   Deposit getDeposit();
 
-  boolean isStaticCall();
+  boolean isConstantCall();
 
   long getVmShouldEndInUs();
 
   long getVmStartInUs();
 
   long getEnergyLimit();
 
-  void setStaticCall();
+  void setConstantCall();
 
   BlockCapsule getBlockByNum(int index);
 }