Merge pull request #615 from tronprotocol/transaction_bytes

check transaction size before broadcast

Author: zergweak

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

@@ -41,4 +41,7 @@ public class Constant {
   public static final String ADD_PRE_FIX_STRING_TESTNET = "a0";
   public static final int ADDRESS_SIZE = 42;
   public static final int BASE58CHECK_ADDRESS_SIZE = 35;
+
+  // config for transaction
+  public static final long TRANSACTION_MAX_BYTE_SIZE = 500 * 1024;
 }

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

@@ -43,13 +43,7 @@
 import org.tron.core.capsule.WitnessCapsule;
 import org.tron.core.db.AccountStore;
 import org.tron.core.db.Manager;
-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.ValidateBandwidthException;
-import org.tron.core.exception.ValidateSignatureException;
+import org.tron.core.exception.*;
 import org.tron.core.net.message.TransactionMessage;
 import org.tron.core.net.node.NodeImpl;
 import org.tron.protos.Contract.AccountCreateContract;
@@ -209,6 +203,9 @@ public boolean broadcastTransaction(Transaction signaturedTransaction) {
     TransactionCapsule trx = new TransactionCapsule(signaturedTransaction);
     try {
       Message message = new TransactionMessage(signaturedTransaction);
+      if (message.getData().length > Constant.TRANSACTION_MAX_BYTE_SIZE) {
+        throw new TooBigTransactionException("too big transaction, the size is " + message.getData().length + " bytes");
+      }
       dbManager.pushTransactions(trx);
       p2pNode.broadcast(message);
       return true;
@@ -223,8 +220,10 @@ public boolean broadcastTransaction(Transaction signaturedTransaction) {
     } catch (DupTransactionException e) {
       logger.error("dup trans", e);
     } catch (TaposException e) {
-      logger.error("tapos error", e);
-    }catch (Exception e){
+      logger.debug("tapos error", e);
+    } catch (TooBigTransactionException e) {
+      logger.debug("transaction error", e);
+    } catch (Exception e){
       logger.error("exception caught", e);
     }
     return false;
@@ -344,12 +343,12 @@ public Block getBlockById(ByteString BlockId) {
     if (Objects.isNull(BlockId)) {
       return null;
     }
-    Block blocke = null;
+    Block block = null;
     try {
-      blocke = dbManager.getBlockStore().get(BlockId.toByteArray()).getInstance();
+      block = dbManager.getBlockStore().get(BlockId.toByteArray()).getInstance();
     } catch (StoreException e) {
     }
-    return blocke;
+    return block;
   }
 
   public BlockList getBlocksByLimitNext(long number, long limit) {

src/main/java/org/tron/core/exception/TooBigTransactionException.java

@@ -0,0 +1,8 @@
+package org.tron.core.exception;
+
+public class TooBigTransactionException extends TronException {
+
+    public TooBigTransactionException() { super(); }
+
+    public TooBigTransactionException(String message) { super(message); }
+}