Merge pull request #491 from tronprotocol/refactor_block_store

Refactor block store

Author: olenheim

src/main/java/org/tron/common/application/ApplicationImpl.java

@@ -31,7 +31,7 @@ public class ApplicationImpl implements Application {
   private void resetP2PNode() {
     p2pNode.listen();
     //p2pNode.connectToP2PNetWork();
-    p2pNode.syncFrom(blockStoreDb.getHeadBlockId());
+    p2pNode.syncFrom(null);
   }
 
   @Override

src/main/java/org/tron/common/utils/Sha256Hash.java

@@ -21,6 +21,7 @@
 
 import com.google.common.io.ByteStreams;
 import com.google.common.primitives.Ints;
+import com.google.common.primitives.Longs;
 import com.google.protobuf.ByteString;
 import java.io.File;
 import java.io.FileInputStream;
@@ -44,6 +45,34 @@ public class Sha256Hash implements Serializable, Comparable<Sha256Hash> {
 
   private final byte[] bytes;
 
+
+  private byte[] generateBlockId(long blockNum, Sha256Hash blockHash) {
+    byte[] numBytes = Longs.toByteArray(blockNum);
+    byte[] hash = blockHash.getBytes();
+    System.arraycopy(numBytes, 0, hash, 0, 8);
+    return hash;
+  }
+
+  private byte[] generateBlockId(long blockNum, byte[] blockHash) {
+    byte[] numBytes = Longs.toByteArray(blockNum);
+    byte[] hash = blockHash;
+    System.arraycopy(numBytes, 0, hash, 0, 8);
+    return hash;
+  }
+
+  public Sha256Hash(long num, byte[] hash) {
+    byte[] rawHashBytes = this.generateBlockId(num, hash);
+    checkArgument(rawHashBytes.length == LENGTH);
+    this.bytes = rawHashBytes;
+  }
+
+  public Sha256Hash(long num, Sha256Hash hash) {
+    byte[] rawHashBytes = this.generateBlockId(num, hash);
+    checkArgument(rawHashBytes.length == LENGTH);
+    this.bytes = rawHashBytes;
+  }
+
+
   /**
    * Use {@link #wrap(byte[])} instead.
    */

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

@@ -15,6 +15,7 @@
 
 package org.tron.core.capsule;
 
+import com.google.common.primitives.Longs;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import java.security.SignatureException;
@@ -42,6 +43,7 @@ public class BlockCapsule implements ProtoCapsule<Block> {
 
   public static class BlockId extends Sha256Hash {
 
+
     @Override
     public boolean equals(Object o) {
       if (this == o) {
@@ -87,21 +89,28 @@ public BlockId() {
       num = 0;
     }
 
+    public BlockId(Sha256Hash blockId) {
+      super(blockId.getBytes());
+      byte[] blockNum = new byte[8];
+      System.arraycopy(blockId.getBytes(), 0, blockNum, 0, 8);
+      num = Longs.fromByteArray(blockNum);
+    }
+
     /**
      * Use {@link #wrap(byte[])} instead.
      */
     public BlockId(Sha256Hash hash, long num) {
-      super(hash.getBytes());
+      super(num, hash);
       this.num = num;
     }
 
     public BlockId(byte[] hash, long num) {
-      super(hash);
+      super(num, hash);
       this.num = num;
     }
 
     public BlockId(ByteString hash, long num) {
-      super(hash.toByteArray());
+      super(num, hash.toByteArray());
       this.num = num;
     }
 
@@ -302,7 +311,8 @@ public String toString() {
     toStringBuff.append("hash=").append(getBlockId()).append("\n");
     toStringBuff.append("number=").append(getNum()).append("\n");
     toStringBuff.append("parentId=").append(getParentHash()).append("\n");
-    toStringBuff.append("witness address=").append(ByteUtil.toHexString(getWitnessAddress().toByteArray())).append("\n");
+    toStringBuff.append("witness address=")
+        .append(ByteUtil.toHexString(getWitnessAddress().toByteArray())).append("\n");
 
     toStringBuff.append("generated by myself=").append(generatedByMyself).append("\n");
     toStringBuff.append("generate time=").append(Time.getTimeString(getTimeStamp())).append("\n");

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

@@ -0,0 +1,5 @@
+package org.tron.core.capsule;
+
+public class BlockIdentifierCapsule {
+
+}

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

@@ -28,6 +28,7 @@
 import java.security.SignatureException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.crypto.ECKey;
 import org.tron.common.crypto.ECKey.ECDSASignature;
@@ -334,8 +335,58 @@ public Transaction getInstance() {
     return this.transaction;
   }
 
+  private StringBuffer toStringBuff = new StringBuffer();
+
+
   @Override
   public String toString() {
-    return this.transaction.toString();
+
+    toStringBuff.setLength(0);
+    toStringBuff.append("TransactionCapsule \n[ ");
+
+    toStringBuff.append("hash=").append(getTransactionId()).append("\n");
+    AtomicInteger i = new AtomicInteger();
+    if (!getInstance().getRawData().getContractList().isEmpty()) {
+      toStringBuff.append("contract list:{ ");
+      getInstance().getRawData().getContractList().forEach(contract -> {
+        toStringBuff.append("[" + i + "] ").append("type: ").append(contract.getType())
+            .append("\n");
+        toStringBuff.append("from address=").append(getOwner(contract)).append("\n");
+        toStringBuff.append("to address=").append(getToAddress(contract)).append("\n");
+        if (contract.getType().equals(ContractType.TransferContract)) {
+          TransferContract transferContract;
+          try {
+            transferContract = contract.getParameter()
+                .unpack(TransferContract.class);
+            toStringBuff.append("transfer amount=").append(transferContract.getAmount())
+                .append("\n");
+          } catch (InvalidProtocolBufferException e) {
+            e.printStackTrace();
+          }
+        } else if (contract.getType().equals(ContractType.TransferAssetContract)) {
+          TransferAssetContract transferAssetContract;
+          try {
+            transferAssetContract = contract.getParameter()
+                .unpack(TransferAssetContract.class);
+            toStringBuff.append("transfer asset=").append(transferAssetContract.getAssetName())
+                .append("\n");
+            toStringBuff.append("transfer amount=").append(transferAssetContract.getAmount())
+                .append("\n");
+          } catch (InvalidProtocolBufferException e) {
+            e.printStackTrace();
+          }
+        }
+        if ( this.transaction.getSignatureList().size() >= i.get() + 1) {
+          toStringBuff.append("sign=").append(getBase64FromByteString(
+              this.transaction.getSignature(i.getAndIncrement()))).append("\n");
+        }
+      });
+      toStringBuff.append("}\n");
+    } else {
+      toStringBuff.append("contract list is empty\n");
+    }
+
+    toStringBuff.append("]");
+    return toStringBuff.toString();
   }
-}
+}

src/main/java/org/tron/core/db/BlockStore.java

@@ -19,12 +19,9 @@
 import java.util.Iterator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
-import org.tron.common.utils.Sha256Hash;
 import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.db.common.iterator.BlockIterator;
 import org.tron.core.exception.BadItemException;
@@ -57,45 +54,20 @@ public void put(byte[] key, BlockCapsule item) {
     super.put(key, item);
   }
 
-  /** create fun. */
+  /**
+   * create fun.
+   */
   public static BlockStore create(String dbName) {
     if (instance == null) {
       synchronized (BlockStore.class) {
         if (instance == null) {
-          logger.info("adafasdfasdfasdfasdf");
           instance = new BlockStore(dbName);
         }
       }
     }
     return instance;
   }
 
-  /** to do. */
-  public Sha256Hash getHeadBlockId() {
-    return head == null ? Sha256Hash.ZERO_HASH : head.getBlockId();
-  }
-
-  /** Get the head block's number. */
-  @Deprecated
-  public long getHeadBlockNum() {
-    return head == null ? 0 : head.getNum();
-  }
-
-  @Deprecated
-  public DateTime getHeadBlockTime() {
-    return head == null ? getGenesisTime() : new DateTime(head.getTimeStamp());
-  }
-
-  @Deprecated
-  public long currentASlot() {
-    return getHeadBlockNum(); // assume no missed slot
-  }
-
-  // genesis_time
-  public DateTime getGenesisTime() {
-    return DateTime.parse("20180101", DateTimeFormat.forPattern("yyyyMMdd"));
-  }
-
   @Override
   public BlockCapsule get(byte[] key) throws ItemNotFoundException, BadItemException {
     byte[] value = dbSource.getData(key);