use tx raw hash as txMsg id

Author: olenheim

src/main/java/org/tron/core/net/message/BlockMessage.java

@@ -22,7 +22,7 @@ public BlockMessage(Block block) {
     this.data = block.toByteArray();
   }
 
-  public BlockMessage(BlockCapsule block) throws Exception {
+  public BlockMessage(BlockCapsule block) {
     data = block.getData();
     this.type = MessageTypes.BLOCK.asByte();
     this.block = block.getInstance();

src/main/java/org/tron/core/net/message/TransactionMessage.java

@@ -1,5 +1,6 @@
 package org.tron.core.net.message;
 
+import org.tron.common.utils.Sha256Hash;
 import org.tron.core.capsule.TransactionCapsule;
 import org.tron.protos.Protocol;
 import org.tron.protos.Protocol.Transaction;
@@ -20,6 +21,11 @@ public TransactionMessage(Transaction trx) {
     this.data = trx.toByteArray();
   }
 
+  @Override
+  public Sha256Hash getMessageId() {
+    return getTransactionCapsule().getTransactionId();
+  }
+
   @Override
   public String toString() {
     return new StringBuilder().append(super.toString())