Blocks & Utilities

- Added ability to construct Transactions from Streams
- Added streaming constructor to VarInt
- Added functionality to Block. It used to be mostly a stub.
- Minor documentation fixes

Author: stephanfeb

build.gradle

@@ -21,7 +21,6 @@ javadoc {
 }
 
 java {
-    sourceCompatibility = JavaVersion.toVersion("1.8")
     withJavadocJar()
     withSourcesJar()
 }
@@ -109,3 +108,5 @@ javadoc {
 }
 
 
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11

src/main/java/org/twostack/bitcoin4j/PrivateKey.java

@@ -22,13 +22,18 @@
 import org.twostack.bitcoin4j.transaction.ReadUtils;
 
 import java.math.BigInteger;
+import java.util.Arrays;
 
 public class PrivateKey {
 
     ECKey key;
     boolean _hasCompressedPubKey;
     NetworkType _networkType;
 
+    public PrivateKey() {
+        this(new ECKey(), true, NetworkType.MAIN);
+    }
+
     public PrivateKey(ECKey key){
         this(key, true, NetworkType.MAIN);
     }
@@ -44,6 +49,9 @@ public byte[] sign(byte[] buffer){
         return sig.encodeToDER();
     }
 
+    public String toWIF(){
+        return key.getPrivateKeyAsWiF(_networkType);
+    }
 
     //FIXME: We can use DumpedPrivateKey to replace the internals here
     public static PrivateKey fromWIF(String wif) throws InvalidKeyException {
@@ -127,7 +135,18 @@ private static NetworkType decodeNetworkType(String wifKey) throws InvalidKeyExc
         }
     }
 
+    /**
+     * @return the PublicKey corresponding to this PrivateKey
+     */
     public PublicKey getPublicKey() {
         return PublicKey.fromHex(Utils.HEX.encode(key.getPubKey()));
     }
+
+
+    /**
+     * @return the ECKey backing this private key.
+     */
+    public ECKey getKey() {
+        return this.key;
+    }
 }

src/main/java/org/twostack/bitcoin4j/VarInt.java

@@ -20,6 +20,8 @@
 import com.google.common.primitives.Ints;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * A variable-length encoded unsigned integer using Satoshi's encoding (a.k.a. "CompactSize").
@@ -63,7 +65,7 @@ public VarInt(byte[] buf, int offset) {
         }
     }
 
-    public static VarInt fromStream(ByteArrayInputStream stream)  {
+    public static VarInt fromStream(InputStream stream) throws IOException {
         int first = 0xFF & stream.read();
         long value;
         if (first < 253) {