resolve conflict

Author: Yrp

README.md

@@ -71,6 +71,7 @@ TRON Protocol and the TVM allow anyone to develop DAPPs for themselves or their
 In the shell command, type:
 ```bash
 git clone https://github.com/tronprotocol/java-tron.git
+git checkout -t origin/master
 ```
 
 * For Mac, you can also install **[GitHub for Mac](https://mac.github.com/)** then **[fork and clone our repository](https://guides.github.com/activities/forking/)**. 

src/main/java/org/tron/common/overlay/discover/message/Message.java

@@ -2,6 +2,7 @@
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.tron.common.utils.Sha256Hash;
+import org.tron.core.exception.P2pException;
 
 public abstract class Message {
 
@@ -46,7 +47,7 @@ public int hashCode() {
     return getMessageId().hashCode();
   }
 
-  public static Message parse(byte[] encode) {
+  public static Message parse(byte[] encode) throws  Exception{
     byte type = encode[0];
     byte[] data = ArrayUtils.subarray(encode, 1, encode.length);
     switch (type) {
@@ -59,7 +60,7 @@ public static Message parse(byte[] encode) {
       case 4:
         return new NeighborsMessage(data);
       default:
-        throw new IllegalArgumentException("No such message");
+        throw new P2pException(P2pException.TypeEnum.NO_SUCH_MESSAGE, "type=" + encode[0]);
     }
   }
 }

src/main/java/org/tron/common/overlay/message/MessageCodec.java

@@ -1,20 +1,3 @@
-/*
- * Copyright (c) [2016] [ <ether.camp> ]
- * This file is part of the ethereumJ library.
- *
- * The ethereumJ library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The ethereumJ library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with the ethereumJ library. If not, see <http://www.gnu.org/licenses/>.
- */
 package org.tron.common.overlay.message;
 
 import io.netty.buffer.ByteBuf;
@@ -31,13 +14,10 @@
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 import org.tron.common.overlay.server.Channel;
+import org.tron.core.exception.P2pException;
 import org.tron.core.net.message.MessageTypes;
 import org.tron.core.net.message.TronMessageFactory;
 
-
-/**
- * The Netty codec which encodes/decodes RPLx frames to subprotocol Messages
- */
 @Component
 @Scope("prototype")
 public class MessageCodec extends ByteToMessageDecoder {
@@ -63,15 +43,15 @@ public void setChannel(Channel channel) {
     this.channel = channel;
   }
 
-  private Message createMessage(byte[] encoded) {
+  private Message createMessage(byte[] encoded) throws Exception{
     byte type = encoded[0];
     if (MessageTypes.inP2pRange(type)) {
       return p2pMessageFactory.create(encoded);
     }
     if (MessageTypes.inTronRange(type)) {
       return tronMessageFactory.create(encoded);
     }
-    throw new Error(MessageFactory.ERR_NO_SUCH_MSG + ", type=" + type + ", len=" + encoded.length);
+    throw new P2pException(P2pException.TypeEnum.NO_SUCH_MESSAGE, "type=" + encoded[0]);
   }
 
 }

src/main/java/org/tron/common/overlay/message/MessageFactory.java

@@ -19,6 +19,6 @@ public abstract class MessageFactory {
   public static String ERR_NO_SUCH_MSG = "No such message";
   public static String ERR_PARSE_FAILED = "parse message failed";
 
-  protected abstract Message create(byte[] data);
+  protected abstract Message create(byte[] data) throws Exception;
 
 }

src/main/java/org/tron/common/overlay/message/P2pMessageFactory.java

@@ -19,29 +19,30 @@
 package org.tron.common.overlay.message;
 
 import org.apache.commons.lang3.ArrayUtils;
+import org.tron.core.exception.P2pException;
 import org.tron.core.net.message.MessageTypes;
 
 public class P2pMessageFactory extends MessageFactory {
 
   @Override
-  public P2pMessage create(byte[] data) {
+  public P2pMessage create(byte[] data) throws Exception{
     try {
       byte type = data[0];
       byte[] rawData = ArrayUtils.subarray(data, 1, data.length);
       return create(type, rawData);
     } catch (Exception e) {
-      if (e.getMessage() != null && e.getMessage().contains(MessageFactory.ERR_NO_SUCH_MSG)){
+      if (e instanceof P2pException){
         throw e;
       }else {
-        throw new Error(MessageFactory.ERR_PARSE_FAILED + ", type=" + data[0] + ", len=" + data.length);
+        throw new P2pException(P2pException.TypeEnum.PARSE_MESSAGE_FAILED, "type=" + data[0] + ", len=" + data.length);
       }
     }
   }
 
-  private P2pMessage create(byte type, byte[] rawData) {
+  private P2pMessage create(byte type, byte[] rawData) throws  Exception{
     MessageTypes messageType = MessageTypes.fromByte(type);
     if (messageType == null){
-      throw new RuntimeException(MessageFactory.ERR_NO_SUCH_MSG +  ", type=" + type);
+      throw new P2pException(P2pException.TypeEnum.NO_SUCH_MESSAGE, "type=" + type);
     }
     switch (messageType) {
       case P2P_HELLO:
@@ -53,7 +54,7 @@ private P2pMessage create(byte type, byte[] rawData) {
       case P2P_PONG:
         return new PongMessage(type, rawData);
       default:
-        throw new Error(MessageFactory.ERR_NO_SUCH_MSG +  ", " + messageType);
+        throw new P2pException(P2pException.TypeEnum.NO_SUCH_MESSAGE, messageType.toString());
     }
   }
 }

src/main/java/org/tron/common/overlay/server/Channel.java

@@ -25,6 +25,7 @@
 import io.netty.handler.timeout.ReadTimeoutHandler;
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,6 +37,7 @@
 import org.tron.common.overlay.discover.NodeStatistics;
 import org.tron.common.overlay.message.*;
 import org.tron.core.db.ByteArrayWrapper;
+import org.tron.core.exception.P2pException;
 import org.tron.core.net.peer.PeerConnectionDelegate;
 import org.tron.core.net.peer.TronHandler;
 
@@ -152,14 +154,15 @@ public void disconnect(ReasonCode reason) {
 
     public void processException(Throwable throwable){
         String errMsg = throwable.getMessage();
+        SocketAddress address = ctx.channel().remoteAddress();
         if (throwable instanceof ReadTimeoutException){
-            logger.error("Read timeout, {}", ctx.channel().remoteAddress());
-        }else if (errMsg != null && (errMsg.contains(MessageFactory.ERR_NO_SUCH_MSG) ||
-                errMsg.contains(MessageFactory.ERR_PARSE_FAILED) ||
-                errMsg.contains("Connection reset by peer"))){
-            logger.error("{}, {}", errMsg, ctx.channel().remoteAddress());
+            logger.error("Read timeout, {}", address);
+        }else if (errMsg != null && errMsg.contains("Connection reset by peer")){
+            logger.error("{}, {}", errMsg, address);
+        }else if(throwable instanceof P2pException){
+            logger.error("type: {}, info: {}, {}", ((P2pException) throwable).getType(), errMsg, address);
         }else {
-            logger.error("exception caught, {}", ctx.channel().remoteAddress(), throwable);
+            logger.error("exception caught, {}", address, throwable);
         }
         close();
     }

src/main/java/org/tron/core/Wallet.java

@@ -43,7 +43,14 @@
 import org.tron.core.capsule.WitnessCapsule;
 import org.tron.core.db.AccountStore;
 import org.tron.core.db.Manager;
-import org.tron.core.exception.*;
+import org.tron.core.exception.ContractExeException;
+import org.tron.core.exception.ContractValidateException;
+import org.tron.core.exception.DupTransactionException;
+import org.tron.core.exception.StoreException;
+import org.tron.core.exception.TaposException;
+import org.tron.core.exception.TooBigTransactionException;
+import org.tron.core.exception.ValidateBandwidthException;
+import org.tron.core.exception.ValidateSignatureException;
 import org.tron.core.net.message.TransactionMessage;
 import org.tron.core.net.node.NodeImpl;
 import org.tron.protos.Contract.AccountCreateContract;
@@ -191,6 +198,7 @@ public Account getBalance(Account account) {
   /**
    * Create a transaction by contract.
    */
+  @Deprecated
   public Transaction createTransaction(TransferContract contract) {
     AccountStore accountStore = dbManager.getAccountStore();
     return new TransactionCapsule(contract, accountStore).getInstance();
@@ -244,7 +252,7 @@ public Transaction createTransaction(VoteWitnessContract voteWitnessContract) {
   public Transaction createTransaction(AssetIssueContract assetIssueContract) {
     return new TransactionCapsule(assetIssueContract).getInstance();
   }
-
+  @Deprecated
   public Transaction createTransaction(WitnessCreateContract witnessCreateContract) {
     return new TransactionCapsule(witnessCreateContract).getInstance();
   }
@@ -287,11 +295,11 @@ public WitnessList getWitnessList() {
         .forEach(witnessCapsule -> builder.addWitnesses(witnessCapsule.getInstance()));
     return builder.build();
   }
-
+  @Deprecated
   public Transaction createTransaction(TransferAssetContract transferAssetContract) {
     return new TransactionCapsule(transferAssetContract).getInstance();
   }
-
+  @Deprecated
   public Transaction createTransaction(
       ParticipateAssetIssueContract participateAssetIssueContract) {
     return new TransactionCapsule(participateAssetIssueContract).getInstance();

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

@@ -23,13 +23,15 @@ public class CreateAccountActuator extends AbstractActuator {
   }
 
   @Override
+  @Deprecated //Can not create account by api. Need send more than 1 trx , will create account if not exit.
   public boolean execute(TransactionResultCapsule ret)
       throws ContractExeException {
     long fee = calcFee();
     try {
 
       AccountCreateContract accountCreateContract = contract.unpack(AccountCreateContract.class);
-      AccountCapsule accountCapsule = new AccountCapsule(accountCreateContract);
+      AccountCapsule accountCapsule = new AccountCapsule(accountCreateContract,
+          System.currentTimeMillis());
       dbManager.getAccountStore()
           .put(accountCreateContract.getOwnerAddress().toByteArray(), accountCapsule);
       ret.setStatus(fee, code.SUCESS);
@@ -42,6 +44,7 @@ public boolean execute(TransactionResultCapsule ret)
   }
 
   @Override
+  @Deprecated //Can not create account by api. Need send more than 1 trx , will create account if not exit.
   public boolean validate() throws ContractValidateException {
     try {
       if (!contract.is(AccountCreateContract.class)) {
@@ -69,11 +72,13 @@ public boolean validate() throws ContractValidateException {
   }
 
   @Override
+  @Deprecated //Can not create account by api. Need send more than 1 trx , will create account if not exit.
   public ByteString getOwnerAddress() throws InvalidProtocolBufferException {
     return contract.unpack(AccountCreateContract.class).getOwnerAddress();
   }
 
   @Override
+  @Deprecated //Can not create account by api. Need send more than 1 trx , will create account if not exit.
   public long calcFee() {
     return 0;
   }

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

@@ -106,7 +106,7 @@ public boolean validate() throws ContractValidateException {
           throw new ContractValidateException(
               "For a non-existent account transfer, the minimum amount is 1 TRX");
         }
-        toAccount = new AccountCapsule(transferContract.getToAddress(), AccountType.Normal);
+        toAccount = new AccountCapsule(transferContract.getToAddress(), AccountType.Normal, System.currentTimeMillis());
         dbManager.getAccountStore().put(transferContract.getToAddress().toByteArray(), toAccount);
       } else {
         //check to account balance if overflow

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

@@ -29,7 +29,6 @@
 import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.protos.Contract.TransferAssetContract;
-import org.tron.protos.Protocol.AccountType;
 import org.tron.protos.Protocol.Transaction.Result.code;
 
 public class TransferAssetActuator extends AbstractActuator {
@@ -131,14 +130,12 @@ public boolean validate() throws ContractValidateException {
       AccountCapsule toAccount = this.dbManager.getAccountStore()
           .get(transferAssetContract.getToAddress().toByteArray());
       if (toAccount == null) {
-        toAccount = new AccountCapsule(transferAssetContract.getToAddress(), AccountType.Normal);
-        dbManager.getAccountStore()
-            .put(transferAssetContract.getToAddress().toByteArray(), toAccount);
-      } else {
-        assetBalance = toAccount.getAssetMap().get(ByteArray.toStr(nameKey));
-        if (assetBalance != null) {
-          assetBalance = Math.addExact(assetBalance, amount); //check if overflow
-        }
+        throw new ContractValidateException("To account is not exit!");
+      }
+
+      assetBalance = toAccount.getAssetMap().get(ByteArray.toStr(nameKey));
+      if (assetBalance != null) {
+        assetBalance = Math.addExact(assetBalance, amount); //check if overflow
       }
     } catch (InvalidProtocolBufferException e) {
       throw new ContractValidateException(e.getMessage());