use tx merkle hash

Author: olenheim

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

@@ -239,7 +239,7 @@ public Sha256Hash calcMerkleRoot() {
 
     Vector<Sha256Hash> ids = transactionsList.stream()
         .map(TransactionCapsule::new)
-        .map(TransactionCapsule::getHash)
+        .map(TransactionCapsule::getMerkleHash)
         .collect(Collectors.toCollection(Vector::new));
 
     return MerkleTree.getInstance().createTree(ids).getRoot().getHash();

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

@@ -180,12 +180,12 @@ public void createTransaction(com.google.protobuf.Message message, ContractType
     transaction = Transaction.newBuilder().setRawData(transactionBuilder.build()).build();
   }
 
-  public Sha256Hash getHash() {
+  public Sha256Hash getMerkleHash() {
     byte[] transBytes = this.transaction.toByteArray();
     return Sha256Hash.of(transBytes);
   }
 
-  public Sha256Hash getRawHash() {
+  private Sha256Hash getRawHash() {
     return Sha256Hash.of(this.transaction.getRawData().toByteArray());
   }
 
@@ -363,7 +363,7 @@ public boolean validateSignature() throws ValidateSignatureException {
   }
 
   public Sha256Hash getTransactionId() {
-    return Sha256Hash.of(this.transaction.getRawData().toByteArray());
+    return getRawHash();
   }
 
   @Override

src/main/java/org/tron/core/db/api/index/TransactionIndex.java

@@ -1,15 +1,14 @@
 package org.tron.core.db.api.index;
 
+import static com.googlecode.cqengine.query.QueryFactory.attribute;
+
 import com.googlecode.cqengine.attribute.Attribute;
 import com.googlecode.cqengine.attribute.SimpleAttribute;
 import com.googlecode.cqengine.index.disk.DiskIndex;
-import com.googlecode.cqengine.index.hash.HashIndex;
-import com.googlecode.cqengine.index.navigable.NavigableIndex;
-import com.googlecode.cqengine.index.suffix.SuffixTreeIndex;
-import com.googlecode.cqengine.persistence.Persistence;
 import com.googlecode.cqengine.persistence.disk.DiskPersistence;
-import com.googlecode.cqengine.persistence.offheap.OffHeapPersistence;
-import com.googlecode.cqengine.persistence.onheap.OnHeapPersistence;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import javax.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -20,13 +19,6 @@
 import org.tron.core.db.common.WrappedByteArray;
 import org.tron.protos.Protocol.Transaction;
 
-import javax.annotation.PostConstruct;
-import java.io.File;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-import static com.googlecode.cqengine.query.QueryFactory.attribute;
-
 @Component
 @Slf4j
 public class TransactionIndex extends AbstractIndex<TransactionCapsule, Transaction> {
@@ -55,7 +47,7 @@ public void init() {
   protected void setAttribute() {
     Transaction_ID =
         attribute("transaction id",
-            bytes -> new TransactionCapsule(getObject(bytes)).getRawHash().toString());
+            bytes -> new TransactionCapsule(getObject(bytes)).getTransactionId().toString());
     OWNERS =
         attribute(String.class, "owner address",
             bytes -> getObject(bytes).getRawData().getContractList().stream()

src/main/java/org/tron/core/net/node/NodeDelegateImpl.java

@@ -61,7 +61,7 @@ public synchronized LinkedList<Sha256Hash> handleBlock(BlockCapsule block, boole
         List<TransactionCapsule> trx = null;
         trx = block.getTransactions();
         return trx.stream()
-            .map(TransactionCapsule::getHash)
+            .map(TransactionCapsule::getTransactionId)
             .collect(Collectors.toCollection(LinkedList::new));
       } else {
         return null;