Merge pull request #356 from tronprotocol/develop-evan-blocksign

block witness signature need not to base64

Author: zhaohong

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

@@ -184,7 +184,7 @@ public void sign(byte[] privateKey) {
     // TODO private_key == null
     ECKey ecKey = ECKey.fromPrivate(privateKey);
     ECDSASignature signature = ecKey.sign(getRawHash().getBytes());
-    ByteString sig = ByteString.copyFrom(signature.toBase64().getBytes());
+    ByteString sig = ByteString.copyFrom(signature.toByteArray());
 
     BlockHeader blockHeader = this.block.getBlockHeader().toBuilder().setWitnessSignature(sig)
         .build();
@@ -201,7 +201,8 @@ public boolean validateSignature() throws ValidateSignatureException {
     try {
       return Arrays
           .equals(ECKey.signatureToAddress(getRawHash().getBytes(),
-              block.getBlockHeader().getWitnessSignature().toStringUtf8()),
+              TransactionCapsule
+                  .getBase64FromByteString(block.getBlockHeader().getWitnessSignature())),
               block.getBlockHeader().getRawData().getWitnessAddress().toByteArray());
     } catch (SignatureException e) {
       throw new ValidateSignatureException(e.getMessage());
@@ -228,9 +229,9 @@ public Sha256Hash calcMerkleRoot() {
     }
 
     Vector<Sha256Hash> ids = transactionsList.stream()
-            .map(TransactionCapsule::new)
-            .map(TransactionCapsule::getHash)
-            .collect(Collectors.toCollection(Vector::new));
+        .map(TransactionCapsule::new)
+        .map(TransactionCapsule::getHash)
+        .collect(Collectors.toCollection(Vector::new));
 
     return MerkleTree.getInstance().createTree(ids).getRoot().getHash();
   }