Merge branch 'develop' of https://github.com/tronprotocol/java-tron into develop

Author: CodeNinjaEvan

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

@@ -21,10 +21,10 @@
 @Slf4j
 public class TransferActuator extends AbstractActuator {
 
-  TransferContract transferContract;
-  byte[] ownerAddress;
-  byte[] toAddress;
-  long amount;
+  private TransferContract transferContract;
+  private byte[] ownerAddress;
+  private byte[] toAddress;
+  private long amount;
 
   TransferActuator(Any contract, Manager dbManager) {
     super(contract, dbManager);
@@ -40,24 +40,20 @@ public class TransferActuator extends AbstractActuator {
 
   @Override
   public boolean execute(TransactionResultCapsule ret) throws ContractExeException {
-
     long fee = calcFee();
     try {
-
-      // if account with to_address is not existed,  create it.
+      // if account with to_address does not exist, create it first.
       AccountCapsule toAccount = dbManager.getAccountStore()
           .get(transferContract.getToAddress().toByteArray());
       if (toAccount == null) {
         toAccount = new AccountCapsule(ByteString.copyFrom(toAddress), AccountType.Normal,
             dbManager.getHeadBlockTimeStamp());
         dbManager.getAccountStore().put(toAddress, toAccount);
       }
-      dbManager.adjustBalance(transferContract.getOwnerAddress().toByteArray(), -calcFee());
+      dbManager.adjustBalance(transferContract.getOwnerAddress().toByteArray(), -fee);
       ret.setStatus(fee, code.SUCESS);
-      dbManager.adjustBalance(transferContract.getOwnerAddress().toByteArray(),
-          -amount);
-      dbManager.adjustBalance(transferContract.getToAddress().toByteArray(),
-          amount);
+      dbManager.adjustBalance(transferContract.getOwnerAddress().toByteArray(), -amount);
+      dbManager.adjustBalance(transferContract.getToAddress().toByteArray(), amount);
     } catch (BalanceInsufficientException e) {
       logger.debug(e.getMessage(), e);
       ret.setStatus(fee, code.FAILED);
@@ -112,7 +108,7 @@ public boolean validate() throws ContractValidateException {
         throw new ContractValidateException("balance is not sufficient.");
       }
 
-      // if account with to_address is not existed,  create it.
+      // if account with to_address is not existed, the minimum amount is 1 TRX
       AccountCapsule toAccount = dbManager.getAccountStore()
           .get(transferContract.getToAddress().toByteArray());
       if (toAccount == null) {
@@ -123,15 +119,14 @@ public boolean validate() throws ContractValidateException {
         }
       } else {
         //check to account balance if overflow
-        balance = Math.addExact(toAccount.getBalance(), amount);
+        long toAddressBalance = Math.addExact(toAccount.getBalance(), amount);
       }
     } catch (Exception ex) {
       throw new ContractValidateException(ex.getMessage());
     }
     return true;
   }
 
-
   @Override
   public ByteString getOwnerAddress() throws InvalidProtocolBufferException {
     return contract.unpack(TransferContract.class).getOwnerAddress();
@@ -141,4 +136,4 @@ public ByteString getOwnerAddress() throws InvalidProtocolBufferException {
   public long calcFee() {
     return ChainConstant.TRANSFER_FEE;
   }
-}
+}

src/main/java/org/tron/core/capsule/TransactionResultCapsule.java

@@ -6,6 +6,7 @@
 
 @Slf4j
 public class TransactionResultCapsule implements ProtoCapsule<Transaction.Result> {
+
   private Transaction.Result transactionResult;
 
   /**
@@ -19,7 +20,6 @@ public TransactionResultCapsule() {
     this.transactionResult = Transaction.Result.newBuilder().build();
   }
 
-
   public TransactionResultCapsule(Transaction.Result.code code, long fee) {
     Transaction.Result ret = Transaction.Result.newBuilder().setRet(code).setFee(fee).build();
   }
@@ -38,7 +38,6 @@ public void setErrorCode(Transaction.Result.code code) {
     this.transactionResult = this.transactionResult.toBuilder().setRet(code).build();
   }
 
-
   @Override
   public byte[] getData() {
     return this.transactionResult.toByteArray();
@@ -48,4 +47,4 @@ public byte[] getData() {
   public Result getInstance() {
     return this.transactionResult;
   }
-}
+}

src/main/java/org/tron/core/config/Parameter.java

@@ -4,7 +4,7 @@ public interface Parameter {
 
   interface ChainConstant {
 
-    long TRANSFER_FEE = 0; // 1 drop
+    long TRANSFER_FEE = 0; // free
     long ASSET_ISSUE_FEE = 1024000000; // 1024 trx 1024*10^6
     long VOTE_WITNESS_FEE = 10000; // 10000 drop
     long CREATE_ACCOUNT_FEE = 10000; // 10000 drop