Fix Private Key Version (128)

Rikski · Dec 20, 2014 · a166092 · a166092
1 parent 5b406af
commit a166092
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/core/src/main/java/org/bitcoinj/core/CoinDefinition.java b/core/src/main/java/org/bitcoinj/core/CoinDefinition.java
@@ -40,13 +40,14 @@ public enum CoinPrecision {
 
     public static final String DONATION_ADDRESS = "FkknEYnex1MeZyPRnEebFK5ZBHHsFZbvaf";  //HashEngineering donation DGC address
 
-    public static final String UNSPENT_API_URL = "http://dgc.blockr.io/api/v1/address/unspent/";
+    public static final String UNSPENT_API_URL = "https://chainz.cryptoid.info/grs/api.dws?q=unspent";
     public enum UnspentAPIType {
         BitEasy,
         Blockr,
-        Abe
+        Abe,
+        Cryptoid,
     };
-    public static final UnspentAPIType UnspentAPI = UnspentAPIType.Blockr;
+    public static final UnspentAPIType UnspentAPI = UnspentAPIType.Cryptoid;
 
     enum CoinHash {
         SHA256,

diff --git a/core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java b/core/src/main/java/org/bitcoinj/core/DumpedPrivateKey.java
@@ -57,11 +57,7 @@ private static byte[] encode(byte[] keyBytes, boolean compressed) {
      */
     public DumpedPrivateKey(NetworkParameters params, String encoded) throws AddressFormatException {
         super(encoded);
-        if (CoinDefinition.allowBitcoinPrivateKey && version == 128)
-        {
-
-        }
-        else if (params != null && version != (params.getDumpedPrivateKeyHeader()))
+        if (params != null && version != (params.getDumpedPrivateKeyHeader()))
             throw new AddressFormatException("Mismatched version number, trying to cross networks? " + version +
                     " vs " + params.getDumpedPrivateKeyHeader());
         if (bytes.length == 33 && bytes[32] == 1) {

diff --git a/core/src/main/java/org/bitcoinj/core/Transaction.java b/core/src/main/java/org/bitcoinj/core/Transaction.java
@@ -1022,7 +1022,9 @@ public synchronized Sha256Hash hashForSignature(int inputIndex, byte[] connected
             uint32ToByteStreamLE(0x000000ff & sigHashType, bos);
             // Note that this is NOT reversed to ensure it will be signed correctly. If it were to be printed out
             // however then we would expect that it is IS reversed.
-            Sha256Hash hash = new Sha256Hash(doubleDigest(bos.toByteArray()));
+            //Sha256Hash hash = new Sha256Hash(doubleDigest(bos.toByteArray()));
+            byte [] bytes = bos.toByteArray();
+            Sha256Hash hash = new Sha256Hash(singleDigest(bytes, 0, bytes.length));
             bos.close();
 
             // Put the transaction back to how we found it.

diff --git a/core/src/main/java/org/bitcoinj/params/MainNetParams.java b/core/src/main/java/org/bitcoinj/params/MainNetParams.java
@@ -31,7 +31,7 @@ public MainNetParams() {
         targetTimespan = TARGET_TIMESPAN;
 
         maxTarget = CoinDefinition.proofOfWorkLimit;
-        dumpedPrivateKeyHeader = 128 + CoinDefinition.AddressHeader;
+        dumpedPrivateKeyHeader = 128;// + CoinDefinition.AddressHeader;
         addressHeader = CoinDefinition.AddressHeader;
         p2shHeader = CoinDefinition.p2shHeader;
         acceptableAddressCodes = new int[] { addressHeader, p2shHeader};