Update to bitcoinj 0.13.2

.gitignore

@@ -9,4 +9,3 @@ obj/
 libs/
 *.chain
 *.spvchain
-*.wallet

.travis.yml

@@ -1,13 +1,18 @@
 # configuration for https://travis-ci.org/bitcoinj/bitcoinj
 language: java
-jdk: openjdk6
-before_install: lsb_release -a
+jdk: oraclejdk8
 install: true # remove default
 script:
-  - mvn -q clean install
-  - cd wallettemplate
-  - jdk_switcher use oraclejdk8
-  - mvn -q clean install
+  - mvn -q clean install -Pno-network
+  - jdk_switcher use openjdk6
+  - cd orchid
+  - mvn -q clean package
+  - cd ../core
+  - mvn -q clean package -Pno-network
+
+after_success:
+  - cd ../core
+  - mvn jacoco:report coveralls:report
 
 notifications:
   irc:

AUTHORS

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 --------------darkcoinj
 HashEngineering <[email protected]>
 
@@ -45,3 +46,73 @@ Oscar Guindzberg <[email protected]>
 Richard Green <[email protected]>
 Martin Zachrison <[email protected]>
 Michael Bumann <[email protected]>
+=======
+$ git log --format='%aN' | sort -u
+
+Aaron Voisine
+Adam Mackler
+Alexander Lolis
+Alex Taylor
+Alon Muroch
+Amichai Rothman
+Andreas Schildbach
+Bennett Hoffman
+Carlos Lopez-Camey
+Carsten Otto
+cyberzac
+Dave Collins
+Diego Basch
+elbandi
+eleetas
+En-Ran Zhou
+Erik Tierney
+Fireduck
+freak
+Gary Rowe
+Giannis Dzegoutanis
+gubatron
+Harald Hoyer
+Jakob Stuber
+Jameson Lopp
+Jarl Fransson
+Jim Burton
+Jiri Peinlich
+Johnathan
+Jonny Heggheim
+Justas
+Kalpesh Parmar
+Ken Sedgwick
+Kevin Greene
+Kosta Korenkov
+Loco
+Manfred Karrer
+Martin Zachrison
+[email protected]
+Matt Corallo
+Michael Bell
+Michael Bumann
+Mike Hearn
+Mike Rosseel
+Miron Cuperman
+monk
+Mora Zyx
+ollekullberg
+Oscar Guindzberg
+Pavol Rusnak
+Peter Dettman
+Peter Stockli
+Peter Todd
+Piotr Włodarek
+Richard Green
+Ross Nicoll
+Sean Gilligan
+Sebastian Ortega
+Simon de la Rouviere
+Simon Vermeersch
+Stephen Reed
+troggy
+Tyler Houlihan
+Wojciech Langiewicz
+Xiaofeng Guo
+Ximo Guanter
+>>>>>>> upstream2/release-0.13

README.md

@@ -1,12 +1,13 @@
-Build status: [![Build Status](https://travis-ci.org/bitcoinj/bitcoinj.png?branch=master)](https://travis-ci.org/bitcoinj/bitcoinj)
+Build status: [![Build Status](https://travis-ci.org/bitcoinj/bitcoinj.png?branch=master)](https://travis-ci.org/bitcoinj/bitcoinj)  
+Coverage status: [![Coverage Status](https://coveralls.io/repos/bitcoinj/bitcoinj/badge.png?branch=master)](https://coveralls.io/r/bitcoinj/bitcoinj?branch=master)
 
 ### Welcome to bitcoinj
 
 The bitcoinj library is a Java implementation of the Bitcoin protocol, which allows it to maintain a wallet and send/receive transactions without needing a local copy of Bitcoin Core. It comes with full documentation and some example apps showing how to use it.
 
 ### Technologies
 
-* Java 6+
+* Java 6 for the core modules, Java 8 for everything else
 * [Maven 3+](http://maven.apache.org) - for building the project
 * [Orchid](https://github.com/subgraph/Orchid) - for secure communications over [TOR](https://www.torproject.org)
 * [Google Protocol Buffers](https://code.google.com/p/protobuf/) - for use with serialization and hardware communications

core/src/main/java/com/hashengineering/crypto/Sha512Hash.java

@@ -69,13 +69,6 @@ public static Sha512Hash create(byte[] contents) {
         }
     }
 
-    /**
-     * Calculates the hash of the hash of the contents. This is a standard operation in Bitcoin.
-     */
-    public static Sha512Hash createDouble(byte[] contents) {
-        return new Sha512Hash(Utils.doubleDigest(contents));
-    }
-
     /**
      * Returns a hash of the given files contents. Reads the file fully into memory before hashing so only use with
      * small files.

core/src/main/java/org/bitcoin/NativeSecp256k1.java

@@ -25,7 +25,7 @@
 /**
  * <p>This class holds native methods to handle ECDSA verification.</p>
  *
- * <p>You can find an example library that can be used for this at https://github.com/sipa/secp256k1</p>
+ * <p>You can find an example library that can be used for this at https://github.com/bitcoin/secp256k1</p>
  *
  * <p>To build secp256k1 for use with bitcoinj, run `./configure` and `make libjavasecp256k1.so` then copy
  * libjavasecp256k1.so to your system library path or point the JVM to the folder containing it with -Djava.library.path